From nobody Mon Jul 7 10:06: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 4bbKf02wWqz61JjG; Mon, 07 Jul 2025 10:06:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bbKf02NRtz3drb; Mon, 07 Jul 2025 10:06:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1751882808; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5YHuSVJzdpqlurqztWWVXTT1TE6DwJu9Q95ISWBUAZQ=; b=xpYUqpalITkvEByjdeVH2QBs15QmsKPJhYxyFRIWiLYDU0QAV/olUDKNFo2BEWzJv+nzTx Kfpq0yJdfLamRhihCdevjLdybFX0JYgPyzC1UDmdRVaDjNwGULwgxKzsufhYafiVao77T6 pU6c+wrHUuoSgs+xWtUMnTifZ+712Q9DkKvx5l47pfU8OyDinLHKokGNvFpN+VqE0wh34t Bs6LovmI9Ll6Hl3ugTlh7SUZ4av8+vpDAz+vpnqg+F/98pQKFp8BhEB6a/PGgS8imZTIZ9 o5/hZd3A3vsUsmhBmbppACKpVZfy8lMCvFRIqjqDpKwH5JVeVFp2QA2DOx11kQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1751882808; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5YHuSVJzdpqlurqztWWVXTT1TE6DwJu9Q95ISWBUAZQ=; b=KfNkZcUcP2QlJnA99mnGKUwPhFWE+cSMph3SiQt28h+N4UKZLyUEc4Ou7bjsXJVq7qJmsO +1qIWJXsM/VxNGR821PIPuJ4plncc/8/wZX3MvhIfEE6EgJqYJtbg+c8J6caiBHogcNFBk jVTJ9n7qgNmGRX5kXZ0A6r5KhIZHCrZNGBWLor/EDVmOmLECD4NvEk1UPQe4gpmD2/olVd n7oQeI8b+sRA6RwsnBTqRwp00/MpKzaOZpHrJrUtEk5/IkfN5baYUMxDd0VogJBgoWduub 0CzRN/07g/iqSLE4beFgcVbICINsHmzL/+oQCtnFg207R2gQiK7G5okkfUeL6A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1751882808; a=rsa-sha256; cv=none; b=AAph3gxXx/s6r71K7YapGVNrYHJnk2QtwESnBvsHfnE2qc4dJFUw/BUDEaQrqC/nImZVa4 uv/H32yYgM7mkzis5Tu2C6vABGGuoQd/0GgmrFGnkBcFMSKFCO4XCc/OPLDuizRoEnmEzJ s8PbHhSZ1GktARnJacA5InqJGUbLF4jMZWXBD3HpxgZVCPNA2WsVlZR4aMGL72TlNSg6Ji sBUFMKOefOSSvlD14tzZMSXC7txAkUHX+JdOfhKFkJ8L6J/u/T3d+Jk4QmUr823/CEITMK uTC+e5lN4jS52GFerlkTm5j6E7LUbULJiGCYGxGqKPrOF995TPu23V26L77heg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4bbKf01PqrzmKQ; Mon, 07 Jul 2025 10:06: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 567A6mSe053093; Mon, 7 Jul 2025 10:06:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 567A6mZi053090; Mon, 7 Jul 2025 10:06:48 GMT (envelope-from git) Date: Mon, 7 Jul 2025 10:06:48 GMT Message-Id: <202507071006.567A6mZi053090@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Zhenlei Huang Subject: git: 72652c93e396 - stable/14 - git-blame-ignore-revs: bpf: Some style and white space cleanup List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 72652c93e39695dc86814aa0ed99957015ed3b90 Auto-Submitted: auto-generated The branch stable/14 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=72652c93e39695dc86814aa0ed99957015ed3b90 commit 72652c93e39695dc86814aa0ed99957015ed3b90 Author: Zhenlei Huang AuthorDate: 2024-09-20 10:09:13 +0000 Commit: Zhenlei Huang CommitDate: 2025-07-07 10:00:27 +0000 git-blame-ignore-revs: bpf: Some style and white space cleanup Hash is updated to match MFC commit. (cherry picked from commit 99215a19448343574ff615e382b2525cec597fe7) --- .git-blame-ignore-revs | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs index ee6fb2d39f52..095b030b32a0 100644 --- a/.git-blame-ignore-revs +++ b/.git-blame-ignore-revs @@ -12,6 +12,8 @@ 49066283a4c1fc5c9d6c4cbee00cc941f4b09792 # bin/ps whitespace cleanup ad94fb48d8bda7cfaec68b3c7897594991b474bc +# style and whitespace fixes for bpf +f97d0c91eefc8568a11ad47f910cdd9dc7826a72 # sort OptionalObsoleteFiles.inc blocks e027fb0ee8d767f577a1c6f73506128beb6384ef 084cbd8c7283952d68f2c40e27e900fe0af5d97e From nobody Mon Jul 7 10:06: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 4bbKf14fvvz61J2x; Mon, 07 Jul 2025 10:06: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bbKf11qSzz3djk; Mon, 07 Jul 2025 10:06:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1751882809; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=TpSWNQyuNdQ/8xdw3U/6NFmzJ12vZ47tQaoD8P8ZENg=; b=iOfNaL2IQoIGGAsit9ymR+ATgU+PdDvIma7xCUMSZBaBbjyGANENLcwdUfUwWX4wco13oy 4FrHbo7Kjx7oOTLu4izd2G06f49+zQgWGZg0xwmD1RBPGPzJtSh9t+WQl1M4Vp6z1Wno9v GHg93Yl7lRJNtkXdpeCwrVX+fv/vzsPiGN/UgkJS1KZcQYHgNGfJ9mo70YWWx92SzvmEPP EFHbdfVh/iufGhfcAr+W38iilQmNkoxgspvrXBdp8YuttvTP/G/8uxW/ilGW3jJj8XIqVr OVUvNzHZFfbwGjAIl8LXbs9A91RPDwN0Yh6TQrHQL14gGlerLPIeRIt7Mi7/Pw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1751882809; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=TpSWNQyuNdQ/8xdw3U/6NFmzJ12vZ47tQaoD8P8ZENg=; b=EbYl/Z+lgf7itfgsChHYGPblJX+bQr0+mWBRCFNAh/HukV7j1VuwrnsyGlPGS5wgo5Gtkh SdTzQCgxB09cXDQ0/CNi2AOytD8XYr3f/KcjSGspWDN4Z6f5HcZ26cjp6BBF6GQddrY3sn e7P5U/OM4Z5X1mKbPi99z0pto0Lza3yxcGi+dXsJyZfU0KkgaAepFVvxkCKQJ5/m5HbGzr uF5sA4BR0HtQ1t2nlF9nkF/r+1/cu+EoWL99BOAOfgDRwl0cmgnBRidQ3sCrP07wVXwNhp zLxpoF7SGAL2OEvwmTH3xEuRLGPOYT/grFmPw/6ZfRq7L3RfXVftICCnnYMkMg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1751882809; a=rsa-sha256; cv=none; b=ruy6sbaxXXjHgr1TxjOA6hqptX6ik7FBn4MPBwFty4RG5PSPf7affUv6UglLV4veAiGWZN W8MADYd8e9mvacjCof44A6WBX6oSVbzpemqb1+CQS8CdfUerv32iWSp6VS9+wVQLjic9IF UR6ZqHNfk6h/BGX2/kJnYIeJMr6JYTTAto/GcjNB4eB0UlBPA9VJeztZkwuVdfZoVjUrU9 7apLTVzkU6VzmdxV6rPbw19hjrpf61vfkMoJ4TQPNxvRcKCxrxYO1v1V/6EfrCFUVItBLI NLF6R/KA6sCjqP119ahXtLXWCo4KDwcrpk7FBT3YypGKFNamRCnKV9udgVnXjg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4bbKf11RLYzmKR; Mon, 07 Jul 2025 10:06: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 567A6nv7053127; Mon, 7 Jul 2025 10:06:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 567A6nV6053124; Mon, 7 Jul 2025 10:06:49 GMT (envelope-from git) Date: Mon, 7 Jul 2025 10:06:49 GMT Message-Id: <202507071006.567A6nV6053124@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Zhenlei Huang Subject: git: f0931a31f536 - stable/14 - git-blame-ignore-revs: iflib: Many style fixes List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: f0931a31f536eb5af7d2cb3242008133ba38dbea Auto-Submitted: auto-generated The branch stable/14 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=f0931a31f536eb5af7d2cb3242008133ba38dbea commit f0931a31f536eb5af7d2cb3242008133ba38dbea Author: Zhenlei Huang AuthorDate: 2024-09-22 02:09:29 +0000 Commit: Zhenlei Huang CommitDate: 2025-07-07 10:00:28 +0000 git-blame-ignore-revs: iflib: Many style fixes Hash is updated to match MFC commit. (cherry picked from commit 0ca553d761e5832ad6ff6fab0a3b896c8fe9d813) --- .git-blame-ignore-revs | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs index 095b030b32a0..2217c5610011 100644 --- a/.git-blame-ignore-revs +++ b/.git-blame-ignore-revs @@ -12,6 +12,8 @@ 49066283a4c1fc5c9d6c4cbee00cc941f4b09792 # bin/ps whitespace cleanup ad94fb48d8bda7cfaec68b3c7897594991b474bc +# style fixes for iflib +647860bff21446419dee923b07490fd4a6cd181a # style and whitespace fixes for bpf f97d0c91eefc8568a11ad47f910cdd9dc7826a72 # sort OptionalObsoleteFiles.inc blocks From nobody Mon Jul 7 10:06: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 4bbKf256mHz61J2y; Mon, 07 Jul 2025 10:06: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bbKf232vpz3djq; Mon, 07 Jul 2025 10:06:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1751882810; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5XtvKr+C0oeZe8gtM2uY4uK3/emDu0J0P65PXMOGYF8=; b=ek8elVoOhIas7MxL3zPGwE+ELAkTkqmfcQyHkCAxTWTTKRkL+Z4//gu8VmmIBdTBZi/NtE N2UtjXtmx/ocFmFIvStDIt6u1+KIGWIn9LXpDwKR4AqKf0JfClf3dH9J24PXQJ5G03E9Nw RFVFjQ4j+8Q69rHwX8nvQnVFmoCYGTHIk4qFPbQhdaJDuG/rfNWU2YDh7LqCBc0hE61+AS 3hNI51zCYd1cdXd9BqbTXH28fip6At6u/ZLfQnksyzs19akdQig6QZIYYK4rxKi4zdvPqP jIx51PJR3LtJkZaobAMYlq5oQWZ9JCnydOFSyl6Hv1LbIMLJdwcbxcwoFJNc9g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1751882810; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5XtvKr+C0oeZe8gtM2uY4uK3/emDu0J0P65PXMOGYF8=; b=uvKErimOw6RpVBHVIFJA6py2FnwRp881KNXONXF8ZrAJy26KtkoNvCLd6rK+hZ2RhnJ/U+ oDFpXNZc8+AsLPeQMqzUEcZD1/k7Ex+49yRNzTikqK0D1v6CFQG+lEBNJjiKrgV2IGJ+dY fQQCHacyHKtTdOhRDJWLtwcnIWFdgR1JYqEFNsg1eQ8qL0J5vDFHua/5VzhlDKk2ciZTmK hwM4gweiqmpGc/j1CAOH4QhxQ+Bx7DUUfmgoz/9aVckwijdcb0SaArwMImDmFc6tuKkxOw oui935KwXb9ZbIdf0P8Mo09R3c/XjulVsLZ68SHNh3BTD7MyLavLdC846OoGIw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1751882810; a=rsa-sha256; cv=none; b=FG+YlWBBKZ3D9dteQJg1qtWkgplJtTFK6Lb9AUbo1qH/UAbgblmwCd5yrDnIpBJ8hIH/KX 5xCgxaehUEPUupv0Y9xDonR2OoaSu43bSNfegzjZMDqX8otWtUUX8YZNs9ojKlR4jsGceA rxw4+aHPz2hZVsS8hDql6L0KztSliEECDHQGLEN0tKXMHMREEtV369LpiWmhyHOQ/PlVRs R3YHhzi79wppu1parUteXyCwCEop0o+WH+tKYrsJRbWZEsiZKq/JJMnTxM+1hhBb7sE9mt CXtL7RZ6c6NTffVlRNW95px3xOqJUUsAQA21Mp04zQX3WdZEiFu9U0ZfdlscGQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4bbKf22fxVzmsD; Mon, 07 Jul 2025 10:06: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 567A6oIQ053161; Mon, 7 Jul 2025 10:06:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 567A6oiW053158; Mon, 7 Jul 2025 10:06:50 GMT (envelope-from git) Date: Mon, 7 Jul 2025 10:06:50 GMT Message-Id: <202507071006.567A6oiW053158@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Zhenlei Huang Subject: git: 8ba6d328fdf8 - stable/14 - git-blame-ignore-revs: sys/sys/kernel.h: Various whitespace fixes List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 8ba6d328fdf85f9d048092533125421ef2fcf8e5 Auto-Submitted: auto-generated The branch stable/14 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=8ba6d328fdf85f9d048092533125421ef2fcf8e5 commit 8ba6d328fdf85f9d048092533125421ef2fcf8e5 Author: Zhenlei Huang AuthorDate: 2024-12-06 11:41:34 +0000 Commit: Zhenlei Huang CommitDate: 2025-07-07 10:00:28 +0000 git-blame-ignore-revs: sys/sys/kernel.h: Various whitespace fixes Hash is updated to match MFC commit. (cherry picked from commit 99f7c0550433782cd228b518173cca5d23998c36) --- .git-blame-ignore-revs | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs index 2217c5610011..9f873aadd745 100644 --- a/.git-blame-ignore-revs +++ b/.git-blame-ignore-revs @@ -12,6 +12,8 @@ 49066283a4c1fc5c9d6c4cbee00cc941f4b09792 # bin/ps whitespace cleanup ad94fb48d8bda7cfaec68b3c7897594991b474bc +# whitespace fixes for sys/sys/kernel.h +3f879ed6eee9618ff7611f5de7a73868ef0cebb9 # style fixes for iflib 647860bff21446419dee923b07490fd4a6cd181a # style and whitespace fixes for bpf From nobody Mon Jul 7 10:06:51 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4bbKf40n9sz61JbY; Mon, 07 Jul 2025 10:06:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bbKf33hJVz3drj; Mon, 07 Jul 2025 10:06:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1751882811; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=wMFJyEW+0Ym+oDdmVIbpJrEll/epM1znA2Qf4qFIPVI=; b=KVpppKXtGagIqeIE6KzKDy5C+xVtGrnwKD0RrUimSj6oOAYQW3mcoOuWK9IMPF6JNiPYsy OBCbvJy9TcN15lYCBZ89uO3eK+RDjUlVYfDf2bkrBGXf9RjeuZYTfDE8ZDmh1JdQHTMbx0 Vqc8xiq4ZBZOK661OLXYUj+WG8ZxLQsVHoUysKz+q09igLAx7xHGfEFFQBE6GImhMPbEjr iENZOHw+GFwPffLp30hMN4wEcRcYDwGAgAiwUuH/NYpdYyBaHl5sIcboL5ZEYYVS/LamQL aH2e1l9nffDvSLwMEh2KTFoy/wOwdgsYpgOlXgPAaBXS5FP0aMTlj8+gtHzvpg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1751882811; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=wMFJyEW+0Ym+oDdmVIbpJrEll/epM1znA2Qf4qFIPVI=; b=S0I4I3VEZy3MBbdfBPIO8UL6He29I5SzkAHmI8pwaFoJJbcSTp2HgXpq18Xnnw4r5xKLg8 2gDS5oPTKfw6VHE2hUjxmrq7gzH7hdRW6trviXgBuWdGPFaCYTqj2tukDODJRcYYGcJsaR 0pUG9GA0TpksXkzjf1lLqxT4wLat0TUJJisscfbLA8qVqmYbexFM/U7ucrdzDHuRPi27P7 qLJ2s3AArooAPvLk3yo3KL/5Dj35DohCM7Dco1uLY8gJRo6HlulRjicqtRsW4ijTzdTk7M 3B4n8qoY2t2cmDByvFiuMbF53TZNLd1RWjk1RtoegCeYNmWAUoDPp4gZ4yqiXw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1751882811; a=rsa-sha256; cv=none; b=FBgigv/a3RNE8qNokXczhnMQDm3QOXdSyOixwMRrmBXMRz8T0YsBv2dvknGIjQy4UEpDjB /BFbxvGyuI2uWLo/DSew48yWd0WsJQpl1ApOr4uxmje5+WACZlBB+K8JI/aIf4RNr+zn4M dWk4i7cNPBelQtm4QoYMLTh3RZGcLcucZHVro5eYWP8dIv+9wEQAMKHOxDu8e9cR+Qb0w6 dbs2aIkSlifQv0scFKEncaEtMXQm+KDoQOeg1eyfYplN4rcW+pmM63CDuNd9mZCdLu5+RY zk7wAVcIDu6+CZSCf/4Ctardot4jk6aNhHUM0BLB6F1NDGOCHspVw1uml+IHmA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4bbKf33H87zmcr; Mon, 07 Jul 2025 10:06: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 567A6pZU053195; Mon, 7 Jul 2025 10:06:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 567A6pxr053192; Mon, 7 Jul 2025 10:06:51 GMT (envelope-from git) Date: Mon, 7 Jul 2025 10:06:51 GMT Message-Id: <202507071006.567A6pxr053192@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Zhenlei Huang Subject: git: 839b9596b35d - stable/14 - axgbe: Fix setting promisc mode List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 839b9596b35d516f6df444898f477cfb3d00a8db Auto-Submitted: auto-generated The branch stable/14 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=839b9596b35d516f6df444898f477cfb3d00a8db commit 839b9596b35d516f6df444898f477cfb3d00a8db Author: Zhenlei Huang AuthorDate: 2024-10-12 13:56:56 +0000 Commit: Zhenlei Huang CommitDate: 2025-07-07 10:00:29 +0000 axgbe: Fix setting promisc mode Ethernet drivers should respect IFF_PROMISC rather than IFF_PPROMISC. The latter is for user-requested promisc mode, it implies the former but not vice versa. Some in-kernel components such as if_bridge(4) and bpf(4) will set promisc mode for interfaces on-demand. While here, update the debugging message to be not confusing. This was spotted while reviewing markj@ 's work D46524. Test from Franco shows that the interface seems to be unconditionally initialized to promisc mode regardless of this fix. That needs further investigation. Reviewed by: markj, Franco Fichtner Tested by: Franco Fichtner MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D46794 (cherry picked from commit c7a2636889a649985e323de23fe495608b6fe483) --- sys/dev/axgbe/if_axgbe_pci.c | 10 ++++++---- sys/dev/axgbe/xgbe-dev.c | 2 +- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/sys/dev/axgbe/if_axgbe_pci.c b/sys/dev/axgbe/if_axgbe_pci.c index 5922e29d33a8..ee800011ff24 100644 --- a/sys/dev/axgbe/if_axgbe_pci.c +++ b/sys/dev/axgbe/if_axgbe_pci.c @@ -2318,11 +2318,11 @@ axgbe_if_promisc_set(if_ctx_t ctx, int flags) axgbe_printf(1, "%s: MAC_PFR 0x%x drv_flags 0x%x if_flags 0x%x\n", __func__, XGMAC_IOREAD(pdata, MAC_PFR), if_getdrvflags(ifp), - if_getflags(ifp)); + flags); - if (if_getflags(ifp) & IFF_PPROMISC) { + if (flags & IFF_PROMISC) { - axgbe_printf(1, "User requested to enter promisc mode\n"); + axgbe_printf(1, "Requested to enter promisc mode\n"); if (XGMAC_IOREAD_BITS(pdata, MAC_PFR, PR) == 1) { axgbe_printf(1, "Already in promisc mode\n"); @@ -2331,10 +2331,11 @@ axgbe_if_promisc_set(if_ctx_t ctx, int flags) axgbe_printf(1, "Entering promisc mode\n"); XGMAC_IOWRITE_BITS(pdata, MAC_PFR, PR, 1); + /* Disable VLAN filtering */ XGMAC_IOWRITE_BITS(pdata, MAC_PFR, VTFE, 0); } else { - axgbe_printf(1, "User requested to leave promisc mode\n"); + axgbe_printf(1, "Requested to leave promisc mode\n"); if (XGMAC_IOREAD_BITS(pdata, MAC_PFR, PR) == 0) { axgbe_printf(1, "Already not in promisc mode\n"); @@ -2343,6 +2344,7 @@ axgbe_if_promisc_set(if_ctx_t ctx, int flags) axgbe_printf(1, "Leaving promisc mode\n"); XGMAC_IOWRITE_BITS(pdata, MAC_PFR, PR, 0); + /* Enable VLAN filtering */ XGMAC_IOWRITE_BITS(pdata, MAC_PFR, VTFE, 1); } diff --git a/sys/dev/axgbe/xgbe-dev.c b/sys/dev/axgbe/xgbe-dev.c index 786e04930780..9f974112c2ba 100644 --- a/sys/dev/axgbe/xgbe-dev.c +++ b/sys/dev/axgbe/xgbe-dev.c @@ -971,7 +971,7 @@ xgbe_config_rx_mode(struct xgbe_prv_data *pdata) { unsigned int pr_mode, am_mode; - pr_mode = ((if_getflags(pdata->netdev) & IFF_PPROMISC) != 0); + pr_mode = ((if_getflags(pdata->netdev) & IFF_PROMISC) != 0); am_mode = ((if_getflags(pdata->netdev) & IFF_ALLMULTI) != 0); xgbe_set_promiscuous_mode(pdata, pr_mode); From nobody Mon Jul 7 10:06: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 4bbKf465g0z61J37; Mon, 07 Jul 2025 10:06:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bbKf44StQz3dZq; Mon, 07 Jul 2025 10:06:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1751882812; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=F8+D38bQ4xI3bPzBPwAyn4tUzu2bHkjyMC3BQZsX7gM=; b=TlQiItOBw4jgVr7/ELPXnTERtMB8nnbmavK2R0P2+YpcD3YOtuhLf1TFqSQxxNugiDLV0Q jHdDL0inxbCgZL7t/Ecc15oPFBDCDmdP+a9WF/nxoDtYwP+B7nAVdULMsccXu1BWCzUfn0 YkbQd0mzwjjhzvit2vSKWMf4eA7KSocV8I73lKvXJWjgbgdpvZQBUGLUNj0a8O8iJTL67f G/j3UBuD266Hajcb/k3MQDZBOBoPNkZhX7L4VsOuaDGN6pEBewQh3aVSLQCbVkC4pJlRtR D6usL/0+3ZEoSCBH2Jr31ZHuG2fY1iZTxi4l7E8nWgzHQriI87UevPN4FKuLjw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1751882812; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=F8+D38bQ4xI3bPzBPwAyn4tUzu2bHkjyMC3BQZsX7gM=; b=GD++Nn3Xu+J1Q1ldEFAVyRNK3Uc72iomwXDZ+wvnekJtsNVnHL5ZOy5sX+rlr1eiCWQnSN Y8g5M/UOKsQFY2v2lkj7lTH/HNIzek6x99zg9Wituq1a60k7i/ClkKIvqjlqsyxhb+urA9 Z9aaY4dxsZqIWx5pazJMeE6zWh7YAvOI/1Xre0IJGLZTeqSow12l+Ns/XnFRp+coMVGO4h FVhUt64+hOKIe3aPmIELhC8bo33CpdTa+U2yCdtof35IRqRD3fzmcaQXRm/aUwKiRfJjuS KbBUc6zQJbsO12XMf4TDJtLgV4/OP5+uYtv3WnjxRNyWWx7CyDqxbku3Q+oUkQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1751882812; a=rsa-sha256; cv=none; b=rTQZNb55FcmUHKP5rh5Q6khBcDuslilayn/leWg+MF9q0Fo/yrHs7fXW+peCzlRd7s4ZQz LXu8wagc7NGJhqhWwgC+3iIf/rcMnA4IBBX7wLMVevcOqk0SD06HWUQWkJiPw7CVyT0rEc K1Se1DLychb6ZY1TMfKQ57vBLNHEH4J1JoxmZVQHz33RAEWNPJVK1F7C6x0DO85+fPd/CP Hje2GGR1MnCW0Pv2K7KBKvcOOxc9OO33lMQyDdxRS3fmRqhRYRB1d7ZokAmAos/PfN3r4+ jeDGKeSURUdU/sX9qX5Po1SEEuZAzrN9Xg8IyqA3RTnOPrk54qj+H1tuKgti7A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4bbKf43tSCzmcs; Mon, 07 Jul 2025 10:06: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 567A6qpF053235; Mon, 7 Jul 2025 10:06:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 567A6qfo053232; Mon, 7 Jul 2025 10:06:52 GMT (envelope-from git) Date: Mon, 7 Jul 2025 10:06:52 GMT Message-Id: <202507071006.567A6qfo053232@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Zhenlei Huang Subject: git: f5195b1a63df - stable/14 - netinet6: Remove a set but not used global variable in6_maxmtu List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: f5195b1a63df2c84d05b29a908e96c107f86a029 Auto-Submitted: auto-generated The branch stable/14 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=f5195b1a63df2c84d05b29a908e96c107f86a029 commit f5195b1a63df2c84d05b29a908e96c107f86a029 Author: Zhenlei Huang AuthorDate: 2025-05-21 10:09:01 +0000 Commit: Zhenlei Huang CommitDate: 2025-07-07 10:00:29 +0000 netinet6: Remove a set but not used global variable in6_maxmtu and its setter in6_setmaxmtu(). This variable was introduced by the KAME projec [1]. It holds the max IPv6 MTU through all the interfaces, but is never used anywhere. [1] 82cd038d51e2 KAME netinet6 basic part(no IPsec,no V6 Multicast Forwarding, no UDP/TCP for IPv6 yet) Reviewed by: glebius MFC after: 1 month Differential Revision: https://reviews.freebsd.org/D49357 (cherry picked from commit e64fe5ad3a23a9f471ebf11e04e490588913c7af) --- sys/netinet6/in6.c | 25 ------------------------- sys/netinet6/in6_ifattach.c | 6 ------ sys/netinet6/in6_var.h | 4 ---- sys/netinet6/nd6.c | 4 ---- sys/netinet6/nd6_rtr.c | 8 ++------ 5 files changed, 2 insertions(+), 45 deletions(-) diff --git a/sys/netinet6/in6.c b/sys/netinet6/in6.c index 60497ae29852..0e2c19efe9d5 100644 --- a/sys/netinet6/in6.c +++ b/sys/netinet6/in6.c @@ -2114,31 +2114,6 @@ in6if_do_dad(struct ifnet *ifp) return (1); } -/* - * Calculate max IPv6 MTU through all the interfaces and store it - * to in6_maxmtu. - */ -void -in6_setmaxmtu(void) -{ - struct epoch_tracker et; - unsigned long maxmtu = 0; - struct ifnet *ifp; - - NET_EPOCH_ENTER(et); - CK_STAILQ_FOREACH(ifp, &V_ifnet, if_link) { - /* this function can be called during ifnet initialization */ - if (!ifp->if_afdata[AF_INET6]) - continue; - if ((ifp->if_flags & IFF_LOOPBACK) == 0 && - IN6_LINKMTU(ifp) > maxmtu) - maxmtu = IN6_LINKMTU(ifp); - } - NET_EPOCH_EXIT(et); - if (maxmtu) /* update only when maxmtu is positive */ - V_in6_maxmtu = maxmtu; -} - /* * Provide the length of interface identifiers to be used for the link attached * to the given interface. The length should be defined in "IPv6 over diff --git a/sys/netinet6/in6_ifattach.c b/sys/netinet6/in6_ifattach.c index fe421c02513f..01d7925de43d 100644 --- a/sys/netinet6/in6_ifattach.c +++ b/sys/netinet6/in6_ifattach.c @@ -71,8 +71,6 @@ #include #include -VNET_DEFINE(unsigned long, in6_maxmtu) = 0; - #ifdef IP6_AUTO_LINKLOCAL VNET_DEFINE(int, ip6_auto_linklocal) = IP6_AUTO_LINKLOCAL; #else @@ -732,10 +730,6 @@ in6_ifattach(struct ifnet *ifp, struct ifnet *altifp) else ifa_free(&ia->ia_ifa); } - - /* update dynamically. */ - if (V_in6_maxmtu < ifp->if_mtu) - V_in6_maxmtu = ifp->if_mtu; } /* diff --git a/sys/netinet6/in6_var.h b/sys/netinet6/in6_var.h index 3d037bc644d8..e99e796a3140 100644 --- a/sys/netinet6/in6_var.h +++ b/sys/netinet6/in6_var.h @@ -551,9 +551,6 @@ do { \ ((ifp)->if_afdata[AF_INET6]))->in6_ifstat[ \ offsetof(struct in6_ifstat, tag) / sizeof(uint64_t)], 1);\ } while (/*CONSTCOND*/ 0) - -VNET_DECLARE(unsigned long, in6_maxmtu); -#define V_in6_maxmtu VNET(in6_maxmtu) #endif /* _KERNEL */ /* @@ -877,7 +874,6 @@ void in6_domifdetach(struct ifnet *, void *); int in6_domifmtu(struct ifnet *); struct rib_head *in6_inithead(uint32_t fibnum); void in6_detachhead(struct rib_head *rh); -void in6_setmaxmtu(void); int in6_if2idlen(struct ifnet *); struct in6_ifaddr *in6ifa_ifpforlinklocal(struct ifnet *, int); struct in6_ifaddr *in6ifa_ifpwithaddr(struct ifnet *, const struct in6_addr *); diff --git a/sys/netinet6/nd6.c b/sys/netinet6/nd6.c index 887da1ebe21a..6ec5a8b54cf4 100644 --- a/sys/netinet6/nd6.c +++ b/sys/netinet6/nd6.c @@ -379,10 +379,6 @@ nd6_setmtu0(struct ifnet *ifp, struct nd_ifinfo *ndi) "new link MTU on %s (%lu) is too small for IPv6\n", if_name(ifp), (unsigned long)ndi->maxmtu); } - - if (ndi->maxmtu > V_in6_maxmtu) - in6_setmaxmtu(); /* check all interfaces just in case */ - } void diff --git a/sys/netinet6/nd6_rtr.c b/sys/netinet6/nd6_rtr.c index 845f9094f4c4..c145af7d3ffc 100644 --- a/sys/netinet6/nd6_rtr.c +++ b/sys/netinet6/nd6_rtr.c @@ -553,12 +553,8 @@ nd6_ra_input(struct mbuf *m, int off, int icmp6len) maxmtu = (ndi->maxmtu && ndi->maxmtu < ifp->if_mtu) ? ndi->maxmtu : ifp->if_mtu; if (mtu <= maxmtu) { - int change = (ndi->linkmtu != mtu); - - ndi->linkmtu = mtu; - if (change) { - /* in6_maxmtu may change */ - in6_setmaxmtu(); + if (ndi->linkmtu != mtu) { + ndi->linkmtu = mtu; rt_updatemtu(ifp); } } else { From nobody Mon Jul 7 10:06: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 4bbKf60w9Zz61JjR; Mon, 07 Jul 2025 10:06:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bbKf55CHmz3dcx; Mon, 07 Jul 2025 10:06:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1751882813; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Jc4JoTMjzBWgWZVgy8EJklpdtk1Qhp5P8YIV+HvySu8=; b=uRcwk8al+3KCtHn4+LWXPZooQYaF+36qU6XYt7MSWIXQJENXHomKo70nDMlKlC0ec4IrjW qWNNkH99hQFiAAlm0PYN+EMuJPooZEIQb7TJhcknV6m54+MQbSSi1zC8pXUTWT1zyA4FM6 kcCs0OzaEv/VROCyyJlGMmsLCVfcCwQPDUSxTL7DjlJYSkXWU59M72oq/1JjtncRxeW6kv T7OT+EBf1rdLQvDbm+oMfePlaw/vXHvSP/0YZF3sBmx0SEzS7LJR2bBI6aK3MciMjy/zrp 7U8FnaZrxu+ngWjP7PtK9qvF1o3GtSnL8lfPUOwYy6aW0FrUZIZQbnvORy4rWg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1751882813; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Jc4JoTMjzBWgWZVgy8EJklpdtk1Qhp5P8YIV+HvySu8=; b=AxRHmp5bnlDdQMRjZgi3Iq6X3uKCqqvh9lqV64gLd/B05h+NCGo4L7y5M0xND6+vh6K3xv seeUPnOLUq7yGnicdpiwNpoFEZPW32e/P+NEwM6fE4WDS0f4oSYGrGrG2ZEa0W0RhyTABG R2MrdCb7/ue4dLddQIzIOdXqZDhnQ/J1gTVPCIhqq8pexwQPaVlYwB2PpxKDTMHcuzWQ0A bK+/JffsnPpCyk9+BTw1p5ivw7hP23cfuRh6s7sR5v3CTT/jAzn1iA97GaLBQQGVrTpZMt HePNcAL9HWq3skFcCDZA1QHP3+LXnHDjlWgDeR5y6sRRMtGyjDYi5w7jMAHxcA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1751882813; a=rsa-sha256; cv=none; b=Zb3GlUqIW4ADeuv1PLDwrW6+cz2gOIC47zKl+JudID8g4Unu1s2FH69JDyXt6JBOVbF6Vt fgeMF4n1PTzVFmqC91s87XdlGuBOhwalmcn5GQ5jZkhH4/dok0CiI4Vr+EsCp7gpZE92cG GNg8OjVzGUx6Ggglscq+uwhz3ix/7SX6Y/dDIcuvKy0Qo43hrN38izJ3gaLmRpZzudE+sk riLKJKf9eBcvw9Z7sgnxkPDChDgBOdD55WakSma/nHk+BJuKgE+exDvmm9ZXnY1oXFRmTv haVz3bx6phnG3Y2SwJpwdBE7tI1dVxMippAAGHKhfMLkpyqftuGPlsA2WjQ9qA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4bbKf54nzHzmsF; Mon, 07 Jul 2025 10:06: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 567A6rxw053276; Mon, 7 Jul 2025 10:06:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 567A6rgu053273; Mon, 7 Jul 2025 10:06:53 GMT (envelope-from git) Date: Mon, 7 Jul 2025 10:06:53 GMT Message-Id: <202507071006.567A6rgu053273@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Zhenlei Huang Subject: git: 077895676d3b - stable/14 - UPDATING: Add an entry for the removal of in6_maxmtu List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 077895676d3baf62a6d2e50626faaaa3e7ef2473 Auto-Submitted: auto-generated The branch stable/14 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=077895676d3baf62a6d2e50626faaaa3e7ef2473 commit 077895676d3baf62a6d2e50626faaaa3e7ef2473 Author: Zhenlei Huang AuthorDate: 2025-05-21 10:11:03 +0000 Commit: Zhenlei Huang CommitDate: 2025-07-07 10:03:54 +0000 UPDATING: Add an entry for the removal of in6_maxmtu (cherry picked from commit c485a58f51608e5473d8580ebd4bf9f4f42fab1a) --- UPDATING | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/UPDATING b/UPDATING index c19d5db50b7c..c1778cc50d83 100644 --- a/UPDATING +++ b/UPDATING @@ -12,6 +12,14 @@ Items affecting the ports and packages system can be found in /usr/ports/UPDATING. Please read that file before updating system packages and/or ports. +20250707: + Commit f5195b1a63df removed in6_maxmtu and its setter in6_setmaxmtu(). + in6_maxmtu is used to store the max IPv6 MTU of all interfaces, + however it does not have any in-tree consumers since the introduction + from the KAME project. The removal should have little impact, and the + max IPv6 MTU can be easily retrieved by iterating over all the attached + interface if 3rd party modules need it. + 20250419: LinuxKPI alloc routines were changed to return physically contiguous memory where expected. These changes may require out-of-tree drivers From nobody Mon Jul 7 10:06: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 4bbKf71w4Jz61J3D; Mon, 07 Jul 2025 10:06: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bbKf668jHz3dmM; Mon, 07 Jul 2025 10:06:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1751882814; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=c2gvONFzybyh1GnIxRsvLCAstGR9vCg4LzyUhztHR2o=; b=lRxyQVSVpGjz8X4VXzrMW1EwfNnB1EiqlJCV1AG1RM15+02SzMIPN3guGUm8/zmnbbtOzH NHNg+NMfkPWq7DqcA7ATOW8KRbZi/R6bYGGNmhLO0NUzG0NFEPmiDDNoPcdcFYAyeACCaD CRpjiwTXjC2inCGJmlGXfDdKdgYA/MYgEDMFw0dgbh5rBO7LTtbSgEAI0VLvsN9tp9RmV2 mdF+LULhvUxbIWTpCGnHwyvCIFePeot52E8jaSev2Gmkk5PxuXcURkP+m9qfOyEiZ5umvk NbULbTjO4sBUSlPVV738F7KUvQzfY6xgIGKmxNs6R7XZ0JOJBBgs1lVGC5TIMg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1751882814; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=c2gvONFzybyh1GnIxRsvLCAstGR9vCg4LzyUhztHR2o=; b=mtrLIsejRlj9xtyRTkPnpPOzW7FYKZjQiHS4b9M5Z8tUKz0hjiiYG0tND11oX5DrqPp+FM Mz2RMpCRVg7qH0iNopdBAedq+L+wwOJ9Jk7MdW/yICcU2pCvDktSf3AM4nNfBzAk9wd6El MMmFr+JEV92SsNBnZX/R946eXwnRu51kcqU+n49fqpVMctZl8iXafxUpoKVSh+wisQFMSd gT/KHd9H9HEstZMATsP5LCNZwwEPHjlK8cnSuHx6Efih1yWp4Ke+4kSHVocJ+SBLqrak57 PO7bEhP0TOWiZVb1TdhDaU+Om7/BWpa5fodBnnLSsaQSBHHcuOY/Pzeml5va6A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1751882814; a=rsa-sha256; cv=none; b=eYbDwm6D64glsQtz/j3t2gVywWAhTegVl3GBl7+uzqFaNxLu1uGQDzu4nRnhExCfaybx3+ SWFxFSp0HQgxIAc+9/9q9Rwy6OGqG1a8/1dO2iIJlEKSPxmGQmhus287dQlWKCF6wFpxcr TEJIFU6YCM2jIUfPWVE4zZ7anPgmAU1VvW8Ls27DqUlvQJavYOehZHvebXSmOQBaUkSuFY BGfj4TBJ4oE8dgWzTMSNtjyDexG/fVCMmtWI1JjPW8Hux0yHf4OyV6Tkus1c/bTnSJDuMx h3767pYq1uqAg3wgYgFMV8dq4Lrg9Es8KYMwa8mLRcYQ7QbX1jIgcdfbdx/8PQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4bbKf65lyBzmct; Mon, 07 Jul 2025 10:06:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 567A6sNq053311; Mon, 7 Jul 2025 10:06:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 567A6srb053308; Mon, 7 Jul 2025 10:06:54 GMT (envelope-from git) Date: Mon, 7 Jul 2025 10:06:54 GMT Message-Id: <202507071006.567A6srb053308@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Zhenlei Huang Subject: git: 2466a1871154 - stable/14 - ifnet: Initialize the address family dependent data region 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: zlei X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 2466a18711548113d3ca4c61ccc7d6717adb6ade Auto-Submitted: auto-generated The branch stable/14 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=2466a18711548113d3ca4c61ccc7d6717adb6ade commit 2466a18711548113d3ca4c61ccc7d6717adb6ade Author: Zhenlei Huang AuthorDate: 2025-05-22 15:00:05 +0000 Commit: Zhenlei Huang CommitDate: 2025-07-07 10:03:58 +0000 ifnet: Initialize the address family dependent data region earlier if_link_ifnet() adds the interface to the global network interface list, and it is a natural synchronization point. With this change, any threads that obtain the reference of the interface via ifunit(), ifunit_ref() etc., will be guaranteed to see the address family dependent data rightly. The issue [1] reported by Mike Belanger also hints the potential race. MFC note: this change depends on e64fe5ad3a23, as calculating the max IPv6 MTU through all the interfaces requires the current interface to be added to the global network interface list firstly. [1] https://lists.freebsd.org/archives/freebsd-net/2025-May/006817.html Reviewed by: glebius MFC after: 1 month MFC with: e64fe5ad3a23 netinet6: Remove a set but not used global variable in6_maxmtu Differential Revision: https://reviews.freebsd.org/D49358 (cherry picked from commit 098b5d4dc744283a90b2d80c11395ecc18a84084) --- sys/net/if.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/net/if.c b/sys/net/if.c index b4ffa9883efc..a0570aed32e9 100644 --- a/sys/net/if.c +++ b/sys/net/if.c @@ -948,11 +948,11 @@ if_attach_internal(struct ifnet *ifp, bool vmove) } #endif - if_link_ifnet(ifp); - if (domain_init_status >= 2) if_attachdomain1(ifp); + if_link_ifnet(ifp); + EVENTHANDLER_INVOKE(ifnet_arrival_event, ifp); if (IS_DEFAULT_VNET(curvnet)) devctl_notify("IFNET", ifp->if_xname, "ATTACH", NULL); From nobody Mon Jul 7 10:06: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 4bbKf83nxLz61Jpj; Mon, 07 Jul 2025 10:06:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bbKf80Cq7z3dq3; Mon, 07 Jul 2025 10:06:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1751882816; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/Oye/kgdL1wpxp/wA69pqWtdhKADtXiXNCn6ZLArHUM=; b=Mk5FbaSSaGsAqjCMvA8VSA/JtzustKH2wK6yduYv0c1h8p6y23LECPfeVa34s/Y/HJsyI4 9ZcUPutIWFPTQWdnQo3Yl5+y4J0gWgkbJjKt2fbJh4ZFRNSsI5+Iwr9sTKqq8ASKNu2mez x7jGGSCkoNyUIe5eTRd5dUA++iesl5/zHrEzig22WiV7AR3nowpK4n7XnMM6iJhx6lgF93 LRVPhYU5lStlGMte9f6tzBO1IuqKugzjJHpH//s2yrUOZR7wHZro+4sY3vlCz3bwMZDNBx a2Eauta7lYGZZHj0npYEBmyi5YRhzCDial2Go+brD5weFJw1wA+yj3C3v5MlOA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1751882816; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/Oye/kgdL1wpxp/wA69pqWtdhKADtXiXNCn6ZLArHUM=; b=rkeYJ7apAmYswjMEvRjL04vOG4bQvoN9ORzZfr1mjOq2N4v9asVMioQMmP4V0UTUDvSlrA QnD3S/Om7YbhupikuTorHfL7sfzimepxuefJDQ9HI+iKsxHpyb+HJtHjVIrf+eJz7MMVcU 9bYDY9fHjccGYs7j6/68PCwiaMsympVXtBnNN7aOGbeYQk1K75S633i//jkXb1jkErDLNp Uhd2e0DdRHv7lVhSamHxxsX+oArDd+zEPvALV0ivV2Jy6UfzC1XuDYmQhZmKRpV6nyeQNF 6cURZcnmtPBOT8FAMUr50t9nUAm6qGW0KlVSwan/0qbY9lReg5KxGmkCzUkKlw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1751882816; a=rsa-sha256; cv=none; b=ljM7Jm3zcYM3bQKu/pgnfOKXZcon6Cf3adwUS9eqUSkjPF0dMC+kPXBn5VpzI4iSRzOfcG ieekZqiJ9qoC/Du7IcdxQnozMgpVfLlwqVj7+MJL+0W80prEfD4lF5eCTAcOHLN/huP90E uhVyMCNBbTyeQsn8E+OfcDxlG7bgUdv3xRvmibsVE4k4tB02CdQGPH6O1CGiUc/WbKJC1f SUkSvb5YigVHkMFAZCG3/ZtHOHgHUxorU1Uw2EowmnUJOp0vFWR/PFhXW/F98c54DgAq0Q HfMOrTt9R1WgTzpR8X13PLF9aVl/JsRbmzEn7aeqpfH7Dq1dOOcdhLq29o7ZPw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4bbKf76j6HzmsG; Mon, 07 Jul 2025 10:06: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 567A6tW5053346; Mon, 7 Jul 2025 10:06:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 567A6tZr053343; Mon, 7 Jul 2025 10:06:55 GMT (envelope-from git) Date: Mon, 7 Jul 2025 10:06:55 GMT Message-Id: <202507071006.567A6tZr053343@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Zhenlei Huang Subject: git: 3bc1aea4cc8a - stable/14 - if_firewire: Make firewire_broadcastaddr static const List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 3bc1aea4cc8a448ffd2e1477950da5e494cf1375 Auto-Submitted: auto-generated The branch stable/14 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=3bc1aea4cc8a448ffd2e1477950da5e494cf1375 commit 3bc1aea4cc8a448ffd2e1477950da5e494cf1375 Author: Zhenlei Huang AuthorDate: 2025-06-01 14:47:24 +0000 Commit: Zhenlei Huang CommitDate: 2025-07-07 10:03:58 +0000 if_firewire: Make firewire_broadcastaddr static const This global variable is used only in this file. While here, constify it since it is only used to read. No functional change intended. MFC after: 1 week (cherry picked from commit 517eb20e54e59173b9dbede0bb3356f6197b5aa9) --- sys/net/if_fwsubr.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/net/if_fwsubr.c b/sys/net/if_fwsubr.c index bf3362fc975c..ceac93d31d56 100644 --- a/sys/net/if_fwsubr.c +++ b/sys/net/if_fwsubr.c @@ -67,7 +67,7 @@ static MALLOC_DEFINE(M_FWCOM, "fw_com", "firewire interface internals"); -struct fw_hwaddr firewire_broadcastaddr = { +static const struct fw_hwaddr firewire_broadcastaddr = { 0xffffffff, 0xffffffff, 0xff, @@ -777,7 +777,7 @@ firewire_ifattach(struct ifnet *ifp, struct fw_hwaddr *llc) ifp->if_mtu = 1500; /* XXX */ ifp->if_output = firewire_output; ifp->if_resolvemulti = firewire_resolvemulti; - ifp->if_broadcastaddr = (u_char *) &firewire_broadcastaddr; + ifp->if_broadcastaddr = (const u_char *) &firewire_broadcastaddr; ifa = ifp->if_addr; KASSERT(ifa != NULL, ("%s: no lladdr!\n", __func__)); From nobody Mon Jul 7 10:06: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 4bbKf92Nrjz61Jbh; Mon, 07 Jul 2025 10:06: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bbKf90jH3z3f0S; Mon, 07 Jul 2025 10:06:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1751882817; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=27T0tW68OntwsERozscl6wrRuUO9K456jEo2FDP6Q18=; b=Wh5RDO/AplYajY4mfZaGHGao/hG+U7vLfIgNiXuwnGtoWY1xqp/YDcn8WmJZG5lc9ny61/ yV8uAYILG6g82ndU1NBXvH4Khlu1fAjONUExZIVdrQ2ikyXCDZXbwqfYO+gO6LmuMrT27/ 26zsgA9Fjie7jtbeqYZ82+pjRlekyUNuiMxA7jBI2oq2X34aEZJQypg3SKC7ZWsHIZowiA 4NGt2he0t2ST4MZv021cEu7k/c2PMjTlIGOSLFeW9la0ml8/SKB3iDrwuxXrmAWoOh1U7k 4WZN+cdxfaZchMVbClB42O3hggoF8vHrP0/Ee40Lf++Q80/ZzDVH8tOl7wknMA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1751882817; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=27T0tW68OntwsERozscl6wrRuUO9K456jEo2FDP6Q18=; b=n6JaMquBEowLTeL4+y1t2vRTVgCoC4gQHJMWVLjH1Weyq/KCX6qIldp+JLdJ71E6Se82s8 jL3dXz5UUQcYnetRlczANjVE7D8ow0/6RLUfLo/FsY7HCBMoHBGJNVmh4rTqs6VUPNbLCW 8yn8V7uqW8Y8LcfjThJSp5vLZ4S8yBEE6AIRI1zEfneUEero9zzGuRsw0q9RKPAesRdY3M hZGLQH6NEkQLOMl01sd8FKCYhDMMICM2fF6gDools3+rmzT4Pkm6MhEBJ+B8ZWGEytdYgA 6nDrl9HBS1LnsGO2w36CpSUBDiVj5L7SQBCUT9aRxbGIQKyIjzbtQ+QrWXAlvQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1751882817; a=rsa-sha256; cv=none; b=kxELKLfzbfbGSHHp2mIuqEMTJHboRQix1s0fIpKLuoW/IVTbMNEO5cAFwGkYdXyCGmHCXl B/EtSish+9t+aq3+Gshr6jP+jte8wuXuQy5Heiqor2cVFqECTUbCHakoXV6UFbQY14vznn VJwLhlM6vbv0UX+i+X59qMxXPjzi2MYQjl3koFXokADFvb1d8yWXq+2UjGXjMqMPMb/awr jl0FCWcRpoKx6fVI+NssncCu0ZQITOeOc0c6K2/CqYKpIbp+q/Njnse7AyhSs5YD/ubjCH aMYLHvY0Abm8nzTy26qWpRPle3RbW06aGG2e+I7Pr9WJSTk7p/D0gdAUzC6cUg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4bbKf90JNWzmvB; Mon, 07 Jul 2025 10:06: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 567A6uFO053381; Mon, 7 Jul 2025 10:06:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 567A6u9P053378; Mon, 7 Jul 2025 10:06:56 GMT (envelope-from git) Date: Mon, 7 Jul 2025 10:06:56 GMT Message-Id: <202507071006.567A6u9P053378@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Zhenlei Huang Subject: git: a2989d11eabe - stable/14 - iflib: Some style(9) tweaks List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: a2989d11eabeb869b8c845a097d4214755d9a99f Auto-Submitted: auto-generated The branch stable/14 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=a2989d11eabeb869b8c845a097d4214755d9a99f commit a2989d11eabeb869b8c845a097d4214755d9a99f Author: Zhenlei Huang AuthorDate: 2025-06-06 10:04:42 +0000 Commit: Zhenlei Huang CommitDate: 2025-07-07 10:03:59 +0000 iflib: Some style(9) tweaks Prefer tab over eight whitespaces for indentation, and four spaces as second level idents. MFC after: 3 days (cherry picked from commit 721e783a2a3316826f92fb44c931e28163118b3f) --- sys/net/iflib.c | 208 ++++++++++++++++++++++++++++---------------------------- 1 file changed, 104 insertions(+), 104 deletions(-) diff --git a/sys/net/iflib.c b/sys/net/iflib.c index 12acdcd4f868..dc93da722ef4 100644 --- a/sys/net/iflib.c +++ b/sys/net/iflib.c @@ -196,7 +196,7 @@ struct iflib_ctx { uint8_t ifc_sysctl_separate_txrx; uint8_t ifc_sysctl_use_logical_cores; uint16_t ifc_sysctl_extra_msix_vectors; - bool ifc_cpus_are_physical_cores; + bool ifc_cpus_are_physical_cores; qidx_t ifc_sysctl_ntxds[8]; qidx_t ifc_sysctl_nrxds[8]; @@ -281,16 +281,16 @@ iflib_get_extra_msix_vectors_sysctl(if_ctx_t ctx) #define CTX_IS_VF(ctx) ((ctx)->ifc_sctx->isc_flags & IFLIB_IS_VF) typedef struct iflib_sw_rx_desc_array { - bus_dmamap_t *ifsd_map; /* bus_dma maps for packet */ - struct mbuf **ifsd_m; /* pkthdr mbufs */ - caddr_t *ifsd_cl; /* direct cluster pointer for rx */ - bus_addr_t *ifsd_ba; /* bus addr of cluster for rx */ + bus_dmamap_t *ifsd_map; /* bus_dma maps for packet */ + struct mbuf **ifsd_m; /* pkthdr mbufs */ + caddr_t *ifsd_cl; /* direct cluster pointer for rx */ + bus_addr_t *ifsd_ba; /* bus addr of cluster for rx */ } iflib_rxsd_array_t; typedef struct iflib_sw_tx_desc_array { - bus_dmamap_t *ifsd_map; /* bus_dma maps for packet */ - bus_dmamap_t *ifsd_tso_map; /* bus_dma maps for TSO packet */ - struct mbuf **ifsd_m; /* pkthdr mbufs */ + bus_dmamap_t *ifsd_map; /* bus_dma maps for packet */ + bus_dmamap_t *ifsd_tso_map; /* bus_dma maps for TSO packet */ + struct mbuf **ifsd_m; /* pkthdr mbufs */ } if_txsd_vec_t; /* magic number that should be high enough for any hardware */ @@ -363,7 +363,7 @@ struct iflib_txq { /* constant values */ if_ctx_t ift_ctx; - struct ifmp_ring *ift_br; + struct ifmp_ring *ift_br; struct grouptask ift_task; qidx_t ift_size; uint16_t ift_id; @@ -381,7 +381,7 @@ struct iflib_txq { bus_dma_tag_t ift_tso_buf_tag; iflib_dma_info_t ift_ifdi; #define MTX_NAME_LEN 32 - char ift_mtx_name[MTX_NAME_LEN]; + char ift_mtx_name[MTX_NAME_LEN]; bus_dma_segment_t ift_segs[IFLIB_MAX_TX_SEGS] __aligned(CACHE_LINE_SIZE); #ifdef IFLIB_DIAGNOSTICS uint64_t ift_cpu_exec_count[256]; @@ -401,7 +401,7 @@ struct iflib_fl { uint64_t ifl_cl_dequeued; #endif /* implicit pad */ - bitstr_t *ifl_rx_bitmap; + bitstr_t *ifl_rx_bitmap; qidx_t ifl_fragidx; /* constant */ qidx_t ifl_size; @@ -457,7 +457,7 @@ struct iflib_rxq { uint8_t ifr_txqid[IFLIB_MAX_TX_SHARED_INTR]; uint8_t ifr_fl_offset; struct lro_ctrl ifr_lc; - struct grouptask ifr_task; + struct grouptask ifr_task; struct callout ifr_watchdog; struct iflib_filter_info ifr_filter_info; iflib_dma_info_t ifr_ifdi; @@ -548,7 +548,7 @@ rxd_info_zero(if_rxd_info_t ri) #define STATE_LOCK_DESTROY(ctx) mtx_destroy(&(ctx)->ifc_state_mtx) #define CALLOUT_LOCK(txq) mtx_lock(&txq->ift_mtx) -#define CALLOUT_UNLOCK(txq) mtx_unlock(&txq->ift_mtx) +#define CALLOUT_UNLOCK(txq) mtx_unlock(&txq->ift_mtx) /* Our boot-time initialization hook */ static int iflib_module_event_handler(module_t, int, void *); @@ -926,7 +926,7 @@ netmap_fl_refill(iflib_rxq_t rxq, struct netmap_kring *kring, bool init) MPASS(i < IFLIB_MAX_RX_REFRESH); if (addr == NETMAP_BUF_BASE(na)) /* bad buf */ - return (netmap_ring_reinit(kring)); + return (netmap_ring_reinit(kring)); fl->ifl_bus_addrs[i] = paddr + nm_get_offset(kring, slot); @@ -1457,17 +1457,17 @@ iflib_dma_alloc_align(if_ctx_t ctx, int size, int align, iflib_dma_info_t dma, i lowaddr = DMA_WIDTH_TO_BUS_LOWADDR(ctx->ifc_softc_ctx.isc_dma_width); err = bus_dma_tag_create(bus_get_dma_tag(dev), /* parent */ - align, 0, /* alignment, bounds */ - lowaddr, /* lowaddr */ - BUS_SPACE_MAXADDR, /* highaddr */ - NULL, NULL, /* filter, filterarg */ - size, /* maxsize */ - 1, /* nsegments */ - size, /* maxsegsize */ - BUS_DMA_ALLOCNOW, /* flags */ - NULL, /* lockfunc */ - NULL, /* lockarg */ - &dma->idi_tag); + align, 0, /* alignment, bounds */ + lowaddr, /* lowaddr */ + BUS_SPACE_MAXADDR, /* highaddr */ + NULL, NULL, /* filter, filterarg */ + size, /* maxsize */ + 1, /* nsegments */ + size, /* maxsegsize */ + BUS_DMA_ALLOCNOW, /* flags */ + NULL, /* lockfunc */ + NULL, /* lockarg */ + &dma->idi_tag); if (err) { device_printf(dev, "%s: bus_dma_tag_create failed: %d (size=%d, align=%d)\n", @@ -1679,11 +1679,11 @@ _iflib_irq_alloc(if_ctx_t ctx, if_irq_t irq, int rid, irq->ii_res = res; KASSERT(filter == NULL || handler == NULL, ("filter and handler can't both be non-NULL")); rc = bus_setup_intr(dev, res, INTR_MPSAFE | INTR_TYPE_NET, - filter, handler, arg, &tag); + filter, handler, arg, &tag); if (rc != 0) { device_printf(dev, "failed to setup interrupt for rid %d, name %s: %d\n", - rid, name ? name : "unknown", rc); + rid, name ? name : "unknown", rc); return (rc); } else if (name) bus_describe_intr(dev, res, tag, "%s", name); @@ -1732,17 +1732,17 @@ iflib_txsd_alloc(iflib_txq_t txq) * Set up DMA tags for TX buffers. */ if ((err = bus_dma_tag_create(bus_get_dma_tag(dev), - 1, 0, /* alignment, bounds */ - lowaddr, /* lowaddr */ - BUS_SPACE_MAXADDR, /* highaddr */ - NULL, NULL, /* filter, filterarg */ - sctx->isc_tx_maxsize, /* maxsize */ - nsegments, /* nsegments */ - sctx->isc_tx_maxsegsize, /* maxsegsize */ - 0, /* flags */ - NULL, /* lockfunc */ - NULL, /* lockfuncarg */ - &txq->ift_buf_tag))) { + 1, 0, /* alignment, bounds */ + lowaddr, /* lowaddr */ + BUS_SPACE_MAXADDR, /* highaddr */ + NULL, NULL, /* filter, filterarg */ + sctx->isc_tx_maxsize, /* maxsize */ + nsegments, /* nsegments */ + sctx->isc_tx_maxsegsize, /* maxsegsize */ + 0, /* flags */ + NULL, /* lockfunc */ + NULL, /* lockfuncarg */ + &txq->ift_buf_tag))) { device_printf(dev, "Unable to allocate TX DMA tag: %d\n", err); device_printf(dev, "maxsize: %ju nsegments: %d maxsegsize: %ju\n", (uintmax_t)sctx->isc_tx_maxsize, nsegments, (uintmax_t)sctx->isc_tx_maxsegsize); @@ -1750,17 +1750,17 @@ iflib_txsd_alloc(iflib_txq_t txq) } tso = (if_getcapabilities(ctx->ifc_ifp) & IFCAP_TSO) != 0; if (tso && (err = bus_dma_tag_create(bus_get_dma_tag(dev), - 1, 0, /* alignment, bounds */ - lowaddr, /* lowaddr */ - BUS_SPACE_MAXADDR, /* highaddr */ - NULL, NULL, /* filter, filterarg */ - tsomaxsize, /* maxsize */ - ntsosegments, /* nsegments */ - sctx->isc_tso_maxsegsize,/* maxsegsize */ - 0, /* flags */ - NULL, /* lockfunc */ - NULL, /* lockfuncarg */ - &txq->ift_tso_buf_tag))) { + 1, 0, /* alignment, bounds */ + lowaddr, /* lowaddr */ + BUS_SPACE_MAXADDR, /* highaddr */ + NULL, NULL, /* filter, filterarg */ + tsomaxsize, /* maxsize */ + ntsosegments, /* nsegments */ + sctx->isc_tso_maxsegsize, /* maxsegsize */ + 0, /* flags */ + NULL, /* lockfunc */ + NULL, /* lockfuncarg */ + &txq->ift_tso_buf_tag))) { device_printf(dev, "Unable to allocate TSO TX DMA tag: %d\n", err); goto fail; @@ -1966,17 +1966,17 @@ iflib_rxsd_alloc(iflib_rxq_t rxq) fl->ifl_size = scctx->isc_nrxd[rxq->ifr_fl_offset]; /* this isn't necessarily the same */ /* Set up DMA tag for RX buffers. */ err = bus_dma_tag_create(bus_get_dma_tag(dev), /* parent */ - 1, 0, /* alignment, bounds */ - lowaddr, /* lowaddr */ - BUS_SPACE_MAXADDR, /* highaddr */ - NULL, NULL, /* filter, filterarg */ - sctx->isc_rx_maxsize, /* maxsize */ - sctx->isc_rx_nsegments, /* nsegments */ - sctx->isc_rx_maxsegsize, /* maxsegsize */ - 0, /* flags */ - NULL, /* lockfunc */ - NULL, /* lockarg */ - &fl->ifl_buf_tag); + 1, 0, /* alignment, bounds */ + lowaddr, /* lowaddr */ + BUS_SPACE_MAXADDR, /* highaddr */ + NULL, NULL, /* filter, filterarg */ + sctx->isc_rx_maxsize, /* maxsize */ + sctx->isc_rx_nsegments, /* nsegments */ + sctx->isc_rx_maxsegsize, /* maxsegsize */ + 0, /* flags */ + NULL, /* lockfunc */ + NULL, /* lockarg */ + &fl->ifl_buf_tag); if (err) { device_printf(dev, "Unable to allocate RX DMA tag: %d\n", err); @@ -1985,8 +1985,8 @@ iflib_rxsd_alloc(iflib_rxq_t rxq) /* Allocate memory for the RX mbuf map. */ if (!(fl->ifl_sds.ifsd_m = - (struct mbuf **) malloc(sizeof(struct mbuf *) * - scctx->isc_nrxd[rxq->ifr_fl_offset], M_IFLIB, M_NOWAIT | M_ZERO))) { + (struct mbuf **) malloc(sizeof(struct mbuf *) * + scctx->isc_nrxd[rxq->ifr_fl_offset], M_IFLIB, M_NOWAIT | M_ZERO))) { device_printf(dev, "Unable to allocate RX mbuf map memory\n"); err = ENOMEM; @@ -1995,8 +1995,8 @@ iflib_rxsd_alloc(iflib_rxq_t rxq) /* Allocate memory for the direct RX cluster pointer map. */ if (!(fl->ifl_sds.ifsd_cl = - (caddr_t *) malloc(sizeof(caddr_t) * - scctx->isc_nrxd[rxq->ifr_fl_offset], M_IFLIB, M_NOWAIT | M_ZERO))) { + (caddr_t *) malloc(sizeof(caddr_t) * + scctx->isc_nrxd[rxq->ifr_fl_offset], M_IFLIB, M_NOWAIT | M_ZERO))) { device_printf(dev, "Unable to allocate RX cluster map memory\n"); err = ENOMEM; @@ -2005,8 +2005,8 @@ iflib_rxsd_alloc(iflib_rxq_t rxq) /* Allocate memory for the RX cluster bus address map. */ if (!(fl->ifl_sds.ifsd_ba = - (bus_addr_t *) malloc(sizeof(bus_addr_t) * - scctx->isc_nrxd[rxq->ifr_fl_offset], M_IFLIB, M_NOWAIT | M_ZERO))) { + (bus_addr_t *) malloc(sizeof(bus_addr_t) * + scctx->isc_nrxd[rxq->ifr_fl_offset], M_IFLIB, M_NOWAIT | M_ZERO))) { device_printf(dev, "Unable to allocate RX bus address map memory\n"); err = ENOMEM; @@ -2017,7 +2017,7 @@ iflib_rxsd_alloc(iflib_rxq_t rxq) * Create the DMA maps for RX buffers. */ if (!(fl->ifl_sds.ifsd_map = - (bus_dmamap_t *) malloc(sizeof(bus_dmamap_t) * scctx->isc_nrxd[rxq->ifr_fl_offset], M_IFLIB, M_NOWAIT | M_ZERO))) { + (bus_dmamap_t *) malloc(sizeof(bus_dmamap_t) * scctx->isc_nrxd[rxq->ifr_fl_offset], M_IFLIB, M_NOWAIT | M_ZERO))) { device_printf(dev, "Unable to allocate RX buffer DMA map memory\n"); err = ENOMEM; @@ -2557,7 +2557,7 @@ done: callout_reset_on(&txq->ift_timer, iflib_timer_default, iflib_timer, txq, txq->ift_timer.c_cpu); - /* Re-enable txsync/rxsync. */ + /* Re-enable txsync/rxsync. */ netmap_enable_all_rings(ifp); } @@ -3188,11 +3188,11 @@ static void print_pkt(if_pkt_info_t pi) { printf("pi len: %d qsidx: %d nsegs: %d ndescs: %d flags: %x pidx: %d\n", - pi->ipi_len, pi->ipi_qsidx, pi->ipi_nsegs, pi->ipi_ndescs, pi->ipi_flags, pi->ipi_pidx); + pi->ipi_len, pi->ipi_qsidx, pi->ipi_nsegs, pi->ipi_ndescs, pi->ipi_flags, pi->ipi_pidx); printf("pi new_pidx: %d csum_flags: %lx tso_segsz: %d mflags: %x vtag: %d\n", - pi->ipi_new_pidx, pi->ipi_csum_flags, pi->ipi_tso_segsz, pi->ipi_mflags, pi->ipi_vtag); + pi->ipi_new_pidx, pi->ipi_csum_flags, pi->ipi_tso_segsz, pi->ipi_mflags, pi->ipi_vtag); printf("pi etype: %d ehdrlen: %d ip_hlen: %d ipproto: %d\n", - pi->ipi_etype, pi->ipi_ehdrlen, pi->ipi_ip_hlen, pi->ipi_ipproto); + pi->ipi_etype, pi->ipi_ehdrlen, pi->ipi_ip_hlen, pi->ipi_ipproto); } #endif @@ -3742,7 +3742,7 @@ defrag: */ txq->ift_rs_pending += nsegs + 1; if (txq->ift_rs_pending > TXQ_MAX_RS_DEFERRED(txq) || - iflib_no_tx_batch || (TXQ_AVAIL(txq) - nsegs) <= MAX_TX_DESC(ctx) + 2) { + iflib_no_tx_batch || (TXQ_AVAIL(txq) - nsegs) <= MAX_TX_DESC(ctx) + 2) { pi.ipi_flags |= IPI_TX_INTR; txq->ift_rs_pending = 0; } @@ -3878,8 +3878,8 @@ iflib_completed_tx_reclaim(iflib_txq_t txq, int thresh) #ifdef INVARIANTS if (iflib_verbose_debug) { printf("%s processed=%ju cleaned=%ju tx_nsegments=%d reclaim=%d thresh=%d\n", __func__, - txq->ift_processed, txq->ift_cleaned, txq->ift_ctx->ifc_softc_ctx.isc_tx_nsegments, - reclaim, thresh); + txq->ift_processed, txq->ift_cleaned, txq->ift_ctx->ifc_softc_ctx.isc_tx_nsegments, + reclaim, thresh); } #endif return (0); @@ -3984,7 +3984,7 @@ iflib_txq_drain(struct ifmp_ring *r, uint32_t cidx, uint32_t pidx) #ifdef INVARIANTS if (iflib_verbose_debug) printf("%s avail=%d ifc_flags=%x txq_avail=%d ", __func__, - avail, ctx->ifc_flags, TXQ_AVAIL(txq)); + avail, ctx->ifc_flags, TXQ_AVAIL(txq)); #endif do_prefetch = (ctx->ifc_flags & IFC_PREFETCH); err = 0; @@ -4366,7 +4366,7 @@ iflib_if_transmit(if_t ifp, struct mbuf *m) if (abdicate) GROUPTASK_ENQUEUE(&txq->ift_task); - if (err) { + if (err) { if (!abdicate) GROUPTASK_ENQUEUE(&txq->ift_task); /* support forthcoming later */ @@ -4459,9 +4459,9 @@ iflib_if_qflush(if_t ifp) } #define IFCAP_FLAGS (IFCAP_HWCSUM_IPV6 | IFCAP_HWCSUM | IFCAP_LRO | \ - IFCAP_TSO | IFCAP_VLAN_HWTAGGING | IFCAP_HWSTATS | \ - IFCAP_VLAN_MTU | IFCAP_VLAN_HWFILTER | \ - IFCAP_VLAN_HWTSO | IFCAP_VLAN_HWCSUM | IFCAP_MEXTPG) + IFCAP_TSO | IFCAP_VLAN_HWTAGGING | IFCAP_HWSTATS | \ + IFCAP_VLAN_MTU | IFCAP_VLAN_HWFILTER | \ + IFCAP_VLAN_HWTSO | IFCAP_VLAN_HWCSUM | IFCAP_MEXTPG) static int iflib_if_ioctl(if_t ifp, u_long command, caddr_t data) @@ -4807,17 +4807,17 @@ iflib_reset_qvalues(if_ctx_t ctx) for (i = 0; i < sctx->isc_nrxqs; i++) { if (scctx->isc_nrxd[i] < sctx->isc_nrxd_min[i]) { device_printf(dev, "nrxd%d: %d less than nrxd_min %d - resetting to min\n", - i, scctx->isc_nrxd[i], sctx->isc_nrxd_min[i]); + i, scctx->isc_nrxd[i], sctx->isc_nrxd_min[i]); scctx->isc_nrxd[i] = sctx->isc_nrxd_min[i]; } if (scctx->isc_nrxd[i] > sctx->isc_nrxd_max[i]) { device_printf(dev, "nrxd%d: %d greater than nrxd_max %d - resetting to max\n", - i, scctx->isc_nrxd[i], sctx->isc_nrxd_max[i]); + i, scctx->isc_nrxd[i], sctx->isc_nrxd_max[i]); scctx->isc_nrxd[i] = sctx->isc_nrxd_max[i]; } if (!powerof2(scctx->isc_nrxd[i])) { device_printf(dev, "nrxd%d: %d is not a power of 2 - using default value of %d\n", - i, scctx->isc_nrxd[i], sctx->isc_nrxd_default[i]); + i, scctx->isc_nrxd[i], sctx->isc_nrxd_default[i]); scctx->isc_nrxd[i] = sctx->isc_nrxd_default[i]; } } @@ -4825,17 +4825,17 @@ iflib_reset_qvalues(if_ctx_t ctx) for (i = 0; i < sctx->isc_ntxqs; i++) { if (scctx->isc_ntxd[i] < sctx->isc_ntxd_min[i]) { device_printf(dev, "ntxd%d: %d less than ntxd_min %d - resetting to min\n", - i, scctx->isc_ntxd[i], sctx->isc_ntxd_min[i]); + i, scctx->isc_ntxd[i], sctx->isc_ntxd_min[i]); scctx->isc_ntxd[i] = sctx->isc_ntxd_min[i]; } if (scctx->isc_ntxd[i] > sctx->isc_ntxd_max[i]) { device_printf(dev, "ntxd%d: %d greater than ntxd_max %d - resetting to max\n", - i, scctx->isc_ntxd[i], sctx->isc_ntxd_max[i]); + i, scctx->isc_ntxd[i], sctx->isc_ntxd_max[i]); scctx->isc_ntxd[i] = sctx->isc_ntxd_max[i]; } if (!powerof2(scctx->isc_ntxd[i])) { device_printf(dev, "ntxd%d: %d is not a power of 2 - using default value of %d\n", - i, scctx->isc_ntxd[i], sctx->isc_ntxd_default[i]); + i, scctx->isc_ntxd[i], sctx->isc_ntxd_default[i]); scctx->isc_ntxd[i] = sctx->isc_ntxd_default[i]; } } @@ -4908,7 +4908,7 @@ cpuid_advance(if_ctx_t ctx, unsigned int cpuid, unsigned int n) } #if defined(SMP) && defined(SCHED_ULE) -extern struct cpu_group *cpu_top; /* CPU topology */ +extern struct cpu_group *cpu_top; /* CPU topology */ static int find_child_with_core(int cpu, struct cpu_group *grp) @@ -5460,9 +5460,9 @@ fail_unlock: iflib_deregister(ctx); fail_ctx_free: device_set_softc(ctx->ifc_dev, NULL); - if (ctx->ifc_flags & IFC_SC_ALLOCATED) - free(ctx->ifc_softc, M_IFLIB); - free(ctx, M_IFLIB); + if (ctx->ifc_flags & IFC_SC_ALLOCATED) + free(ctx->ifc_softc, M_IFLIB); + free(ctx, M_IFLIB); return (err); } @@ -5791,11 +5791,11 @@ iflib_register(if_ctx_t ctx) if_setqflushfn(ifp, iflib_if_qflush); if_setflags(ifp, IFF_BROADCAST | IFF_SIMPLEX | IFF_MULTICAST); ctx->ifc_vlan_attach_event = - EVENTHANDLER_REGISTER(vlan_config, iflib_vlan_register, ctx, - EVENTHANDLER_PRI_FIRST); + EVENTHANDLER_REGISTER(vlan_config, iflib_vlan_register, ctx, + EVENTHANDLER_PRI_FIRST); ctx->ifc_vlan_detach_event = - EVENTHANDLER_REGISTER(vlan_unconfig, iflib_vlan_unregister, ctx, - EVENTHANDLER_PRI_FIRST); + EVENTHANDLER_REGISTER(vlan_unconfig, iflib_vlan_unregister, ctx, + EVENTHANDLER_PRI_FIRST); if ((sctx->isc_flags & IFLIB_DRIVER_MEDIA) == 0) { ctx->ifc_mediap = &ctx->ifc_media; @@ -5868,12 +5868,12 @@ iflib_queues_alloc(if_ctx_t ctx) KASSERT(ntxqs > 0, ("number of queues per qset must be at least 1")); KASSERT(nrxqs > 0, ("number of queues per qset must be at least 1")); KASSERT(nrxqs >= fl_offset + nfree_lists, - ("there must be at least a rxq for each free list")); + ("there must be at least a rxq for each free list")); /* Allocate the TX ring struct memory */ if (!(ctx->ifc_txqs = (iflib_txq_t) malloc(sizeof(struct iflib_txq) * - ntxqsets, M_IFLIB, M_NOWAIT | M_ZERO))) { + ntxqsets, M_IFLIB, M_NOWAIT | M_ZERO))) { device_printf(dev, "Unable to allocate TX ring memory\n"); err = ENOMEM; goto fail; @@ -5882,7 +5882,7 @@ iflib_queues_alloc(if_ctx_t ctx) /* Now allocate the RX */ if (!(ctx->ifc_rxqs = (iflib_rxq_t) malloc(sizeof(struct iflib_rxq) * - nrxqsets, M_IFLIB, M_NOWAIT | M_ZERO))) { + nrxqsets, M_IFLIB, M_NOWAIT | M_ZERO))) { device_printf(dev, "Unable to allocate RX ring memory\n"); err = ENOMEM; goto rx_fail; @@ -5941,7 +5941,7 @@ iflib_queues_alloc(if_ctx_t ctx) #endif /* DEV_NETMAP */ err = ifmp_ring_alloc(&txq->ift_br, 2048, txq, iflib_txq_drain, - iflib_txq_can_drain, M_IFLIB, M_WAITOK); + iflib_txq_can_drain, M_IFLIB, M_WAITOK); if (err) { /* XXX free any allocated rings */ device_printf(dev, "Unable to allocate buf_ring\n"); @@ -5954,7 +5954,7 @@ iflib_queues_alloc(if_ctx_t ctx) callout_init(&rxq->ifr_watchdog, 1); if ((ifdip = malloc(sizeof(struct iflib_dma_info) * nrxqs, - M_IFLIB, M_NOWAIT | M_ZERO)) == NULL) { + M_IFLIB, M_NOWAIT | M_ZERO)) == NULL) { device_printf(dev, "Unable to allocate RX DMA info memory\n"); err = ENOMEM; @@ -5979,7 +5979,7 @@ iflib_queues_alloc(if_ctx_t ctx) rxq->ifr_fl_offset = fl_offset; rxq->ifr_nfl = nfree_lists; if (!(fl = - (iflib_fl_t) malloc(sizeof(struct iflib_fl) * nfree_lists, M_IFLIB, M_NOWAIT | M_ZERO))) { + (iflib_fl_t) malloc(sizeof(struct iflib_fl) * nfree_lists, M_IFLIB, M_NOWAIT | M_ZERO))) { device_printf(dev, "Unable to allocate free list memory\n"); err = ENOMEM; goto err_tx_desc; @@ -6636,7 +6636,7 @@ iflib_msix_init(if_ctx_t ctx) */ if (bar != -1) { ctx->ifc_msix_mem = bus_alloc_resource_any(dev, - SYS_RES_MEMORY, &bar, RF_ACTIVE); + SYS_RES_MEMORY, &bar, RF_ACTIVE); if (ctx->ifc_msix_mem == NULL) { device_printf(dev, "Unable to map MSI-X table\n"); goto msi; @@ -6781,7 +6781,7 @@ mp_ring_state_handler(SYSCTL_HANDLER_ARGS) state[0], state[1], state[2], ring_state); rc = sbuf_finish(sb); sbuf_delete(sb); - return (rc); + return (rc); } enum iflib_ndesc_handler { @@ -6842,7 +6842,7 @@ mp_ndesc_handler(SYSCTL_HANDLER_ARGS) static void iflib_add_device_sysctl_pre(if_ctx_t ctx) { - device_t dev = iflib_get_dev(ctx); + device_t dev = iflib_get_dev(ctx); struct sysctl_oid_list *child, *oid_list; struct sysctl_ctx_list *ctx_list; struct sysctl_oid *node; @@ -6888,7 +6888,7 @@ iflib_add_device_sysctl_pre(if_ctx_t ctx) CTLFLAG_RDTUN, &ctx->ifc_sysctl_extra_msix_vectors, 0, "attempt to reserve the given number of extra MSI-X vectors during driver load for the creation of additional interfaces later"); SYSCTL_ADD_INT(ctx_list, oid_list, OID_AUTO, "allocated_msix_vectors", - CTLFLAG_RDTUN, &ctx->ifc_softc_ctx.isc_vectors, 0, + CTLFLAG_RDTUN, &ctx->ifc_softc_ctx.isc_vectors, 0, "total # of MSI-X vectors allocated by driver"); /* XXX change for per-queue sizes */ @@ -6907,7 +6907,7 @@ iflib_add_device_sysctl_post(if_ctx_t ctx) { if_shared_ctx_t sctx = ctx->ifc_sctx; if_softc_ctx_t scctx = &ctx->ifc_softc_ctx; - device_t dev = iflib_get_dev(ctx); + device_t dev = iflib_get_dev(ctx); struct sysctl_oid_list *child; struct sysctl_ctx_list *ctx_list; iflib_fl_t fl; From nobody Mon Jul 7 10:06:59 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4bbKfC5q11z61Jh4; Mon, 07 Jul 2025 10:06: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bbKfC2Wbsz3f5R; Mon, 07 Jul 2025 10:06:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1751882819; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=KC7B7ypSaMxVbvoM1dH8sPtdyGXbQ8CiSdknGARlIYA=; b=XuqKJQlcsrgVJnM3ozj1KAptf4a1/FZTgF1JQr0K6Td1oPoazFu+EntbVAueIVfddQ+zZV zGDB/Nkx6JuSa80RM6GAlKVrypWXiA/mP9qE+AxBTvs37o4EwODIvyo7Iaxk9f0yOErQTB b29gLOF6/XFeLItLpFYQAG1Gk944fl9FY4NAKhJ692WSfE/B1bKDA2b+fyR+OX8RQgqP3n R/SmgQLHvF8/K5WZ+JcQkwpt1QtwKj4SB8KScA5LPU47w89b/Z1/vOgprqFkqWcGW7IAwZ G+bZuXxqfoJEkNiHhQ7EceJdgaLPypoxbIslxWpJRNLHFVlZkSnvq+0drFg2ZQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1751882819; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=KC7B7ypSaMxVbvoM1dH8sPtdyGXbQ8CiSdknGARlIYA=; b=vayeOOj2l0g0PU+gfdKU2Gw888SxwsxPxDRk0fKT1bXrM1yTHzCVx1AMJy7usyP6JPhSmI VgB9vMAAWVcCxGbJUfGnVB4RrsWuhA9HWrXXxHuhZiuWlfXdVO9kDRBVCK+hcVFbkF5QP1 SyC8brvfQdYyah1nmj5o7trpmM5G2WHPvAl3pKfUvow3hCBTpLlAyEAdbdnI8Am01M8aXF SC1SwrkhJifoY90WpGnEcA2xyXBgzlb8eaJTgKhU3aqUQB3qRFDoPYL94ZR9qM2BK7HqfN hjkyWGo6LlDx7No7mvZDP4OHMbD8sPjRJ0v6eOQrnE2pWE+5H0L0exd0gk2OVw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1751882819; a=rsa-sha256; cv=none; b=ADX0LCjItLjEO5NGUic5E+ISYYjiwvKaLnkrJPAWZJ5yBLqDrqhSNfYKRAKVbM0HOfMQ5I wZE8hvIT+zRRaR3mYnnK7IACZRMzizKp9pudxnV2Zo/7bZy42OqazWFcQQv28S86EHKVbO WMh9eLrJIL+kJJPmAUuuA53yBh6+Qizcl3pLOazl+cth9LEk0xZXdxswbOYnrw+iD+nSoK jq4aHyYNhyBSRt7tSjxwXQQz7nSEN3PJhNtxEwyCw6wP4KvWQ61fEkmPZUYZ9osun4w5so Kqf3ZHVOGxbBF/hKvCLiqqejkZzxbFp833uNQPXHb7OnXQa1WC6dREf7S0rO9A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4bbKfC1wj7zmcw; Mon, 07 Jul 2025 10:06: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 567A6xt9053450; Mon, 7 Jul 2025 10:06:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 567A6xsn053447; Mon, 7 Jul 2025 10:06:59 GMT (envelope-from git) Date: Mon, 7 Jul 2025 10:06:59 GMT Message-Id: <202507071006.567A6xsn053447@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Zhenlei Huang Subject: git: 3da0853d7119 - stable/14 - ng_iface(4): Remove a redundant assignment of if_type List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 3da0853d71197610375262b8bb06cadda6c8f4dc Auto-Submitted: auto-generated The branch stable/14 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=3da0853d71197610375262b8bb06cadda6c8f4dc commit 3da0853d71197610375262b8bb06cadda6c8f4dc Author: Zhenlei Huang AuthorDate: 2025-06-13 10:07:18 +0000 Commit: Zhenlei Huang CommitDate: 2025-07-07 10:05:09 +0000 ng_iface(4): Remove a redundant assignment of if_type That is unnecessary since change [1], as if_alloc(IFT_PROPVIRTUAL) has set if_type already. [1] fc74a9f93a5f Stop embedding struct ifnet at the top of driver softcs No functional change intended. MFC after: 1 week (cherry picked from commit c43d6dadf7e34a94f4d119ff6d7113ad9a9b4d38) --- sys/netgraph/ng_iface.c | 1 - 1 file changed, 1 deletion(-) diff --git a/sys/netgraph/ng_iface.c b/sys/netgraph/ng_iface.c index d42e74d5fd22..fbe89e13474b 100644 --- a/sys/netgraph/ng_iface.c +++ b/sys/netgraph/ng_iface.c @@ -545,7 +545,6 @@ ng_iface_constructor(node_p node) ifp->if_ioctl = ng_iface_ioctl; ifp->if_mtu = NG_IFACE_MTU_DEFAULT; ifp->if_flags = (IFF_SIMPLEX|IFF_POINTOPOINT|IFF_NOARP|IFF_MULTICAST); - ifp->if_type = IFT_PROPVIRTUAL; /* XXX */ ifp->if_addrlen = 0; /* XXX */ ifp->if_hdrlen = 0; /* XXX */ ifp->if_baudrate = 64000; /* XXX */ From nobody Mon Jul 7 10:06: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 4bbKfB5HYvz61Jpm; Mon, 07 Jul 2025 10:06:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bbKfB1xxdz3dts; Mon, 07 Jul 2025 10:06:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1751882818; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kYukBEEoFA2vIq4BzlMKHMdlzKPcK0m4/riKYGr1qE8=; b=ovm4vb/p6a5wbYi1r7e7JJiX0MSar3+y4RiBwrCE9Ivx1f/aJJqNtID3vctjxDp8bht5s/ b57CyVnapWxvKiYm/WUkwQLJ5jIeFX2pTvdUgOXxCMQvmM3iVDb1KEQg6Foj2rZLsUk1dU FgAF5jwn7jBh6y5fsvRKJ4vJPjl4mhpWKNGK/1kbf5tYkJ3qUkVlvcBCkkIR1s1rJwx/Tz Qz3TwJqEaLhhPL7N/jHQUXlgqrZNFa9eoGLpVcru/2pe4gB1wk3a0mAPVMu3DsiM1k0Vbz RWHIP1lyRvaqT69msBGbiA4JlXVsqGv9mhTsl4YPJd40csI20/2ig5ygm8gPNg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1751882818; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kYukBEEoFA2vIq4BzlMKHMdlzKPcK0m4/riKYGr1qE8=; b=VhwetLEafryk6Ngl7hgn/C3g7tBjTjHd8iJVyl2TmK8InN4AG3ResxOwLDvJjoguPMriMj u4eoVcDqrbtcX/QEO61HI25bhTQknWt6lu+J8q+tbqFIZvwAZUQE+wA8Q3eZ0U8Nr1orbn 5cU2n+VM+lT1GMaJKvRvcpY2wWZKTWD8YJtiosqiWgCD2RUibgRPNgEfE024buArCgATZj ytQR0Dn97Au0eLhtsxMVyzMJgNI7L4Ol9AeytBD3to9JRaxzwTTrAuZsyN80GKhtJerKhd D9XJ6S06q3Xd6AqtECBYtsgk4KxPvLUTB471499WX3Aq27slXynQo07ypZiLSg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1751882818; a=rsa-sha256; cv=none; b=kchPYkkSkOlOEgVqPyPGFrFnG/eLFpBR6J2/xKXfUZbTiqk8uXuR+qwJjyWKqDNzCxKRVG D4EJMxIM0mkBgu/Q9cXF5qr5Z+Et8lIfmxC1lpbij+ru0864rSpArRDqXOitaRjGhwb0bN tEEcXFPgs98w2GnfbhBlTYto6gk2c+Ales+jsOpoj0k3M22nk+TDkLDLVKjYFnI+8FKuqS dS4EmVSCc/ePvmWBMrFghbJZcuVYRgf3LjhIlQ+w8wh+0ZDVWOk/Jg0R+3MVJu5ZnnD68s PR5QtjHU3Tu0yWQ4ORxETxOBqFcMUct1sexvoPOKAn4Aw53jcUhKTz1pBZYPwQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4bbKfB1D2fzmcv; Mon, 07 Jul 2025 10:06: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 567A6wAF053415; Mon, 7 Jul 2025 10:06:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 567A6wDW053412; Mon, 7 Jul 2025 10:06:58 GMT (envelope-from git) Date: Mon, 7 Jul 2025 10:06:58 GMT Message-Id: <202507071006.567A6wDW053412@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Zhenlei Huang Subject: git: 1ddf7942c331 - stable/14 - git-blame-ignore-revs: iflib style(9) tweaks List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 1ddf7942c331d61657aefbbf9998d00c27c25bef Auto-Submitted: auto-generated The branch stable/14 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=1ddf7942c331d61657aefbbf9998d00c27c25bef commit 1ddf7942c331d61657aefbbf9998d00c27c25bef Author: Zhenlei Huang AuthorDate: 2025-06-06 10:07:06 +0000 Commit: Zhenlei Huang CommitDate: 2025-07-07 10:05:05 +0000 git-blame-ignore-revs: iflib style(9) tweaks Hash is updated to match MFC commit. (cherry picked from commit 898a886b4504cd9c7fe7dddd918cd64c068b1cfe) --- .git-blame-ignore-revs | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs index 9f873aadd745..22cddb7b766d 100644 --- a/.git-blame-ignore-revs +++ b/.git-blame-ignore-revs @@ -8,6 +8,8 @@ # # This file is sorted in git log order (newest commits first). +# iflib style tweaks +a2989d11eabeb869b8c845a097d4214755d9a99f # queue(3) single space after all #define 49066283a4c1fc5c9d6c4cbee00cc941f4b09792 # bin/ps whitespace cleanup From nobody Mon Jul 7 10:07: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 4bbKfD72mHz61Jpq; Mon, 07 Jul 2025 10:07:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bbKfD3b9yz3dxN; Mon, 07 Jul 2025 10:07:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1751882820; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=uBYxNPjZN2LtEeeLNRF5JgQ0W+f/pgM1tact1uK0CGA=; b=A1zYsTpT0piJPSf3pp3qICbQpBh09zs6Y9kkSxmSsoNbt4f6YTUi12MAq58kimUVBMC0Ft 7Bv3zvR47dYdH8kPxmmOcZ63h0rAafeHwbwPy+G2xkbA2c4XWf/FlmIqqNGqGnQS4Y6gEg dvl0cxTng7dTSxeGDKAbpv2xQWGQVALmVCa00PKaGmzm8GEZJ5m5T0KcEks0QNPXsp0CdL M5NjZrdJrBO4nqMbUyVIrnnajbwCjfHOUi1EOfvPz/VJheXj8Otp+SpUSx4l+cyz2Uflpt tjhGvtkfaJGIF0mKa14FUFz3ZrVGJt/NR7ozBdMBU2hlk/ViCXfyz16HC4EOSQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1751882820; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=uBYxNPjZN2LtEeeLNRF5JgQ0W+f/pgM1tact1uK0CGA=; b=jxotIITEHwqZ+uI+gLdfngl6drFpcSuBuZ1ZDEx2jKijZxeqQkBpBL1JbQ30ROEsYOs/1U hTFyhoKT9vpsNAtzglvqNAxwzN2ah1onPxIU5Z+dm/qUSK3owV4HrQl9KGzmvmEfLnYiBe lrzN8hebbxQH/ajCod1JUPS3s6tJvWJPDm5iIdvyjnWsqQIsAQeivXT9R/P5B4CeCJvMOC 8Nr2o5UKBYqTiAWOeXiNNusq4Kp+T8d+MriER/v8N6TrTU1o/yQhfV7KfF4xOR7uIGRaGC lIvaP2GRbKC/zSO+olI2MOe5pK+45SnlXdZUatxg6WtTJ6gIyEQ0gkhKI4jxFg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1751882820; a=rsa-sha256; cv=none; b=c16GXV0xVIQxu6pZFhZtU6lVjQ4yxqa55GxzmO5ZYcooMTYvyjS8VKIUOcvupTiEVjG8nO ynLEv0p7ZmGPaiTK7aNT+Yzy+fLMy75cSHtz9N7wg5gmVMF3afwOFf2SGIsTw0b907rGTI EYCdIIP/qGGBhJSG/qv7hxML6gntGBKTaqrK+EDSwjiWUw9VyKI7j0WSppSaTOzFuvuzYU uMKouW+JQGPsSieqrkJtAQJwoojnb/1Ks6ejP2CRXvR6qaKR8lVatawSTkBiNMS+57m203 xVlM2eRT0eQdl9NiVVUUMqMHhCdfbo1s+O9omkD3UHolxL+OgB7jt96HcV3dbA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4bbKfD3820zmWY; Mon, 07 Jul 2025 10:07:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 567A70mS053496; Mon, 7 Jul 2025 10:07:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 567A708e053493; Mon, 7 Jul 2025 10:07:00 GMT (envelope-from git) Date: Mon, 7 Jul 2025 10:07:00 GMT Message-Id: <202507071007.567A708e053493@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Zhenlei Huang Subject: git: 082a6da890f3 - stable/14 - pfsync: Remove a redundant assignment of if_type List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 082a6da890f3487f1465c0757784798ebe38ef84 Auto-Submitted: auto-generated The branch stable/14 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=082a6da890f3487f1465c0757784798ebe38ef84 commit 082a6da890f3487f1465c0757784798ebe38ef84 Author: Zhenlei Huang AuthorDate: 2025-06-16 14:12:03 +0000 Commit: Zhenlei Huang CommitDate: 2025-07-07 10:05:10 +0000 pfsync: Remove a redundant assignment of if_type On initializing the interface, if_alloc(IFT_PFSYNC) has set if_type already. No functional change intended. MFC after: 1 week (cherry picked from commit 48af70e7c82150942fd095a38131e454e47ad162) --- sys/netpfil/pf/if_pfsync.c | 1 - 1 file changed, 1 deletion(-) diff --git a/sys/netpfil/pf/if_pfsync.c b/sys/netpfil/pf/if_pfsync.c index 503bdab0c6ac..5db72edc2dab 100644 --- a/sys/netpfil/pf/if_pfsync.c +++ b/sys/netpfil/pf/if_pfsync.c @@ -401,7 +401,6 @@ pfsync_clone_create(struct if_clone *ifc, int unit, caddr_t param) ifp->if_softc = sc; ifp->if_ioctl = pfsyncioctl; ifp->if_output = pfsyncoutput; - ifp->if_type = IFT_PFSYNC; ifp->if_hdrlen = sizeof(struct pfsync_header); ifp->if_mtu = ETHERMTU; mtx_init(&sc->sc_mtx, pfsyncname, NULL, MTX_DEF); From nobody Mon Jul 7 10:07: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 4bbKfG0NT6z61JSG; Mon, 07 Jul 2025 10:07:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bbKfF5QCFz3f67; Mon, 07 Jul 2025 10:07:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1751882821; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=PVZcLcGAuFoW09O8ww9PYyfMHbvJ0ERHZzJ0VEh8Tdk=; b=bLMiBMiYMu9Ksw4zTkwfyKTeYw/9dCb1BqzedDmCNZexkxrk6lHpgdh3WBbpAEA6M9UNCY UVoenjMUrXPmjYIY008tQpTxveF9Rvj+lYq/TN2PtYjwwdI0SPpGR41EFrm2utIWJBzO+y 7ryqE7eJnfji+1pPnyBEglHyHVz7baCbc3jWg7ia7nqW3GvUw57uBU4EMGGH5a3n6yDKAr qfs87FeBFziBsYsOG2CaPVkdU9i6J8wWrGrJ6g4IAP0lJmwKpgpzRZZ2Aw2FU7MzAn3hfV orJO3cKinlK0mvHCnyugRJXw5zTE1mG29qAdZGUDLqWdNifaSXKdRuDTXg6J0g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1751882821; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=PVZcLcGAuFoW09O8ww9PYyfMHbvJ0ERHZzJ0VEh8Tdk=; b=dzjvieIgAhD/rkRoAfpUmTvt2C9oC0xsBVtIQYh4az1p0ah2THScgil+HOLo9E5mge8K6C Q37EAeMFbYAr7mvxiy5TruDMqc563uSaJv2RsD++nv7pe//Qm8i/NFgTnYfMB3FiYXDvNx Vn7B7FKEMRrklwVhNyXzUuccA/Nw58ogqvgDPtznLJKSC56H7o4A/OMWKW/lQoJqtd0ijn Dl28hGLfVbznam/QenCbANU5FG2MqLRpKBulv7jaxE1Lf9iZFx0u10qqPIUJEiNJRWp0Po ZECT6tnaJsmrl4Ri5GZUbnCeZcUYBU679L5eZupyBW58cegIKnmMcdQjXvRfiw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1751882821; a=rsa-sha256; cv=none; b=odwwrUdw24zrNOcJVG/Axiiys0ln517APy0UScnVfHIuRUZa3T6EsnvbQkgsS3xeh6zM6i 9yXeLMcnFAM/x5u83U1mEx5ICHStW88KvRJ4zWjomWvSkBp9RKZkyTtnwYBQ59Rs4qkSlh Nw3iDGhwrR3bWSqIVE8PUJ6Vlk4iSrCzFHMVET4ccds1qPb8MdbTcLC3K30UoDCA8zwsT3 4G8tNW+Wi7iDY822jdpGhyeH5rCcZOhXEkq4OBgAqgmw2TTueC/QhYvqNDVSMk4GBY4Wlu 7Tj12evVy6mlDUXCy/60WKlI8tnyrFoxNsp5ykWIsQVgGjGw+zsW4VzXwKg65w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4bbKfF4336zmWZ; Mon, 07 Jul 2025 10:07:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 567A71Wv053530; Mon, 7 Jul 2025 10:07:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 567A718l053527; Mon, 7 Jul 2025 10:07:01 GMT (envelope-from git) Date: Mon, 7 Jul 2025 10:07:01 GMT Message-Id: <202507071007.567A718l053527@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Zhenlei Huang Subject: git: 193f0bde3b04 - stable/14 - bridge: Remove a redundant assignment of if_type List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 193f0bde3b048559d36c3e6db5d6b2be7daeaf6f Auto-Submitted: auto-generated The branch stable/14 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=193f0bde3b048559d36c3e6db5d6b2be7daeaf6f commit 193f0bde3b048559d36c3e6db5d6b2be7daeaf6f Author: Zhenlei Huang AuthorDate: 2025-06-16 14:35:40 +0000 Commit: Zhenlei Huang CommitDate: 2025-07-07 10:05:10 +0000 bridge: Remove a redundant assignment of if_type ether_ifattach() no longer sets if_type to IFT_ETHER and keeps it as is since the change [1]. [1] fc74a9f93a5f Stop embedding struct ifnet at the top of driver softcs No functional change intended. MFC after: 1 week (cherry picked from commit a07604e6264b88222941fa61c6f989bad5490765) --- sys/net/if_bridge.c | 1 - 1 file changed, 1 deletion(-) diff --git a/sys/net/if_bridge.c b/sys/net/if_bridge.c index 4d4f52263748..035ba0f0806c 100644 --- a/sys/net/if_bridge.c +++ b/sys/net/if_bridge.c @@ -806,7 +806,6 @@ bridge_clone_create(struct if_clone *ifc, char *name, size_t len, ether_ifattach(ifp, sc->sc_defaddr.octet); /* Now undo some of the damage... */ ifp->if_baudrate = 0; - ifp->if_type = IFT_BRIDGE; #ifdef VIMAGE ifp->if_reassign = bridge_reassign; #endif From nobody Mon Jul 7 10:07: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 4bbKfH0RtXz61JSJ; Mon, 07 Jul 2025 10:07: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bbKfG5SrCz3fF3; Mon, 07 Jul 2025 10:07:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1751882822; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=CSA5tbSFeAE1vUtDo+fYejpKnM5UHweaz94am3+GTG8=; b=KEttb2AA75aXJwI5V/10PHSNz44THgXQwuWXoXQX/WXmHvWZ93/iZmuYHDVdWTcCDXimy0 XW0F4lky8kcUMiK1Y2wJkxuu0VkxYu3GmNu5aF04c47qUOJxqqicjLfurXw14OXTCcBoMH 41vj5HKXbjNNSY/3GlKylYJrORxSMNnSmcQYr6P7Stwx/923i5oO/zasWrW362B/2gLYyU rF++sBGbwU10wv/HG5JqDAQBfCdjSVgCiTHrZli6Xzr1u4YqtynUfvGMI1inFoRRlmRgrm 8pD64Xef4uQVXzDZ/XcIUS3wq/EIFsK28fHVS7uhWfFHn/fwHWwHbG1QrOu7gQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1751882822; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=CSA5tbSFeAE1vUtDo+fYejpKnM5UHweaz94am3+GTG8=; b=onkedMdsnVDHMLr7oVtM6g72ZmXZfwyJxCGA5N7eTCe2ZKXnwBZ6u752gV1ypKtTnIsm5x qunKHxEUr1NppA09kBwtGYcqc/sn6R2axVmcEDoIzO99pWicEQLJHbUETcDbUI5s+6pO9C fbMzUMckO/GvltaIV3ATtHvPdLPSJMpvEi9e3FsZ1uPGJ0u/XGNlVI4AutXEuYKJNuQdB8 B9RoX8SOZMjawyBw82COWkouifcbPyMx5P0Uk+REf0M6NqUDSaO1Yx4ovr9+gvbMC6Ld7S iyKhPV4IFNWaAEHSVUXBTDD4uZQVL3xo+QcGjRgwSCXjAFBniPZnevFxPJqdRg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1751882822; a=rsa-sha256; cv=none; b=rVQfzyRIpW5ZNASJcMDpLEda5TfYUBlJfIeSwqO5O0YTO4iinlLJXZtCWUVBg/HHUmSVy8 l/AdAGByfXGXl2eGn2AXnuYQYYjvz759KKonvmjiTHHaPv/FwV2+YeIAcvjcTOz1KVK1FR 4/vVRwUj7jZrJwsCYjrSytAWJVux54XKe0xEdRf2pBR3O/fF8ud4iBofVeNTxnvMn2TLPt CZjeMyUYDfQ0NT3LHd6ZojJ5XtkNcjjZeZO8Bj76DvA1nrQCjdLU6RoD8MoTqIgae9oXOk DqIL1uzo9gGqDe6TZw5O4DzP1LCKuQ3Nu42dD3M6GZao3C9Zwu+F91Q8U5o8WA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4bbKfG4zqJzmvC; Mon, 07 Jul 2025 10:07: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 567A72rk053564; Mon, 7 Jul 2025 10:07:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 567A72Hn053561; Mon, 7 Jul 2025 10:07:02 GMT (envelope-from git) Date: Mon, 7 Jul 2025 10:07:02 GMT Message-Id: <202507071007.567A72Hn053561@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Zhenlei Huang Subject: git: 3bb09e6b1930 - stable/14 - ethernet: Set maximum Ethernet header length based on the capability IFCAP_VLAN_MTU List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 3bb09e6b1930b58d9d92aa3f28515114631a1d6b Auto-Submitted: auto-generated The branch stable/14 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=3bb09e6b1930b58d9d92aa3f28515114631a1d6b commit 3bb09e6b1930b58d9d92aa3f28515114631a1d6b Author: Zhenlei Huang AuthorDate: 2025-06-21 15:12:29 +0000 Commit: Zhenlei Huang CommitDate: 2025-07-07 10:05:10 +0000 ethernet: Set maximum Ethernet header length based on the capability IFCAP_VLAN_MTU Lots of Ethernet drivers fix the header length after ether_ifattach(). Well since the net stack can conclude it based on the capability IFCAP_VLAN_MTU, let the net stack do it rather than individual drivers. Reviewed by: markj, glebius MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D50846 (cherry picked from commit 6ce8fd1978a9526ff0dc02ed98ef797f9154ec1f) --- sys/net/if_ethersubr.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sys/net/if_ethersubr.c b/sys/net/if_ethersubr.c index 9210f1378666..baf3a27c2e7e 100644 --- a/sys/net/if_ethersubr.c +++ b/sys/net/if_ethersubr.c @@ -997,7 +997,8 @@ ether_ifattach(struct ifnet *ifp, const u_int8_t *lla) struct sockaddr_dl *sdl; ifp->if_addrlen = ETHER_ADDR_LEN; - ifp->if_hdrlen = ETHER_HDR_LEN; + ifp->if_hdrlen = (ifp->if_capabilities & IFCAP_VLAN_MTU) != 0 ? + ETHER_HDR_LEN + ETHER_VLAN_ENCAP_LEN : ETHER_HDR_LEN; ifp->if_mtu = ETHERMTU; if_attach(ifp); ifp->if_output = ether_output; From nobody Mon Jul 7 10:07: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 4bbKfK1ntjz61Jjl; Mon, 07 Jul 2025 10:07: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bbKfJ6wL2z3dy5; Mon, 07 Jul 2025 10:07:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1751882825; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=IWjVC8uUPZHqg0dUYB1zXwncw4DXM9vvtVVTX38SO7U=; b=wUJAzXXdX7opqHJbyGlgPL5BFSRCEOoFPDjCQaHlYKTrZJ9K0jEm39e105ph6hZ36b4S33 3bSdXY5yLarRsiwNbkpZHfR54n0Wz5xZbtS+0h72S6pcySPk8kJexaZGPxj0hJXqC20JLp Rzb2doC7X+BjcoCzpG8FVpSG/7pHOl9svtLEAkUWVOiHYT2j4JuRcdsbUVQyp4twP42OzV d+7z6kS0LTZ6sK6nyeLkJIlW+t1GV9Q8I/anVDSfUq1MkxsTHTDt1HgofcLLq+JRVYu2uy RINYKeVWoZhM+rL4RiSdysP6B9SwxaEy4nNYyn5NvgwsJXQVtSVveAErBLHS5Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1751882825; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=IWjVC8uUPZHqg0dUYB1zXwncw4DXM9vvtVVTX38SO7U=; b=NI7ByPpg8TFz4yOFf5N+Z0KlVQsIGyWC5/rmf6mrhIDGbXA/rocJ8mm14obpzrP8xhg+5W vpXX7zy2VCjPbk5qfAuWACtqbK/nGKjUWch77WBgzzmIZ98De5w/DB2/XovyMt/5Ibp3Iq cffD+qybTXCr5Aw7LqW8g7WeCqG9/yPQCB4kunghvRN+4Fm7y3b1aMBgzI3K1RMVpZE3M2 BKNty6v+g8JBDhUq4Ln7oLMg7YVtkCXtKykDvjoKRgl9ar8l8yZqgkl0tmfNVdJLSbXm1S 28DGbLtoRVD9+qfrME6DdUBY8oZSfRe23Ehy8nsmrwWhPnv1k1MUo8fgw9Z6JQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1751882825; a=rsa-sha256; cv=none; b=ihVLgiBZlFI5dVgpsXwBsmjKI27/yhv/WEANRPASNYtzN+S/MB69DEd8Ff472wrD1wO2Jw Qf+tKyfqTBDzoBrtnMsNaI3Y14mspTOoZbOSxJKTPnxqmnYyel5mKrfYY9rcxa7cMxbyHO JE1/S6id2wOQmYRwFKM+EfESWHe53nlRoqj9Gl95lbNe8EIH/bngtfRqSpRJHIqghtUNky /u6EM3DvS7HSJWG7/oRyA25ePDDCSJyw7yF/Rh7YD71mLhSZsifWpFSECNWVX2l6fAm5gm D0ogbgFIDPudr5CWUvJqp3IBhoFKaa+5YjJ1708sKDwd305VLaw7VOiXeJcjzQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4bbKfJ6XDyzmvD; Mon, 07 Jul 2025 10:07: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 567A745j053633; Mon, 7 Jul 2025 10:07:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 567A74Sg053630; Mon, 7 Jul 2025 10:07:04 GMT (envelope-from git) Date: Mon, 7 Jul 2025 10:07:04 GMT Message-Id: <202507071007.567A74Sg053630@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Zhenlei Huang Subject: git: ff54b680383b - stable/14 - if_vlan: Fix up if_type before attaching the interface List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: ff54b680383bb0f212e813b74e7a3f76423d2238 Auto-Submitted: auto-generated The branch stable/14 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=ff54b680383bb0f212e813b74e7a3f76423d2238 commit ff54b680383bb0f212e813b74e7a3f76423d2238 Author: Zhenlei Huang AuthorDate: 2025-06-26 16:37:13 +0000 Commit: Zhenlei Huang CommitDate: 2025-07-07 10:05:10 +0000 if_vlan: Fix up if_type before attaching the interface ether_ifattach() does not touch if_type, so it is not mandatory to fix the if_type after ether_ifattach(). Without this change, the event listeners, e.g. netlink, will see wrong interface type IFT_ETHER rather than the correct one IFT_L2VLAN. There is also a potential race that other threads see inconsistent interface type, i.e. initially IFT_ETHER and eventually IFT_L2VLAN. As a nice effect, this change eliminates the memory allocation for if_hw_addr, as vlan(4) interfaces do not support setting or retrieving the hardware MAC address yet [1]. [1] ddae57504b79 Persistently store NIC's hardware MAC address, and add a way to retrive it MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D50914 (cherry picked from commit a19b353d354d4ef808965c53253103cb6e7e6708) --- sys/net/if_vlan.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/net/if_vlan.c b/sys/net/if_vlan.c index dce1cff5bc69..6a0d9331324e 100644 --- a/sys/net/if_vlan.c +++ b/sys/net/if_vlan.c @@ -1185,10 +1185,10 @@ vlan_clone_create(struct if_clone *ifc, char *name, size_t len, ifp->if_ratelimit_query = vlan_ratelimit_query; #endif ifp->if_flags = VLAN_IFFLAGS; + ifp->if_type = IFT_L2VLAN; ether_ifattach(ifp, eaddr); /* Now undo some of the damage... */ ifp->if_baudrate = 0; - ifp->if_type = IFT_L2VLAN; ifp->if_hdrlen = ETHER_VLAN_ENCAP_LEN; ifa = ifp->if_addr; sdl = (struct sockaddr_dl *)ifa->ifa_addr; From nobody Mon Jul 7 10:07: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 4bbKfJ0cmcz61JhB; Mon, 07 Jul 2025 10:07: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bbKfH605Gz3dvj; Mon, 07 Jul 2025 10:07:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1751882823; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Pr3Q9wd7BuNUQYHIWfXEQIZad5E2tuCKR7Gz9qmUXbM=; b=SyeK42PXVVCLK+jmn/GIPGu8P1plLSg2bel219peklN3xzzedLbXuI+uFSnSipykguWSle XQIgWL79JnSb80/oJ0rwqpy5apS95VqNFBfNys8L5RDCGq7b7U6jJJ7hjgNMW/TW1Fpb0K NMv2HQHulP0BeVlhxhtkOu0reOF8dPD8pEEMOKfMFmUmbGUQmloq67cZYz60iLbUBsX0l5 VDG9whqpROG5lW8NQo0t3dFv/J+Z8t7/FvNyr75xmMgeBlIPadMoA7Rhd2y/Xqj6tmxopn IqOLv7tIMjogWBtgHJCOJFfgzcarxWsOx3cfbdL6G/rFArtfkVwn1h+otrcnrg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1751882823; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Pr3Q9wd7BuNUQYHIWfXEQIZad5E2tuCKR7Gz9qmUXbM=; b=f9VNdrdKf9ItsY+Kg88VUVlhJwX94W9INcXOLr/4XytZKaw/45KCUnMlx7lQLVschZf2L0 CooelV7Sh0Nf3iMT9mbQGheULcbe3wUtBCiEJWiVgxaI2t4+BvmLnXEg6FY6o0V2xUYEKY RbDUtmc15Jbq1hvg0GzYN705m2/8KpPx2erkh1GJrsf6wgVUQmJTT7C9aM7nzrPChIJXHt ECGHvM/sy5HyfrSYeDNSH0Ma111yVLZrtAt632HzHLCN3zSvICkuPb6pKYbw2o2gNoMlfN Dpz15YyWfzmcYjTTu/r9gAks2bAiQq56tE/NhnqVWdGAyzVij0ik0wPsmLjPxA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1751882823; a=rsa-sha256; cv=none; b=YNemwG+WJhfbMXMnLpt1xMKSEgabONOKtNH5b238eK6C1xZ7Ovpazf5v/7G1yFndo8TilS PStpBanld8oWSIvk75x+xH62ZzDXrWPdgXHepsuCh6iS05A1/voStV++wsuZPO35+/Awa1 tsJCMu0QrLKfCfbfNJKBjZ7Pnnu28RR6aI7lmvTGnJhVct+I8w6UkRKkx6Zvoe+d/cIGe/ LaWlII1KYPc7l4MmjhI4VEiimJ5uSe6uKEaNGFr4UM038p6as72Q3K9QEqr1X4xAm8KExT cyCwYO1mc6Gy8E/oDXmambxt1Z+Dh6EuqNkVaeEUjSHEHtDaGXU4KRdRTY0eiQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4bbKfH5Vw7zmsH; Mon, 07 Jul 2025 10:07: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 567A73fa053598; Mon, 7 Jul 2025 10:07:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 567A738e053595; Mon, 7 Jul 2025 10:07:03 GMT (envelope-from git) Date: Mon, 7 Jul 2025 10:07:03 GMT Message-Id: <202507071007.567A738e053595@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Zhenlei Huang Subject: git: 99d4e2870c03 - stable/14 - ifnet: Eliminate unnecessary synchronization of the interface index in the link layer address List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 99d4e2870c03ce86855fa2edab2fe9af0d3ff410 Auto-Submitted: auto-generated The branch stable/14 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=99d4e2870c03ce86855fa2edab2fe9af0d3ff410 commit 99d4e2870c03ce86855fa2edab2fe9af0d3ff410 Author: Zhenlei Huang AuthorDate: 2025-06-24 10:01:18 +0000 Commit: Zhenlei Huang CommitDate: 2025-07-07 10:05:10 +0000 ifnet: Eliminate unnecessary synchronization of the interface index in the link layer address Change 80e60e236d85 made the if_index global, and for the whole lifecycle of an interface its index never changes, then there is no need to synchronize the interface index in the link layer address when moving interfaces from one vnet to another. No functional change intended. Reviewed by: glebius Fixes: 80e60e236d85 ifnet: make if_index global MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D50975 (cherry picked from commit 0b4c4833ee3eab0ce46b3bdbf054bca4b6bb7429) --- sys/net/if.c | 15 --------------- 1 file changed, 15 deletions(-) diff --git a/sys/net/if.c b/sys/net/if.c index a0570aed32e9..39854489f5f7 100644 --- a/sys/net/if.c +++ b/sys/net/if.c @@ -932,21 +932,6 @@ if_attach_internal(struct ifnet *ifp, bool vmove) } #endif } -#ifdef VIMAGE - else { - /* - * Update the interface index in the link layer address - * of the interface. - */ - for (ifa = ifp->if_addr; ifa != NULL; - ifa = CK_STAILQ_NEXT(ifa, ifa_link)) { - if (ifa->ifa_addr->sa_family == AF_LINK) { - sdl = (struct sockaddr_dl *)ifa->ifa_addr; - sdl->sdl_index = ifp->if_index; - } - } - } -#endif if (domain_init_status >= 2) if_attachdomain1(ifp); From nobody Mon Jul 7 10:07: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 4bbKfL42Wxz61Jrr; Mon, 07 Jul 2025 10:07: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bbKfL0SYYz3f1x; Mon, 07 Jul 2025 10:07:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1751882826; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vcRmqS6jAgnWwBCczFn3fIigvxm8fIJXO0VOtAngi6c=; b=ksyvS2OkiDHrr0z1aRcEjt45I1yYnXLLmNfowEbxJQ5GH14mqwyhjaE6hZdMV5Amr894xA DiGX0MBoq4YCNuo4a5F6t63NVCZy5mPm4nidmWomw1IchTzVnK48e+KwBUsPWJ/II7UxXx f3ZYZPz8O5/eKXB8Glqy9D3D1QXgJuMT+5Kc5reACA7s5d9/a1UwtRnz63nfQbS53JjFM2 1Z2F9xzB9Brxs/ZJfTgNdJOhn1uOtc5t+mR0aApYvWY0OwvzKQ1WalTYKYOIc8/YBTkOcH aHu5qHwvev3ddSnXVWqqMMHSIUYH/3M0BYVWkTrkZYyVnWcIcvG7w+Zm7YwuVA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1751882826; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vcRmqS6jAgnWwBCczFn3fIigvxm8fIJXO0VOtAngi6c=; b=JjEXcNccmDnYhxgdddrqZRCavO0ofdXoGpFh1SJkKPKchxSaRmn634l8Cq8cA/rVuw8aBN vl4mATcA6XeFU7eMg68b7qgwnvQXFOb+wTAwdePYklKpf6xCAzp/d238Bfumt4Mbj02EqM DH0hGRqcoWyk634hGCANgwy6W0jOz14TyAqqr5dbsyeH1K2LEF+ciSpGGmKtFM8psqkE/c YAuRlzxX366x6TsMeIZOUIEylIm7UO5V+H2gFiCxZz237VlmdaFwAykAfEnKQXZmikXkQS 4KWUhV5EGVgu1zoCqqQ0qAasCGLLd/4pv5Aouwv6LEgiEkam7cKmfVDBMKl4CQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1751882826; a=rsa-sha256; cv=none; b=VjC8UMVaBgWl2w4jvZwOKdnCo+lGf04dmuUJJF2QFDNS7ljEQbY61B/T4rP4BJyPw6PSkH JI0s1wvwwdcuEW7N9a8Ch932QmI5mX3qPzZTm0PSra6d7f19xPJzfvkXyPDd3gpp+VOvGc DLLMqmkxuE1rYSSMSiXOYdWA9BP28l35x8SYWFXTtnp/IDmH6IJtDiuHfK8m1jHyVg5dxS hSi0sHsKJIELi/v6xUxmoSq0LwTFghqaLWuqm5jQ3+t8zjLf5RtgyWuNCZi7PcprultleL d6xJW7gjcmAeiNxGR7pUccUlyX2mNwadsoLtI5gboVVUxUlxuF1v1euifb/S+g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4bbKfL04Y2zmvF; Mon, 07 Jul 2025 10:07: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 567A75ub053675; Mon, 7 Jul 2025 10:07:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 567A75TX053672; Mon, 7 Jul 2025 10:07:05 GMT (envelope-from git) Date: Mon, 7 Jul 2025 10:07:05 GMT Message-Id: <202507071007.567A75TX053672@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Zhenlei Huang Subject: git: efbaf14c5b68 - stable/14 - pfsync: Destroy buckets mutexes on clone destroying interface List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: efbaf14c5b681c8f1a04a47c7bf8740134fff098 Auto-Submitted: auto-generated The branch stable/14 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=efbaf14c5b681c8f1a04a47c7bf8740134fff098 commit efbaf14c5b681c8f1a04a47c7bf8740134fff098 Author: Zhenlei Huang AuthorDate: 2025-06-28 15:46:51 +0000 Commit: Zhenlei Huang CommitDate: 2025-07-07 10:05:10 +0000 pfsync: Destroy buckets mutexes on clone destroying interface So that the associated data with them will be freed. Reviewed by: kp Fixes: 4fc65bcbe3fb pfsync: Performance improvement MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D51063 (cherry picked from commit 8213c07c20586a67bc7f7152bd7ff76c02cbc007) --- sys/netpfil/pf/if_pfsync.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/sys/netpfil/pf/if_pfsync.c b/sys/netpfil/pf/if_pfsync.c index 5db72edc2dab..b75cc4e08029 100644 --- a/sys/netpfil/pf/if_pfsync.c +++ b/sys/netpfil/pf/if_pfsync.c @@ -492,6 +492,10 @@ pfsync_clone_destroy(struct ifnet *ifp) mtx_destroy(&sc->sc_mtx); mtx_destroy(&sc->sc_bulk_mtx); + for (c = 0; c < pfsync_buckets; c++) { + b = &sc->sc_buckets[c]; + mtx_destroy(&b->b_mtx); + } free(sc->sc_buckets, M_PFSYNC); free(sc, M_PFSYNC); From nobody Mon Jul 7 10:07: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 4bbKfM6dDGz61Jbt; Mon, 07 Jul 2025 10:07:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bbKfM1Zkdz3dyW; Mon, 07 Jul 2025 10:07:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1751882827; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ABLqcM3FxkvnXyKFtfa6vDndtp19Lj9eEH9+T3mjWig=; b=p45zFVoUgSMdcdziEQPysDR7BCV+GzXiBumCoNT7Z4li8SKvsMo3wqSUJzCGWGtRYuSAie 2gYgX3uroiWIKL6kC+aNa0Wp0Q8DwzwRVIKlalIw9/4UM+nwOey69sf8gQyPMjFwdsz93f e8iU1H7fKKXZMtEj3R6+84kkqi5C8OStrWP/2BRbsh21SRMrA8avFb7JxFZc6SI1V0Z8TN ZXFeAeMJrH366Ta87H3/ZSjDIMQ9yPQjVT9u4QMxQSYK3y2U192Bq3FzrNdd3a5CUaYTZx HIs1BxPwb+ykloQvNzn2xwA5D+pAY2pXKawIuQv1DMzCPVsJ2idqhDrLVFCPeg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1751882827; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ABLqcM3FxkvnXyKFtfa6vDndtp19Lj9eEH9+T3mjWig=; b=jmi3ro9mWdRpmwWEsLzNY3nmH4FHHoAIMDN3sX4KoyOQe5F52YIwU6DB5uhr32M25iqTWs WdsQjDDRQQDegKS2Eblqm3rvLbLD3K2v25QCwnAnl2/6MF+yA9++lMzjM8v77JUIyF2wGH J+zwjRUUDRGoylCTwhqPP4RfHr8HhGFUbKFP/a5UmIYDP73YNXk4iALgF7aJkPaLzAF+5X GvMKJB4RoG80ZpeVVXAEkD2ARdqKdm2WWrCgnSqXSpL+TatDcFsJoc5pjGg7qyFxwdFmla soQ1dbdgRQ30QO0As8jGPKH0XZmzwlODzke0wa9aRYTaeKJjDzwVh1gt5E14OA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1751882827; a=rsa-sha256; cv=none; b=Mb4Q6JONWTAyEwGB2g2YLQJytAwjUQVbJONHyslRnx8ydZ4d/I3czpbQr6oDThoJIW8pG8 LtpqqFcNWfRAE01dtbuVkyoDDj/3WsSCnwgYrAhQTkuqgtcujZTAjGTBP1i6llTgtSmuTC p8PjrcsarDV9r2cePvObTJG149zJ830XJXIiMD06pRxh+ZPRtGOYopWJ71Tp71VrmxcyoD X/iH/5GRTOtlZGCM0m5n1/QnYoh8sTZZ428KeFmhai8knDRtVei/rm7hOroGpTUGw61U20 FIeA8tqC1bxSmM+nNq2mtyEmrjPgrlo8uPn4EKkqWuktR8qJWyRnmRoq/87VCA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4bbKfM0yTbzmcx; Mon, 07 Jul 2025 10:07: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 567A7776053711; Mon, 7 Jul 2025 10:07:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 567A77fW053706; Mon, 7 Jul 2025 10:07:07 GMT (envelope-from git) Date: Mon, 7 Jul 2025 10:07:07 GMT Message-Id: <202507071007.567A77fW053706@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Zhenlei Huang Subject: git: 8cc376735c65 - stable/14 - pfsync: Allocate and initialize buckets before attaching the interface List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 8cc376735c65a18c53a70c30957a5f56dd066b79 Auto-Submitted: auto-generated The branch stable/14 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=8cc376735c65a18c53a70c30957a5f56dd066b79 commit 8cc376735c65a18c53a70c30957a5f56dd066b79 Author: Zhenlei Huang AuthorDate: 2025-06-28 15:46:51 +0000 Commit: Zhenlei Huang CommitDate: 2025-07-07 10:05:10 +0000 pfsync: Allocate and initialize buckets before attaching the interface This prevents a potential race that the ioctl threads see NULL or uninitialized buckets. Reviewed by: kp Fixes: 4fc65bcbe3fb pfsync: Performance improvement MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D51064 (cherry picked from commit edc307eca9a9a9b0ce7445cff513b48f6489e5c6) --- sys/netpfil/pf/if_pfsync.c | 33 ++++++++++++++++----------------- 1 file changed, 16 insertions(+), 17 deletions(-) diff --git a/sys/netpfil/pf/if_pfsync.c b/sys/netpfil/pf/if_pfsync.c index b75cc4e08029..64c938ee52ee 100644 --- a/sys/netpfil/pf/if_pfsync.c +++ b/sys/netpfil/pf/if_pfsync.c @@ -395,23 +395,6 @@ pfsync_clone_create(struct if_clone *ifc, int unit, caddr_t param) sc->sc_flags |= PFSYNCF_OK; sc->sc_maxupdates = 128; sc->sc_version = PFSYNC_MSG_VERSION_DEFAULT; - - ifp = sc->sc_ifp = if_alloc(IFT_PFSYNC); - if_initname(ifp, pfsyncname, unit); - ifp->if_softc = sc; - ifp->if_ioctl = pfsyncioctl; - ifp->if_output = pfsyncoutput; - ifp->if_hdrlen = sizeof(struct pfsync_header); - ifp->if_mtu = ETHERMTU; - mtx_init(&sc->sc_mtx, pfsyncname, NULL, MTX_DEF); - mtx_init(&sc->sc_bulk_mtx, "pfsync bulk", NULL, MTX_DEF); - callout_init_mtx(&sc->sc_bulk_tmo, &sc->sc_bulk_mtx, 0); - callout_init_mtx(&sc->sc_bulkfail_tmo, &sc->sc_bulk_mtx, 0); - - if_attach(ifp); - - bpfattach(ifp, DLT_PFSYNC, PFSYNC_HDRLEN); - sc->sc_buckets = mallocarray(pfsync_buckets, sizeof(*sc->sc_buckets), M_PFSYNC, M_ZERO | M_WAITOK); for (c = 0; c < pfsync_buckets; c++) { @@ -433,6 +416,22 @@ pfsync_clone_create(struct if_clone *ifc, int unit, caddr_t param) b->b_snd.ifq_maxlen = ifqmaxlen; } + ifp = sc->sc_ifp = if_alloc(IFT_PFSYNC); + if_initname(ifp, pfsyncname, unit); + ifp->if_softc = sc; + ifp->if_ioctl = pfsyncioctl; + ifp->if_output = pfsyncoutput; + ifp->if_hdrlen = sizeof(struct pfsync_header); + ifp->if_mtu = ETHERMTU; + mtx_init(&sc->sc_mtx, pfsyncname, NULL, MTX_DEF); + mtx_init(&sc->sc_bulk_mtx, "pfsync bulk", NULL, MTX_DEF); + callout_init_mtx(&sc->sc_bulk_tmo, &sc->sc_bulk_mtx, 0); + callout_init_mtx(&sc->sc_bulkfail_tmo, &sc->sc_bulk_mtx, 0); + + if_attach(ifp); + + bpfattach(ifp, DLT_PFSYNC, PFSYNC_HDRLEN); + V_pfsyncif = sc; return (0); From nobody Mon Jul 7 13:58: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 4bbQmw0Nclz61n1g; Mon, 07 Jul 2025 13:58:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bbQmv6Z0xz3Pj8; Mon, 07 Jul 2025 13:58:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1751896688; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=D5W94nbG9yOka+sbAuk93aaLOz0DxYq+3ysjnRzcp8o=; b=unxdhkICYa51Iw30TDdPZowAoNto9qHbLCqjJOSg06wYFWqanUvvHg7sKSziTjZa8gp5vo Zx9fNK+Q31V1LYRAhyLFA+n6CmDdXaXRJkbLI2Jk6IWmqb/BnvnmPFnnmq2AohwJIGHDZj hra9vKC9T333gMHeYPiD7EKQxc2c3S3GhLDdBQyJKwSvmMUoKmZNj6STj+o+vuAFTkapqC jXmT1xIAyvkQ+CVndVjpLTTX1haFniq8SLlpZnz9bf1YgvdIWjo+MPeVj4uJahDBggWFXy w9wRO9XGZcuJozGa8AN4UU7GCDtbEfuE2Xtj74AH2hqE4ye+8Uq8fKLu8z98aA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1751896688; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=D5W94nbG9yOka+sbAuk93aaLOz0DxYq+3ysjnRzcp8o=; b=xRKhDMnMxzceZAnYD9+BuFrtCd9Oit97xp7nYC+qezwawCp1YSz7cJ5vt+CJvTgKO0r/an hMX5V/hWGAMHz0ZExwCxR5E9bbMt8nn3LP58YHoS41ta4Gy5zGKRRZDizY506GlNqvpuOx F5BK3I9+gTgIdAiSZUMVDx9u9zRCYoErh4h5DwTK/NSV2s+xWmx0K1Zxk3KbRz3ue4nteL NFqKqjh1XBdOngHDNJDvLEAcPzizsQ9b0LhQ7+LqPecJXcU0VH6paMCriaPwIpO4kZSRAd IptKGEV48Y5qpqywFjq7JHJeirjdKqRZGPw9LGwRprGmpllQCBSSSeldpYCiSg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1751896688; a=rsa-sha256; cv=none; b=mvTvsVQPuhkVRn6cujGQQ4QjxW42r9m1KTp4NVGUomCtMeFRjzrZx6cRT71ZBYgB9KGywq CRHa/HqIyvf2vG9ASLaMKJz+ApCzjSlc0qDTa20QPmkvlBlQxm5DYAp0TJRDd66pIsKZIF NUzCOkvEiIddsOFidnVLCtKUMhYt8V3X7MJkEecZRxkG5U5UOz/gAAXr/k3P1C9w1w9qqB ttryvT8Zus5PibIh37EhZ2+wKqCMry8MIYljI/exQxowvo4ITOmj1T50+jFTeZvpMoe69I GgPC4PEY73agpyQJ0u71FVZ1EfRh7lHlLh6MzOwWDugdHdwFKY/Jns4NAMgs7w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4bbQmv5X1LztVc; Mon, 07 Jul 2025 13:58: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 567Dw7f4083791; Mon, 7 Jul 2025 13:58:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 567Dw7bm083788; Mon, 7 Jul 2025 13:58:07 GMT (envelope-from git) Date: Mon, 7 Jul 2025 13:58:07 GMT Message-Id: <202507071358.567Dw7bm083788@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Warner Losh Subject: git: 1a55bc50656b - stable/14 - acpi_wmi.4: fall cleaning List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 1a55bc50656bd46639dd1fbde2cc0ab8a85d1e7c Auto-Submitted: auto-generated The branch stable/14 has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=1a55bc50656bd46639dd1fbde2cc0ab8a85d1e7c commit 1a55bc50656bd46639dd1fbde2cc0ab8a85d1e7c Author: Alexander Ziaee AuthorDate: 2024-10-17 05:24:50 +0000 Commit: Warner Losh CommitDate: 2025-07-07 13:57:01 +0000 acpi_wmi.4: fall cleaning + add descriptions to existing examples + github repo url in sysctls => port named in example using it + reword MOF description for consistency with external docs + restore standard link, move to STANDARDS + grammar and markup nits + tag SPDX MFC after: 3 days Reviewed by: imp Pull Request: https://github.com/freebsd/freebsd-src/pull/1477 Closes: https://github.com/freebsd/freebsd-src/pull/1477 (cherry picked from commit 954ac4049852cc1cf6d6074d9247b67f02b84b12) --- share/man/man4/acpi_wmi.4 | 61 ++++++++++++++++++++++++++++------------------- 1 file changed, 37 insertions(+), 24 deletions(-) diff --git a/share/man/man4/acpi_wmi.4 b/share/man/man4/acpi_wmi.4 index 9ad14ed7892a..e5c5517ba4ac 100644 --- a/share/man/man4/acpi_wmi.4 +++ b/share/man/man4/acpi_wmi.4 @@ -1,3 +1,6 @@ +.\"- +.\" SPDX-License-Identifier: BSD-2-Clause +.\" .\" Copyright (c) 2009 Michael Gmelin .\" All rights reserved. .\" @@ -22,47 +25,45 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd September 5, 2019 +.Dd June 12, 2025 .Dt ACPI_WMI 4 .Os .Sh NAME .Nm acpi_wmi -.Nd "ACPI to WMI mapping driver" +.Nd ACPI to WMI mapping 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 acpi_wmi" -.Ed +.Pp +.Dl Cd "device acpi_wmi" .Pp Alternatively, to load the driver as a module at boot time, place the following line in .Xr loader.conf 5 : -.Bd -literal -offset indent -acpi_wmi_load="YES" -.Ed +.Pp +.Dl acpi_wmi_load="YES" .Sh DESCRIPTION The .Nm driver provides an interface for vendor specific WMI implementations -(e.g. HP and Acer laptops). -It creates /dev/wmistat%d, which can be read to get -information about GUIDs found in the system. +.Pq e.g. HP and Acer laptops . +It creates +.Pa /dev/wmistat%d , +which can be read to get information about GUIDs found in the system. .Sh FILES .Bl -tag -width /dev/wmistat%d -compact .It Pa /dev/wmistat%d -WMI status device. +WMI status devices. .El .Sh SYSCTLS The following sysctl node is currently implemented: -.Bl -tag +.Bl -tag -width "dev.acpi_wmi.%d.bmof" .It Va dev.acpi_wmi.%d.bmof -Managed Object Format (MOF) blob. -You can obtain human readable output by bmf2mof in bmfdec tool. -(https://github.com/pali/bmfdec) +binary Managed Object Format (MOF) buffer .El .Sh EXAMPLES +Read GUIDs from the first WMI interface found in the system: .Bd -literal # cat /dev/wmistat0 GUID INST EXPE METH STR EVENT OID @@ -78,7 +79,14 @@ GUID INST EXPE METH STR EVENT OID {8232DE3D-663D-4327-A8F4-E293ADB9BF05} 0 NO NO NO NO BG {8F1F6436-9F42-42C8-BADC-0E9424F20C9A} 0 NO NO NO NO BH {8F1F6435-9F42-42C8-BADC-0E9424F20C9A} 0 NO NO NO NO BI -# sysctl -b dev.acpi_wmi.0.bmof |bmf2mof +.Ed +.Pp +Read first WMI interface description with +.Sy bmf2mof +from +.Pa ports/converters/bmfdec : +.Bd -literal +# sysctl -b dev.acpi_wmi.0.bmof | bmf2mof [abstract] class Lenovo_BIOSElement { }; @@ -91,10 +99,15 @@ class Lenovo_BiosSetting : Lenovo_BiosElement { [WmiDataId(1), Description("BIOS setting")] String CurrentSetting; }; ... - .Ed .Sh SEE ALSO .Xr acpi 4 +.Sh STANDARDS +.Rs +.%T Windows Instrumentation: WMI and ACPI +.%I Microsoft Corporation +.%U https://github.com/microsoft/Windows-driver-samples/tree/main/wmi/wmiacpi +.Re .Sh HISTORY The .Nm @@ -107,13 +120,13 @@ The driver was written by .An Michael Gmelin Aq Mt freebsd@grem.de . .Pp -Work has been inspired by the Linux acpi-wmi driver written by Carlos Corbacho. -.Pp -See http://www.microsoft.com/whdc/system/pnppwr/wmi/wmi-acpi.mspx for -the specification of ACPI-WMI. +Work inspired by the Linux +.Sy acpi-wmi +driver written by Carlos Corbacho. .Pp -MOF part has been inspired by the Linux wmi-bmof driver -written by Andy Lutomirski. +MOF handling inspired by the Linux +.Sy wmi-bmof +driver written by Andy Lutomirski. .Pp This manual page was written by .An Michael Gmelin Aq Mt freebsd@grem.de . From nobody Mon Jul 7 13:58: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 4bbQmx042Vz61n1h; Mon, 07 Jul 2025 13:58:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bbQmw60YSz3PWp; Mon, 07 Jul 2025 13:58:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1751896688; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=IW85R7R4IQ7NLt+jpHQ+W2lAh3beBaczb7U6MAfU1Fw=; b=tbdYy4i/X4SWw3srIvB4scjoQyi/Xjt2vQVjV2AnGMRJrF/t7EKkwhXOAXJg+5NAOkSeDu buvRztjR3sUiULhccG+yHUTd7n6xkA4LSjwpFPa7fpZzpgbcxjARvB4hX3phl8qj7cY4p3 QfuNFDr0Jiamjzjw8PcV9Gu+lyW3be+ZqfqP6H/T/P5UlEWH/vRKeVvL3RHRRRkueFYRqM 9d3JIs5gKfgQ8KkSjXBuFSiOuJxxZTJMeb2d7GaUNCMoHwun2lzDNMCGg14FobC9Tq+oA4 pFrdt6GfB7kt/LUiWkhTeRsPd00iwvUwLdUUB4z+e5ROnwXN63fYTH9Kgv3QTQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1751896688; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=IW85R7R4IQ7NLt+jpHQ+W2lAh3beBaczb7U6MAfU1Fw=; b=tkjqislcjVdnADe04dqCgzspa6fhmGjVoX+5KaBl3Ldn/d2euKLRp514tERKgRPbdluNnl dK/9F62s72Lg3CfB2aLj8oqERhdJIuAyyGP/rTipD8xmKxZdfd6D1IjGp9d2T+ngCH5sza 95W9tNGi6KPmQrH/IqFaPVTY1fU+WQHtvfFayK5Ufx7B3ydxFO+oJQ2LXvJePzAjUCmTOE vAymS/AFsSeiTAGz9LoWDJ6TFHS3kRo4+cqQNbhSV3teGMb5VwAZBVnCpb1zx+RpFIvqZo K96Vg4qDFq1fYxcYCcz6jZ51Aa+rYgq9r2HOdflQizfPTVhYTyr4K/C3uD72SA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1751896688; a=rsa-sha256; cv=none; b=WlZZSgenZQ301AGdzerFIcy3mjC01Nx4hOv9Eoo/fYts/Z6En+f7aJQmwJu+12v6stBxkS 20qTlVewv54OIGe5ItJoAUo7ACyaLWJnwqtqvTouVlQ7OveyfwXlQD2VZHoFA+vyAZBPh9 jEiYTznf7vIouNbXQShusW84iaY1Dr3DsvDBj2yqSpCmx9WLIK3TJIKEFxMx3RfQmUAHyC hy0BkXvm+FbNMYX19alx+SqKqT/z+8pTgfzJxvIeiwQuZ9Nh1KcK9Vc80vAju/z+Ji+1gy BWVbAms3O0KdRQS84aqS6lwQEoILLGUZVZBFIMPnHpJRXAc2gJ/PJVEqRU5H4Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4bbQmw5YGGztVd; Mon, 07 Jul 2025 13:58: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 567Dw8E3083826; Mon, 7 Jul 2025 13:58:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 567Dw8DY083824; Mon, 7 Jul 2025 13:58:08 GMT (envelope-from git) Date: Mon, 7 Jul 2025 13:58:08 GMT Message-Id: <202507071358.567Dw8DY083824@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Warner Losh Subject: git: 0077daf9cdc4 - stable/14 - pf.conf.5: additional quoting for ranges in lists List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 0077daf9cdc45cf36e7cc2ca3b65252194221400 Auto-Submitted: auto-generated The branch stable/14 has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=0077daf9cdc45cf36e7cc2ca3b65252194221400 commit 0077daf9cdc45cf36e7cc2ca3b65252194221400 Author: Quentin Thébault AuthorDate: 2024-11-07 06:13:05 +0000 Commit: Warner Losh CommitDate: 2025-07-07 13:57:01 +0000 pf.conf.5: additional quoting for ranges in lists When defining network address ranges in macros that will later be used as items in list macro, these ranges must be quoted with additiona simple quotes. For instance, the following does not work and is rejected as a syntax error: usr = "192.168.1.0/24" srv = "192.168.2.10 - 192.168.29" nat_ranges = "{" $usr $srv "}" Defining ranges as the following instead will work: usr = "'192.168.1.0/24'" srv = "'192.168.2.10 - 192.168.29'" MFC after: 3 days Reviewed by: imp, ziaee Pull Request: https://github.com/freebsd/freebsd-src/pull/1516 (cherry picked from commit 54f278caf37f9ab578ee58fc70c7b66446ea7e84) --- share/man/man5/pf.conf.5 | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/share/man/man5/pf.conf.5 b/share/man/man5/pf.conf.5 index 0b73ba6b5e02..697711a8306c 100644 --- a/share/man/man5/pf.conf.5 +++ b/share/man/man5/pf.conf.5 @@ -100,6 +100,8 @@ Macro names may not be reserved words (for example .Ar in , .Ar out ) . Macros are not expanded inside quotes. +Ranges of network addresses used in macros that will be expanded in lists +later on must be quoted with additional simple quotes. .Pp For example, .Bd -literal -offset indent @@ -107,6 +109,11 @@ ext_if = \&"kue0\&" all_ifs = \&"{\&" $ext_if lo0 \&"}\&" pass out on $ext_if from any to any pass in on $ext_if proto tcp from any to any port 25 + +usr_lan_range = "'192.0.2.0/24'" +srv_lan_range = "'198.51.100.0 - 198.51.100.255'" +nat_ranges = \&"{\&" $usr_lan_range $srv_lan_range \&"}\&" +nat on $ext_if from $nat_ranges to any -> ($ext_if) .Ed .Sh TABLES Tables are named structures which can hold a collection of addresses and From nobody Mon Jul 7 13:58: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 4bbQmy39bBz61n1j; Mon, 07 Jul 2025 13:58: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bbQmy0vnzz3PjB; Mon, 07 Jul 2025 13:58:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1751896690; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Sgrk0sQ1ah1lphgTiPsYYpl+6cFL5eD3yNnnCMg3Kb4=; b=kcmFlS/CzYRg2kCIlFoEte2r7vJfaYdYpM3F2gXp+5NYz+hU7WM62yNbE/NCr1NtMHlkIg MNJSi31Fy99SEs6M5RnikZ0+LjZadTUvp0/6fTHfRitRFPh4nl+sWhLovcXjLbdtYfVPWi uoUuhyntChQ5sfaGFMVq4iN2KAjEweDjc5vLDYxSSHj7B8KXx4+jQLqpQzZpl06HCQIGmn a6op3PHzdWcEwi8k6YI4SWmYtctn9p8j2ykOWWIYNRldsbmKvHT4UQI28WtsABhMR3oAv5 k1CE7NCfkWXHiQTkXKpTDHKe/JYKnq/q79qYNf6m2OTkuE9/LJwWJ6yyeZC/CQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1751896690; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Sgrk0sQ1ah1lphgTiPsYYpl+6cFL5eD3yNnnCMg3Kb4=; b=qigDz2XczODiwrzd5Jao091ludT7Pc44ELiq5k162+6zJ22YpbBt2DXXoZ5y4pSYdrgn6q GDIbPTKZRxdkmrhXVO0nAhTfN27kIdg53u5wTmhcn2c+MJcZ36C22hJGHCLvhk1fBa0oua ja4S0xDZSAkjBF4GSjsFmf/C0Ez7Rkf1iVFrLhj7sonSMi0MZ6Xwkl5c7w2rzb06itW6aG ZvNuRAjO3iOXzZofo1i9Inxnpam0Hi2XfjbLuMIx/pDT5CUwYOSgSAqrkFVgxxdW8+u50Q mO1peiFdGivBEejbPjyCPMxdR08+ypr2R51W1/WlFnW46uZh7LNJQLqM7roqNQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1751896690; a=rsa-sha256; cv=none; b=rvuqUHNu2dpSRUF91Xx/5TUC3NhOPXqM7PjpH4KIMDNR+l5o5V9xcyh8CZjbgYVAtxPHz6 p5NsOLp2WYgs8+xAkADbodujQgsj6A6F78Xsp6bliyHrtcGxaamEomzsLUs/dG4e2r0V9u 3lV/9kSnlmdpcuCMgzF9WKcKc7FyAiV0yVWbLtkPdNW6AyKva1msKMD4XnCstXHk9bBgi4 CujvsiTDOvE2WKLgLNTUJSfCUk/UOMH76jWErdr0/PsEwkyfEwRU1NZOzeL7iwQlK6HLUv R7IafQ9Nk5GKLXS7PSAQGnnTfE2zdVawvK4+C5RzM4LdZB+yt6hBAPDL17WuFQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4bbQmx6b3LztZ3; Mon, 07 Jul 2025 13:58: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 567Dw93v083861; Mon, 7 Jul 2025 13:58:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 567Dw95v083857; Mon, 7 Jul 2025 13:58:09 GMT (envelope-from git) Date: Mon, 7 Jul 2025 13:58:09 GMT Message-Id: <202507071358.567Dw95v083857@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Warner Losh Subject: git: f28690ec6a6a - stable/14 - pf.conf.5: use subsections and reword titles List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: f28690ec6a6a0e5cc8465c0cfb78c866df3b3272 Auto-Submitted: auto-generated The branch stable/14 has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=f28690ec6a6a0e5cc8465c0cfb78c866df3b3272 commit f28690ec6a6a0e5cc8465c0cfb78c866df3b3272 Author: Quentin Thébault AuthorDate: 2024-11-13 06:54:46 +0000 Commit: Warner Losh CommitDate: 2025-07-07 13:57:01 +0000 pf.conf.5: use subsections and reword titles The current manpage has two PARAMETERS top-level sections, which can be confusing when searching or browsing documentation quickly. Since the parameters described in these two sections are actually applicable within the scope of the sections they follow (ETHERNET FILTERING and PACKET FILTERING respectively), I propose we move them to subsections. I also propose we reword the title of one of those subsections to facilitate quick searching or browsing. MFC after: 3 days Reviewed by: imp, ziaee Pull Request: https://github.com/freebsd/freebsd-src/pull/1516 Closes: https://github.com/freebsd/freebsd-src/pull/1516 (cherry picked from commit 12859ee366d084b5506d58b030079f839c4915e3) --- share/man/man5/pf.conf.5 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/share/man/man5/pf.conf.5 b/share/man/man5/pf.conf.5 index 697711a8306c..b43ebac6bd0e 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 January 10, 2025 +.Dd June 12, 2025 .Dt PF.CONF 5 .Os .Sh NAME @@ -727,7 +727,7 @@ Unlike for layer 3 traffic the packet is always silently dropped. The packet is passed; no state is created for layer 2 traffic. .El -.Sh PARAMETERS +.Ss Parameters applicable to layer 2 rules The rule parameters specify the packets to which a rule applies. A packet always comes in on, or goes out through, one interface. Most parameters are optional. @@ -1651,7 +1651,7 @@ handles state tracking. See .Sx STATEFUL TRACKING OPTIONS below for further details. -.Sh PARAMETERS +.Ss Parameters The rule parameters specify the packets to which a rule applies. A packet always comes in on, or goes out through, one interface. Most parameters are optional. From nobody Mon Jul 7 13:58: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 4bbQmz6Zx5z61nF8; Mon, 07 Jul 2025 13:58:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bbQmz0f0jz3PlF; Mon, 07 Jul 2025 13:58:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1751896691; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=IG9ol7zqfpCAYAbXl5VjzyKw4O9k4y7ODlt1FRXfuvM=; b=pq2f41JPMLOXgsdr+V8RY9ySGwL6xtCMOkTmR/cZkmqw4mYz5gXLW3ctLmXFbuegWtZ/KM zUyaf/Ehu1+iMD9zkMCIX2JxlZ6NsH09iBiIGmCzqq4amzb40HNoH6LreLrfqJBEfjVXo5 z80GrRista7Km8T2vuyxv8PQGJ3Ab6GHmmzHbWcnLMSCn5s22IXUQQtR9ZMFjXl1cI0z3D 4Zyr1Misr5PSqZFC2YP5c0+XGmqe+qsUhpupr3TO2OhREIAeGLJ/SfV4Uo+EGt2pY4t2T+ /ihDhS2XOi2S1ZZJbiKpHIl1sbuFqxsFrvUuzehU6obNt0U9e55+ORS0kliE2g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1751896691; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=IG9ol7zqfpCAYAbXl5VjzyKw4O9k4y7ODlt1FRXfuvM=; b=k1UZ+0i3QcmBeXS3N99f5zXEuPOVMUgppCJyuQt7Gze5F1+eV2iY+4BenWZ4rI5rYZtE1G D5fCtLRPZ+n0cTl7PI27qBX0wtF5eSYmKi8WlC3VkOEY31+Rsl+obx+Qj+KOG50aB892Dt 2LzZpw2GslW/UN2E3Jp8MvdieLxM1gRgseed1K/ie0lIXcudDJlNwSr2clqKJ2rZIIbO6c RpMcBQkhGfgIQiGWnTdHLzcnwb9vU9Hr+ZjSoIltpzmgy1VY8K6ZOSuDNfJSMgALJEVHyy RgV6SdwRvPtcou79biO4qXh4bjaUjEOiNHxidrcd2T6aG+ajGeY3KWm9r93a4g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1751896691; a=rsa-sha256; cv=none; b=LJ9ckjFLmCU6U2c2Gb6mT5JSk3fuCRqYbIeX5cRLQRrd8d3FrHkbmmhpWiLXfxue9ZPDyS SoimAXtZOyQ0kk+2F/icA8631kDZ8GLxxEhDScs++L/ry1gy9YWu2R/0vfd3lQLE9pawcb hEwTeA/ENlV4iGGBGz63UkvUxNdDtRCowZJM1nD0hHGLx2p7tnhVpm0f8M/sc0hN43/PrO PjGdfcFpR9Gucn3g053QeurR9g5Sd6wnXMpLHF7lwwzQViAVYsS9waCUJizbMfEgUzS0VL Ru0d8M8uKzLPgAYGfQy0qn8HoPU67FypwiNCUjjoisZdYUMVBirvUBZiOjpzvA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4bbQmz091DztVf; Mon, 07 Jul 2025 13:58:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 567DwAd3083897; Mon, 7 Jul 2025 13:58:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 567DwAZl083894; Mon, 7 Jul 2025 13:58:10 GMT (envelope-from git) Date: Mon, 7 Jul 2025 13:58:10 GMT Message-Id: <202507071358.567DwAZl083894@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Warner Losh Subject: git: 669b52503298 - stable/14 - Add USB quirk for Creative Stage SE mini List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 669b52503298fc3f2ea822e7e1b99d98a9b0d9a6 Auto-Submitted: auto-generated The branch stable/14 has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=669b52503298fc3f2ea822e7e1b99d98a9b0d9a6 commit 669b52503298fc3f2ea822e7e1b99d98a9b0d9a6 Author: Jan Biedermann AuthorDate: 2025-06-05 23:25:22 +0000 Commit: Warner Losh CommitDate: 2025-07-07 13:57:01 +0000 Add USB quirk for Creative Stage SE mini Note: The commit in main was modified for the new macros in main. stable merge will need to use the version originally in #1715 MFC After: 2 weeks Pull Request: https://github.com/freebsd/freebsd-src/pull/1715 Closes: https://github.com/freebsd/freebsd-src/pull/1715 --- sys/dev/usb/quirk/usb_quirk.c | 1 + sys/dev/usb/usbdevs | 1 + 2 files changed, 2 insertions(+) diff --git a/sys/dev/usb/quirk/usb_quirk.c b/sys/dev/usb/quirk/usb_quirk.c index 21fbd3d9d70a..5920ffa934a0 100644 --- a/sys/dev/usb/quirk/usb_quirk.c +++ b/sys/dev/usb/quirk/usb_quirk.c @@ -224,6 +224,7 @@ static struct usb_quirk_entry usb_quirks[USB_DEV_QUIRKS_MAX] = { UQ_MSC_NO_START_STOP, UQ_MSC_IGNORE_RESIDUE), USB_QUIRK(CREATIVE, NOMAD, 0x0001, 0xffff, UQ_MSC_FORCE_WIRE_BBB, UQ_MSC_FORCE_PROTO_SCSI, UQ_MSC_READ_CAP_OFFBY1), + USB_QUIRK(CREATIVE, STAGE_SE_MINI, 0x0000, 0xffff, UQ_MSC_NO_INQUIRY), USB_QUIRK(CYPRESS, XX6830XX, 0x0000, 0xffff, UQ_MSC_NO_GETMAXLUN, UQ_MSC_NO_SYNC_CACHE), USB_QUIRK(EMTEC, DANEELEC4GB, 0x0000, 0xffff, UQ_MSC_NO_SYNC_CACHE), diff --git a/sys/dev/usb/usbdevs b/sys/dev/usb/usbdevs index a7519c1e7fe5..251d2f483a61 100644 --- a/sys/dev/usb/usbdevs +++ b/sys/dev/usb/usbdevs @@ -1662,6 +1662,7 @@ product CORSAIR STRAFE2 0x1b44 Corsair STRAFE Gaming keyboard product CREATIVE NOMAD_II 0x1002 Nomad II MP3 player product CREATIVE NOMAD_IIMG 0x4004 Nomad II MG product CREATIVE NOMAD 0x4106 Nomad +product CREATIVE STAGE_SE_MINI 0x3295 Stage SE mini product CREATIVE2 VOIP_BLASTER 0x0258 Voip Blaster product CREATIVE3 OPTICAL_MOUSE 0x0001 Notebook Optical Mouse From nobody Mon Jul 7 19:23:04 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4bbYzs1CN3z611XR; Mon, 07 Jul 2025 19:23: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bbYzs07kqz3ld7; Mon, 07 Jul 2025 19:23:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1751916185; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=KBBqSLs59vSxAyL4aHnAVnaW3fHE2Hg5SZZDm3dqBsM=; b=OmMmdVNdWq8BUUH4Wc9fI8v2++z07F8AvhFCNUINFYtEAVh27e2tbZ4s6CmtiAUlrALTiG sOjnIKu0g82SHW59XpfVZa7DOw6KS1UvIOxDte8ikq+/7ZJPZwnMsjQrviMN7wQ7y0PUCM UpHLJyjBOdSvZnmkWCP5RgOTC1BtG2ZQhWOcE82acMXiqS5+j19KvVsQ6NZx8/pC656gVf rBgAlNjTSfCIF4vZaIElYD0Z4f7B4Um7L3CeSl0ddx+MsnBovg6RD3GTB9tcX8SaQu4MEY qHSX4z3KXi15OH9UHq7zEFtZe8bhUDbisOefG6BzkYcLCTJV2/ICt9y7qq+/AA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1751916185; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=KBBqSLs59vSxAyL4aHnAVnaW3fHE2Hg5SZZDm3dqBsM=; b=HXnW+Pb7MSaduaHdzApQzQ3qgTsZruxaiFTW6j/gvTIj1BlXl+3zrtGK9czuBVNRANfuja 36CIgQWQ+UKUHBHiYmRTWx2sy1Zg/0FLRymmyPCqaymiMeJbwrznKmLop3+AC6NttXDv8G G/rRuqidSQ7OxTwPsdrYxJOFdaEo67GUpxf99wOmGHzpsaNaO+6drZpl+w8FZFS0RteQG8 8LfoaeqW2x72HeWrITp7DGn5WQAKPVbPQRJDb5bWrCZQqZcGakqLN7Q0pywwVTVOPxttUM uWJeFg611PgYoUURU0dSDoz1CRodcn9Ze4Xo62qldTIyk5j7utk+YENJI+RPoA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1751916185; a=rsa-sha256; cv=none; b=MmXf2v3vyo51H3oPpiK1Mny0GiTStUFpWMKNQ6/mlu4VTx64DXfmiQ7DAqCuEvRVbqBVGp jHZQYGhQMagGkorry+C9jBwEcu8nAWp+EaMYeIx0lM0Q1GkMVPShP79n52mSXuHO+avbTw Ffi2y17kbm5JDfl/GvuFDLKCnAAP3TlEe5y33d0WK8SQLm3rVsPZaxL1XTQAyiJEjEgB6Y wybLMRleeV7/FrVH35R2uwmSJMe/cR+LdvKfmZTCQTpd1FRvZnT5GdfVO36V3vyFsoq02s e97MbAsHBOHQI/EEmgOODpvtqYZPvawdS3V18schSRWtkbxi4j0sfhx1PASQvQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4bbYzr6sHRz143m; Mon, 07 Jul 2025 19:23:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 567JN4a9010706; Mon, 7 Jul 2025 19:23:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 567JN4S5010703; Mon, 7 Jul 2025 19:23:04 GMT (envelope-from git) Date: Mon, 7 Jul 2025 19:23:04 GMT Message-Id: <202507071923.567JN4S5010703@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ahmad Khalifa Subject: git: 32c90988d204 - stable/14 - gpio: remove redundant calls to bus_attach_children List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: vexeduxr X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 32c90988d204ca2c7ede51de9474756db5be27d0 Auto-Submitted: auto-generated The branch stable/14 has been updated by vexeduxr: URL: https://cgit.FreeBSD.org/src/commit/?id=32c90988d204ca2c7ede51de9474756db5be27d0 commit 32c90988d204ca2c7ede51de9474756db5be27d0 Author: Ahmad Khalifa AuthorDate: 2025-07-04 13:51:11 +0000 Commit: Ahmad Khalifa CommitDate: 2025-07-07 18:47:12 +0000 gpio: remove redundant calls to bus_attach_children gpiobus_attach_bus already calls it. Reviewed by: mmel, imp, andrew Approved by: imp (mentor) MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D51108 (cherry picked from commit c2d8cca77152ebf72f488490163585be7e34eb0f) --- sys/arm/mv/mvebu_gpio.c | 2 +- sys/arm/nvidia/tegra_gpio.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/arm/mv/mvebu_gpio.c b/sys/arm/mv/mvebu_gpio.c index 001369bb3a02..3ade09e82d1a 100644 --- a/sys/arm/mv/mvebu_gpio.c +++ b/sys/arm/mv/mvebu_gpio.c @@ -810,7 +810,7 @@ mvebu_gpio_attach(device_t dev) return (ENXIO); } - return (bus_generic_attach(dev)); + return (0); } static int diff --git a/sys/arm/nvidia/tegra_gpio.c b/sys/arm/nvidia/tegra_gpio.c index 29bc8624e27a..e37fd69a121e 100644 --- a/sys/arm/nvidia/tegra_gpio.c +++ b/sys/arm/nvidia/tegra_gpio.c @@ -824,7 +824,7 @@ tegra_gpio_attach(device_t dev) return (ENXIO); } - return (bus_generic_attach(dev)); + return (0); } static int From nobody Mon Jul 7 19:23: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 4bbYzt585dz611XS; Mon, 07 Jul 2025 19:23: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bbYzt172Nz3lpW; Mon, 07 Jul 2025 19:23:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1751916186; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bHJ3d4Q8uyiPdyDq1ardrwgWjnOSZ8qYgr6ogeL6r1Q=; b=vDKXx+sjn7eqtDT+4yusUO3Zh4kUhz80wI3ZmktOIY7DHYyqJ3aBXLdjOYMx8pbjhVCpya zx2YpBsmj9e7qO3vcifoIdJbr4+FvW4JOG/edpllXUDliDiUOcWIwBUjKe98SqmWPKjtP6 6XIbzaJy2Ah6sFRsV2RkUnUpTDcj5ob1IJ7qkkSK1esqHL0EBOSOWcBlsfhU/k0q8HtfWe yxWFA33smOZUn5tCP1hprZd+lfh00bN5XuU1zldZAn2OsGAV9JsbSfBpuPGVS+Ep2+J0f0 sNdQQqeUIXCX5Mgt7vZ6xOxXyS7Jf6wjP+VBBWMNRRUxHHCtYLkAqll6m6KHNA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1751916186; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bHJ3d4Q8uyiPdyDq1ardrwgWjnOSZ8qYgr6ogeL6r1Q=; b=p8PZpdDy8ccM5s+pddtrlpDFiXGurEMvRtm+vO7wjoNvXNpvxtoZZoB9FwDlk39flmhz73 Wzb/tjM/3KImqA3cr9vWzZIaxa2+rn0Eg4gKoV3YnASTzlTSjbH2ROY6DarcxQ8UZ7UC4M kGmQjaIlmJOTpcDl1oDrwBOfTScyKCFRb4OPQaFI7FsS3ZNKx4NUPFbLtD+AZLnMNPXYSj B0oDsU5P/bHOadhDIeUWU9Flvwc7/8rZUG7y2/JC1nBNR1Xsr6PtEudd+6VTWGX9JBeMwC kkQlZnYp+1tEFPUs0lny3fjRdcRok0UWckiGLI2oZadZg9YvIvwP5Zv3d8ZS/g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1751916186; a=rsa-sha256; cv=none; b=srga0ggea8ovZeyE+Hj5Rsfi8Ypkezou1deW5WNPPYmlM9M9zQTeWR15khXALPzlXLsBhR I3LXA84/k74frXp8exVfBM+g4P12SsKNGAMJU02/mW2ZgFO/71tsnt7jiH7ayAu3QWSkED T8QzI5/hC+VxwBHgdQA+OeRM1t0zy9C3bTG+39fLy1n8bjiTn4AutkWbZnzdQAOS7bZUGz s9QuU+oRsdlPM2uqXht4DtWDE6by3gpcm1P7c7fqUsHfC8B0q0ev1iO57wWZIuM0gTj/lX EEqJ2iNz7jzz63jzNlvDdvgcPcQHYpJGeWsMcteAb7JJQvYqX1sXS4sVwlpjdA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4bbYzt0jkYz141T; Mon, 07 Jul 2025 19:23: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 567JN65d010739; Mon, 7 Jul 2025 19:23:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 567JN5YO010736; Mon, 7 Jul 2025 19:23:05 GMT (envelope-from git) Date: Mon, 7 Jul 2025 19:23:05 GMT Message-Id: <202507071923.567JN5YO010736@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ahmad Khalifa Subject: git: c6a6b94b6613 - stable/14 - gpiobus: add a gpiobus_add_bus function List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: vexeduxr X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: c6a6b94b661378961179d832be6f1eceef91f953 Auto-Submitted: auto-generated The branch stable/14 has been updated by vexeduxr: URL: https://cgit.FreeBSD.org/src/commit/?id=c6a6b94b661378961179d832be6f1eceef91f953 commit c6a6b94b661378961179d832be6f1eceef91f953 Author: Ahmad Khalifa AuthorDate: 2025-07-04 13:51:25 +0000 Commit: Ahmad Khalifa CommitDate: 2025-07-07 18:48:59 +0000 gpiobus: add a gpiobus_add_bus function Some drivers need to postpone the attachment of gpiobus until hardware init is done. Add a new gpiobus_add_bus function to accommodate this case. Suggested by: mmel, andrew Reviewed by: mmel, imp, andrew Approved by: imp (mentor) MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D51133 (cherry picked from commit 2c356c8b8f79c08d42b23a72b7a320b59d955a3f) --- sys/dev/gpio/gpiobus.c | 20 ++++++++++++++++++-- sys/dev/gpio/gpiobusvar.h | 1 + 2 files changed, 19 insertions(+), 2 deletions(-) diff --git a/sys/dev/gpio/gpiobus.c b/sys/dev/gpio/gpiobus.c index a8dd8a753676..266fe1a29c3b 100644 --- a/sys/dev/gpio/gpiobus.c +++ b/sys/dev/gpio/gpiobus.c @@ -294,7 +294,7 @@ gpiobus_print_pins(struct gpiobus_ivar *devi, struct sbuf *sb) } device_t -gpiobus_attach_bus(device_t dev) +gpiobus_add_bus(device_t dev) { device_t busdev; @@ -308,8 +308,24 @@ gpiobus_attach_bus(device_t dev) #ifdef FDT ofw_gpiobus_register_provider(dev); #endif - bus_generic_attach(dev); + return (busdev); +} +/* + * Attach a gpiobus child. + * Note that the controller is expected + * to be fully initialized at this point. + */ +device_t +gpiobus_attach_bus(device_t dev) +{ + device_t busdev; + + busdev = gpiobus_add_bus(dev); + if (busdev == NULL) + return (NULL); + + bus_generic_attach(dev); return (busdev); } diff --git a/sys/dev/gpio/gpiobusvar.h b/sys/dev/gpio/gpiobusvar.h index 74783e112f89..3ae0767466c9 100644 --- a/sys/dev/gpio/gpiobusvar.h +++ b/sys/dev/gpio/gpiobusvar.h @@ -172,6 +172,7 @@ struct resource *gpio_alloc_intr_resource(device_t consumer_dev, int *rid, * these should not be called directly by other drivers. */ int gpio_check_flags(uint32_t, uint32_t); +device_t gpiobus_add_bus(device_t); device_t gpiobus_attach_bus(device_t); int gpiobus_detach_bus(device_t); int gpiobus_attach(device_t); From nobody Mon Jul 7 19:23: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 4bbYzv5K3Cz611Tc; Mon, 07 Jul 2025 19:23:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bbYzv1trWz3lXS; Mon, 07 Jul 2025 19:23:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1751916187; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+I2Dw5ShgIPGOuBFw90oz7gEcE/Ypsj4nkeknRUz450=; b=ik6wUyWPbzc3A7jheduShH0iHsp237/tWhGp1IaL32z76MxquHFg9mL/rReAxCFqoVt5H9 0wMiFp8THLOWYjotEulII+iA72gkwU1wKXnUK6KWLQzQgTus8YByahDyq3jI3rLq0v+rfU To9wrXfTBvpwY9u1Fb/LX6klceIQsf8wJTOlIy5/TQEy4CKR9OTDM9roThmOu2ynyvkpgz BdjJy+XD+kA6IJ9W8PxUWknOPdaEaARBbVQ8yPoGRvEwNkWGZEHjMi/s0S8UjQAck9x/8M A6sbhb0Gu9LYU8qefQ9nTe3LNCKudwtJgYUJxHCwQeIXkG1JDXb2qVSgcrzJ2Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1751916187; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+I2Dw5ShgIPGOuBFw90oz7gEcE/Ypsj4nkeknRUz450=; b=q4qkCO2YN1ZBl4GaVq8HSXeSzNyNhbhtUG5yP1G1Fsy/oGD3PbkvXyKYYOJ7rI3PbeFavt bua8PdHoeFOlC+Ldpoj5WsW2cWWj4RyV2E/usnVzWmKI8ly6sPSu2pzt6Ob2o4LUnICw3c ENlMzO3QrOh+VZblOfKduVNw4zooZUYrhduCy6YP+jx61e0AF7HF3FPs3GXIIVu7zmke5j nX5SFgG5VbUioKNrXncwW5V3ECCE8KHbNiBEoMw/uqHa2g2PisPF+0uYpJ2Z3iaYi+VhA7 Dnk5LzcJzBOed7KkMk8Ngqcef0tuAtDEFTQlDC8FcrG4+1vHuGyGrsSLUcZuSA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1751916187; a=rsa-sha256; cv=none; b=N3vxmOoMCTNPLDBRzs0PX+VqbVQ4vuDnKBQGgZI/1ZXruBQfku9VDuhdSDOsFXz716VWZe 0zQqosP/ThwRP5MoS1itT47oBTPm9vrpxIcI0IMz4bU4Q+8J3sVhkp6kW3tw1HQ5pS2YaH sTrjDVjla4l6Exn/CvfyUdYPIZimC46M+SVH3IDS+Hp5JZSVfE2IEE6SrcoXA4dZ7vZ9GU 0DgTwTmjb5Xvii+xd3/J5toYq+JQ0e+e5sLdzRBDjXJwk7/eqDEQQwjIwx4JMHSEd4qSjV ahwPogS4cJPdLLgtsbNGZ+UuXoGbaMFCQlwEMQ8ZIiGyovQJDTx2QQNznv8d5g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4bbYzv1S7Rz140N; Mon, 07 Jul 2025 19:23: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 567JN72g010772; Mon, 7 Jul 2025 19:23:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 567JN7lb010769; Mon, 7 Jul 2025 19:23:07 GMT (envelope-from git) Date: Mon, 7 Jul 2025 19:23:07 GMT Message-Id: <202507071923.567JN7lb010769@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ahmad Khalifa Subject: git: cdba3a8f9fce - stable/14 - gpio: attach gpiobus when the controller is ready List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: vexeduxr X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: cdba3a8f9fce453774833f2f1123536cd17003b8 Auto-Submitted: auto-generated The branch stable/14 has been updated by vexeduxr: URL: https://cgit.FreeBSD.org/src/commit/?id=cdba3a8f9fce453774833f2f1123536cd17003b8 commit cdba3a8f9fce453774833f2f1123536cd17003b8 Author: Ahmad Khalifa AuthorDate: 2025-07-04 13:52:00 +0000 Commit: Ahmad Khalifa CommitDate: 2025-07-07 18:51:47 +0000 gpio: attach gpiobus when the controller is ready Only attach gpiobus when the controller is fully initialized. Children of gpiobus expect this to be the case. Reviewed by: mmel, imp, andrew Approved by: imp (mentor) MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D51088 (cherry picked from commit 4695e3aa7c685c092cb4b2662bee16c31be790f8) --- sys/arm/allwinner/aw_gpio.c | 8 ++++---- sys/arm/broadcom/bcm2835/bcm2835_gpio.c | 6 +++--- sys/arm/nvidia/as3722_gpio.c | 2 +- sys/arm64/nvidia/tegra210/max77620_gpio.c | 2 +- sys/arm64/rockchip/rk_gpio.c | 12 ++++++------ sys/dev/gpio/pl061.c | 12 ++++++++++-- sys/dev/gpio/pl061.h | 1 + sys/dev/gpio/pl061_acpi.c | 15 ++++----------- sys/dev/gpio/pl061_fdt.c | 15 ++++----------- sys/dev/gpio/qoriq_gpio.c | 11 ++++++----- sys/dev/iicbus/gpio/tca64xx.c | 3 +-- sys/powerpc/mpc85xx/mpc85xx_gpio.c | 4 ++-- 12 files changed, 43 insertions(+), 48 deletions(-) diff --git a/sys/arm/allwinner/aw_gpio.c b/sys/arm/allwinner/aw_gpio.c index 1229d5bb146d..b180ef226c15 100644 --- a/sys/arm/allwinner/aw_gpio.c +++ b/sys/arm/allwinner/aw_gpio.c @@ -1076,10 +1076,6 @@ aw_gpio_attach(device_t dev) aw_gpio_register_isrcs(sc); intr_pic_register(dev, OF_xref_from_node(ofw_bus_get_node(dev))); - sc->sc_busdev = gpiobus_attach_bus(dev); - if (sc->sc_busdev == NULL) - goto fail; - /* * Register as a pinctrl device */ @@ -1088,6 +1084,10 @@ aw_gpio_attach(device_t dev) fdt_pinctrl_register(dev, "allwinner,pins"); fdt_pinctrl_configure_tree(dev); + sc->sc_busdev = gpiobus_attach_bus(dev); + if (sc->sc_busdev == NULL) + goto fail; + config_intrhook_oneshot(aw_gpio_enable_bank_supply, sc); return (0); diff --git a/sys/arm/broadcom/bcm2835/bcm2835_gpio.c b/sys/arm/broadcom/bcm2835/bcm2835_gpio.c index e4fc57b79ba5..48d1d2af5abc 100644 --- a/sys/arm/broadcom/bcm2835/bcm2835_gpio.c +++ b/sys/arm/broadcom/bcm2835/bcm2835_gpio.c @@ -837,12 +837,12 @@ bcm_gpio_attach(device_t dev) } sc->sc_gpio_npins = i; bcm_gpio_sysctl_init(sc); - sc->sc_busdev = gpiobus_attach_bus(dev); - if (sc->sc_busdev == NULL) - goto fail; fdt_pinctrl_register(dev, "brcm,pins"); fdt_pinctrl_configure_tree(dev); + sc->sc_busdev = gpiobus_attach_bus(dev); + if (sc->sc_busdev == NULL) + goto fail; return (0); diff --git a/sys/arm/nvidia/as3722_gpio.c b/sys/arm/nvidia/as3722_gpio.c index f7ae3c99d0f4..0f823ce3e0c1 100644 --- a/sys/arm/nvidia/as3722_gpio.c +++ b/sys/arm/nvidia/as3722_gpio.c @@ -545,7 +545,7 @@ as3722_gpio_attach(struct as3722_softc *sc, phandle_t node) sc->gpio_pins = malloc(sizeof(struct as3722_gpio_pin *) * sc->gpio_npins, M_AS3722_GPIO, M_WAITOK | M_ZERO); - sc->gpio_busdev = gpiobus_attach_bus(sc->dev); + sc->gpio_busdev = gpiobus_add_bus(sc->dev); if (sc->gpio_busdev == NULL) return (ENXIO); for (i = 0; i < sc->gpio_npins; i++) { diff --git a/sys/arm64/nvidia/tegra210/max77620_gpio.c b/sys/arm64/nvidia/tegra210/max77620_gpio.c index 0021aab151de..b60d62a3e0c3 100644 --- a/sys/arm64/nvidia/tegra210/max77620_gpio.c +++ b/sys/arm64/nvidia/tegra210/max77620_gpio.c @@ -673,7 +673,7 @@ max77620_gpio_attach(struct max77620_softc *sc, phandle_t node) sx_init(&sc->gpio_lock, "MAX77620 GPIO lock"); - sc->gpio_busdev = gpiobus_attach_bus(sc->dev); + sc->gpio_busdev = gpiobus_add_bus(sc->dev); if (sc->gpio_busdev == NULL) return (ENXIO); diff --git a/sys/arm64/rockchip/rk_gpio.c b/sys/arm64/rockchip/rk_gpio.c index b1175963a5e4..5a96ea2d0cb4 100644 --- a/sys/arm64/rockchip/rk_gpio.c +++ b/sys/arm64/rockchip/rk_gpio.c @@ -363,12 +363,6 @@ rk_gpio_attach(device_t dev) return (ENXIO); } - sc->sc_busdev = gpiobus_attach_bus(dev); - if (sc->sc_busdev == NULL) { - rk_gpio_detach(dev); - return (ENXIO); - } - /* Set the cached value to unknown */ for (i = 0; i < RK_GPIO_MAX_PINS; i++) sc->pin_cached[i].is_gpio = 2; @@ -378,6 +372,12 @@ rk_gpio_attach(device_t dev) sc->swporta_ddr = rk_gpio_read_4(sc, RK_GPIO_SWPORTA_DDR); RK_GPIO_UNLOCK(sc); + sc->sc_busdev = gpiobus_attach_bus(dev); + if (sc->sc_busdev == NULL) { + rk_gpio_detach(dev); + return (ENXIO); + } + return (0); } diff --git a/sys/dev/gpio/pl061.c b/sys/dev/gpio/pl061.c index 1a12710ababa..1d7a1439ea76 100644 --- a/sys/dev/gpio/pl061.c +++ b/sys/dev/gpio/pl061.c @@ -485,14 +485,21 @@ pl061_attach(device_t dev) } } + mtx_init(&sc->sc_mtx, device_get_nameunit(dev), "pl061", MTX_SPIN); + + if (sc->sc_xref != 0 && !intr_pic_register(dev, sc->sc_xref)) { + device_printf(dev, "couldn't register PIC\n"); + PL061_LOCK_DESTROY(sc); + goto free_isrc; + } + sc->sc_busdev = gpiobus_attach_bus(dev); if (sc->sc_busdev == NULL) { device_printf(dev, "couldn't attach gpio bus\n"); + PL061_LOCK_DESTROY(sc); goto free_isrc; } - mtx_init(&sc->sc_mtx, device_get_nameunit(dev), "pl061", MTX_SPIN); - return (0); free_isrc: @@ -501,6 +508,7 @@ free_isrc: * for (irq = 0; irq < PL061_NUM_GPIO; irq++) * intr_isrc_deregister(PIC_INTR_ISRC(sc, irq)); */ + bus_teardown_intr(dev, sc->sc_irq_res, sc->sc_irq_hdlr); bus_release_resource(dev, SYS_RES_IRQ, sc->sc_irq_rid, sc->sc_irq_res); free_pic: diff --git a/sys/dev/gpio/pl061.h b/sys/dev/gpio/pl061.h index 809a1168493d..d9fe23e502b1 100644 --- a/sys/dev/gpio/pl061.h +++ b/sys/dev/gpio/pl061.h @@ -46,6 +46,7 @@ struct pl061_softc { struct resource *sc_mem_res; struct resource *sc_irq_res; void *sc_irq_hdlr; + intptr_t sc_xref; int sc_mem_rid; int sc_irq_rid; struct pl061_pin_irqsrc sc_isrcs[PL061_NUM_GPIO]; diff --git a/sys/dev/gpio/pl061_acpi.c b/sys/dev/gpio/pl061_acpi.c index d2531fa94faf..ba927af27f1c 100644 --- a/sys/dev/gpio/pl061_acpi.c +++ b/sys/dev/gpio/pl061_acpi.c @@ -68,19 +68,12 @@ pl061_acpi_probe(device_t dev) static int pl061_acpi_attach(device_t dev) { - int error; + struct pl061_softc *sc; - error = pl061_attach(dev); - if (error != 0) - return (error); + sc = device_get_softc(dev); + sc->sc_xref = ACPI_GPIO_XREF; - if (!intr_pic_register(dev, ACPI_GPIO_XREF)) { - device_printf(dev, "couldn't register PIC\n"); - pl061_detach(dev); - error = ENXIO; - } - - return (error); + return (pl061_attach(dev)); } static device_method_t pl061_acpi_methods[] = { diff --git a/sys/dev/gpio/pl061_fdt.c b/sys/dev/gpio/pl061_fdt.c index 352f21560d72..c001b8eb232e 100644 --- a/sys/dev/gpio/pl061_fdt.c +++ b/sys/dev/gpio/pl061_fdt.c @@ -62,19 +62,12 @@ pl061_fdt_probe(device_t dev) static int pl061_fdt_attach(device_t dev) { - int error; + struct pl061_softc *sc; - error = pl061_attach(dev); - if (error != 0) - return (error); + sc = device_get_softc(dev); + sc->sc_xref = OF_xref_from_node(ofw_bus_get_node(dev)); - if (!intr_pic_register(dev, OF_xref_from_node(ofw_bus_get_node(dev)))) { - device_printf(dev, "couldn't register PIC\n"); - pl061_detach(dev); - error = ENXIO; - } - - return (error); + return (pl061_attach(dev)); } static device_method_t pl061_fdt_methods[] = { diff --git a/sys/dev/gpio/qoriq_gpio.c b/sys/dev/gpio/qoriq_gpio.c index 5dabe03b775a..a82bd88757e5 100644 --- a/sys/dev/gpio/qoriq_gpio.c +++ b/sys/dev/gpio/qoriq_gpio.c @@ -370,11 +370,6 @@ qoriq_gpio_attach(device_t dev) for (i = 0; i <= MAXPIN; i++) sc->sc_pins[i].gp_caps = DEFAULT_CAPS; - sc->busdev = gpiobus_attach_bus(dev); - if (sc->busdev == NULL) { - qoriq_gpio_detach(dev); - return (ENOMEM); - } /* * Enable the GPIO Input Buffer for all GPIOs. * This is safe on devices without a GPIBE register, because those @@ -385,6 +380,12 @@ qoriq_gpio_attach(device_t dev) OF_device_register_xref(OF_xref_from_node(ofw_bus_get_node(dev)), dev); + sc->busdev = gpiobus_attach_bus(dev); + if (sc->busdev == NULL) { + qoriq_gpio_detach(dev); + return (ENOMEM); + } + return (0); } diff --git a/sys/dev/iicbus/gpio/tca64xx.c b/sys/dev/iicbus/gpio/tca64xx.c index a129c8727c8a..90c38438cdf3 100644 --- a/sys/dev/iicbus/gpio/tca64xx.c +++ b/sys/dev/iicbus/gpio/tca64xx.c @@ -262,14 +262,13 @@ tca64xx_attach(device_t dev) sc->addr = iicbus_get_addr(dev); mtx_init(&sc->mtx, "tca64xx gpio", "gpio", MTX_DEF); + OF_device_register_xref(OF_xref_from_node(ofw_bus_get_node(dev)), dev); sc->busdev = gpiobus_attach_bus(dev); if (sc->busdev == NULL) { device_printf(dev, "Could not create busdev child\n"); return (ENXIO); } - OF_device_register_xref(OF_xref_from_node(ofw_bus_get_node(dev)), dev); - #ifdef DEBUG switch (sc->chip) { case TCA6416_TYPE: diff --git a/sys/powerpc/mpc85xx/mpc85xx_gpio.c b/sys/powerpc/mpc85xx/mpc85xx_gpio.c index f8c46a9975ae..43ac63ab7031 100644 --- a/sys/powerpc/mpc85xx/mpc85xx_gpio.c +++ b/sys/powerpc/mpc85xx/mpc85xx_gpio.c @@ -227,14 +227,14 @@ mpc85xx_gpio_attach(device_t dev) return (ENOMEM); } + OF_device_register_xref(OF_xref_from_node(ofw_bus_get_node(dev)), dev); + sc->busdev = gpiobus_attach_bus(dev); if (sc->busdev == NULL) { mpc85xx_gpio_detach(dev); return (ENOMEM); } - OF_device_register_xref(OF_xref_from_node(ofw_bus_get_node(dev)), dev); - return (0); } From nobody Tue Jul 8 10:05: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 4bbxYZ751Lz60hym; Tue, 08 Jul 2025 10:05: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bbxYZ6CJTz3Fp5; Tue, 08 Jul 2025 10:05:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1751969106; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=A0QDfw+yf8k6ww1q5j6GR/oEvHiIvCVKTxOscmfipnU=; b=A7H3gbOmlmZ5tGmmIypMLP0qrXP7uMUfO9CI/TARpVmENFV0PZu/zex4KCjSRdxgZhxK6/ zS4agIMDZKU6UsGBHOpC7USECqT7SXfW2Jl9WuBPUIaP7iFrkwn7dVVWV2JH23NpZC7T/i P9BC6XakGf+OgjBWLDlgiVSNmgE+tqII8usBY11aaRBNYGSPBj63SUgrOXNjD969WCLMdl eLtpudvFYvk/Hjx5qlq9RZsDbKi2+aJKFcpr7mhGXQamRjWJRbM/1QbHDLMR0YDwfQBBbK zLZ4nhQiNoxv0CDN6IrV9DOqtKSwrgzZ1MLTjUYLFXLBBRHxZfGjg5tQ8IAdDg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1751969106; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=A0QDfw+yf8k6ww1q5j6GR/oEvHiIvCVKTxOscmfipnU=; b=amBZJWipHJHYvZ8oXA8Qwa123THXki68RXci+cDw6lF4K4TWbn2rUQjIjgsH/ypMMn/0zv u5sm9HlqTZHYFgD++xr7Rzl0BxWcyzVCyv+0lG5WB262aezV9ldB8XMxf6ka4qp6Ug9Ohc nz44M39w5kX/PJBUuH2RxN20MbrNHAQ6GiophyM9ibP23R/O1jvzpGVqVw2xDw6jaZkMG3 VyhfHeJvH88unZ7fZRPHej88of0T36g4VHAS/gbRawhDbsnK6whDxHkJ43VVr0sdwjyr5j PNQWC3Zc0IcTafGVziH0jsecl1jkC9FfJMkR++jX5+1/0LYkgushn4SgrSFLXA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1751969106; a=rsa-sha256; cv=none; b=vPbrExmqFcSDSGeHDvwMwT3e026Tj4fbnbK62/ewPAabZ2Zqnumsf81I3EaE4kMrmWRtfd k5VvRx0phBmzkriTzESBhzT6WuZU9WpYASTaZzIlrGfoq94QvpNynEpybQD7Zs6ShL9qfp WfqFp/brmurTpH+nKsXVvQRPjCYuoPs4onoyHXnY7L5vNPJmZW6sX6J3atRiom3/bNF0qL dlVlTg7Z2h/e2WCrC0X+V0qcTjSFDPGCj8Ke6zrv4F+4Ox726Tc69Rqlp9zQE4s8XUrXku dvi9wnV6eiE4A0YGRyBYNhLkzORJzxWPkpwmEMH+8HOFWXu8oMHq+d3CgywrJA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4bbxYZ5k5BzXnt; Tue, 08 Jul 2025 10:05: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 568A564F067369; Tue, 8 Jul 2025 10:05:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 568A56Y6067366; Tue, 8 Jul 2025 10:05:06 GMT (envelope-from git) Date: Tue, 8 Jul 2025 10:05:06 GMT Message-Id: <202507081005.568A56Y6067366@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Zhenlei Huang Subject: git: 12a1baa42bd0 - stable/13 - bridge: Remove a redundant assignment of if_type List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 12a1baa42bd0b2ed7b5c6a8b0807fd50929a8799 Auto-Submitted: auto-generated The branch stable/13 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=12a1baa42bd0b2ed7b5c6a8b0807fd50929a8799 commit 12a1baa42bd0b2ed7b5c6a8b0807fd50929a8799 Author: Zhenlei Huang AuthorDate: 2025-06-16 14:35:40 +0000 Commit: Zhenlei Huang CommitDate: 2025-07-08 10:03:28 +0000 bridge: Remove a redundant assignment of if_type ether_ifattach() no longer sets if_type to IFT_ETHER and keeps it as is since the change [1]. [1] fc74a9f93a5f Stop embedding struct ifnet at the top of driver softcs No functional change intended. MFC after: 1 week (cherry picked from commit a07604e6264b88222941fa61c6f989bad5490765) (cherry picked from commit 193f0bde3b048559d36c3e6db5d6b2be7daeaf6f) --- sys/net/if_bridge.c | 1 - 1 file changed, 1 deletion(-) diff --git a/sys/net/if_bridge.c b/sys/net/if_bridge.c index b385772bdf73..e7c98958d2b1 100644 --- a/sys/net/if_bridge.c +++ b/sys/net/if_bridge.c @@ -785,7 +785,6 @@ bridge_clone_create(struct if_clone *ifc, int unit, caddr_t params) ether_ifattach(ifp, sc->sc_defaddr.octet); /* Now undo some of the damage... */ ifp->if_baudrate = 0; - ifp->if_type = IFT_BRIDGE; #ifdef VIMAGE ifp->if_reassign = bridge_reassign; #endif From nobody Tue Jul 8 10: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 4bbxYW5yLRz60hpm; Tue, 08 Jul 2025 10: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bbxYW4c8Rz3Fbw; Tue, 08 Jul 2025 10: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=1751969103; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jBny3hhhpz1jJ86Ic2AC9YpSfIj/z+Nd4Ppy5XPjyqM=; b=lV6xHBEs0VJf+ArKkfil3zJDpNRsqZiPL8q5aRrte8936cJKrgxSCYQ9KxcQYypwTX2FWY mL9THbCaC80m9CLZlaOxA5FB5qjHvC3n2Wv7jszediLs7UWUAhhHMuT5P8fBYoTidcWlbi zCuigmLTFVvon/QppEIBTtf0QIASq1rE/Fb8e4daZEtoO8NXLAhjaP2kZ7HOyxWqo9DuVn 7ofQZfPD5eC0Y8o4x8bgyDzE4Lmxcyb+H2XAkEU+xJ6FdwXilt0i5wHc96emSa2EcvSkpm pAXDzTNKr+oTLt4B0bEO2M4MGuG8nubtRGV2Nc6b/U2Aqdvuej4vw0OEtZ1DZA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1751969103; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jBny3hhhpz1jJ86Ic2AC9YpSfIj/z+Nd4Ppy5XPjyqM=; b=SB8WqLpNJjFL9rTKmtTwJf2dugirs5WjJiYJQwA1ce7M+ziLqK5KjL5aJ5j4AMDrAoYp5e 4SePYfmLfLph0alRvdJv3jqRFNvhYhj3IPiKlLW5xN5KzH5sIsn3g6p/V4EosOaT/DjZwE QFn38CV7KM3MDUuESt4J4uu7kYw9S/u303g96EHktYvBP2KWKOP3mwLPn+LrJKALojhzzE gpVDvshnm3lW06K14AiJMgiSqj6WX2lCnsXcVPe6pKOKO1dJbqp3NU+NoefXj6xiRrrgvj AfVDskCMU2A30T+LXSKr9HD+BIS92qbL6+GPLt7vFI+4husIVJpw3eFal2uL7g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1751969103; a=rsa-sha256; cv=none; b=rGw1OCPzxQlcmdBmnIEkOj2qVcPSCBLyj0EFrxP9v36SKx7xpqkYKN4bgYCu5PiFFvtn5P l4/yUPRrODGITFU8K2sOUggyrmiVVr6NOrsU/j7kh8ibFr6d3DJ1fcDZgN0lTvl+avgd2T 1OYaiAiBD/nyB1vgWIdbK0UFMDiIFJXRF/h1O52XPigoCDvWsFv+tT+88Mq0nv4V425wws Q1YyHgIGsdlMqNZfmF3xVjaU8Z29k+Wg8JN9M9X+LUjVpsgWdnOKzjHJYe5ybMqlbvEDwq qVyLH/kQCpmRaL0RAMblecC6I52t1GJ+zu/Ex7LXiYHaXo5rDFONetdiOfvn3w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4bbxYW3kWPzXYm; Tue, 08 Jul 2025 10: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 568A53wo067258; Tue, 8 Jul 2025 10: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 568A53id067255; Tue, 8 Jul 2025 10:05:03 GMT (envelope-from git) Date: Tue, 8 Jul 2025 10:05:03 GMT Message-Id: <202507081005.568A53id067255@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Zhenlei Huang Subject: git: afaa32661b48 - stable/13 - axgbe: Fix setting promisc mode List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: afaa32661b482323c3cce149fb74aa7b3b14ffa5 Auto-Submitted: auto-generated The branch stable/13 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=afaa32661b482323c3cce149fb74aa7b3b14ffa5 commit afaa32661b482323c3cce149fb74aa7b3b14ffa5 Author: Zhenlei Huang AuthorDate: 2024-10-12 13:56:56 +0000 Commit: Zhenlei Huang CommitDate: 2025-07-08 10:03:28 +0000 axgbe: Fix setting promisc mode Ethernet drivers should respect IFF_PROMISC rather than IFF_PPROMISC. The latter is for user-requested promisc mode, it implies the former but not vice versa. Some in-kernel components such as if_bridge(4) and bpf(4) will set promisc mode for interfaces on-demand. While here, update the debugging message to be not confusing. This was spotted while reviewing markj@ 's work D46524. Test from Franco shows that the interface seems to be unconditionally initialized to promisc mode regardless of this fix. That needs further investigation. Reviewed by: markj, Franco Fichtner Tested by: Franco Fichtner MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D46794 (cherry picked from commit c7a2636889a649985e323de23fe495608b6fe483) --- sys/dev/axgbe/if_axgbe_pci.c | 10 ++++++---- sys/dev/axgbe/xgbe-dev.c | 2 +- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/sys/dev/axgbe/if_axgbe_pci.c b/sys/dev/axgbe/if_axgbe_pci.c index 679de1c6092a..52f9abaafb45 100644 --- a/sys/dev/axgbe/if_axgbe_pci.c +++ b/sys/dev/axgbe/if_axgbe_pci.c @@ -2342,11 +2342,11 @@ axgbe_if_promisc_set(if_ctx_t ctx, int flags) struct ifnet *ifp = pdata->netdev; axgbe_printf(1, "%s: MAC_PFR 0x%x drv_flags 0x%x if_flags 0x%x\n", - __func__, XGMAC_IOREAD(pdata, MAC_PFR), ifp->if_drv_flags, ifp->if_flags); + __func__, XGMAC_IOREAD(pdata, MAC_PFR), ifp->if_drv_flags, flags); - if (ifp->if_flags & IFF_PPROMISC) { + if (flags & IFF_PROMISC) { - axgbe_printf(1, "User requested to enter promisc mode\n"); + axgbe_printf(1, "Requested to enter promisc mode\n"); if (XGMAC_IOREAD_BITS(pdata, MAC_PFR, PR) == 1) { axgbe_printf(1, "Already in promisc mode\n"); @@ -2355,10 +2355,11 @@ axgbe_if_promisc_set(if_ctx_t ctx, int flags) axgbe_printf(1, "Entering promisc mode\n"); XGMAC_IOWRITE_BITS(pdata, MAC_PFR, PR, 1); + /* Disable VLAN filtering */ XGMAC_IOWRITE_BITS(pdata, MAC_PFR, VTFE, 0); } else { - axgbe_printf(1, "User requested to leave promisc mode\n"); + axgbe_printf(1, "Requested to leave promisc mode\n"); if (XGMAC_IOREAD_BITS(pdata, MAC_PFR, PR) == 0) { axgbe_printf(1, "Already not in promisc mode\n"); @@ -2367,6 +2368,7 @@ axgbe_if_promisc_set(if_ctx_t ctx, int flags) axgbe_printf(1, "Leaving promisc mode\n"); XGMAC_IOWRITE_BITS(pdata, MAC_PFR, PR, 0); + /* Enable VLAN filtering */ XGMAC_IOWRITE_BITS(pdata, MAC_PFR, VTFE, 1); } diff --git a/sys/dev/axgbe/xgbe-dev.c b/sys/dev/axgbe/xgbe-dev.c index 214ff8d4fbe3..beffa47cae7e 100644 --- a/sys/dev/axgbe/xgbe-dev.c +++ b/sys/dev/axgbe/xgbe-dev.c @@ -971,7 +971,7 @@ xgbe_config_rx_mode(struct xgbe_prv_data *pdata) { unsigned int pr_mode, am_mode; - pr_mode = ((pdata->netdev->if_flags & IFF_PPROMISC) != 0); + pr_mode = ((pdata->netdev->if_flags & IFF_PROMISC) != 0); am_mode = ((pdata->netdev->if_flags & IFF_ALLMULTI) != 0); xgbe_set_promiscuous_mode(pdata, pr_mode); From nobody Tue Jul 8 10:05: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 4bbxYX5F4vz60j50; Tue, 08 Jul 2025 10:05: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bbxYX4Xw5z3GD3; Tue, 08 Jul 2025 10:05:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1751969104; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=arH0TwZISjVDPeGXf6Ji8nCECeuzzQ3CewZ1ia+Yfxk=; b=IqRTJ0Tz0qJS4kjceQi3IVkb7X6HADPeXRyQK6bS8MAxN1xAPpSTeH+iS+WN/rwquXF8rl nozrc8n4+ykfuYpgQn5Jp0Y64E5tJoB9Eu+HGPx1JK6647mAX8EOxuktvCu0L9l3AzG7Ue oKHEnYXEWbCGHczGEnQG9hEk4ROPiidDkFGJ8uxbdEuHjUhD0IdPR8gGaNDz+vipefyKPU +G4ZvrtL6scYqoKogcVDfAT3x9V5buJ4RSD12oFq89LHM9swxbytK0qHI0Xs83COQ+KhBh SIh2sYwGTkRcH1hdhKKcUMCOviq2I97wEO3g6AGxBXlxH7JtrH5qgD+n+k4m8Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1751969104; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=arH0TwZISjVDPeGXf6Ji8nCECeuzzQ3CewZ1ia+Yfxk=; b=b9AkSGgKwMVW5Abtyeg6TfaRX6HaJMxnGNqLeCfWKxrhQ80zM82Un3Ze31uGGtFDw9HRKV wqW+sfLSvb98Q5lY04Grf3soMEwEfzFUqdrQM6MGacYpyCI9fd4kbblZFXCL+YKyj8jZlS DMN6HTMJ7B/pFPOG3g/cBSK8G5rgA0XG6fbJbCzLUHSmz9Rir/6BMg4Q5Gdfv7mAuwjNJf a3vcu1eM2VejD9ycBsFYW0/90Eoea2LBLAQ48Tb3QI7w2OiiM3U7v9ctWva2bNyaXzocP/ oESdGRYQiQSpfVG4NdaNZSf80EMaMG21/k1HgHw2MWVICxFABJyhc3tmIEQ5+w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1751969104; a=rsa-sha256; cv=none; b=UZ9Xz+xPu6y5OrG5fIvh9yuLWdw50YyOnzKKZWvv4PDAN+PQz/PDT2KJiK+C2pFLz2sge0 4ONwVMq4p0YR/rlBcCRewgp+9NSahLoGafxWMg1dbyNw6maK0GuHJD6k1yE6tFE/+lnBGX sHptA/xDSfoa1wuLUzTzkKDVLKLK1QMSFdCM5X+QAqRkjBLWiU3k74SQvOcDJaS0TazHDc HUjUo4SG9Ud0yQlNd78rdqLPxaZDj2lFBehfMIj/nF40XviskRAKgSWgipL0xLxd71BOvQ dPqTpZxVolWqrN+5OB0Bq6rOMKl/HL9emC4NAbUB85xBmwPZeuzQmPT1skmNJA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4bbxYX44tTzXjc; Tue, 08 Jul 2025 10:05: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 568A54Ew067293; Tue, 8 Jul 2025 10:05:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 568A54Cf067290; Tue, 8 Jul 2025 10:05:04 GMT (envelope-from git) Date: Tue, 8 Jul 2025 10:05:04 GMT Message-Id: <202507081005.568A54Cf067290@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Zhenlei Huang Subject: git: e59f60d3c08c - stable/13 - if_vlan: Fix up if_type before attaching the interface List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: e59f60d3c08c263f14bbd3cf7dde499e80d7335c Auto-Submitted: auto-generated The branch stable/13 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=e59f60d3c08c263f14bbd3cf7dde499e80d7335c commit e59f60d3c08c263f14bbd3cf7dde499e80d7335c Author: Zhenlei Huang AuthorDate: 2025-06-26 16:37:13 +0000 Commit: Zhenlei Huang CommitDate: 2025-07-08 10:03:28 +0000 if_vlan: Fix up if_type before attaching the interface ether_ifattach() does not touch if_type, so it is not mandatory to fix the if_type after ether_ifattach(). Without this change, the event listeners, e.g. netlink, will see wrong interface type IFT_ETHER rather than the correct one IFT_L2VLAN. There is also a potential race that other threads see inconsistent interface type, i.e. initially IFT_ETHER and eventually IFT_L2VLAN. As a nice effect, this change eliminates the memory allocation for if_hw_addr, as vlan(4) interfaces do not support setting or retrieving the hardware MAC address yet [1]. [1] ddae57504b79 Persistently store NIC's hardware MAC address, and add a way to retrive it MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D50914 (cherry picked from commit a19b353d354d4ef808965c53253103cb6e7e6708) (cherry picked from commit ff54b680383bb0f212e813b74e7a3f76423d2238) --- sys/net/if_vlan.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/net/if_vlan.c b/sys/net/if_vlan.c index b098d09a8d9f..b45b8a8ac561 100644 --- a/sys/net/if_vlan.c +++ b/sys/net/if_vlan.c @@ -1138,10 +1138,10 @@ vlan_clone_create(struct if_clone *ifc, char *name, size_t len, caddr_t params) ifp->if_ratelimit_query = vlan_ratelimit_query; #endif ifp->if_flags = VLAN_IFFLAGS; + ifp->if_type = IFT_L2VLAN; ether_ifattach(ifp, eaddr); /* Now undo some of the damage... */ ifp->if_baudrate = 0; - ifp->if_type = IFT_L2VLAN; ifp->if_hdrlen = ETHER_VLAN_ENCAP_LEN; ifa = ifp->if_addr; sdl = (struct sockaddr_dl *)ifa->ifa_addr; From nobody Tue Jul 8 10:05: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 4bbxYY6zfzz60j53; Tue, 08 Jul 2025 10:05: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bbxYY5R7Vz3G9q; Tue, 08 Jul 2025 10:05:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1751969105; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/Iw0wKgT8QctkzJr6R5d1ZQhkGYtNP/6Q3gJRNPgtIk=; b=ytKjMRwSUmNpg4GStQ/Ee1R2HHb57DLoi3xLaGAJ2QGqF0ngPEDaUsOAK5DTTiP1+3oZFF U3V7jazy1Tvn0h/i0UEdxQSJWFzDAyScEDnwl6J7Ymp/7z8iNxXr6n87Sc7zyZmtmVVOIa X2h3SxZkRcM/6wTJjE6ts36REpKiGaCaNtu8W8Sw+JcFszwyV+Wpuy/MnKv6+mWDftKVG5 g75Ww2OjbBUL3EU9sc55KTacfZ0vGDlgo9Wz96cmTSwIk3Vk10DUaeSVMRyaFx9wbUY0mh uf6nMGgVvjAKGOnrvzJlGn0E3QdrugzYcpc6rb7u/r2UHRXJpaFBF+zJ6HVSCg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1751969105; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/Iw0wKgT8QctkzJr6R5d1ZQhkGYtNP/6Q3gJRNPgtIk=; b=gJ2Msz/my/v7A0Yl9UJrapxycNaLcGmS2kZZUkLoUB/eL54iRRmLsEpkLjHjzLB4L6ibJT Pu5K+zzo9MjyyJIQ4W4WGvt9Jyo/XbVwBfiL82KxOAoTO8CGHoUzzGnInnTtVWtZI2mQPX AKqGIC20eQsCY0ZJ+vmCDiU8KSerqzW2WXy5vAXJhCZZvjspZyBeLuRqSZK+oARxFDJhBf XssZBIh8Jd40cTBgcGGAB8tK9NEjGedIYKAnEAsG5UCqh/t42zIWY/sN/pB2xXqEc1Rtt9 MlcYfowvcMFAp72vlCspw81I2NfKjo5bK8LHSbCauaHt/sXLHjSJ1qO6lrvqIg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1751969105; a=rsa-sha256; cv=none; b=aLCBUiMMVQEGAIwcjYZ4g/HiEczcso1PQxqAtR+HXF9Hnfqv2XYrvqGzh3Biq2ZKkLs/nB /F2yX1tcW7/jgq+WwMepTWPEIzGK6WfD5o2Md6M97uf6rp/yo1KkvxHdcyJslfKiUoBlwt 6W3QTj94GkezqfmoRwmljT9y43deGyRlhVtFxiisjr5WgDWbxcPV9flkbgUDrs3hJ4FDr/ NCcKxvJIsM6MIju2QIYrPDMI1rViD/oa9T5OqTr0kU7MWD+rqxg4xCgN2YWClMmxRXI3rS harGJvTGT47nfTjvTFiUSfBqtGHAewMwxZVAmNRPbyfcvnamuPxImcKbelQy6Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4bbxYY52kfzXjd; Tue, 08 Jul 2025 10:05: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 568A559X067326; Tue, 8 Jul 2025 10:05:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 568A55gu067323; Tue, 8 Jul 2025 10:05:05 GMT (envelope-from git) Date: Tue, 8 Jul 2025 10:05:05 GMT Message-Id: <202507081005.568A55gu067323@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Zhenlei Huang Subject: git: 56a81f37332a - stable/13 - ng_iface(4): Remove a redundant assignment of if_type List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 56a81f37332a6b22562a4e810b1b99d058fa6c5b Auto-Submitted: auto-generated The branch stable/13 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=56a81f37332a6b22562a4e810b1b99d058fa6c5b commit 56a81f37332a6b22562a4e810b1b99d058fa6c5b Author: Zhenlei Huang AuthorDate: 2025-06-13 10:07:18 +0000 Commit: Zhenlei Huang CommitDate: 2025-07-08 10:03:28 +0000 ng_iface(4): Remove a redundant assignment of if_type That is unnecessary since change [1], as if_alloc(IFT_PROPVIRTUAL) has set if_type already. [1] fc74a9f93a5f Stop embedding struct ifnet at the top of driver softcs No functional change intended. MFC after: 1 week (cherry picked from commit c43d6dadf7e34a94f4d119ff6d7113ad9a9b4d38) (cherry picked from commit 3da0853d71197610375262b8bb06cadda6c8f4dc) --- sys/netgraph/ng_iface.c | 1 - 1 file changed, 1 deletion(-) diff --git a/sys/netgraph/ng_iface.c b/sys/netgraph/ng_iface.c index 6bc0e527bd82..8793a96d29cb 100644 --- a/sys/netgraph/ng_iface.c +++ b/sys/netgraph/ng_iface.c @@ -544,7 +544,6 @@ ng_iface_constructor(node_p node) ifp->if_ioctl = ng_iface_ioctl; ifp->if_mtu = NG_IFACE_MTU_DEFAULT; ifp->if_flags = (IFF_SIMPLEX|IFF_POINTOPOINT|IFF_NOARP|IFF_MULTICAST); - ifp->if_type = IFT_PROPVIRTUAL; /* XXX */ ifp->if_addrlen = 0; /* XXX */ ifp->if_hdrlen = 0; /* XXX */ ifp->if_baudrate = 64000; /* XXX */ From nobody Tue Jul 8 10:05: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 4bbxYd2Xc3z60hVx; Tue, 08 Jul 2025 10:05:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bbxYd12lTz3Fc8; Tue, 08 Jul 2025 10:05:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1751969109; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=tv4qI7+AfhceMwd+Tr2htA3NC09ddvPDKfeWgIHXtDI=; b=J/IYhDJDKcl+7lukFACZnFBjzuowpNWM9VSKLVQk/rAXjKnbWUgAY55rvLjrsuBcRCPpvX C37ctcH/yATZkoccvhtaW4pqIvkLd0w/BrFJGhY8opFlIwrna7FFaDWlP4M7SqpJRehlXx pB1e0JCKBb/julHd/ZCfk0kDdu5soZxub1N0kTwaLWsbzUUjVr3JJfDNyRI8tWJL6nIqJm hImSi06ISOFksNOkhgTDHWVV0Fs8qtlYqre965zfmq5qr/Bc6HsSP/b8AfCIGhuGeUKT9T oKZfskRcVXDeRTlD0uturK9paFWYwkRMV7JNH3hQu0aupyPkD8W/G+5e77/ksg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1751969109; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=tv4qI7+AfhceMwd+Tr2htA3NC09ddvPDKfeWgIHXtDI=; b=yj7Qx9hFjQmJx+7hUHSsD+/y6PcHE1M8vuJDr1LkqmDd7uNd/xUJUBYBHvpZg+wr9XB8ov z4WYe5/qBGRADOnM0aomNDm7PSp91GENtl7CSdzekMOeLLZClR9KeBuO5jhbXoIlEInApw 3TDwzIbocf6QLTXjVTFs+GwJ94YnZVw3TVJYC3u/IZ/ISd4dvAN9bgm3iSM5pphNu4t7Nz CMCkNnZLI+blPkoEZkJ95xCwkkiOyBNH+QU+WMRf0W7xuIsmkG7TvKvZuyvUahXeX+/yTR V1TEjnO+1xq+Pe2J3HpCDUbW2fOU2z03BTjVsurnc1nLM2L94rbVpkWHoBXuzg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1751969109; a=rsa-sha256; cv=none; b=sxWXiXF+1li6QhIz8QMkvqGrQc4+UPbKMMvmD5C2lDOHWGVlQbhgDRK0tvx46y+6mxbQc4 zUENyocf5jnMFzbc49iOV7BVCS2/6EI8rybgtQYOFZknM+WbQw4QLjdyQ9lyEbGUKf5dA0 C4dn6ci25xYWJeC74Ieg318tRyO95+1Cbc/Qy78a8tA8ubjbF7xqtqtrWjT68CbUKPQ7yH o8q0C3gMwza92XMeuQJNpCXAodX4NQ9CRu1le8WiIBZVN89yHOhMa+Uzy+mZgrYRUo0Iu8 Rp4ERsnffKVKOYYP2y7CnSRbJfrhOQ5LR8B3zY7u18D+M9/52vFTmV2JoCb8jg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4bbxYd0Q3HzYgg; Tue, 08 Jul 2025 10:05: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 568A58VA067434; Tue, 8 Jul 2025 10:05:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 568A58lE067431; Tue, 8 Jul 2025 10:05:08 GMT (envelope-from git) Date: Tue, 8 Jul 2025 10:05:08 GMT Message-Id: <202507081005.568A58lE067431@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Zhenlei Huang Subject: git: 9d53e7eaab9e - stable/13 - pfsync: Destroy buckets mutexes on clone destroying interface List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: zlei X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 9d53e7eaab9e2e75491941dc035a345bc0f39c99 Auto-Submitted: auto-generated The branch stable/13 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=9d53e7eaab9e2e75491941dc035a345bc0f39c99 commit 9d53e7eaab9e2e75491941dc035a345bc0f39c99 Author: Zhenlei Huang AuthorDate: 2025-06-28 15:46:51 +0000 Commit: Zhenlei Huang CommitDate: 2025-07-08 10:03:29 +0000 pfsync: Destroy buckets mutexes on clone destroying interface So that the associated data with them will be freed. Reviewed by: kp Fixes: 4fc65bcbe3fb pfsync: Performance improvement MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D51063 (cherry picked from commit 8213c07c20586a67bc7f7152bd7ff76c02cbc007) (cherry picked from commit efbaf14c5b681c8f1a04a47c7bf8740134fff098) --- sys/netpfil/pf/if_pfsync.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/sys/netpfil/pf/if_pfsync.c b/sys/netpfil/pf/if_pfsync.c index 412739513472..9eef37ff9005 100644 --- a/sys/netpfil/pf/if_pfsync.c +++ b/sys/netpfil/pf/if_pfsync.c @@ -437,6 +437,10 @@ pfsync_clone_destroy(struct ifnet *ifp) mtx_destroy(&sc->sc_mtx); mtx_destroy(&sc->sc_bulk_mtx); + for (c = 0; c < pfsync_buckets; c++) { + b = &sc->sc_buckets[c]; + mtx_destroy(&b->b_mtx); + } free(sc->sc_buckets, M_PFSYNC); free(sc, M_PFSYNC); From nobody Tue Jul 8 11: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 4bbzpd4p2Sz60tG0; Tue, 08 Jul 2025 11: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bbzpd1chGz40cS; Tue, 08 Jul 2025 11: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=1751975193; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1dUBpNwUb0YzcyG9vD5a889V8UD+Syrx4YmMrXZxaM8=; b=v20y0yUxNspScDH1M9+eTXPU7g6McSYzewfI2DV2V2UbIJl0VAoLe7jjqVW1t08R4RVTSU M1GiGZWBLm+aBerWxIDupOdgR05LYVOW6esixBzF3gE8ilPXgO0SPAoWEt7zNYu0OldkBQ WT4JevTVTvYcs4hUL+Fala7uOqBRgIJThquS4Qc6k1t+wnsuEqnvbha73pR0VvsgsGv5ro me2Kb+InBfWCW52qnH9Tjx2+vMe0SoR57y2RVBDL7wCuu5OBOenzyekYE+toNFnkKChMMm ImGqg3SRa4IbMD+jLdoCU6c/KeP8fs6xhGilfX2pukFzTSROlJDBmgvQ+snA9w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1751975193; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1dUBpNwUb0YzcyG9vD5a889V8UD+Syrx4YmMrXZxaM8=; b=mP+O4XtL7cJHiTd8l2oNYIQr7mHD91zEi41XFwwu6i15zpZQutkPt4Gs/Mhdb45zm5IqL3 1x0Aye7uN6Rb1pjUPCY/uafZJaf51VhPBBQWyGJT9hZHHYa+nJkx3Aakwo6ypuIJOzqBUm +txnR5nr+DoZC06JMmv8DTnNvx8xM25L7yCTINpqDwwjkgNP+yUYJHDOEXibtetP+rLVSz Y5m5EplDAk3lMNBsMecUtFzG5JfIp4R2OirDd0gs7owlzOOWvz+fuNfzhNVr0uDjefw4UL rr+jsds0XRhyCvhmd0CAKbgYKorRHZ0xVMbJl6GzFZbEiaxmb00QH/Iwbjm31g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1751975193; a=rsa-sha256; cv=none; b=yX6uyvRRmEA1lTflUIxvidashZkNSPPKbhvxLEAP1G7uOl/8T1aoCNVr1/YCa5ZZZExfuV Ry4ZVfsBqBiRe4DtEtLl6RIU3K7+CVJW4Mw+9ldar9eD1LvkIlzVYSCiBaPjkZmiff0gM2 x1Tw+HWoA5KnSXbcQPTCXgybASF1SsqA3sA5W1COoVRfv1LpHTxCmRgcvCBRrgbA5nRqZp IRyKH0NNZwm5q7FlXd+j4hUgAHJrOHzKE46hcrxpPHKHItGrWMfReSOJMGl41/pJWR1CSd fVy6tBYM6hH+pwiZ7c+shRC9qBglWbEtrJDCytledZdNVElVlVn7sHPD5uXrTQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4bbzpd0kRmzc2h; Tue, 08 Jul 2025 11: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 568BkWmg055558; Tue, 8 Jul 2025 11: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 568BkWW4055555; Tue, 8 Jul 2025 11:46:32 GMT (envelope-from git) Date: Tue, 8 Jul 2025 11:46:32 GMT Message-Id: <202507081146.568BkWW4055555@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Renato Botelho Subject: git: a9475bf3dfb2 - stable/14 - bectl: Print activate message in a single line List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: garga X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: a9475bf3dfb23782ce9e1d4da16473b2f9597d6b Auto-Submitted: auto-generated The branch stable/14 has been updated by garga: URL: https://cgit.FreeBSD.org/src/commit/?id=a9475bf3dfb23782ce9e1d4da16473b2f9597d6b commit a9475bf3dfb23782ce9e1d4da16473b2f9597d6b Author: Renato Botelho AuthorDate: 2025-07-01 19:14:16 +0000 Commit: Renato Botelho CommitDate: 2025-07-08 11:46:24 +0000 bectl: Print activate message in a single line When -t parameter is used, bectl prints a complementary message "for next boot" on a second line. Change it to print entire message on a single line. Reviewed by: kevans MFC after: 1 week Sponsored by: Rubicon Communications, LLC ("Netgate") Differential Revision: https://reviews.freebsd.org/D49439 (cherry picked from commit e690b6519ae70921b084d5df0e707abaf848d795) --- sbin/bectl/bectl.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/sbin/bectl/bectl.c b/sbin/bectl/bectl.c index be95ca5cd36a..f37a1473680e 100644 --- a/sbin/bectl/bectl.c +++ b/sbin/bectl/bectl.c @@ -159,13 +159,15 @@ bectl_cmd_activate(int argc, char *argv[]) /* activate logic goes here */ if ((err = be_activate(be, argv[0], temp)) != 0) /* XXX TODO: more specific error msg based on err */ - printf("Did not successfully activate boot environment %s\n", + printf("Did not successfully activate boot environment %s", argv[0]); else - printf("Successfully activated boot environment %s\n", argv[0]); + printf("Successfully activated boot environment %s", argv[0]); if (temp) - printf("for next boot\n"); + printf(" for next boot"); + + printf("\n"); return (err); } From nobody Tue Jul 8 14:32: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 4bc3Tj5C25z614S2; Tue, 08 Jul 2025 14:32:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bc3Tj3t19z49F6; Tue, 08 Jul 2025 14:32:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1751985129; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=LSpEB7eRoNHUXbGGZqo7LHiAUNIfUaYlfpE4upZbGrM=; b=NwemQ/E7g7ly3nfmWQLPMLSL3P+umR5RKSbjwHn/68RqEgatgf4eXTjiz1A3lY+S4HX5pF zKU44+f0VJP5Dcy7Rao1U3UALstHn+l2wSTAyDMbrZsvjK7HqdOTUzSlcp2CYZfdsh9EUV vcD9f6LUdYV2G3/uxkbbf7lmkd+/vnza24x1rsoYGeY4INkd/7p1XGTbMKXkIA/AdAbfbn mEip48BYwQwR8NvsCmZFvv8LY5uHSt4wTAO2G/jY+SmfwKWtFuV8UMPj144SXiJfWX0rma oxg14y4SZqKWCyB2Qh6ADdTkQ6xe3z4DdfZYDbbQK7vzX0JLWIVAf1DL+8Z5kQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1751985129; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=LSpEB7eRoNHUXbGGZqo7LHiAUNIfUaYlfpE4upZbGrM=; b=fP+ukNe9fZt5dnP6hE0H6OtrkYCQ0aN7j0cgy7Hmyx8mfgenr4CDdi1Vd4QX5OqOleyRaH yJFBXUWBptUepL0n6/Azx3+HHoUabz/Ru8OH/h7xW1DT7U38uXdvE1kMkYIp1lPXRmndFp 2mxO9eFV5BV7hi1H2VADRtmD1POdLfw2UbJFoVdKrNzrZFogvpNUsVimetOnpbvGbDfexx jHWa10Os9dNpE1+HP0B0MFOQY146TmVTpkW3cqoD8jOm6RzhIuUfPUscMXciwm2yudx3LJ lVgwcFMRN3ZyY7NsJgcbIY6ZznP+ZlBF0MfBZuz3AotoFadr8cufZWChxyIeuw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1751985129; a=rsa-sha256; cv=none; b=ICjaBzBeZSOgY9cG6GZkrbXwq3/q4Eu8zg07ewUOG5Sa+Nv7LTerK8QMn2QQk/G/Q+G5Hm krBJOOJwMB+Ks9tkIbFrBSJcbjp4w4HsmUiEcj36KSPq4BKA9GACSAk483ZbU6PXryhXCI F5n2MXliclXknS0Tx4DVKkJX2+aO8Ax5c0+PmZCjxUbRNuFHImgUmzx5VG1sIvQJGM+Viv +BcT+5cyG5CNc1P64WTjQMLPdyrqslg8N5sZ3rq/yZlLyTYpyC1324/81DRAQ4bvWsEq1I U+3gj8ktabM7uRDAV/iEb98ajaHqurHNAYYmcGUu9RNSy9gSvhzyuBZmrfy3+Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4bc3Tj3SvTzh30; Tue, 08 Jul 2025 14:32: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 568EW9s3071960; Tue, 8 Jul 2025 14:32:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 568EW9ws071957; Tue, 8 Jul 2025 14:32:09 GMT (envelope-from git) Date: Tue, 8 Jul 2025 14:32:09 GMT Message-Id: <202507081432.568EW9ws071957@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Baptiste Daroussin Subject: git: e52f11f4bbc8 - stable/14 - libyaml: import libyaml vendor version 0.2.5 List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bapt X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: e52f11f4bbc89df8114715a210adf2411ca4936d Auto-Submitted: auto-generated The branch stable/14 has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=e52f11f4bbc89df8114715a210adf2411ca4936d commit e52f11f4bbc89df8114715a210adf2411ca4936d Author: Baptiste Daroussin AuthorDate: 2025-06-26 06:57:37 +0000 Commit: Baptiste Daroussin CommitDate: 2025-07-08 14:06:59 +0000 libyaml: import libyaml vendor version 0.2.5 The yaml parser used in nuageinit is too incomplete, import libyaml in order to be able to use as a complete parser for nuageinit. (cherry picked from commit 0f5c86ddb0257f4b7620f1d8e898289be30b19bf) --- contrib/libyaml/.appveyor.yml | 29 + contrib/libyaml/.github/workflows/main.yml | 59 + contrib/libyaml/.gitignore | 46 + contrib/libyaml/.indent.pro | 1 + contrib/libyaml/.makefile | 63 + contrib/libyaml/.travis.yml | 28 + contrib/libyaml/CMakeLists.txt | 160 + contrib/libyaml/Changes | 372 ++ contrib/libyaml/License | 20 + contrib/libyaml/Makefile.am | 54 + contrib/libyaml/ReadMe.md | 46 + contrib/libyaml/announcement.msg | 89 + contrib/libyaml/bootstrap | 3 + contrib/libyaml/configure.ac | 73 + contrib/libyaml/doc/doxygen.cfg | 222 ++ contrib/libyaml/docker/README.mkd | 17 + contrib/libyaml/docker/alpine-3.7 | 26 + contrib/libyaml/docker/fedora-25 | 26 + contrib/libyaml/docker/ubuntu-14.04 | 29 + contrib/libyaml/docker/ubuntu-16.04 | 24 + contrib/libyaml/examples/anchors.yaml | 10 + contrib/libyaml/examples/array.yaml | 2 + contrib/libyaml/examples/global-tag.yaml | 14 + contrib/libyaml/examples/json.yaml | 1 + contrib/libyaml/examples/mapping.yaml | 2 + contrib/libyaml/examples/numbers.yaml | 1 + contrib/libyaml/examples/strings.yaml | 7 + contrib/libyaml/examples/tags.yaml | 7 + contrib/libyaml/examples/yaml-version.yaml | 3 + contrib/libyaml/include/Makefile.am | 17 + contrib/libyaml/include/yaml.h | 1985 +++++++++++ ...terfuzz-testcase-minimized-5607885063061504.yml | 1 + contrib/libyaml/src/Makefile.am | 4 + contrib/libyaml/src/api.c | 1393 ++++++++ contrib/libyaml/src/dumper.c | 394 +++ contrib/libyaml/src/emitter.c | 2358 +++++++++++++ contrib/libyaml/src/loader.c | 544 +++ contrib/libyaml/src/parser.c | 1375 ++++++++ contrib/libyaml/src/reader.c | 469 +++ contrib/libyaml/src/scanner.c | 3598 ++++++++++++++++++++ contrib/libyaml/src/writer.c | 141 + contrib/libyaml/src/yaml_private.h | 684 ++++ contrib/libyaml/tests/CMakeLists.txt | 27 + contrib/libyaml/tests/Makefile.am | 9 + contrib/libyaml/tests/ReadMe.md | 63 + contrib/libyaml/tests/example-deconstructor-alt.c | 800 +++++ contrib/libyaml/tests/example-deconstructor.c | 1127 ++++++ contrib/libyaml/tests/example-reformatter-alt.c | 217 ++ contrib/libyaml/tests/example-reformatter.c | 202 ++ contrib/libyaml/tests/run-all-tests.sh | 29 + contrib/libyaml/tests/run-dumper.c | 314 ++ contrib/libyaml/tests/run-emitter-test-suite.c | 290 ++ contrib/libyaml/tests/run-emitter.c | 327 ++ contrib/libyaml/tests/run-loader.c | 63 + contrib/libyaml/tests/run-parser-test-suite.c | 189 + contrib/libyaml/tests/run-parser.c | 63 + contrib/libyaml/tests/run-scanner.c | 63 + contrib/libyaml/tests/test-reader.c | 354 ++ contrib/libyaml/tests/test-version.c | 29 + contrib/libyaml/yaml-0.1.pc.in | 10 + contrib/libyaml/yamlConfig.cmake.in | 16 + lib/Makefile | 1 + lib/libyaml/Makefile | 29 + share/mk/src.libnames.mk | 1 + 64 files changed, 18620 insertions(+) diff --git a/contrib/libyaml/.appveyor.yml b/contrib/libyaml/.appveyor.yml new file mode 100644 index 000000000000..36d706aecdf5 --- /dev/null +++ b/contrib/libyaml/.appveyor.yml @@ -0,0 +1,29 @@ +version: 0.2.5.{build} + +image: +- Visual Studio 2015 +- Visual Studio 2013 + +build_script: + +# +# CMake based in-source build and tests using Visual Studio +# + +# Use 32-bit default generator ("Visual Studio 12 2013" or "Visual Studio 14 2015") +- cmake . +- cmake --build . --config Release --clean-first +- ctest -C Release + +# +# Autoconf based in-source build and tests under Cygwin using gcc +# + +# 32-bit cygwin build +- C:\cygwin\bin\sh -c "export PATH=/usr/bin:/usr/local/bin:$PATH && ./bootstrap && ./configure && make && make test && make distclean" +# 64-bit cygwin build +- C:\cygwin64\bin\sh -c "export PATH=/usr/bin:/usr/local/bin:$PATH && ./bootstrap && ./configure && make && make test && make distclean" +# 32-bit mingw-w64 build +- C:\cygwin\bin\sh -c "export PATH=/usr/bin:/usr/local/bin:$PATH && ./bootstrap && ./configure --host=i686-w64-mingw32 --target=i686-w64-mingw32 && make && make test && make distclean" +# 64-bit mingw-w64 build +- C:\cygwin64\bin\sh -c "export PATH=/usr/bin:/usr/local/bin:$PATH && ./bootstrap && ./configure --host=x86_64-w64-mingw32 --target=x86_64-w64-mingw32 && make && make test && make distclean" diff --git a/contrib/libyaml/.github/workflows/main.yml b/contrib/libyaml/.github/workflows/main.yml new file mode 100644 index 000000000000..c2bdef471011 --- /dev/null +++ b/contrib/libyaml/.github/workflows/main.yml @@ -0,0 +1,59 @@ +name: linux/mac + +on: + push: + branches: [ '*' ] + pull_request: + branches: [ master ] + +jobs: + + build: + + runs-on: ${{ matrix.os }} + strategy: + matrix: + compiler: + - gcc + - clang + os: + - ubuntu-latest + - macOS-latest + + steps: + - uses: actions/checkout@v2 + + - run: env | sort + - name: Install software + run: | + if [[ '${{ matrix.os }}' == macOS-latest ]]; then + brew install automake bash coreutils make + echo ::add-path::/usr/local/opt/coreutils/libexec/gnubin + echo ::add-path::/usr/local/opt/make/libexec/gnubin + fi + - name: Fetch branches + run: | + git config remote.origin.fetch +refs/heads/*:refs/remotes/origin/* + git fetch --unshallow + + - run: ./bootstrap + - run: ./configure + - run: make + - run: make test-all + + - run: | + git clean -d -x -f + rm -fr tests/run-test-suite + git worktree prune + + - name: Compiler version + run: ${{ matrix.compiler }} --version + env: + CC: ${{ matrix.compiler }} + - run: cmake . + env: + CC: ${{ matrix.compiler }} + - run: make + env: + CC: ${{ matrix.compiler }} + - run: make test diff --git a/contrib/libyaml/.gitignore b/contrib/libyaml/.gitignore new file mode 100644 index 000000000000..90840c8ac2de --- /dev/null +++ b/contrib/libyaml/.gitignore @@ -0,0 +1,46 @@ +*.BAK +*.a +*.cmake +*.dll +*.exe +*.la +*.lo +*.log +*.o +*.pc +*.so +*.trs +*~ +.deps/ +.libs/ +/Testing/ +/libtool +CMakeCache.txt +CMakeFiles/ +GNUmakefile +Makefile +Makefile.in +/aclocal.m4 +/autom4te.cache +/config +config.h* +/config.status +/configure +stamp-h1 +!config/config.h.in +/packaging/ +/tests/run-dumper +/tests/run-emitter +/tests/run-emitter-test-suite +/tests/run-loader +/tests/run-parser +/tests/run-parser-test-suite +/tests/run-scanner +/tests/example-deconstructor +/tests/example-deconstructor-alt +/tests/example-reformatter +/tests/example-reformatter-alt +/tests/run-test-suite +/tests/test-reader +/tests/test-version +/dist/ diff --git a/contrib/libyaml/.indent.pro b/contrib/libyaml/.indent.pro new file mode 100644 index 000000000000..d647720f74d6 --- /dev/null +++ b/contrib/libyaml/.indent.pro @@ -0,0 +1 @@ +-kr -nut -nce -l250 diff --git a/contrib/libyaml/.makefile b/contrib/libyaml/.makefile new file mode 100644 index 000000000000..9d526a4d3983 --- /dev/null +++ b/contrib/libyaml/.makefile @@ -0,0 +1,63 @@ +# This file is used for common development targets that can be done with +# needing the cumbersome bootstrapping process. +# +# You can use it like this: +# +# make -f .makefile indent +# +# If you copy or link this file to `GNUmakefile` then you can just do: +# +# make indent +# +# When copied to `GNUmakefile`, this file is can also be used for bootstrapping +# Makefile targets. Since GNUmakefile is loaded before Makefile, we do the +# bootstrapping tasks need to get a Makefile first, then we use the Makefile to +# make our target. + +# Remind user when they are using GNUmakefile: +ifeq ($(lastword $(MAKEFILE_LIST)),GNUmakefile) + $(info *** NOTE: GNUmakefile in use. ***) +endif + +MAKE_TARGETS := \ + all \ + all-am \ + all-recursive \ + install \ + test \ + test-all \ + test-suite \ + +# SOURCE_FILES := $(shell find . | grep '\.c$$') +SOURCE_FILES := $(shell find tests/run-test-suite | grep '\.c$$') +ifneq ($(shell which gindent),) +INDENT := gindent +else +INDENT := indent +endif + +# +# Proxy make targets: +# +default: all + +# Proxy these targets to the real Makefile, after bootstrapping is necessary. +$(MAKE_TARGETS): Makefile + @make -f $< $@ + +Makefile: Makefile.in + ./configure + +Makefile.in: + ./bootstrap + +# +# Development make targets: +# +indent: + $(INDENT) $(SOURCE_FILES) + +distclean purge: + git clean -dxf -e GNUmakefile + rm -fr tests/run-test-suite + git worktree prune diff --git a/contrib/libyaml/.travis.yml b/contrib/libyaml/.travis.yml new file mode 100644 index 000000000000..dca3bc73c4c5 --- /dev/null +++ b/contrib/libyaml/.travis.yml @@ -0,0 +1,28 @@ +language: c + +matrix: + include: + - os: linux + compiler: gcc + sudo: required + - os: linux + compiler: clang + sudo: required + - os: osx + compiler: gcc + - os: osx + compiler: clang + +before_install: + +# Travis branch-specific clone problem workaround: +- git config remote.origin.fetch +refs/heads/*:refs/remotes/origin/* +- git fetch +- env | sort + +- if [[ "$TRAVIS_OS_NAME" == "linux" ]]; then + pip install --user scikit-ci-addons==0.15.0; + ci_addons travis/install_cmake 3.2.0; + fi + +script: tests/run-all-tests.sh diff --git a/contrib/libyaml/CMakeLists.txt b/contrib/libyaml/CMakeLists.txt new file mode 100644 index 000000000000..4f811481779a --- /dev/null +++ b/contrib/libyaml/CMakeLists.txt @@ -0,0 +1,160 @@ + +cmake_minimum_required(VERSION 3.0) +project (yaml C) + +set (YAML_VERSION_MAJOR 0) +set (YAML_VERSION_MINOR 2) +set (YAML_VERSION_PATCH 5) +set (YAML_VERSION_STRING "${YAML_VERSION_MAJOR}.${YAML_VERSION_MINOR}.${YAML_VERSION_PATCH}") + +option(BUILD_SHARED_LIBS "Build libyaml as a shared library" OFF) +set(YAML_STATIC_LIB_NAME "yaml" CACHE STRING "Base name of static library output") + +# +# Output directories for a build tree +# +if(NOT DEFINED CMAKE_RUNTIME_OUTPUT_DIRECTORY) + set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}) +endif() + +# +# Install relative directories +# +if(NOT DEFINED INSTALL_LIB_DIR) + set(INSTALL_LIB_DIR lib) +endif() +if(NOT DEFINED INSTALL_BIN_DIR) + set(INSTALL_BIN_DIR bin) +endif() +if(NOT DEFINED INSTALL_INCLUDE_DIR) + set(INSTALL_INCLUDE_DIR include) +endif() +if(NOT DEFINED INSTALL_CMAKE_DIR) + set(INSTALL_CMAKE_DIR cmake) +endif() + +# +# Build library +# +set(SRCS + src/api.c + src/dumper.c + src/emitter.c + src/loader.c + src/parser.c + src/reader.c + src/scanner.c + src/writer.c + ) + +set(config_h ${CMAKE_CURRENT_BINARY_DIR}/include/config.h) +configure_file( + cmake/config.h.in + ${config_h} + ) + +add_library(yaml ${SRCS}) + +if(NOT BUILD_SHARED_LIBS) + set_target_properties(yaml + PROPERTIES OUTPUT_NAME ${YAML_STATIC_LIB_NAME} + ) +endif() + +set_target_properties(yaml + PROPERTIES DEFINE_SYMBOL YAML_DECLARE_EXPORT + ) + +target_compile_definitions(yaml + PRIVATE HAVE_CONFIG_H + PUBLIC + $<$>:YAML_DECLARE_STATIC> + $<$:_CRT_SECURE_NO_WARNINGS> + ) + +target_include_directories(yaml PUBLIC + $ + $ + $ + ) + +# +# Install rules +# +install( + FILES + include/yaml.h + DESTINATION include COMPONENT Development + ) + +install( + TARGETS yaml + EXPORT yamlTargets + RUNTIME DESTINATION "${INSTALL_BIN_DIR}" COMPONENT Runtime + LIBRARY DESTINATION "${INSTALL_LIB_DIR}" COMPONENT Development + ARCHIVE DESTINATION "${INSTALL_LIB_DIR}" COMPONENT Development + ) + +# +# Add tests +# +include(CTest) # This module defines BUILD_TESTING option +if(BUILD_TESTING) + add_subdirectory(tests) +endif() + +# +# Generate 'yamlConfig.cmake', 'yamlConfigVersion.cmake' and 'yamlTargets.cmake' +# +include(CMakePackageConfigHelpers) + +# Configure 'yamlConfig.cmake' for a build tree +set(CONFIG_DIR_CONFIG ${PROJECT_BINARY_DIR}) +set(config_file ${PROJECT_BINARY_DIR}/yamlConfig.cmake) +configure_package_config_file( + yamlConfig.cmake.in + ${config_file} + INSTALL_DESTINATION ${PROJECT_BINARY_DIR} + PATH_VARS CONFIG_DIR_CONFIG + NO_CHECK_REQUIRED_COMPONENTS_MACRO + ) + +# Configure 'yamlTargets.cmake' for a build tree +export(TARGETS yaml + FILE ${PROJECT_BINARY_DIR}/yamlTargets.cmake + ) + +# Configure and install 'yamlConfig.cmake' for an install tree +set(CONFIG_DIR_CONFIG ${INSTALL_CMAKE_DIR}) +set(install_config_file ${PROJECT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/yamlConfig.cmake ) +configure_package_config_file( + yamlConfig.cmake.in + ${install_config_file} + INSTALL_DESTINATION ${CMAKE_INSTALL_PREFIX}/${INSTALL_CMAKE_DIR} + PATH_VARS CONFIG_DIR_CONFIG + NO_CHECK_REQUIRED_COMPONENTS_MACRO + ) +install( + FILES ${install_config_file} + DESTINATION ${INSTALL_CMAKE_DIR} COMPONENT Development + ) + +# Configure and install 'yamlTargets.cmake' for an install tree +install(EXPORT yamlTargets + FILE yamlTargets.cmake + DESTINATION ${INSTALL_CMAKE_DIR} + COMPONENT Development + ) + +# Configure 'yamlConfigVersion.cmake' for a build tree +set(config_version_file ${PROJECT_BINARY_DIR}/yamlConfigVersion.cmake) +write_basic_package_version_file( + ${config_version_file} + VERSION ${YAML_VERSION_STRING} + COMPATIBILITY AnyNewerVersion +) +# ... and install for an install tree +install( + FILES ${config_version_file} + DESTINATION ${INSTALL_CMAKE_DIR} COMPONENT Development + ) diff --git a/contrib/libyaml/Changes b/contrib/libyaml/Changes new file mode 100644 index 000000000000..e4b96edcbef7 --- /dev/null +++ b/contrib/libyaml/Changes @@ -0,0 +1,372 @@ +0.2.5 2020-06-01 + +https://github.com/yaml/libyaml/pull/105 +Allow question marks in plain scalars in flow collections + +https://github.com/yaml/libyaml/pull/186 +Emitter: Don't output trailing space for empty scalar nodes + +https://github.com/yaml/libyaml/pull/185 +Emitter: Output space after an alias mapping key + +https://github.com/yaml/libyaml/pull/187 +Add -h and --flow (on|off|keep) to run-*-test-suite + +https://github.com/yaml/libyaml/pull/182 +Remove unnecessary include and malloc + +https://github.com/yaml/libyaml/pull/177 +Add specific files back to .gitignore + +https://github.com/yaml/libyaml/pull/181 +Output error position in run-parser-test-suite.c + +https://github.com/yaml/libyaml/pull/191 +A couple patches to improve test suite support + +0.2.4 2020-04-19 + + - https://github.com/yaml/libyaml/pull/143 + Add packaging/docker-dist to Makefile.am + + - https://github.com/yaml/libyaml/pull/174 + Fix logic for document end before directive + + +0.2.3 2020-04-11 + + - https://github.com/yaml/libyaml/pull/130 + Fixed typo. + + - https://github.com/yaml/libyaml/pull/144 + Fix typo in comment + + - https://github.com/yaml/libyaml/pull/140 + Use pointer to const for strings that aren't/shouldn't be modified + + - https://github.com/yaml/libyaml/pull/128 + Squash a couple of warnings in example-deconstructor-alt + + - https://github.com/yaml/libyaml/pull/151 + Fix spelling for error message + + - https://github.com/yaml/libyaml/pull/161 + Make appveyor config be a hidden file + + - https://github.com/yaml/libyaml/pull/159 + Add CHANGES file + + - https://github.com/yaml/libyaml/pull/160 + Always output document end before directive (YAML 1.2 compatibility) + + - https://github.com/yaml/libyaml/pull/162 + Output document end marker after open ended scalars + + - https://github.com/yaml/libyaml/pull/157 + change cmake target name from libOFF.a to libyaml.a + + - https://github.com/yaml/libyaml/pull/155 + include/yaml.h: fix comments + + - https://github.com/yaml/libyaml/pull/169 + Fixed missing token in example + + - https://github.com/yaml/libyaml/pull/127 + Avoid recursion in the document loader. + + - https://github.com/yaml/libyaml/pull/172 + Support %YAML 1.2 directives + + - https://github.com/yaml/libyaml/pull/66 + Change dllexport controlling macro to use _WIN32 + +0.2.2 2019-03-12 + + - https://github.com/yaml/libyaml/pull/95 + build: do not install config.h + + - https://github.com/yaml/libyaml/pull/97 + appveyor.yml: fix Release build + + - https://github.com/yaml/libyaml/pull/103 + Remove unused code in yaml_document_delete + + - https://github.com/yaml/libyaml/pull/104 + Allow colons in plain scalars inside flow collections + + - https://github.com/yaml/libyaml/pull/109 + Fix comparison in tests/run-emitter.c + + - https://github.com/yaml/libyaml/pull/117 + Fix typo error + + - https://github.com/yaml/libyaml/pull/119 + The closing single quote needs to be indented... + + - https://github.com/yaml/libyaml/pull/121 + fix token name typos in comments + + - https://github.com/yaml/libyaml/pull/122 + Revert removing of open_ended after top level plain scalar + + - https://github.com/yaml/libyaml/pull/125 + Cherry-picks from PR 27 + + - https://github.com/yaml/libyaml/pull/135 + Windows/C89 compatibility + + - https://github.com/yaml/libyaml/pull/136 + allow override of Windows static lib name + +0.2.1 2018-06-24 + + - https://github.com/yaml/libyaml/pull/10 + Support static and dynamic libraries + + - https://github.com/yaml/libyaml/pull/12 + Use .gitignore instead of .hgignore + + - https://github.com/yaml/libyaml/pull/13 + Add support for `make test` and travis + + - https://github.com/yaml/libyaml/pull/14 + Dockerfile for testing + + - https://github.com/yaml/libyaml/pull/15 + Apply old fix for `\/` that is not in master. + + - https://github.com/yaml/libyaml/pull/17 + Update license to include all years until now. + + - https://github.com/yaml/libyaml/pull/18 + Port bug fix from Perl binding + + - https://github.com/yaml/libyaml/pull/22 + Fix misspell: preceed + + - https://github.com/yaml/libyaml/pull/23 + Removed trailing-whitespaces + + - https://github.com/yaml/libyaml/pull/24 + Fix typo + + - https://github.com/yaml/libyaml/pull/25 + added an examples directory with a few yaml examples + + - https://github.com/yaml/libyaml/pull/26 + Added missing Cflags path in pkg-config file + + - https://github.com/yaml/libyaml/pull/31 + add unit tests to cmake configuration + + - https://github.com/yaml/libyaml/pull/32 + Include an example of a custom tag from Python + + - https://github.com/yaml/libyaml/pull/33 + Include an example of a %YAML tag + + - https://github.com/yaml/libyaml/pull/34 + Added an example of using a global tag + + - https://github.com/yaml/libyaml/pull/36 + Fix -Wformat compilation errors in tests + + - https://github.com/yaml/libyaml/pull/37 + Update bug report URL in LibYAML + + - https://github.com/yaml/libyaml/pull/38 + Use AM_CPPFLAGS since autotools deprecated INCLUDE + + - https://github.com/yaml/libyaml/pull/39 + Update bug report URL in README + + - https://github.com/yaml/libyaml/pull/41 + Add travis and Makefile support for libyaml-test + + - https://github.com/yaml/libyaml/pull/43 + Add Dockerfile for Fedora 25 + + - https://github.com/yaml/libyaml/pull/44 + WIP: Enable all warnings (-Wall) in libyaml and tests + + - https://github.com/yaml/libyaml/pull/45 + Fix typo + + - https://github.com/yaml/libyaml/pull/47 + Move travis script guts to separate file + + - https://github.com/yaml/libyaml/pull/48 + `yaml/libyaml-test` should become part of `yaml/libyaml` + + - https://github.com/yaml/libyaml/pull/50 + Add a GNUMakefile for immediate make targets + + - https://github.com/yaml/libyaml/pull/53 + Switch from test blacklist to whitelist + + - https://github.com/yaml/libyaml/pull/55 + Update defs for MingGW support on Windows + + - https://github.com/yaml/libyaml/pull/58 + Improve CMakeLists + + - https://github.com/yaml/libyaml/pull/64 + README: Update libyaml link + + - https://github.com/yaml/libyaml/pull/69 + Skip 5 tests in libyaml-emitter.list + + - https://github.com/yaml/libyaml/pull/74 + Forbid escaped singlequote in doublequotes + + - https://github.com/yaml/libyaml/pull/76 + Rewrite make test-suite + + - https://github.com/yaml/libyaml/pull/77 + Undefined PTRDIFF_MAX on HP-UX + + - https://github.com/yaml/libyaml/pull/78 + Fixed most compiler warnings -Wall -Wextra + + - https://github.com/yaml/libyaml/pull/82 + Move yaml-test-suite integration onto a separate branch. + + - https://github.com/yaml/libyaml/pull/86 + Fix problems in CI failures (travis and semaphore) + + - https://github.com/yaml/libyaml/pull/87 + appveyor.yml: add mingw-w64 builds + + - https://github.com/yaml/libyaml/pull/88 + add -no-undefined to src/Makefile.am + + - https://github.com/yaml/libyaml/pull/89 + Added alpine linux testing to dockerfiles + + - https://github.com/yaml/libyaml/pull/93 + remove need for PTRDIFF_MAX + + - https://github.com/yaml/libyaml/pull/94 + .gitignore: major cleanup + + - https://github.com/yaml/libyaml/pull/120 + Fix doc. + +0.1.7 2016-08-27 + + - Fixed segfault in yaml_string_write_handler. + + - Fixed invalid simple key assertion. + + - Fixed error handling in some examples (thank to Mathias Svensson). + + - Removed obsolete VS project files. + +0.1.6 2014-03-26 + + - https://github.com/yaml/libyaml/commit/d1003a9 + Fixed heap overflow in yaml_parser_scan_uri_escapes (Thanks + Ivan Fratric of the Google Security Team). + + - https://github.com/yaml/libyaml/commit/662f4be + Added tag 0.1.5 for changeset a5142b24428b + +0.1.5 2014-02-03 + + - https://github.com/yaml/libyaml/commit/303b455 + Manually define PTRDIFF_MAX for VS C compiler. + + - https://github.com/yaml/libyaml/commit/1ef1171 + Forgot to set the error state. + + - https://github.com/yaml/libyaml/commit/c9479c7 + Limit input size to SIZE_MAX/2. + + - https://github.com/yaml/libyaml/commit/c201bf6 + Guard against overflows in indent and flow_level. + + - https://github.com/yaml/libyaml/commit/bb8ab82 + Added .hgignore. + + - https://github.com/yaml/libyaml/commit/2d94fc5 + Prevent node index overflow (Reported by Florian Weimer). + + - https://github.com/yaml/libyaml/commit/df33f25 + Bumped the version number. + + - https://github.com/yaml/libyaml/commit/f56726b + Fixed invalid size_t->int cast (Thank to Florian Weimer). + + - https://github.com/yaml/libyaml/commit/01e8dad + Added a basic CMake project. + + - https://github.com/yaml/libyaml/commit/f54fc40 + Added tag 0.1.4 for changeset 3e6507fa0c26 + +0.1.4 2012-12-24 + + - Fixed a bug that prevented an empty mapping being used as a simple key + (thank to spitzak(at)rhythm(dot)com). + + - Fixed pointer overflow when calculating the position of a potential + simple key (thank to ppelletier(at)oblong(dot)com). + + - Fixed yaml.dll not exporting any symbols + (thank to pxn11432(at)nifty(dot)com). + + - Added pkg-config support (thank to rainwoodman(at)gmail(dot)com). + +0.1.3 2009-08-29 + + - This release fixes non-standard structure initialization and + a streaming-related issue. + +0.1.2 2008-12-27 + + - Minor bugfix release + +0.1.1 2006-08-01 + + - https://github.com/yaml/libyaml/commit/5e52c31 + Fixed a problem when the DOCUMENT-END event is not emitted until + the beginning of the next document is available. Fixed #51. + Thanks edward(at)sweetbytes.net for the bug report. + + - https://github.com/yaml/libyaml/commit/dd71484 + Add project files for Visual Studio 2003. + + - https://github.com/yaml/libyaml/commit/ce8a93e + Fix the example_deconstructor project. + + - https://github.com/yaml/libyaml/commit/c9b74de + Eliminate some warnings and add more doxygen definitions. + + - https://github.com/yaml/libyaml/commit/0122490 + Undefine the NDEBUG directive for the test programs. + + - https://github.com/yaml/libyaml/commit/071329a + Fix a bug in the emitter introduced while fixing warnings for VC6. + + - https://github.com/yaml/libyaml/commit/6f6bbb8 + Add VC6 projects for the test executables. + + - https://github.com/yaml/libyaml/commit/0174ed6 + Add win32 fixes and project files for VC6. + + - https://github.com/yaml/libyaml/commit/e27a3c8 + Add functions for constructing, parsing and emitting YAML documents. + + - https://github.com/yaml/libyaml/commit/a907bf8 + Add `const` qualifier for `yaml_parser_set_input_string` parameter `input`. + + - https://github.com/yaml/libyaml/commit/c83b67a + Force a new line at the end of the input stream even if there + are no a new line character. This fixes a nasty bug when libyaml hangs on + documents like `[[[[`. Thanks ciaranm for reporting the bug. + + - https://github.com/yaml/libyaml/commit/609cce0 + Older versions of gcc do not know about -Wno-pointer-sign. + +0.0.1 2006-08-01 + + - Initial release diff --git a/contrib/libyaml/License b/contrib/libyaml/License new file mode 100644 index 000000000000..3d82c281ee8c --- /dev/null +++ b/contrib/libyaml/License @@ -0,0 +1,20 @@ +Copyright (c) 2017-2020 Ingy döt Net +Copyright (c) 2006-2016 Kirill Simonov + +Permission is hereby granted, free of charge, to any person obtaining a copy of +this software and associated documentation files (the "Software"), to deal in +the Software without restriction, including without limitation the rights to +use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies +of the Software, and to permit persons to whom the Software is furnished to do +so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. diff --git a/contrib/libyaml/Makefile.am b/contrib/libyaml/Makefile.am new file mode 100644 index 000000000000..551c74071f7a --- /dev/null +++ b/contrib/libyaml/Makefile.am @@ -0,0 +1,54 @@ +## Run `./bootstrap` to generate the "Makefile.in" files in this directory and +## the "$SUBDIRS" subdirectories. + +SUBDIRS = include src . tests + +EXTRA_DIST = Changes ReadMe.md License CMakeLists.txt doc/doxygen.cfg + +LIBYAML_TEST_SUITE_RUN_REPO_DEFAULT := https://github.com/yaml/libyaml +LIBYAML_TEST_SUITE_RUN_REPO ?= $(LIBYAML_TEST_SUITE_RUN_REPO_DEFAULT) +LIBYAML_TEST_SUITE_RUN_BRANCH ?= run-test-suite + +pkgconfigdir = $(libdir)/pkgconfig +pkgconfig_DATA = yaml-0.1.pc + +maintainer-clean-local: + rm -f aclocal.m4 config.h.in configure config/* + -find ${builddir} -name Makefile.in -exec rm -f '{}' ';' + +distclean-local: + rm -fr tests/run-test-suite packaging + -git worktree prune + +.PHONY: bootstrap +bootstrap: maintainer-clean + ./bootstrap + ./configure + make + +test: all + make -C tests check-TESTS + +test-suite: tests/run-test-suite all + make -C $< test + +test-all: test test-suite + +tests/run-test-suite: +ifeq ($(LIBYAML_TEST_SUITE_RUN_REPO),$(LIBYAML_TEST_SUITE_RUN_REPO_DEFAULT)) + -git branch --track $(LIBYAML_TEST_SUITE_RUN_BRANCH) origin/$(LIBYAML_TEST_SUITE_RUN_BRANCH) + -git worktree prune + git worktree add $@ $(LIBYAML_TEST_SUITE_RUN_BRANCH) + else + git clone --branch $(LIBYAML_TEST_SUITE_RUN_BRANCH) $(LIBYAML_TEST_SUITE_RUN_REPO) $@ + endif + +packaging: + -git branch --track $@ origin/$@ + git worktree add --force $@ $@ + +docker-dist: packaging + make -C $ To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Baptiste Daroussin Subject: git: 15c15f78b120 - stable/14 - lua_ucl: make sure flua gets build after libucl List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bapt X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 15c15f78b1209eead6d81f54d94aa7fd1915d5eb Auto-Submitted: auto-generated The branch stable/14 has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=15c15f78b1209eead6d81f54d94aa7fd1915d5eb commit 15c15f78b1209eead6d81f54d94aa7fd1915d5eb Author: Baptiste Daroussin AuthorDate: 2024-09-06 15:49:16 +0000 Commit: Baptiste Daroussin CommitDate: 2025-07-08 14:24:27 +0000 lua_ucl: make sure flua gets build after libucl --- lib/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/Makefile b/lib/Makefile index 1b848ad77caa..855d7ca0279e 100644 --- a/lib/Makefile +++ b/lib/Makefile @@ -151,7 +151,7 @@ SUBDIR_DEPEND_nss_tacplus= libtacplus .if !defined(COMPAT_LIBCOMPAT) SUBDIR+= flua -SUBDIR_DEPEND_flua= libjail +SUBDIR_DEPEND_flua= libjail libucl .endif # NB: keep these sorted by MK_* knobs From nobody Tue Jul 8 14:32: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 4bc3Tl30L0z614cn; Tue, 08 Jul 2025 14:32:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bc3Tk5Ld7z49FB; Tue, 08 Jul 2025 14:32:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1751985130; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4ZQ5yH17WcI064Aim1XM2iSKHAQvY3P0HPOFeXuCZSQ=; b=EuWURrlq1iubzdY6bkS8FvyWsMYxJRlMCJGLzH/LrYmVenUQJYQ0ybYykZH1VTyhz6ugWx b/JdzfZvvr7UMErmeXktDfvYLCJ7vM1NMUBSu5ezbzAPjuL34GWRYx6X7l8ol2VILaazTI bUBNpSZDZJUoEhGrTYflgDFZ7xp1Sh2UEzqEX1HYzuAi1ceTJfqclSaEzcZTn5CPBT0jMY e2Z0blcN1NC7atftX9SRTD7uv3x96Cwgq7WU9B5GdF68UJfxTVdFt+qZUkAN31v8AbIthi bZTTqWhoH3lY6eNcvbc4+XulftsCUVD/BW/yQbbNubCWdQILmKKxjLxtR1cyAA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1751985130; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4ZQ5yH17WcI064Aim1XM2iSKHAQvY3P0HPOFeXuCZSQ=; b=jc4o5RXjM9CVYYhGGaL4+zhSvnWBA2vMPtzigbiNaTAgBFGy911k4KoPm0y4VMYmpyG+iS JPb5aDp+HJ6w66YSqkWrwPnAcvIUc3+iCKTlazgk4tjrB5GTzX/U6+RBn+k2BCl07bdaVk 5EDyP5fA/nibD95KYibkFlUA7DetfuV+CRFTeDwa0lTaP/dCSPUOkkmYbgqDAmnnRNShoh oLxIkRgSx9zkbfuBeK5wNKdzimzh/I+O5N/IyK/VMt1f6u2CDlPQSzYB9VvNMwzQn/NYp8 UVghuMWuGI65MZ7r2DdT3oZ8dNklahxhPZ6R1piu+5tMxkSdowPaBN/KpJGTKw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1751985130; a=rsa-sha256; cv=none; b=thnYJVWCHB0/AvkcBXbYbn0dHWrfwBeWMrLh+GopMR0WGdGMMslZtePVkDnRD61psGBUNE XqNeeuDycBl9hVtZY82e5Q+qRQCmuV7l5kmXhubsUTf82pb0wGJZQ82xYBNhvxAGe/YIE3 U5MxKdmcXdR+Eq4EtqYsvfWDD7SpXqBtL/XnCgKNj/7OijUSbjO2Wt1cLZXdYNBYN9nIQB hLjegrnny0F4TLAkTdgbonIG4e+9mdKf/G8eJ/TSmr7Vrq0kA5jIUvSICpBT1ovvyLHY+c qS3U039KqFDkr+zuhF+ctK8bHjjchipbiVSSJGYqLAo38m5OyuvNKtirPfG/Wg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4bc3Tk4PXPzgxF; Tue, 08 Jul 2025 14:32: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 568EWA6S071999; Tue, 8 Jul 2025 14:32:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 568EWAvO071996; Tue, 8 Jul 2025 14:32:10 GMT (envelope-from git) Date: Tue, 8 Jul 2025 14:32:10 GMT Message-Id: <202507081432.568EWAvO071996@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Baptiste Daroussin Subject: git: e6e6ac56887b - stable/14 - flua: make the ucl module a dynamic module List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bapt X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: e6e6ac56887b6072cc6cafce454cb0ef3a4e6ad9 Auto-Submitted: auto-generated The branch stable/14 has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=e6e6ac56887b6072cc6cafce454cb0ef3a4e6ad9 commit e6e6ac56887b6072cc6cafce454cb0ef3a4e6ad9 Author: Baptiste Daroussin AuthorDate: 2024-09-06 15:13:08 +0000 Commit: Baptiste Daroussin CommitDate: 2025-07-08 14:17:08 +0000 flua: make the ucl module a dynamic module Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D46569 (cherry picked from commit bb2d016afb009920f4bb2400c15a86e557b2d55a) --- lib/flua/Makefile | 1 + lib/flua/libucl/Makefile | 17 +++++++++++++++++ libexec/flua/Makefile | 9 ++------- libexec/flua/linit_flua.c | 2 -- 4 files changed, 20 insertions(+), 9 deletions(-) diff --git a/lib/flua/Makefile b/lib/flua/Makefile index 769736039f7e..168d05f54674 100644 --- a/lib/flua/Makefile +++ b/lib/flua/Makefile @@ -1,4 +1,5 @@ SUBDIR+= libhash SUBDIR+= libjail +SUBDIR+= libucl .include diff --git a/lib/flua/libucl/Makefile b/lib/flua/libucl/Makefile new file mode 100644 index 000000000000..7d2681b85fcb --- /dev/null +++ b/lib/flua/libucl/Makefile @@ -0,0 +1,17 @@ +SHLIB_NAME= ucl.so +SHLIBDIR= ${LIBDIR}/flua + +WARNS= 2 + +UCLSRC?= ${SRCTOP}/contrib/libucl +.PATH: ${UCLSRC}/lua +SRCS+= lua_ucl.c +CFLAGS+= \ + -I${SRCTOP}/contrib/lua/src \ + -I${SRCTOP}/lib/liblua \ + -I${UCLSRC}/include \ + -I${UCLSRC}/src \ + -I${UCLSRC}/uthash +LIBADD+= ucl + +.include diff --git a/libexec/flua/Makefile b/libexec/flua/Makefile index f79b00d0bbf9..4173e43baab2 100644 --- a/libexec/flua/Makefile +++ b/libexec/flua/Makefile @@ -5,7 +5,8 @@ LUASRC?= ${SRCTOP}/contrib/lua/src .PATH: ${LUASRC} PROG= flua -WARNS?= 2 +WARNS?= 3 +MAN= # No manpage; this is internal. CWARNFLAGS.gcc+= -Wno-format-nonliteral @@ -31,10 +32,4 @@ LIBADD+= edit LDFLAGS+= -Wl,-E .endif -UCLSRC?= ${SRCTOP}/contrib/libucl -.PATH: ${UCLSRC}/lua -SRCS+= lua_ucl.c -CFLAGS+= -I${UCLSRC}/include -I${UCLSRC}/src -I${UCLSRC}/uthash -LIBADD+= ucl - .include diff --git a/libexec/flua/linit_flua.c b/libexec/flua/linit_flua.c index 6bc300095c27..87cabb58deb2 100644 --- a/libexec/flua/linit_flua.c +++ b/libexec/flua/linit_flua.c @@ -35,7 +35,6 @@ #include "lauxlib.h" #include "lfs.h" #include "lposix.h" -#include "lua_ucl.h" /* ** these libs are loaded by lua.c and are readily available to any Lua @@ -60,7 +59,6 @@ static const luaL_Reg loadedlibs[] = { {"posix.sys.stat", luaopen_posix_sys_stat}, {"posix.sys.utsname", luaopen_posix_sys_utsname}, {"posix.unistd", luaopen_posix_unistd}, - {"ucl", luaopen_ucl}, {NULL, NULL} }; From nobody Tue Jul 8 14:32:11 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4bc3Tm165lz614ns; Tue, 08 Jul 2025 14:32: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bc3Tl5lh9z49Mb; Tue, 08 Jul 2025 14:32:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1751985131; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Bv0VES4LQmUAoUXlnG+iEGYZFlz0ipECt3r5KN6Egp0=; b=T2pyIwL1rVXZaEAmTu1bBkrDu+VN9DTQEYlTQN0pQ1NVmLGuAEe8j6mlW47tYeehlI3BrY Gufw//4yaRmbM2wAXRSW8IQBGEhlBVXCwft7OvdbmYv5EF7GqShuADqKL2cCr8syXM2TH7 Rzw31k8EXy37swGvZ2lGvbV8MkemiYa//Dg4HHxHNBSTFc7XmGXBRmbFjPmVr25uWyJVdn h19ImO+FqVB6fnQqXH9lcRuHnUUsArWLbZJM7fG1VLkemASOg4d6Z6nGEWblYAuCcPUI3r jQ+0udPzGlFIEOdpqMa+CGQqwm63sZ0HQgUuU4phzBjzZtsaHPJRQaktmne1fQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1751985131; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Bv0VES4LQmUAoUXlnG+iEGYZFlz0ipECt3r5KN6Egp0=; b=xBka7yeTSjp9G+bIefiCA6za2OSitcaCv7zyNl2yGBTOwvtON+1rUAB5naIOTwqYPcIfZs msfL43XBinc6MC+BITeNiswY7HLf6MjRo5G3Z3c5qh9PLmcXtiGwdWEvvE5eecMOvpRiDq PHM/E1fjKY5o1Ks4Kre7GxL7kT6mGhke7xmj0PTBo8GUElYOOdxYUb+CIDGyX+x4g4BaSw 41nNzft3w5ltc+rAlqPCkhUE9Slrv4lXqJGk64CJlAptxKUGc3VV4vhLomuYXg4mA5ftrr /gx7CDkcuFq25ya9LlvXFUH2i1jJ799agPdSrs2hqza/Ancf6v6WWl+tRz/V8Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1751985131; a=rsa-sha256; cv=none; b=m7afMV2B8jOCOyguQP705uHSF0xtps5NCA9KPmkPQ0yLOszR5iaQKp8An/RgFSUCO1ayGq +EKPLIoX27ibMLLGVYEH1pbaW3XpUkJW8n4Y6LKhD8MNq27q3//i/VG6KHhtqPxB1pr6Je x7udutEB2CxiKQ4Bb7jV/LupxZOeYRlOa1+MlLSXLE4rtxR33IeKj1ZkpkkmCNau/eZhGC Jn5iyanaFzyIBRZJ+lIFhHmLn7rpoT6to9K1gQx6JchXanmowF6IEo5AB9wY6ki2/kVpgC lJi7jCWtE+kBV+rWMNPT/Yw6K0KdDAVJ5SfWAxqKOB63tKVYQJhx7SIVOG9Osw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4bc3Tl5LM2zgn7; Tue, 08 Jul 2025 14:32:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 568EWBCT072031; Tue, 8 Jul 2025 14:32:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 568EWBYv072028; Tue, 8 Jul 2025 14:32:11 GMT (envelope-from git) Date: Tue, 8 Jul 2025 14:32:11 GMT Message-Id: <202507081432.568EWBYv072028@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Baptiste Daroussin Subject: git: d9b415c9f1c8 - stable/14 - flua: add freebsd module implementing kldload/kldunload List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bapt X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: d9b415c9f1c8201e828dfc08640927eca8b2f64c Auto-Submitted: auto-generated The branch stable/14 has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=d9b415c9f1c8201e828dfc08640927eca8b2f64c commit d9b415c9f1c8201e828dfc08640927eca8b2f64c Author: Baptiste Daroussin AuthorDate: 2024-09-06 09:00:50 +0000 Commit: Baptiste Daroussin CommitDate: 2025-07-08 14:23:50 +0000 flua: add freebsd module implementing kldload/kldunload Reviewed by: markj, imp Approved by: imp Differential Revision: https://reviews.freebsd.org/D46558 --- etc/mtree/BSD.usr.dist | 4 + lib/flua/libfreebsd/Makefile | 3 + lib/flua/libfreebsd/sys/Makefile | 4 + lib/flua/libfreebsd/sys/linker/Makefile | 12 +++ .../libfreebsd/sys/linker/freebsd.sys.linker.3lua | 67 +++++++++++++ .../libfreebsd/sys/linker/lua_freebsd_sys_linker.c | 104 +++++++++++++++++++++ 6 files changed, 194 insertions(+) diff --git a/etc/mtree/BSD.usr.dist b/etc/mtree/BSD.usr.dist index 70dbd2b0eef2..3ff04fe4e716 100644 --- a/etc/mtree/BSD.usr.dist +++ b/etc/mtree/BSD.usr.dist @@ -74,6 +74,10 @@ engines-3 .. flua + freebsd + sys + .. + .. .. i18n .. diff --git a/lib/flua/libfreebsd/Makefile b/lib/flua/libfreebsd/Makefile new file mode 100644 index 000000000000..6ed0451055ff --- /dev/null +++ b/lib/flua/libfreebsd/Makefile @@ -0,0 +1,3 @@ +SUBDIR+= sys + +.include diff --git a/lib/flua/libfreebsd/sys/Makefile b/lib/flua/libfreebsd/sys/Makefile new file mode 100644 index 000000000000..9f38294536f2 --- /dev/null +++ b/lib/flua/libfreebsd/sys/Makefile @@ -0,0 +1,4 @@ +SUBDIR+= linker + +.include + diff --git a/lib/flua/libfreebsd/sys/linker/Makefile b/lib/flua/libfreebsd/sys/linker/Makefile new file mode 100644 index 000000000000..318cc5078b33 --- /dev/null +++ b/lib/flua/libfreebsd/sys/linker/Makefile @@ -0,0 +1,12 @@ +SHLIB_NAME= linker.so +SHLIBDIR= ${LIBDIR}/flua/freebsd/sys + +SRCS+= lua_freebsd_sys_linker.c + +CFLAGS+= \ + -I${SRCTOP}/contrib/lua/src \ + -I${SRCTOP}/lib/liblua \ + +MAN= freebsd.sys.linker.3lua + +.include diff --git a/lib/flua/libfreebsd/sys/linker/freebsd.sys.linker.3lua b/lib/flua/libfreebsd/sys/linker/freebsd.sys.linker.3lua new file mode 100644 index 000000000000..0ab8f185388a --- /dev/null +++ b/lib/flua/libfreebsd/sys/linker/freebsd.sys.linker.3lua @@ -0,0 +1,67 @@ +.\" +.\" SPDX-License-Identifier: BSD-2-Clause +.\" +.\" Copyright (c) 2024, Baptiste Daroussin +.\" +.\" 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. Redistributions in binary form must reproduce the above copyright +.\" notice, this list of conditions and the following disclaimer in the +.\" documentation and/or other materials provided with the distribution. +.\" +.\" 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 September 6, 2024 +.Dt FREEBSD.SYS.LINKER 3lua +.Os +.Sh NAME +.Nm freebsd.sys.linker +.Nd Lua binding to +.Fx 's +Linker functions +.Sh SYNOPSIS +.Bd -literal +local linker = require('freebsd.sys.linker') +.Ed +.Pp +.Bl -tag -width XXXX -compact +.It Dv fileid, err, errno = linker.kldload(name) +.It Dv ok, err, errno = linker.kldunload(fileid|name) +.El +.Sh DESCRIPTION +The +.Nm +module is a binding to the +.Fx 's +linker functions. +List of functions: +.Bl -tag -width XXXX +.It Dv fileid, err = freebsd.sys.linker.kldload(name) +Load the kernel module named +.Fa name +and return the identifier +.Pq fileid +as an interger. +.It Dv ok, err, errno = freebsd.sys.linker.kldunload(fileid|name) +Unload the kernel module identifier either by +.Fa name +as a string, or +.Fa fileid +as an integer. +.El +.Sh SEE ALSO +.Xr kldload 2 , +.Xr kldunload 2 diff --git a/lib/flua/libfreebsd/sys/linker/lua_freebsd_sys_linker.c b/lib/flua/libfreebsd/sys/linker/lua_freebsd_sys_linker.c new file mode 100644 index 000000000000..a2dc3b487525 --- /dev/null +++ b/lib/flua/libfreebsd/sys/linker/lua_freebsd_sys_linker.c @@ -0,0 +1,104 @@ +/*- + * SPDX-License-Identifier: BSD-2-Clause + * + * Copyright (c) 2024, Baptiste Daroussin + * + * 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. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE REGENTS 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 REGENTS 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. + */ + + +#include +#include + +#include +#include +#include + +#include +#include +#include + +int luaopen_freebsd_sys_linker(lua_State *L); + +static int +lua_kldload(lua_State *L) +{ + const char *name; + int ret; + + name = luaL_checkstring(L, 1); + ret = kldload(name); + if (ret == -1) { + lua_pushnil(L); + lua_pushstring(L, strerror(errno)); + lua_pushinteger(L, errno); + return (3); + } + lua_pushinteger(L, ret); + return (1); +} + +static int +lua_kldunload(lua_State *L) +{ + const char *name; + int ret, fileid; + + if (lua_isinteger(L, 1)) { + fileid = lua_tointeger(L, 1); + } else { + name = luaL_checkstring(L, 1); + fileid = kldfind(name); + } + if (fileid == -1) { + lua_pushnil(L); + lua_pushstring(L, strerror(errno)); + lua_pushinteger(L, errno); + return (3); + } + ret = kldunload(fileid); + lua_pushinteger(L, ret); + if (ret == -1) { + lua_pushnil(L); + lua_pushstring(L, strerror(errno)); + lua_pushinteger(L, errno); + return (3); + } + lua_pushinteger(L, 0); + return (1); +} + +#define REG_SIMPLE(n) { #n, lua_ ## n } +static const struct luaL_Reg freebsd_sys_linker[] = { + REG_SIMPLE(kldload), + REG_SIMPLE(kldunload), + { NULL, NULL }, +}; +#undef REG_SIMPLE + +int +luaopen_freebsd_sys_linker(lua_State *L) +{ + luaL_newlib(L, freebsd_sys_linker); + + return (1); +} From nobody Tue Jul 8 14:32: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 4bc3Tn1NzDz614cp; Tue, 08 Jul 2025 14:32:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bc3Tm6gfgz49Km; Tue, 08 Jul 2025 14:32:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1751985132; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=b3Rtm+5oyelrIul1DikFteLOwD4QMsITchPcjqdLwaA=; b=fliDJNUdymeK8a6gFe+E9IrdjewxzpSCUc50z4CbuQiOuikz4q7buD725qnuD0LZbS6+hq coKcPVFkuw1Gj36tfo82yY1fl7dQ40xg83vXwVSxnJrj5reWUHYLZWmcA1USxGnKfRN1Ne qA8GTK55wUsvKToNUYqkz3xDMxjyO0y/bho72uOE6Q8ALoXQloX9PZZuLIXrzB34CPNnUd iR/WdBZ4is3XrlQtP011ECgqaFPe43ric8BTYIVVKBF/GU2GjGP2Ot8RENodBqUEi9Pixa o9V8I8PmQ8Sx9frpgpoBbl4STe6bO1HJwgC7GlFP/AF2wJXly9En9eLqsHtd9w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1751985132; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=b3Rtm+5oyelrIul1DikFteLOwD4QMsITchPcjqdLwaA=; b=uD3EnvVWDqOaeYttlFe4qnYBs9NSxmea5jxj4HuDsUhsSvL5CpZJncKafWUUMvxLraDWSy dzjIG5OrZc4JhPySeWO7CrYPpDFcAMK+UhYiAkzx2Zkbs2V11fhkLAl2JoUkqllo4qDwAs wupJTJMEPSUJZ/BJsNyUCoRL7m4ECMHgBWMPCNISYxMmw+gUwVPNu53rY/9CdBYDHLLGUN /uLJ5LUdwR2tmpTeL6sAAGDmI/sqsEbL59W6rrNiX1J5hHUJmhxqn63pfe1zN1iIpr+WEr +3BbgyXjb1XSlZuOrTXJefgroko/TXKFGg4ZEb9JuG7LpzKOhpW5ugk3oRSs/Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1751985132; a=rsa-sha256; cv=none; b=vbTyu9VqOCn7ThiQ/NZ/KZZ+jBBohafDSVmbTYnt8fqiRBUGwsnIsN+b28fsp7sjq3gN8f Iztv5njAPnVgiquuGzZW5DHejIj1YT53xIqQx/lqcXzltXMP2F11W248Guhn+hSswfgPth 5GDrcuVhAMGlESDnjK2xb2BpOTSeqJd5QZwTiQZ5D5dxI3gjMmRi83FzeFhfRnYt6xm2TA ke2AJ5icvFPcqpVbLhLDaCAkfujXx6rxLJAdpNhFCZbsr5CA9XQP7Xod4B3dhC6dbC5Ya3 WiUhpYQEt3QuXvl6MMizudktJAhSkCZDjT69B1CquXI86Yd41GU19P7VjOm28Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4bc3Tm6HBRzh32; Tue, 08 Jul 2025 14:32: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 568EWCjk072065; Tue, 8 Jul 2025 14:32:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 568EWCZj072062; Tue, 8 Jul 2025 14:32:12 GMT (envelope-from git) Date: Tue, 8 Jul 2025 14:32:12 GMT Message-Id: <202507081432.568EWCZj072062@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Baptiste Daroussin Subject: git: 2cab763fc87f - stable/14 - freebsd.sys.linker: rename source file List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bapt X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 2cab763fc87f316a5a2972f9e7feaf5ed41ebcd1 Auto-Submitted: auto-generated The branch stable/14 has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=2cab763fc87f316a5a2972f9e7feaf5ed41ebcd1 commit 2cab763fc87f316a5a2972f9e7feaf5ed41ebcd1 Author: Baptiste Daroussin AuthorDate: 2024-09-06 15:35:28 +0000 Commit: Baptiste Daroussin CommitDate: 2025-07-08 14:24:05 +0000 freebsd.sys.linker: rename source file Suggested by: markj (cherry picked from commit 705583b76f3fba9e8c3cf77142e8ac84de721ac1) --- lib/flua/libfreebsd/sys/linker/Makefile | 2 +- lib/flua/libfreebsd/sys/linker/{lua_freebsd_sys_linker.c => linker.c} | 0 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/flua/libfreebsd/sys/linker/Makefile b/lib/flua/libfreebsd/sys/linker/Makefile index 318cc5078b33..572b5949d2a1 100644 --- a/lib/flua/libfreebsd/sys/linker/Makefile +++ b/lib/flua/libfreebsd/sys/linker/Makefile @@ -1,7 +1,7 @@ SHLIB_NAME= linker.so SHLIBDIR= ${LIBDIR}/flua/freebsd/sys -SRCS+= lua_freebsd_sys_linker.c +SRCS+= linker.c CFLAGS+= \ -I${SRCTOP}/contrib/lua/src \ diff --git a/lib/flua/libfreebsd/sys/linker/lua_freebsd_sys_linker.c b/lib/flua/libfreebsd/sys/linker/linker.c similarity index 100% rename from lib/flua/libfreebsd/sys/linker/lua_freebsd_sys_linker.c rename to lib/flua/libfreebsd/sys/linker/linker.c From nobody Tue Jul 8 14:32: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 4bc3Tq4f8Fz614nw; Tue, 08 Jul 2025 14:32: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bc3Tq0vvXz49Kx; Tue, 08 Jul 2025 14:32:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1751985135; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jHz2FzCrLj/KK15xxcagLvtHs2h7I032sLR1Y1KACOk=; b=GVjjtthGtfmbzuyawc76MNmMX9g9fSHdvAaFBSs7If7gSptFUA2kzmm9zxDbziL4nSCNoo lDBoiZ79FblS60BUnCr6o/W3ljYUlHKVCMj4mTXo2mEZ0XLA4zZBqFIbMlo7hcgoTBfCy8 sqHJzEYuUROtJWiuLp2ftGJ6+ktzQWiqYUE8e4xKxmS0UI8r2eNeej+rthG8EDqR9U6n/Y ArseO4UV6EyyqepVTv7gclmySY2Mi75wqeDLCl3SvgRsmX/JvQo9dWI7hVNgmcfDXQ+EGc s7XnqML3fx5YCH9WdrS7iQzw7eiGsq6Lfp0fY7hfG1nJ/625NcX5cWtwCgBkEQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1751985135; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jHz2FzCrLj/KK15xxcagLvtHs2h7I032sLR1Y1KACOk=; b=J73jgzraawh/e7BgrbwXyxcKTPi8f3GSMpxSARQCGroVLu/o24SuXqeyB6witebuf7ZZGS S7nUuwuUJU6ahsadgs0D6nMlJ3gY9BnYqY2ZXvSga2xaWmHHPEGdhgBzzPHNWyWJoiSai9 BBJTsybt7xLyP90xLZV6RAUINruAbzvmUZ/eKAjW2EHqfAsdEl3hU/9G6J5KvbvSwF1p6z BNKvWaX97zzHuWQF1SstrJoWnWCiplk8dnyrRtP0K48iXatUYH4SonlxpQ8xa+F8PsiAax qQIzPmWdoWGiHSFgdxKP/CouYjKcIcXou4zm0U2k6JFzD3F+KHltSKW2L9QR6w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1751985135; a=rsa-sha256; cv=none; b=YTVuvmz6gxIVEUlKaMtFvFR8ZZ9bah3JUMY0Sehlg6oQSH9moS6Wrh2qg090EoB4xFXqCq h9skt7bLwqmIKC8wvi2o5Q54TxRq1dm/sUwmiS9L9xTX8zKYMpiGLKNkFSvv9ZmjbhZK1d mOuiUsLf4+iP8US07urymkcnKTfr1hSBhBlA8Fh5oAgD8RRMdG32sZ7+JGzwg8xIpEUiBM HzlZaZ0UlzK49KtkOIDv42ImH82Vremayz2YWynsvl+KW6SFKtRA6hMOlqUSmEu8uRJSLI ifeLwJLdbKXad5s4oBw6mn8y77EbTlLHTXUa9vrsInuqxQOLDjBEnc5ydTRYFA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4bc3Tq0SzkzhJQ; Tue, 08 Jul 2025 14:32: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 568EWE9h072129; Tue, 8 Jul 2025 14:32:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 568EWELS072126; Tue, 8 Jul 2025 14:32:14 GMT (envelope-from git) Date: Tue, 8 Jul 2025 14:32:14 GMT Message-Id: <202507081432.568EWELS072126@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Baptiste Daroussin Subject: git: c3d3155c55ce - stable/14 - flua: hook libfreebsd to the build List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bapt X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: c3d3155c55cec77a7fb3dc9e44f24bdb6ae9ea84 Auto-Submitted: auto-generated The branch stable/14 has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=c3d3155c55cec77a7fb3dc9e44f24bdb6ae9ea84 commit c3d3155c55cec77a7fb3dc9e44f24bdb6ae9ea84 Author: Baptiste Daroussin AuthorDate: 2024-09-06 15:52:08 +0000 Commit: Baptiste Daroussin CommitDate: 2025-07-08 14:24:52 +0000 flua: hook libfreebsd to the build --- lib/flua/Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/flua/Makefile b/lib/flua/Makefile index 168d05f54674..d88e76f61062 100644 --- a/lib/flua/Makefile +++ b/lib/flua/Makefile @@ -1,3 +1,4 @@ +SUBDIR+= libfreebsd SUBDIR+= libhash SUBDIR+= libjail SUBDIR+= libucl From nobody Tue Jul 8 14:32: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 4bc3Tr41m3z614nx; Tue, 08 Jul 2025 14:32: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bc3Tr1b10z49L3; Tue, 08 Jul 2025 14:32:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1751985136; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3V1NBLT5v8sQwIQKYxLokBcxbB1UzjgSQ9ZgYOgokc0=; b=XZi3fNmpT3kL41F0MvsWP4inquxRteSM5OwLBUDR+z+u7Wjc7sZH9GSUQxcR+FfGdbK+rE CDaVDpfBME8FzQr3i+3R5VPkwJ+PLYZEKMui2LG8LaN9sh8iDvCRGYBhy8suxHxA6ikQIb yaxz4tFgO9PkguMtZWYGechGXENheGXKq8IU4wnv2uoc+IJLAtBdi8jUY2ukn1Fo38sex8 8bmyoHxRrzPUwQgtgYwVEvFTR2zaBNexD/XogCHXWkJbw+BpcgCg20146msz0OFAbMCAHk /LUZm5rWMbIWLArqFf9SnmRIPD2yDfq39MQEenvw5tIOdjHglwC6z/p33SkF1Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1751985136; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3V1NBLT5v8sQwIQKYxLokBcxbB1UzjgSQ9ZgYOgokc0=; b=ElIUDOcXP5pEjwtanM7ndcRw4B4JZfzOaeq/hQswoyKFwslrcuhr0pv+T/q7oMsAX6lBgH scaLaEzB6XDYk/Xg6rlJgDdDZg01gUk84ZzMchDXURlHsbgfs6onDxtMNTga69bUflCMpC mzo990vRC0lEKjWrFFza2aZp63NaaFNirco7BHiq0BdrwjI6mRgFNcejcWqgp05b5NjtrL wfVai3N3ACkpbvgks+kA21ZYP9oNKidU7bqozgu4slK26v1uawVugCsfcnAM/Xs0bnLAUK lN5WzOSX1ckjOAti3RbEySftqifdD0eHOHSPjWjKV2hCeGr0Pb3j3wOI6QbWYQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1751985136; a=rsa-sha256; cv=none; b=s9xYyaV5sirKgOSBezgsxG33X7VjX4gsNA9vDRY4J90f/yDDb9ZIn0WQaZeavFSm0HvMUZ YsZ5Cwwd2J5Z9UREYtJCt/AUV0aCRc1ucvj7ySn/Gxjy3ZM2sFHaWFINjDM6YNKv2MKBfI EUPmcAF0xr8erf38ueLny+OnCNl15StM6+XTMNB5F+gSLaXpxR5NdA7lGNCtxT7WhDDYyc D6PVocM2DMv85NTOuxNuIfVEKFqHDmpJIGZUaS1+kToB8SH+DB+mprC+o+PlZ0U3bo5DkB r7q1+sTRM4moyXs1WoZgwUybv5J16dk1EIHvnjEWNAmYjx/F4eCOGS6LJEh0oQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4bc3Tr17RSzgxJ; Tue, 08 Jul 2025 14:32: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 568EWGHp072165; Tue, 8 Jul 2025 14:32:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 568EWGE5072162; Tue, 8 Jul 2025 14:32:16 GMT (envelope-from git) Date: Tue, 8 Jul 2025 14:32:16 GMT Message-Id: <202507081432.568EWGE5072162@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Baptiste Daroussin Subject: git: 96c10cda41ee - stable/14 - flua: fix buildworld from a clean room List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bapt X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 96c10cda41eee13182d1ac8b9e0842e5244711bf Auto-Submitted: auto-generated The branch stable/14 has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=96c10cda41eee13182d1ac8b9e0842e5244711bf commit 96c10cda41eee13182d1ac8b9e0842e5244711bf Author: Baptiste Daroussin AuthorDate: 2024-09-07 11:25:43 +0000 Commit: Baptiste Daroussin CommitDate: 2025-07-08 14:25:44 +0000 flua: fix buildworld from a clean room now that the flua ucl module is built the lib directory, it is being build at a moment where it cannot link yet to libucl, push libucl in the _prebuild_libs to ensure it is present in a path to be linked against at the time the lua ucl module is being built. While here, remove libucl from boostrap as a dependence of flua as it is not needed anymore now that flua ucl module is dynamically loadable. --- Makefile.inc1 | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/Makefile.inc1 b/Makefile.inc1 index d218ee62e697..656f2df9c9f8 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -2456,8 +2456,8 @@ ${_bt}-usr.sbin/kldxref: ${_bt_libelf_depend} # 13.0-CURRENT cycle, thus needs to be built on -older releases and stable # branches. .if ${BOOTSTRAPPING} < 1300059 -${_bt}-libexec/flua: ${_bt}-lib/liblua ${_bt}-lib/libucl -_flua= lib/liblua lib/libucl libexec/flua +${_bt}-libexec/flua: ${_bt}-lib/liblua +_flua= lib/liblua libexec/flua .endif # r245440 mtree -N support added @@ -3178,7 +3178,8 @@ _prebuild_libs= ${_kerberos5_lib_libasn1} \ lib/libutil lib/libpjdlog ${_lib_libypclnt} lib/libz lib/msun \ lib/libxo \ ${_secure_lib_libcrypto} ${_secure_lib_libssl} \ - ${_lib_libldns} ${_secure_lib_libssh} + ${_lib_libldns} ${_secure_lib_libssh} \ + lib/libucl .if ${MK_DIALOG} != "no" _prebuild_libs+= gnu/lib/libdialog From nobody Tue Jul 8 14:32:23 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4bc3V02B12z614ql; Tue, 08 Jul 2025 14:32:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bc3V00F3qz49M1; Tue, 08 Jul 2025 14:32:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1751985144; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=24FTLD+MnV8D9EFGKBs5/0P8NC/UvxHsP7YVilByli0=; b=Gjq6BWPL5hpDzX04YODzCGVW72GY8dDvSAmktCUfMRhnPTRxkbOb9VSs/ylBSiwxAK0NoH 2+IHQvZy+aqI+kHUqiA2YVmIpuobyt3q6lIpx/9RGtuyVqKT0v7K3rk+0MHXAg3xv0hQLn WAeA32iOsggQmhueT0APD3LvTvQHT5QgtBY5cxRKv85NMTLphPW6a20ZtIMVn15Am8/Vj0 ZcpBz/wzsfLaOH7UOkOjWh0h7HApynwMoy3B70yo9Fp+JjSCVYJgg1OmAHGEqh3PrXVk2P BYw2l2vpp2rkpIgfPmNnK8CKBQBBmxP320GCxAMddO0hQlZ6YqBKKQ+QCTzm4w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1751985144; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=24FTLD+MnV8D9EFGKBs5/0P8NC/UvxHsP7YVilByli0=; b=x9itZXQpbbTF8pcuR5g7lDU775bSbvaRsJJEqVseg5kXJcsjU0mNpWS7MQcBwBwS9r5XFd Vv+eLyQ/38jCt9dZseF4kudKpTebopHFHxfeFu0PjBkrPDPAw33s2z4MpoOXgUozhlg/x+ vteoPLpa4AEsQw/+nSrPsV7/OBbHt7HvV3h3ocPMEOde0ctVP8fRiyFxBEwML6R/M5eZgm 20hBzG869IQZzZEMJhKGDgPpV9JyhCTfE0gr8+EE6NV79uf7ekT1VWTEb1vQLEVd/yqSYP m5bbrYw6QxQandQRhVsk0AG5WbpvB5IPTCuboNGWCHWfo3y5/vTuKdR2v1lsUg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1751985144; a=rsa-sha256; cv=none; b=fersqMDxygRtxz1gmOZvLdfHHjpPEdtdSPawKfKc7Pisn/vNzEtUwBDssu7Wl/y9dUKz8H /2YdVIO8XGePFQxScYruC5zVL3meoTRtdLDMpMeAzWfyHQ0UglUxomc9IB4+TkuZ+cy7mk K9xb0QTgKLXea4o46UoTsIATG5BH15ef4GCXuYWvOuBkCLNmFDoEffsK/P71/SFlHwJcMD h4xOBvTTrmnkzCsl+dk3+yakgvYZbGf+4NMEBkeOu25B9SoS08Itd33L9BiLXYFVL+Viaw MjNt6XUc5B1dhwWqM2a1xScUh4qeiv2+ZT9OULDXxj8UX3tKT5aTa4kLs9sgPg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4bc3Tz6pmNzgnF; Tue, 08 Jul 2025 14:32:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 568EWN25073465; Tue, 8 Jul 2025 14:32:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 568EWNV2073462; Tue, 8 Jul 2025 14:32:23 GMT (envelope-from git) Date: Tue, 8 Jul 2025 14:32:23 GMT Message-Id: <202507081432.568EWNV2073462@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Baptiste Daroussin Subject: git: 823f1076c7cd - stable/14 - nuageinit: use lyaml to parse yaml files List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bapt X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 823f1076c7cd28f4eebe18aeb576d719a0148fee Auto-Submitted: auto-generated The branch stable/14 has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=823f1076c7cd28f4eebe18aeb576d719a0148fee commit 823f1076c7cd28f4eebe18aeb576d719a0148fee Author: Baptiste Daroussin AuthorDate: 2025-06-26 06:49:07 +0000 Commit: Baptiste Daroussin CommitDate: 2025-07-08 14:31:25 +0000 nuageinit: use lyaml to parse yaml files This fixes case where vendors or cloudinit consumers are using all features from yaml. KDE is using reference for its CI for example. lima-vm uses syntax for which our previous yaml.lua has bug in the parser (https://github.com/lima-vm/lima/issues/1508) (cherry picked from commit 40dafa08b2e7a04d2662b601ef89b48132c1b6c1) --- ObsoleteFiles.inc | 3 + libexec/nuageinit/Makefile | 2 +- libexec/nuageinit/nuageinit | 6 +- libexec/nuageinit/tests/nuageinit.sh | 9 +- libexec/nuageinit/yaml.lua | 587 ----------------------------------- 5 files changed, 13 insertions(+), 594 deletions(-) diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc index 5195dba6d58e..cecfc8c47a75 100644 --- a/ObsoleteFiles.inc +++ b/ObsoleteFiles.inc @@ -51,6 +51,9 @@ # xargs -n1 | sort | uniq -d; # done +# 20250708: replace yaml.lua with lyaml +OLD_FILES+=usr/share/flua/yaml.lua + # 20250524: don't install zoneinfo version OLD_FILES+=usr/share/zoneinfo/version diff --git a/libexec/nuageinit/Makefile b/libexec/nuageinit/Makefile index a4d8e0de5777..755ecb7ff418 100644 --- a/libexec/nuageinit/Makefile +++ b/libexec/nuageinit/Makefile @@ -1,6 +1,6 @@ PACKAGE= nuageinit SCRIPTS= nuageinit -FILES= nuage.lua yaml.lua +FILES= nuage.lua FILESDIR= ${SHAREDIR}/flua MAN= nuageinit.7 diff --git a/libexec/nuageinit/nuageinit b/libexec/nuageinit/nuageinit index 1550440940df..5af1b84c1848 100755 --- a/libexec/nuageinit/nuageinit +++ b/libexec/nuageinit/nuageinit @@ -6,7 +6,7 @@ local nuage = require("nuage") local ucl = require("ucl") -local yaml = require("yaml") +local yaml = require("lyaml") local sys_stat = require("posix.sys.stat") if #arg ~= 2 then @@ -408,7 +408,7 @@ elseif citype == "nocloud" then if err then nuage.err("error parsing nocloud meta-data: " .. err) end - local obj = yaml.eval(f:read("*a")) + local obj = yaml.load(f:read("*a")) f:close() if not obj then nuage.err("error parsing nocloud meta-data") @@ -466,7 +466,7 @@ if line == "#cloud-config" then } f = io.open(ni_path .. "/" .. ud) - local obj = yaml.eval(f:read("*a")) + local obj = yaml.load(f:read("*a")) f:close() if not obj then nuage.err("error parsing cloud-config file: " .. ud) diff --git a/libexec/nuageinit/tests/nuageinit.sh b/libexec/nuageinit/tests/nuageinit.sh index f344e7f6c710..44830f67e4c8 100644 --- a/libexec/nuageinit/tests/nuageinit.sh +++ b/libexec/nuageinit/tests/nuageinit.sh @@ -477,6 +477,7 @@ EOF MIIBxwIBAAJhAKD0YSHy73nUgysO13XsJmd4fHiFyQ+00R7VVu2iV9Qco ... -----END RSA PRIVATE KEY----- + " atf_check -o inline:"${_expected}" cat ${PWD}/etc/ssh/ssh_host_rsa_key _expected="ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAGEAoPRhIfLvedSDKw7Xd ...\n" @@ -484,7 +485,9 @@ MIIBxwIBAAJhAKD0YSHy73nUgysO13XsJmd4fHiFyQ+00R7VVu2iV9Qco _expected="-----BEGIN OPENSSH PRIVATE KEY----- blabla ... ------END OPENSSH PRIVATE KEY-----\n" +-----END OPENSSH PRIVATE KEY----- + +" atf_check -o inline:"${_expected}" cat ${PWD}/etc/ssh/ssh_host_ed25519_key _expected="ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIK+MH4E8KO32N5CXRvXVqvyZVl0+6ue4DobdhU0FqFd+\n" atf_check -o inline:"${_expected}" cat ${PWD}/etc/ssh/ssh_host_ed25519_key.pub @@ -728,7 +731,7 @@ config2_userdata_runcmd_body() runcmd: EOF chmod 755 "${PWD}"/media/nuageinit/user_data - atf_check -s exit:1 -e match:"attempt to index a nil value" /usr/libexec/nuageinit "${PWD}"/media/nuageinit config-2 + atf_check /usr/libexec/nuageinit "${PWD}"/media/nuageinit config-2 cat > media/nuageinit/user_data << 'EOF' #cloud-config runcmd: @@ -767,7 +770,7 @@ config2_userdata_packages_body() packages: EOF chmod 755 "${PWD}"/media/nuageinit/user_data - atf_check -s exit:1 -e match:"attempt to index a nil value" /usr/libexec/nuageinit "${PWD}"/media/nuageinit postnet + atf_check /usr/libexec/nuageinit "${PWD}"/media/nuageinit postnet cat > media/nuageinit/user_data << 'EOF' #cloud-config packages: diff --git a/libexec/nuageinit/yaml.lua b/libexec/nuageinit/yaml.lua deleted file mode 100644 index 2cd50c29a469..000000000000 --- a/libexec/nuageinit/yaml.lua +++ /dev/null @@ -1,587 +0,0 @@ ---- --- SPDX-License-Identifier: MIT --- --- Copyright (c) 2017 Dominic Letz dominicletz@exosite.com - -local table_print_value -table_print_value = function(value, indent, done) - indent = indent or 0 - done = done or {} - if type(value) == "table" and not done [value] then - done [value] = true - - local list = {} - for key in pairs (value) do - list[#list + 1] = key - end - table.sort(list, function(a, b) return tostring(a) < tostring(b) end) - local last = list[#list] - - local rep = "{\n" - local comma - for _, key in ipairs (list) do - if key == last then - comma = '' - else - comma = ',' - end - local keyRep - if type(key) == "number" then - keyRep = key - else - keyRep = string.format("%q", tostring(key)) - end - rep = rep .. string.format( - "%s[%s] = %s%s\n", - string.rep(" ", indent + 2), - keyRep, - table_print_value(value[key], indent + 2, done), - comma - ) - end - - rep = rep .. string.rep(" ", indent) -- indent it - rep = rep .. "}" - - done[value] = false - return rep - elseif type(value) == "string" then - return string.format("%q", value) - else - return tostring(value) - end -end - -local table_print = function(tt) - print('return '..table_print_value(tt)) -end - -local table_clone = function(t) - local clone = {} - for k,v in pairs(t) do - clone[k] = v - end - return clone -end - -local string_trim = function(s, what) - what = what or " " - return s:gsub("^[" .. what .. "]*(.-)["..what.."]*$", "%1") -end - -local push = function(stack, item) - stack[#stack + 1] = item -end - -local pop = function(stack) - local item = stack[#stack] - stack[#stack] = nil - return item -end - -local context = function (str) - if type(str) ~= "string" then - return "" - end - - str = str:sub(0,25):gsub("\n","\\n"):gsub("\"","\\\""); - return ", near \"" .. str .. "\"" -end - -local Parser = {} -function Parser.new (self, tokens) - self.tokens = tokens - self.parse_stack = {} - self.refs = {} - self.current = 0 - return self -end - -local exports = {version = "1.2"} - -local word = function(w) return "^("..w..")([%s$%c])" end - -local tokens = { - {"comment", "^#[^\n]*"}, - {"indent", "^\n( *)"}, - {"space", "^ +"}, - {"true", word("enabled"), const = true, value = true}, - {"true", word("true"), const = true, value = true}, - {"true", word("yes"), const = true, value = true}, - {"true", word("on"), const = true, value = true}, - {"false", word("disabled"), const = true, value = false}, - {"false", word("false"), const = true, value = false}, - {"false", word("no"), const = true, value = false}, - {"false", word("off"), const = true, value = false}, - {"null", word("null"), const = true, value = nil}, - {"null", word("Null"), const = true, value = nil}, - {"null", word("NULL"), const = true, value = nil}, - {"null", word("~"), const = true, value = nil}, - {"id", "^\"([^\"]-)\" *(:[%s%c])"}, - {"id", "^'([^']-)' *(:[%s%c])"}, - {"string", "^\"([^\"]-)\"", force_text = true}, - {"string", "^'([^']-)'", force_text = true}, - {"timestamp", "^(%d%d%d%d)-(%d%d?)-(%d%d?)%s+(%d%d?):(%d%d):(%d%d)%s+(%-?%d%d?):(%d%d)"}, - {"timestamp", "^(%d%d%d%d)-(%d%d?)-(%d%d?)%s+(%d%d?):(%d%d):(%d%d)%s+(%-?%d%d?)"}, - {"timestamp", "^(%d%d%d%d)-(%d%d?)-(%d%d?)%s+(%d%d?):(%d%d):(%d%d)"}, - {"timestamp", "^(%d%d%d%d)-(%d%d?)-(%d%d?)%s+(%d%d?):(%d%d)"}, - {"timestamp", "^(%d%d%d%d)-(%d%d?)-(%d%d?)%s+(%d%d?)"}, - {"timestamp", "^(%d%d%d%d)-(%d%d?)-(%d%d?)"}, - {"doc", "^%-%-%-[^%c]*"}, - {",", "^,"}, - {"string", "^%b{} *[^,%c]+", noinline = true}, - {"{", "^{"}, - {"}", "^}"}, - {"string", "^%b[] *[^,%c]+", noinline = true}, - {"[", "^%["}, - {"]", "^%]"}, - {"-", "^%-", noinline = true}, - {":", "^:"}, - {"pipe", "^(|)(%d*[+%-]?)", sep = "\n"}, - {"pipe", "^(>)(%d*[+%-]?)", sep = " "}, - {"id", "^([%w][%w %-_]*)(:[%s%c])"}, - {"string", "^[^%c]+", noinline = true}, - {"string", "^[^,%]}%c ]+"} -}; -exports.tokenize = function (str) - local token - local row = 0 - local ignore - local indents = 0 - local lastIndents - local stack = {} - local indentAmount = 0 - local inline = false - str = str:gsub("\r\n","\010") - - while #str > 0 do - for i in ipairs(tokens) do - local captures = {} - if not inline or tokens[i].noinline == nil then - captures = {str:match(tokens[i][2])} - end - - if #captures > 0 then - captures.input = str:sub(0, 25) - token = table_clone(tokens[i]) - token[2] = captures - local str2 = str:gsub(tokens[i][2], "", 1) - token.raw = str:sub(1, #str - #str2) - str = str2 - - if token[1] == "{" or token[1] == "[" then - inline = true - elseif token.const then - -- Since word pattern contains last char we're re-adding it - str = token[2][2] .. str - token.raw = token.raw:sub(1, #token.raw - #token[2][2]) - elseif token[1] == "id" then - -- Since id pattern contains last semi-colon we're re-adding it - str = token[2][2] .. str - token.raw = token.raw:sub(1, #token.raw - #token[2][2]) - -- Trim - token[2][1] = string_trim(token[2][1]) - elseif token[1] == "string" then - -- Finding numbers - local snip = token[2][1] - if not token.force_text then - if snip:match("^(-?%d+%.%d+)$") or snip:match("^(-?%d+)$") then - token[1] = "number" - end - end - - elseif token[1] == "comment" then - ignore = true; - elseif token[1] == "indent" then - row = row + 1 - inline = false - lastIndents = indents - if indentAmount == 0 then - indentAmount = #token[2][1] - end - - if indentAmount ~= 0 then - indents = (#token[2][1] / indentAmount); - else - indents = 0 - end - - if indents == lastIndents then - ignore = true; - elseif indents > lastIndents + 2 then - error("SyntaxError: invalid indentation, got " .. tostring(indents) - .. " instead of " .. tostring(lastIndents) .. context(token[2].input)) - elseif indents > lastIndents + 1 then - push(stack, token) - elseif indents < lastIndents then - local input = token[2].input - token = {"dedent", {"", input = ""}} - token.input = input - while lastIndents > indents + 1 do - lastIndents = lastIndents - 1 - push(stack, token) - end - end - end -- if token[1] == XXX - token.row = row - break - end -- if #captures > 0 - end - - if not ignore then - if token then - push(stack, token) - token = nil - else - error("SyntaxError " .. context(str)) - end - end - - ignore = false; - end - - return stack -end - -Parser.peek = function (self, offset) - offset = offset or 1 - return self.tokens[offset + self.current] -end - -Parser.advance = function (self) - self.current = self.current + 1 - return self.tokens[self.current] -end - -Parser.advanceValue = function (self) - return self:advance()[2][1] -end - -Parser.accept = function (self, type) - if self:peekType(type) then - return self:advance() - end -end - -Parser.expect = function (self, type, msg) - return self:accept(type) or - error(msg .. context(self:peek()[1].input)) -end - -Parser.expectDedent = function (self, msg) - return self:accept("dedent") or (self:peek() == nil) or - error(msg .. context(self:peek()[2].input)) -end - -Parser.peekType = function (self, val, offset) - return self:peek(offset) and self:peek(offset)[1] == val -end - -Parser.ignore = function (self, items) - local advanced - repeat - advanced = false - for _,v in pairs(items) do - if self:peekType(v) then - self:advance() - advanced = true - end - end - until advanced == false -end - -Parser.ignoreSpace = function (self) - self:ignore{"space"} -end - -Parser.ignoreWhitespace = function (self) - self:ignore{"space", "indent", "dedent"} -end - -Parser.parse = function (self) - - local ref = nil - if self:peekType("string") and not self:peek().force_text then - local char = self:peek()[2][1]:sub(1,1) - if char == "&" then - ref = self:peek()[2][1]:sub(2) - self:advanceValue() - self:ignoreSpace() - elseif char == "*" then - ref = self:peek()[2][1]:sub(2) - return self.refs[ref] - end - end - - local result - local c = { - indent = self:accept("indent") and 1 or 0, - token = self:peek() - } - push(self.parse_stack, c) - - if c.token[1] == "doc" then - result = self:parseDoc() - elseif c.token[1] == "-" then - result = self:parseList() - elseif c.token[1] == "{" then - result = self:parseInlineHash() - elseif c.token[1] == "[" then - result = self:parseInlineList() - elseif c.token[1] == "id" then - result = self:parseHash() - elseif c.token[1] == "string" then - result = self:parseString("\n") - elseif c.token[1] == "timestamp" then - result = self:parseTimestamp() - elseif c.token[1] == "number" then - result = tonumber(self:advanceValue()) - elseif c.token[1] == "pipe" then - result = self:parsePipe() - elseif c.token.const == true then - self:advanceValue(); - result = c.token.value - else - error("ParseError: unexpected token '" .. c.token[1] .. "'" .. context(c.token.input)) - end - - pop(self.parse_stack) - while c.indent > 0 do - c.indent = c.indent - 1 - local term = "term "..c.token[1]..": '"..c.token[2][1].."'" - self:expectDedent("last ".. term .." is not properly dedented") - end - - if ref then - self.refs[ref] = result - end - return result -end - -Parser.parseDoc = function (self) - self:accept("doc") - return self:parse() -end - -Parser.inline = function (self) - local current = self:peek(0) - if not current then - return {}, 0 - end - - local inline = {} - local i = 0 - - while self:peek(i) and not self:peekType("indent", i) and current.row == self:peek(i).row do - inline[self:peek(i)[1]] = true - i = i - 1 - end - return inline, -i -end - -Parser.isInline = function (self) - local _, i = self:inline() - return i > 0 -end - -Parser.parent = function(self, level) - level = level or 1 - return self.parse_stack[#self.parse_stack - level] -end - -Parser.parentType = function(self, type, level) - return self:parent(level) and self:parent(level).token[1] == type -end - -Parser.parseString = function (self) - if self:isInline() then - local result = self:advanceValue() - - --[[ - - a: this looks - flowing: but is - no: string - --]] - local types = self:inline() - if types["id"] and types["-"] then - if not self:peekType("indent") or not self:peekType("indent", 2) then - return result - end - end - - --[[ - a: 1 - b: this is - a flowing string - example - c: 3 - --]] - if self:peekType("indent") then - self:expect("indent", "text block needs to start with indent") - local addtl = self:accept("indent") - - result = result .. "\n" .. self:parseTextBlock("\n") - - self:expectDedent("text block ending dedent missing") - if addtl then - self:expectDedent("text block ending dedent missing") - end - end - return result - else - --[[ - a: 1 - b: - this is also - a flowing string - example - c: 3 - --]] - return self:parseTextBlock("\n") - end -end - -Parser.parsePipe = function (self) - local pipe = self:expect("pipe") - self:expect("indent", "text block needs to start with indent") - local result = self:parseTextBlock(pipe.sep) - self:expectDedent("text block ending dedent missing") - return result -end - -Parser.parseTextBlock = function (self, sep) - local token = self:advance() - local result = string_trim(token.raw, "\n") - local indents = 0 - while self:peek() ~= nil and ( indents > 0 or not self:peekType("dedent") ) do - local newtoken = self:advance() - while token.row < newtoken.row do - result = result .. sep - token.row = token.row + 1 - end - if newtoken[1] == "indent" then - indents = indents + 1 - elseif newtoken[1] == "dedent" then - indents = indents - 1 - else - result = result .. string_trim(newtoken.raw, "\n") - end - end - return result -end - -Parser.parseHash = function (self, hash) - hash = hash or {} - local indents = 0 - - if self:isInline() then - local id = self:advanceValue() - self:expect(":", "expected semi-colon after id") - self:ignoreSpace() - if self:accept("indent") then - indents = indents + 1 - hash[id] = self:parse() - else - hash[id] = self:parse() - if self:accept("indent") then - indents = indents + 1 - end - end - self:ignoreSpace(); - end - - while self:peekType("id") do - local id = self:advanceValue() - self:expect(":","expected semi-colon after id") - self:ignoreSpace() - hash[id] = self:parse() - self:ignoreSpace(); - end - - while indents > 0 do - self:expectDedent("expected dedent") - indents = indents - 1 - end - - return hash -end - -Parser.parseInlineHash = function (self) - local id - local hash = {} - local i = 0 - - self:accept("{") - while not self:accept("}") do - self:ignoreSpace() - if i > 0 then - self:expect(",","expected comma") - end - - self:ignoreWhitespace() - if self:peekType("id") then - id = self:advanceValue() - if id then - self:expect(":","expected semi-colon after id") - self:ignoreSpace() - hash[id] = self:parse() - self:ignoreWhitespace() - end - end - - i = i + 1 - end - return hash -end - -Parser.parseList = function (self) - local list = {} - while self:accept("-") do - self:ignoreSpace() - list[#list + 1] = self:parse() - - self:ignoreSpace() - end - return list -end - -Parser.parseInlineList = function (self) - local list = {} - local i = 0 - self:accept("[") - while not self:accept("]") do - self:ignoreSpace() - if i > 0 then - self:expect(",","expected comma") - end - - self:ignoreSpace() - list[#list + 1] = self:parse() - self:ignoreSpace() - i = i + 1 - end - - return list -end - -Parser.parseTimestamp = function (self) - local capture = self:advance()[2] - - return os.time{ - year = capture[1], - month = capture[2], - day = capture[3], - hour = capture[4] or 0, - min = capture[5] or 0, - sec = capture[6] or 0, - isdst = false, - } - os.time{year=1970, month=1, day=1, hour=8} -end - -exports.eval = function (str) - return Parser:new(exports.tokenize(str)):parse() -end - -exports.dump = table_print - -return exports From nobody Tue Jul 8 14:32: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 4bc3Tx6WCvz614tn; Tue, 08 Jul 2025 14:32:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bc3Tx5LX8z49Lh; Tue, 08 Jul 2025 14:32:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1751985141; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=01sUur/HOJPoATB/Uzl02MzYs2Jf6qZpU71f7I1UNaQ=; b=R4ypncxTK4auAAwsKpUlWJbuInCTFdW70Ty8r0GEkT+PzxGLoYMVbzmL71P5gfiBVgi4W1 ncSL3zMsXMiZ0JWWlVKGpuZUG/jEJiVTcSsMHp/9AXeFPS5p6F0EuLCjJZQM0YGTLOMet9 IHjDG1kVXlu3n1kZYWybGrlcdDcItwpTNHA/z9m7lmX3+a1pgOupH/N629uAMc/UDis6tF SjzmfgtCN/gpwaN8ZtEi2ajc7VEhc+4OOTAJe6htHEHXTn4CLXF5nt3539bE6Tv0QkdFRD brx6carH12rSx62cTXsiTae9vbxlXWQNQkBjg4IalG4WTi33nSetiCUhqlSYgg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1751985141; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=01sUur/HOJPoATB/Uzl02MzYs2Jf6qZpU71f7I1UNaQ=; b=S7U8XI7Zf4KO2z3ZvWwIibYkIC6v+kqARWm5Q8kx7fLH0tAcRMrpzPA07d4/gzK/lOA36J 69Oycuh47GArhlupAJeR6aLDVq0Db7Rkkr/NWMy9WhZMe+5ZIJ8FCRWiWQxIeCEB7Q79w3 YZFdxftBeXig6vF8XA+A9h1q3Cz+mKwFeU21exJtVfBWKqkQBeXZp0wcvljHS0r7uJaS+x u7ZDZole3Lt27YzBlNJrP+Bwaey8F/jHWb4EU2UFTBaNC5UF7h/Bam/8eAy5a0XNFv5giQ NaWalkpD8YTc1ya0w4iqtO83q/tzDmaV9Jy5PhADrHf7txbTEfWEleIpLgbZKA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1751985141; a=rsa-sha256; cv=none; b=KdwOYIfnhB77aj9eol5Tx8ycj4EM4N/x3ttyH3hSTctPUM1Y3dco+fa2qWVT2xbHUieZK5 3/BaP4IJ2OMukXtY4TysFS3U/21quEIj3ck0QLkJttcvuPRR2aRBo9/HSUZfg0476SvauM +GPkT3dkZoI2TV6qZ8Y3ROSdlORNEBPVY5KHFLAbcrD7sLQYRn0RP2/ocpw2uf4LPMwc/Q Nza492A3I4AyueW9xFfJ++DwMTRM3n1NRwjplp7TqewyVit4fvGU/eO8qvbegkYuwLdXaF fVLV5CWvzkizfhdVTrl2+kYAVXwBCpvMCacfwS257rsgTx1ZZYHghnPdOShSaQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4bc3Tx4y5tzhGY; Tue, 08 Jul 2025 14:32: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 568EWL4x072406; Tue, 8 Jul 2025 14:32:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 568EWLZ0072390; Tue, 8 Jul 2025 14:32:21 GMT (envelope-from git) Date: Tue, 8 Jul 2025 14:32:21 GMT Message-Id: <202507081432.568EWLZ0072390@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Baptiste Daroussin Subject: git: 4ea761b726fe - stable/14 - flua: add freebsd.kenv, kenv(2) bindings List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bapt X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 4ea761b726fe6a3531a7f7a17933226c03a7c772 Auto-Submitted: auto-generated The branch stable/14 has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=4ea761b726fe6a3531a7f7a17933226c03a7c772 commit 4ea761b726fe6a3531a7f7a17933226c03a7c772 Author: Baptiste Daroussin AuthorDate: 2024-09-12 12:42:01 +0000 Commit: Baptiste Daroussin CommitDate: 2025-07-08 14:28:16 +0000 flua: add freebsd.kenv, kenv(2) bindings Add bindings for kenv(2) right now only get() has been created it allows do dump into a key/value table the kernel environement if no argument is passed, or it returns the value associated to the provided key. Reviewed by: imp, kevans, markj Accepted by: imp, kevans Differential Revision: https://reviews.freebsd.org/D46654 (cherry picked from commit 696922fbfa3e1c400701a3a39dcadf7dee12b06c) --- libexec/flua/libfreebsd/Makefile | 1 + libexec/flua/libfreebsd/Makefile.inc | 2 + libexec/flua/libfreebsd/kenv/Makefile | 5 ++ libexec/flua/libfreebsd/kenv/freebsd.kenv.3lua | 44 ++++++++++++ libexec/flua/libfreebsd/kenv/kenv.c | 96 ++++++++++++++++++++++++++ 5 files changed, 148 insertions(+) diff --git a/libexec/flua/libfreebsd/Makefile b/libexec/flua/libfreebsd/Makefile index 6ed0451055ff..36d39d6b0502 100644 --- a/libexec/flua/libfreebsd/Makefile +++ b/libexec/flua/libfreebsd/Makefile @@ -1,3 +1,4 @@ +SUBDIR+= kenv SUBDIR+= sys .include diff --git a/libexec/flua/libfreebsd/Makefile.inc b/libexec/flua/libfreebsd/Makefile.inc index 01b5f23410c8..26a1540482c7 100644 --- a/libexec/flua/libfreebsd/Makefile.inc +++ b/libexec/flua/libfreebsd/Makefile.inc @@ -1 +1,3 @@ +SHLIBDIR?= ${LIBDIR}/flua/freebsd + .include "../Makefile.inc" diff --git a/libexec/flua/libfreebsd/kenv/Makefile b/libexec/flua/libfreebsd/kenv/Makefile new file mode 100644 index 000000000000..1726c892c515 --- /dev/null +++ b/libexec/flua/libfreebsd/kenv/Makefile @@ -0,0 +1,5 @@ +SHLIB_NAME= kenv.so +SRCS+= kenv.c +MAN= freebsd.kenv.3lua + +.include diff --git a/libexec/flua/libfreebsd/kenv/freebsd.kenv.3lua b/libexec/flua/libfreebsd/kenv/freebsd.kenv.3lua new file mode 100644 index 000000000000..d254dd22c91c --- /dev/null +++ b/libexec/flua/libfreebsd/kenv/freebsd.kenv.3lua @@ -0,0 +1,44 @@ +.\" +.\" SPDX-License-Identifier: BSD-2-Clause +.\" +.\" Copyright (c) 2024, Baptiste Daroussin +.\" +.Dd September 6, 2024 +.Dt FREEBSD.KENV 3lua +.Os +.Sh NAME +.Nm freebsd.kenv +.Nd Lua binding to +.Fx 's +Linker functions +.Sh SYNOPSIS +.Bd -literal +local kenv = require('freebsd.kenv') +.Ed +.Pp +.Bl -tag -width XXXX -compact +.It Dv table = kenv.get() +.It Dv value = kenv.get(key) +.El +.Sh DESCRIPTION +The +.Nm +module is a binding to the +.Xr kenv 2 +function. +.Pp +List of functions: +.Bl -tag -width XXXX +.It Dv table = freebsd.kenv.get() +Dump the kernel environnement into a key/value +.Fa table . +.It Dv value = freebsd.kenv.get(key) +Return the +.Fa value +associated to the +.Fa key , +if it exists, or +.Va nil +otherwise. +.Sh SEE ALSO +.Xr kenv 2 diff --git a/libexec/flua/libfreebsd/kenv/kenv.c b/libexec/flua/libfreebsd/kenv/kenv.c new file mode 100644 index 000000000000..954baa00facb --- /dev/null +++ b/libexec/flua/libfreebsd/kenv/kenv.c @@ -0,0 +1,96 @@ +/*- + * SPDX-License-Identifier: BSD-2-Clause + * + * Copyright (c) 2024, Baptiste Daroussin + */ + +#include +#include +#include +#include +#include + +#include +#include +#include + +int luaopen_freebsd_kenv(lua_State *L); + +static int +lua_kenv_get(lua_State *L) +{ + const char *env; + int ret, n; + char value[1024]; + + n = lua_gettop(L); + if (n == 0) { + char *buf, *bp, *cp; + int size; + + size = kenv(KENV_DUMP, NULL, NULL, 0); + if (size < 0) { + lua_pushnil(L); + lua_pushstring(L, strerror(errno)); + lua_pushinteger(L, errno); + return (3); + } + size += 1; + buf = malloc(size); + if (buf == NULL) { + lua_pushnil(L); + lua_pushstring(L, strerror(errno)); + lua_pushinteger(L, errno); + return (3); + } + if (kenv(KENV_DUMP, NULL, buf, size) < 0) { + free(buf); + lua_pushnil(L); + lua_pushstring(L, strerror(errno)); + lua_pushinteger(L, errno); + return (3); + } + + lua_newtable(L); + for (bp = buf; *bp != '\0'; bp += strlen(bp) + 1) { + cp = strchr(bp, '='); + if (cp == NULL) + continue; + *cp++ = '\0'; + lua_pushstring(L, cp); + lua_setfield(L, -2, bp); + bp = cp; + } + free(buf); + return (1); + } + env = luaL_checkstring(L, 1); + ret = kenv(KENV_GET, env, value, sizeof(value)); + if (ret == -1) { + if (errno == ENOENT) { + lua_pushnil(L); + return (1); + } + lua_pushnil(L); + lua_pushstring(L, strerror(errno)); + lua_pushinteger(L, errno); + return (3); + } + lua_pushstring(L, value); + return (1); +} + +#define REG_SIMPLE(n) { #n, lua_kenv_ ## n } +static const struct luaL_Reg freebsd_kenv[] = { + REG_SIMPLE(get), + { NULL, NULL }, +}; +#undef REG_SIMPLE + +int +luaopen_freebsd_kenv(lua_State *L) +{ + luaL_newlib(L, freebsd_kenv); + + return (1); +} From nobody Tue Jul 8 14:32: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 4bc3Tw6FSFz614lf; Tue, 08 Jul 2025 14:32: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bc3Tw4V2Cz49N6; Tue, 08 Jul 2025 14:32:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1751985140; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=oEgDzuS5DoyzXSqgv/UooXLtK2JzWYfZzNkPCpGW+VI=; b=ZHXlTfl1HLK+TTUEzYmoNGqXFGhedxf6BCJnp4stgewNXSDIR5paBIu6FKww7I5/4L8j+C jcakOhTZafnrfyGHoWZgCXWdAPcUG8Ux5aNjoLAhUfbB0xgtGul8EoiV5awZs2TrNr9WfI HWPZwEAJJ2Ix51zTW4KFziJtG4kFDM8ZliG5+hsY6EhUZ8oQf3AgOo3bMJLQZYkCGyuz4a XMu1eJPQHmW75oiFyDq/KV7u4e7IFvusL2/zcQF8STe0iyOBFAVkXl6PrqIayk9jwcnMqH 0bSradSlnUrdZdCI8FgXmUdP32TnLX9k6K4QAKnMNkZ08zQvyrw+VON0lAARGg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1751985140; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=oEgDzuS5DoyzXSqgv/UooXLtK2JzWYfZzNkPCpGW+VI=; b=y1S8LHKH7EHaMD60ecDtNc0gG5Gi+NSR+x3ocLwucQUvjQGaBFHJtk3yRuIpdWZQvr7sTN dImSGWF1z7i9Q2X29D8F675pFy8P7KpHs+2UewCnZhJFK1VpfoyZeqCP56ie+0vSIHCXRO eR220orxhtPUQc3xXEENBvJmenB7pWU6U/V9YjMZhKsyIFyi4gKVaT7CsalYJI/xzKBoSb L+sVl9Z6gwSwVPbumXOQ2lZvEKIYi7oFdYvmw+dLjfcxD+U7ze3ur1u8OsTmMs1xqiT4k7 AdBw3qonMw+YUi7PK8g+H8TdCL659hVC8M9GlqP7qgn7oERRW3QGmO4fmdtz0g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1751985140; a=rsa-sha256; cv=none; b=ojC6xty/aXeCcmY2a444BL7rmEfkFbQsO20+EE7eoDlICTvGc5ToYrEnazlmODSTuvvGvA Rae7qHRjtwK6WQjZOARJxGomZhnWacDqRbbRT8mIwapZ2fuKxM0+oJRDnASE90H1JaEhUi BDh0TNBD00Jm8QuzR3WNTB4kJUpazfFwtgi74zf84z0E/1O7uEuYMQSu6Y5zXFY33zN0hl jo0vCkavW9MlEceeG6QeDtBYELkimReVNA/ER63VjMn5FztPE3GcKW5f6t7KDYWh3rPTnJ UvpHITBS/Ix+ljvZoqu/w4nXscbTXaRJJXka4TrAv67VKpEMTz6qBEYuWLWDHA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4bc3Tw45hYzh3B; Tue, 08 Jul 2025 14:32: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 568EWKjk072296; Tue, 8 Jul 2025 14:32:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 568EWK60072293; Tue, 8 Jul 2025 14:32:20 GMT (envelope-from git) Date: Tue, 8 Jul 2025 14:32:20 GMT Message-Id: <202507081432.568EWK60072293@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Baptiste Daroussin Subject: git: 178a01e3b9a4 - stable/14 - freebsd.sys.linker: remove license to only keep SPDX line List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bapt X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 178a01e3b9a4497a424ca0f80f456f189bf6a635 Auto-Submitted: auto-generated The branch stable/14 has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=178a01e3b9a4497a424ca0f80f456f189bf6a635 commit 178a01e3b9a4497a424ca0f80f456f189bf6a635 Author: Baptiste Daroussin AuthorDate: 2024-09-13 05:06:39 +0000 Commit: Baptiste Daroussin CommitDate: 2025-07-08 14:28:00 +0000 freebsd.sys.linker: remove license to only keep SPDX line (cherry picked from commit fa4b5aa51f1b3971e92f831b8e67e83aaed3c212) --- .../libfreebsd/sys/linker/freebsd.sys.linker.3lua | 21 --------------------- libexec/flua/libfreebsd/sys/linker/linker.c | 22 ---------------------- 2 files changed, 43 deletions(-) diff --git a/libexec/flua/libfreebsd/sys/linker/freebsd.sys.linker.3lua b/libexec/flua/libfreebsd/sys/linker/freebsd.sys.linker.3lua index 0ab8f185388a..34198d20463e 100644 --- a/libexec/flua/libfreebsd/sys/linker/freebsd.sys.linker.3lua +++ b/libexec/flua/libfreebsd/sys/linker/freebsd.sys.linker.3lua @@ -3,27 +3,6 @@ .\" .\" Copyright (c) 2024, Baptiste Daroussin .\" -.\" 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. Redistributions in binary form must reproduce the above copyright -.\" notice, this list of conditions and the following disclaimer in the -.\" documentation and/or other materials provided with the distribution. -.\" -.\" 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 September 6, 2024 .Dt FREEBSD.SYS.LINKER 3lua .Os diff --git a/libexec/flua/libfreebsd/sys/linker/linker.c b/libexec/flua/libfreebsd/sys/linker/linker.c index a2dc3b487525..87eccfb651f0 100644 --- a/libexec/flua/libfreebsd/sys/linker/linker.c +++ b/libexec/flua/libfreebsd/sys/linker/linker.c @@ -2,30 +2,8 @@ * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 2024, Baptiste Daroussin - * - * 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. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE REGENTS 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 REGENTS 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. */ - #include #include From nobody Tue Jul 8 14:32: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 4bc3V13DLbz614qm; Tue, 08 Jul 2025 14:32: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bc3V112N8z49Cb; Tue, 08 Jul 2025 14:32:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1751985145; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=OpHdORxcefN1aQHGarIHYvVEtTJEWqc6sR4PR3GYwwc=; b=tsUURKsXveu7RLrRM0KTbiTB9AOOPiJ9hhX4Q5MnkJNWkr+MwfQfH6Scb5y1z7yN2NxGQb QDkm5eO7e0S2BIkLDF4zP5mlsrQDj4/VcSZq7x16qwvLJcy8hF3Sx3HDOORN3EYzr3ADdN 6qmGgTQSNNJLBFOOlfC6jxXMqpBHUdiz2Y9u1GwxPwEnGKXKnAR3+zYaBW4U8DoN0sDRG8 da6czrBizeg812XKOKyy4FUD42x2cswVi1IrhGuEAamozDGn7OPbEgEU2u0oOhd3Ehqz+H 0mWL/OVTMyAc5acCofoMtqm8w76Rl+Ot3Nv+CQLxC174zDTNm4N4NVWPCpUQzQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1751985145; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=OpHdORxcefN1aQHGarIHYvVEtTJEWqc6sR4PR3GYwwc=; b=BiQ4vtIa/sC7A8FMxge/o8RRJayjRH19OBBR2m+AV1CDuF83t3vtMRul3629lb0cQv7Le6 sUyx4Pn6WNwXRi+ugB/usUxa/+ABMkxdiyRqZfRfRlYbkwBq8a80b/hZoroMrTXrWfYzd1 m4LQhqfEygoDstT04zI7Boj+fsIpLwAUAOmslvAw/yw3pA+gBmoaEcPll27Yzp/FHKNAmd H+S1sY/QPEq3FNWU8KSK33FGsmWJ+z6VnbBq8Bgo5CfUAfdcq/92FMB7CZFYgC4/zjWCyc 6FPYDb6FhZ6QeiCLiemL5hGxahtK1RhrLeDAShypSJRqgQgzA2752bw/Ypz24w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1751985145; a=rsa-sha256; cv=none; b=NqmJCgpMGxSL8MZjEh/6yVW8htCcVBgmUrjbSCp6GiCRhwQx4YOqcmkN6ARn0xb5GZRLbN fEwVJMAwAtDa3AhEUsLgmp5Qj2YXr/TxgMVV8fVYI7DSoXy9IaN0kBhXP7LpP7xpMJ9Jsw BjBiLj0vBhYQ/0tK/pcYdM3GVa7a6P9/dvaJmE+IWHJeU0LshVFNN/iea7nqe2MKltx6Fi NSv9tzntKFT3/vjZmSjF34H5zAi7lK//u+GqWlXCzLQLf0/CcBP9/YwBKtQSRroMrB4nWa EJIAJVjTKCAHOCYOq/YD6kYqivbuuvl5mi7B+Fi24RSUQ+uzC/AWJ4tHQi2u8w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4bc3V10dBgzhGd; Tue, 08 Jul 2025 14:32: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 568EWOtg073498; Tue, 8 Jul 2025 14:32:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 568EWOO2073495; Tue, 8 Jul 2025 14:32:24 GMT (envelope-from git) Date: Tue, 8 Jul 2025 14:32:24 GMT Message-Id: <202507081432.568EWOO2073495@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Baptiste Daroussin Subject: git: ee1fd6b260c0 - stable/14 - nuageinit: launch post network script with postnet citype List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bapt X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: ee1fd6b260c04560f424e4dc974b966b41af8dba Auto-Submitted: auto-generated The branch stable/14 has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=ee1fd6b260c04560f424e4dc974b966b41af8dba commit ee1fd6b260c04560f424e4dc974b966b41af8dba Author: Sebastien Baylocq AuthorDate: 2025-06-25 15:20:50 +0000 Commit: Baptiste Daroussin CommitDate: 2025-07-08 14:31:47 +0000 nuageinit: launch post network script with postnet citype Sponsored by: OVHCloud (cherry picked from commit dba00b1c6bc1bb9753bf0a554eab04077e85e214) --- libexec/rc/rc.d/nuageinit_post_net | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libexec/rc/rc.d/nuageinit_post_net b/libexec/rc/rc.d/nuageinit_post_net index bea4c5e37c5f..6d2591a603af 100755 --- a/libexec/rc/rc.d/nuageinit_post_net +++ b/libexec/rc/rc.d/nuageinit_post_net @@ -16,8 +16,8 @@ rcvar="nuageinit_enable" execute_post_net() { - test -f /var/cache/nuageinit/post_network_config || return - /usr/libexec/nuageinit /var/cache/nuageinit/post_network_config | tee -a /var/log/nuageinit.log + test -f /var/cache/nuageinit/user_data -o -f /var/cache/nuageinit/user-data || return + /usr/libexec/nuageinit /var/cache/nuageinit/ postnet | tee -a /var/log/nuageinit.log } # Share the same config as nuageinit From nobody Tue Jul 8 14:32: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 4bc3Tz1rNpz614bV; Tue, 08 Jul 2025 14:32:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bc3Ty6SCcz49Qd; Tue, 08 Jul 2025 14:32:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1751985142; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=JtvEmMV8Y+do7CSsahiF762N59r8mQtjDzDyFxEPXpw=; b=Z9XF7ZcMXTEG8R6aOfLRM32vypp4jwo21X/W3MwumnEInEx1MrkauzY/YjtvdAWexxkPDw K0O2D15sUYu3N41VIQNJ4vmCbUteXUGgUdNXfygjJNkssufelxyRV3YXAb/3iNOh0Qdrzd +cGGhvQ16kecqQodbxybzTSLs7nuyYb6VWIYpn9oK7VlIfB641aogWxdqoDjKumv+YrOck iObL/PrWzfOY/aXLAHf/1EmoBuUBig93FyOM4yWQXhc89l5QDb0+uHdXWD8brhGEgtIOM7 VvmQmuJKb9768N4HaCwNTZy5R5EKy0BKgH5k6FxbG1ZpKRl1008WkrHkk/OoLw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1751985142; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=JtvEmMV8Y+do7CSsahiF762N59r8mQtjDzDyFxEPXpw=; b=RroTTv8DlLChymRE0R2yjo+Bu2QOWPMmFxQycTLpjH6fAzzw6f+xABQZdDT5o5nFPII5Te PW9SmqkCv2FDW35YDYfGpHRZSDxEK1iAY4GZku7nkBtBIxnnBh4A7q6U6cTvfv+MoZnPZo KHN5TqAGHOyltkmYyc499GloBtQNgBGPEl0uGlg71SJrl1LV8Tc8nWToxSFFr3KIz/vq2y xx7RKVFIrwT4AoEJBOMkS3RzDJOJO/BBp8TGeCRR7M9lWKxQrU5Vck3rR5ruWMqNuCaJJK QpzbtIqYNZWwWFiwrf089ENlUxbYbnxAFM/qgARdCHEtBQd24oZDu/OLAjt9Sw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1751985142; a=rsa-sha256; cv=none; b=WcxKI7TWYeyGteuugahSinIJAxFe0bzncwu75sdtxLHima+/rcbZAKiFzhZEkFOxxWiRL+ T5ETVvTgYRamQ9b+p0dVq0ZDrISQ29aJvnDGL2GiCJ6f83eGrc6o1DkRxTO4FxnpFqJKPT i+r/uDQM5JdNu8uAocWw4fd4V9lBEAicbBJwWfviNLYZj/blk8OoRCgf82LvdMLBREDv3P 4DNBjt7p6vBb8O1r56OTIgQd0hZ+I+8sErpoKi1OHKOMYJnttkglDUoojlB1UZzkOlwKpp CIlQ1P2FnRsXV/2WNPxfjDmopznEZv7zAe6jD1+UhgOMt/QXaeMe/Yl0WmwRhg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4bc3Ty62tgzhM3; Tue, 08 Jul 2025 14:32: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 568EWMbl073432; Tue, 8 Jul 2025 14:32:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 568EWMAK073429; Tue, 8 Jul 2025 14:32:22 GMT (envelope-from git) Date: Tue, 8 Jul 2025 14:32:22 GMT Message-Id: <202507081432.568EWMAK073429@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Baptiste Daroussin Subject: git: c508393e49fc - stable/14 - lyaml: vendor import lua bindings for libyaml List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bapt X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: c508393e49fc4d18cf40fa439a9e625bde93a68f Auto-Submitted: auto-generated The branch stable/14 has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=c508393e49fc4d18cf40fa439a9e625bde93a68f commit c508393e49fc4d18cf40fa439a9e625bde93a68f Author: Baptiste Daroussin AuthorDate: 2025-06-26 07:12:41 +0000 Commit: Baptiste Daroussin CommitDate: 2025-07-08 14:29:16 +0000 lyaml: vendor import lua bindings for libyaml (cherry picked from commit 2bc180ef045e5911cce0cea1c2a139cffd2b577a) --- contrib/lyaml/.gitignore | 9 + contrib/lyaml/.luacov | 8 + contrib/lyaml/AUTHORS | 6 + contrib/lyaml/LICENSE | 27 + contrib/lyaml/NEWS.md | 352 ++++++++++++ contrib/lyaml/README.md | 232 ++++++++ contrib/lyaml/build-aux/config.ld.in | 34 ++ contrib/lyaml/build-aux/luke | 672 ++++++++++++++++++++++ contrib/lyaml/doc/index.html | 97 ++++ contrib/lyaml/doc/ldoc.css | 303 ++++++++++ contrib/lyaml/doc/modules/lyaml.explicit.html | 267 +++++++++ contrib/lyaml/doc/modules/lyaml.functional.html | 236 ++++++++ contrib/lyaml/doc/modules/lyaml.html | 224 ++++++++ contrib/lyaml/doc/modules/lyaml.implicit.html | 533 +++++++++++++++++ contrib/lyaml/ext/yaml/emitter.c | 459 +++++++++++++++ contrib/lyaml/ext/yaml/lyaml.h | 161 ++++++ contrib/lyaml/ext/yaml/parser.c | 410 +++++++++++++ contrib/lyaml/ext/yaml/scanner.c | 340 +++++++++++ contrib/lyaml/ext/yaml/yaml.c | 66 +++ contrib/lyaml/lib/lyaml/explicit.lua | 120 ++++ contrib/lyaml/lib/lyaml/functional.lua | 87 +++ contrib/lyaml/lib/lyaml/implicit.lua | 283 +++++++++ contrib/lyaml/lib/lyaml/init.lua | 534 +++++++++++++++++ contrib/lyaml/lukefile | 47 ++ contrib/lyaml/lyaml-6.2.8-1.rockspec | 59 ++ contrib/lyaml/spec/ext_yaml_emitter_spec.yaml | 239 ++++++++ contrib/lyaml/spec/ext_yaml_parser_spec.yaml | 391 +++++++++++++ contrib/lyaml/spec/ext_yaml_scanner_spec.yaml | 380 ++++++++++++ contrib/lyaml/spec/lib_lyaml_functional_spec.yaml | 121 ++++ contrib/lyaml/spec/lib_lyaml_spec.yaml | 343 +++++++++++ contrib/lyaml/spec/spec_helper.lua | 277 +++++++++ libexec/flua/Makefile | 1 + libexec/flua/liblyaml/Makefile | 22 + 33 files changed, 7340 insertions(+) diff --git a/contrib/lyaml/.gitignore b/contrib/lyaml/.gitignore new file mode 100644 index 000000000000..19d7cbb6dd7d --- /dev/null +++ b/contrib/lyaml/.gitignore @@ -0,0 +1,9 @@ +*~ +*.o +*.so +*.src.rock +/ChangeLog +/build-aux/config.ld +/luacov.*.out +/lyaml-*.tar.gz +/TAGS diff --git a/contrib/lyaml/.luacov b/contrib/lyaml/.luacov new file mode 100644 index 000000000000..0aa52d25e0ea --- /dev/null +++ b/contrib/lyaml/.luacov @@ -0,0 +1,8 @@ +modules = { + ['lyaml'] = 'lib/lyaml/init.lua', + ['lyaml.*'] = 'lib', +} + +runreport = true + +tick = true diff --git a/contrib/lyaml/AUTHORS b/contrib/lyaml/AUTHORS new file mode 100644 index 000000000000..1eb673371bf7 --- /dev/null +++ b/contrib/lyaml/AUTHORS @@ -0,0 +1,6 @@ +lyaml is the work of several authors (see git history for +contributors). + +There is an earlier C LibYAML binding + + Copyright Andrew Danforth diff --git a/contrib/lyaml/LICENSE b/contrib/lyaml/LICENSE new file mode 100644 index 000000000000..402e64dfec29 --- /dev/null +++ b/contrib/lyaml/LICENSE @@ -0,0 +1,27 @@ +This software comprises files that are copyright their respective +authors (see the AUTHORS file for details), and distributed under +the terms of the MIT license (the same license as Lua itself), +unless noted otherwise in the body of that file. + +==================================================================== +Copyright (C) 2013-2022 Gary V. Vaughan + +Permission is hereby granted, free of charge, to any person +obtaining a copy of this software and associated documentation +files (the "Software"), to deal in the Software without restriction, +including without limitation the rights to use, copy, modify, merge, +publish, distribute, sublicense, and/or sell copies of the Software, +and to permit persons to whom the Software is furnished to do so, +subject to the following conditions: + +The above copyright notice and this permission notice shall be +included in all copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGE- +MENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE +FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF +CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION +WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +==================================================================== diff --git a/contrib/lyaml/NEWS.md b/contrib/lyaml/NEWS.md new file mode 100644 index 000000000000..32611d83671a --- /dev/null +++ b/contrib/lyaml/NEWS.md @@ -0,0 +1,352 @@ +# lyaml NEWS - User visible changes + +## Noteworthy changes in release 6.2.8 (2022-10-22) [stable] + +### Bug fixes + + - `luke` no longer crashes in `std.normalize` require loops + occasionally in Lua 5.4. + + - lyaml emitter no longer leaks at least six bytes for every + map, sequence and scalar emitted. + + +## Noteworthy changes in release 6.2.7 (2020-11-27) [stable] + +### Bug fixes + + - Don't skip YAML entries from mixed key Lua tables. + + +## Noteworthy changes in release 6.2.6 (2020-08-28) [stable] + +### Bug fixes + + - `luke` really propagates `LDFLAGS` to module compilation + commands. + + +## Noteworthy changes in release 6.2.5 (2020-04-15) [stable] + +### Bug fixes + + - `luke` really propagates `YAML_BINDIR`, `YAML_DIR`, + `YAML_INCDIR` and `YAML_LIBDIR` to checksymbol test in lukefile + given the change to `external_dependencies` layout in 6.1.2. + + +## Noteworthy changes in release 6.2.4 (2019-07-20) [stable] + +### Bug fixes + + - `luke` works with upgraded bootstrap luarocks version of + `require`. + + +## Noteworthy changes in release 6.2.3 (2018-09-16) [stable] + +### New Features + + - Initial support for Lua 5.4. + + +## Noteworthy changes in release 6.2.2 (2018-03-28) [stable] + +### Bug fixes + + - Remove spurious dependency on `std.normalize` and `std._debug` + libraries. + + +## Noteworthy changes in release 6.2.1 (2018-02-20) [stable] + +### Bug fixes + + - `spec/spec_helper.lua` now looks in the correct objdir + for object modules built by luke, instead of adding unused + paths from old Autotools objdirs. So now specl is properly + running examples against the not yet installed lyaml objects. + + +## Noteworthy changes in release 6.2 (2017-11-26) [stable] + +### Bug fixes + + - `luke` uses the correct spelling of LIBFLAG to match luarocks now. + + - `luke` no longer throws spurious `cp: file exists` errors. + + - `luke` works on luajit again. + + +## Noteworthy changes in release 6.1.3 (2017-05-29) [stable] + +### Bug fixes + + - `luke` no longer bombs out with a nil concat error. + + +## Noteworthy changes in release 6.1.2 (2017-04-30) [stable] + +### Bug fixes + + - `luke` now propagates `LUA_DIR`, `YAML_INCDIR` and `YAML_LIBDIR` + correctly. + + +## Noteworthy changes in release 6.1.1 (2017-01-22) [stable] + +### New Features + + - Builds and installs with `luke` instead of Autotools. + + +## Noteworthy changes in release 6.1 (2016-10-08) [stable] + +### Bug fixes + + - `lyaml.load` now correctly reads implicit null scalars in a YAML + document as an `lyaml.null` reference, identical to the "~" + shorthand syntax, according to [the specification][nullspec]. + + ```yaml + empty: + canonical: ~ + english: null + ~: null key + ``` + + +## Noteworthy changes in release 6.0 (2015-07-27) [stable] + +### New Features + + - `lyaml.load` now correctly reads a !!bool tagged scalar from a + YAML document, or an implicit bool value, according to + [the specification][boolspec]. + + ```yaml + %TAG ! tag:yaml.org,2002: + --- + truthy: + - !bool Y + - !bool y + - !bool True + - !bool "on" + falsey: + - !bool n + - !bool OFF + - !bool garbage + ``` + + - `lyaml.load` now correctly reads a !!float tagged scalar from a + YAML document, or an implicit float value, according to + [the specification][floatspec]. + + - `lyaml.load` now correctly reads a !!int tagged scalar from a + YAML document, or an implicit integer value, according to + [the specification][intspec]. + + - `lyaml.load` now supports the !!merge key type according to + [the specification][mergespec]. + + ```yaml + - &MERGE { x: 1, y: 2 } + - &OVERRIDE { x: 0, z: 1 } + - + << : [&MERGE, &OVERRIDE] + z: 3 + ``` + + The anchored tables remain in the document too, so this results in + the following Lua table: + + ```lua + { -- START_STREAM + { -- START_DOCUMENT + { x = 1, y = 2 }, -- MERGE + { x = 0, z = 1 }, -- OVERRIDE + { x = 1, y = 2, z = 3}, -- <<< + } -- END_DOCUMENT + } -- END_STREAM + ``` + +### Bug fixes + + - Multi-line strings were previously being dumped using single quotes + which caused the dumped YAML to break. + + For example, { foo = "a\nmultiline\nstring" } would get dumped as: + + ```yaml + foo: 'a + + multiline + + string' + ``` + + Note the extra line-breaks in between each line. This also causes + YAML parsing to fail (since the blank lines didn't have the expected + indentation). + + This patch fixes the dump to use the YAML literal syntax for any + multi-line strings so the same example gets dumped as: + + ```yaml + foo: |- + a + multiline + string + ``` + + - `lyaml.load` now correctly reads the !!null tag in a YAML + document as an `lyaml.null` reference, identical to the "~" + shorthand syntax, according to [the specification][nullspec]. + +### Incompatible Changes + + - `lyaml.load` now takes a table of options as an optional second + argument, not a simple boolean to determine whether all documents + should be returned from the stream. For now, a `true` second + argument will be converted to the modern equivalent: + + ```lua + lyaml.load (document, { all = true }) + ``` + + - `lyaml.dump` now takes a table of options as an optional second + argument, not an initial table of anchors. For now, a second + argument without any new API keys will be converted to the modern + equivalent: + + ```lua + lyaml.dump (t, { anchors = arg2 }) + ``` + +[boolspec]: http://yaml.org/type/bool.html +[floatspec]: http://yaml.org/type/float.html +[intspec]: http://yaml.org/type/int.html +[mergespec]: http://yaml.org/type/merge.html +[nullspec]: http://yaml.org/type/null.html + + +## Noteworthy changes in release 5.1.4 (2015-01-01) [stable] + + - This release is functionally identical to the last. + + +## Noteworthy changes in release 5.1.3 (2015-01-01) [stable] + + - This release is functionally identical to the last. + + +## Noteworthy changes in release 5.1.2 (2014-12-27) [stable] + +### Bugs Fixed + + - No more spurious .travis.yml is out of date warnings during + `luarocks install lyaml`. + + +## Noteworthy changes in release 5.1.1 (2014-12-19) [stable] + +### Bugs Fixed + + - When using `sudo make install` instead of LuaRocks, `lyaml.so` + is now correctly installed to `$luaexecdir`. + + +## Noteworthy changes in release 5.1.0 (2014-12-17) [stable] + +### New Features + + - Lua 5.3.0 compatibility. + + +## Noteworthy changes in release 5 (2014-09-25) [beta] + +### Build + + - Significantly reduced pointer mismatch warnings from modern GNU + compilers. + +### New Features + + - `lyaml.dump` now takes a second argument containing a table of + potential anchor values in `ANCHOR_NAME = { "match", "elements" }` + pairs format. The first time any are matched in the table being + dumped, they are preceded by `&ANCHOR_NAME` in the output YAML + document; subsequent matches are not written out in full, but + shortened to the appropriate `*ANCHOR_NAME` alias. + +### Bugs Fixed + + - `yaml.emitter` no longer emits numbers in SINGLE_QUOTE style by + default. + + - `yaml.emitter ().emit` returns error strings correctly for invalid + STREAM_START encoding, and MAPPING_START, SEQUENCE_START & SCALAR + style fields. + + +## Noteworthy changes in release 4 (2013-09-11) [beta] + +### New Features + + - New yaml.emitter API returns an object with an emit method for + adding events using yaml_*_event_initialize() calls. + + - New yaml.parser API returns a Lua iterator that fetches the next + event using yaml_parser_parse(). + + - New yaml.scanner API returns a Lua iterator that fetches the next + token using yaml_parser_scan(). + + - Beginnings of Specl specs, starting with a reasonably comprehensive + specifications for the new APIs above. + + - C implementation of lyaml.dump has moved to Lua implementation as + yaml.dump. + + - C implementation of lyaml.load has moved to Lua implementation as + yaml.load. + + - The new Lua implementation of lyaml.load () handles multi-document + streams, and returns a table of documents when the new second + argument is `true`. + + +## Noteworthy changes in release 3 (2013-04-27) [beta] + + - This release is functionally identical to the last. + +### New Features + + - lyaml builds are now made against Lua 5.1, Lua 5.2 and luajit 2.0.0 + automatically, with every commit. + + - move to a cleaner, automated release system. + + +## Noteworthy changes in release 2 (2013-03-18) [beta] + + - This release is functionally identical to the last. + + - Use correct MIT license attribution, relicensing build files to match + Andrew Danforth''s MIT licensed lyaml.c too. + + +## Noteworthy changes in release 1 (2013-03-17) [beta] + +### New Features + + - A binding for libYAML, by Andrew Danforth: Updated for Lua 5.1 and + 5.2, and packaged as a luarock. + + - I spun this out of Specl (http://github.com/gvvaughan/specl) so that + other projects may use it, and to simplify the Specl build. + +### Known Issues + + - There's not really any documentation, sorry. Contributions welcome! diff --git a/contrib/lyaml/README.md b/contrib/lyaml/README.md new file mode 100644 index 000000000000..d1e96845ddfa --- /dev/null +++ b/contrib/lyaml/README.md @@ -0,0 +1,232 @@ +LYAML +===== + +Copyright (C) 2013-2022 Gary V. Vaughan + +[![License](https://img.shields.io/:license-mit-blue.svg)](https://mit-license.org) +[![workflow status](https://github.com/gvvaughan/lyaml/actions/workflows/spec.yml/badge.svg?branch=release-v6.2.8)](https://github.com/gvvaughan/lyaml/actions) +[![codecov.io](https://codecov.io/github/gvvaughan/lyaml/coverage.svg?branch=release-v6.2.8)](https://codecov.io/github/gvvaughan/lyaml?branch=release-v6.2.8) + +[LibYAML] binding for [Lua], with a fast C implementation +for converting between [%YAML 1.1][yaml11] and [Lua] tables, +and a low-level [YAML] event parser for implementing more +intricate [YAML] document loading. + +Usage +----- + +### High Level API + +These functions quickly convert back and forth between Lua tables +and [%YAML 1.1][yaml11] format strings. + +```lua +local lyaml = require "lyaml" +local t = lyaml.load (YAML-STRING, [OPTS-TABLE]) +local yamlstr = lyaml.dump (LUA-TABLE, [OPTS-TABLE]) +local null = lyaml.null () +``` + +#### `lyaml.load` + +`lyaml.load` accepts a YAML string for parsing. If the YAML string contains +multiple documents, only the first document will be returned by default. To +return multiple documents as a table, set `all = true` in the second +argument OPTS-TABLE. + +```lua +lyaml.load("foo: bar") +--> { foo = "bar" } + +lyaml.load("foo: bar", { all = true }) +--> { { foo = "bar" } } + +multi_doc_yaml = [[ +--- +one +... +--- +two +... +]] + +lyaml.load(multi_doc_yaml) +--> "one" + +lyaml.load(multi_doc_yaml, { all = true }) +--> { "one", "two" } +``` + +You can supply an alternative function for converting implicit plain +scalar values in the `implicit_scalar` field of the OPTS-TABLE argument; +otherwise a default is composed from the functions in the `lyaml.implicit` +module. + +You can also supply an alternative table for coverting explicitly tagged +scalar values in the `explicit_scalar` field of the OPTS-TABLE argument; +otherwise all supported tags are parsed by default using the functions +from the `lyaml.explicit` module. + +#### `lyaml.dump` + +`lyaml.dump` accepts a table of values to dump. Each value in the table +represents a single YAML document. To dump a table of lua values this means +the table must be wrapped in another table (the outer table represents the +YAML documents, the inner table is the single document table to dump). + +```lua +lyaml.dump({ { foo = "bar" } }) +--> --- +--> foo: bar +--> ... + +lyaml.dump({ "one", "two" }) +--> --- one +--> ... +--> --- two +--> ... +``` + +If you need to round-trip load a dumped document, and you used a custom +function for converting implicit scalars, then you should pass that same +function in the `implicit_scalar` field of the OPTS-TABLE argument to +`lyaml.dump` so that it can quote strings that might otherwise be +implicitly converted on reload. + +#### Nil Values + +[Lua] tables treat `nil` valued keys as if they were not there, +where [YAML] explicitly supports `null` values (and keys!). Lyaml +will retain [YAML] `null` values as `lyaml.null ()` by default, +though it is straight forward to wrap the low level APIs to use `nil`, +subject to the usual caveats of how nil values work in [Lua] tables. + + +### Low Level APIs + +```lua +local emitter = require ("yaml").emitter () + +emitter.emit {type = "STREAM_START"} +for _, event in ipairs (event_list) do + emitter.emit (event) +end +str = emitter.emit {type = "STREAM_END"} +``` + +The `yaml.emitter` function returns an emitter object that has a +single emit function, which you call with event tables, the last +`STREAM_END` event returns a string formatted as a [YAML 1.1][yaml11] +document. + +```lua +local iter = require ("yaml").scanner (YAML-STRING) + +for token_table in iter () do + -- process token table +end +``` + +Each time the iterator returned by `scanner` is called, it returns +a table describing the next token of YAML-STRING. See LibYAML's +[yaml.h] for details of the contents and semantics of the various +tokens produced by `yaml_parser_scan`, the underlying call made by +the iterator. + +[LibYAML] implements a fast parser in C using `yaml_parser_scan`, which +is also bound to lyaml, and easier to use than the token API above: + +```lua +local iter = require ("yaml").parser (YAML-STRING) + +for event_table in iter () do + -- process event table +end +``` + +Each time the iterator returned by `parser` is called, it returns +a table describing the next event from the "Parse" process of the +"Parse, Compose, Construct" processing model described in the +[YAML 1.1][yaml11] specification using [LibYAML]. + +Implementing the remaining "Compose" and "Construct" processes in +[Lua] is left as an exercise for the reader -- though, unlike the +high-level API, `lyaml.parser` exposes all details of the input +stream events, such as line and column numbers. + + +Installation +------------ + +There's no need to download an [lyaml] release, or clone the git repo, +unless you want to modify the code. If you use [LuaRocks], you can +use it to install the latest release from its repository: + + luarocks --server=http://rocks.moonscript.org install lyaml + +Or from the rockspec in a release tarball: + + luarocks make lyaml-?-1.rockspec + +To install current git master from [GitHub][lyaml] (for testing): + + luarocks install http://raw.github.com/gvvaughan/lyaml/master/lyaml-git-1.rockspec + +To install without [LuaRocks], clone the sources from the +[repository][lyaml], and then run the following commands: + +```sh +cd lyaml +build-aux/luke LYAML_DIR=LIBYAML-INSTALL-PREFIX +sudo build-aux/luke PREFIX=LYAML-INSTALL-PREFIX install +specl -v1freport spec/*_spec.yaml +``` + +The dependencies are listed in the dependencies entry of the file +[rockspec][L15]. + + +Bug reports and code contributions +---------------------------------- + +This library is maintained by its users. + +Please make bug reports and suggestions as [GitHub Issues][issues]. +Pull requests are especially appreciated. + +But first, please check that your issue has not already been reported by +someone else, and that it is not already fixed by [master][lyaml] in +preparation for the next release (see Installation section above for how +to temporarily install master with [LuaRocks][]). + +There is no strict coding style, but please bear in mind the following +points when proposing changes: + +0. Follow existing code. There are a lot of useful patterns and avoided + traps there. + +1. 3-character indentation using SPACES in Lua sources: It makes rogue + TABs easier to see, and lines up nicely with 'if' and 'end' keywords. + +2. Simple strings are easiest to type using single-quote delimiters, + saving double-quotes for where a string contains apostrophes. + +3. Save horizontal space by only using SPACEs where the parser requires + them. + +4. Use vertical space to separate out compound statements to help the + coverage reports discover untested lines. + +5. Prefer explicit string function calls over object methods, to mitigate + issues with monkey-patching in caller environment. + + +[issues]: http://github.com/gvvaughas/lyaml/issues +[libyaml]: http://pyyaml.org/wiki/LibYAML +[lua]: http://www.lua.org +[luarocks]: http://www.luarocks.org +[lyaml]: http://github.com/gvvaughan/lyaml +[L15]: http://github.com/gvvaughan/lyaml/blob/master/lyaml-git-1.rockspec#L15 +[yaml.h]: http://pyyaml.org/browser/libyaml/branches/stable/include/yaml.h +[yaml]: http://yaml.org +[yaml11]: http://yaml.org/spec/1.1/ diff --git a/contrib/lyaml/build-aux/config.ld.in b/contrib/lyaml/build-aux/config.ld.in new file mode 100644 index 000000000000..0d55b9e94c30 --- /dev/null +++ b/contrib/lyaml/build-aux/config.ld.in @@ -0,0 +1,34 @@ +--[[ + LYAML binding for Lua 5.1, 5.2, 5.3 & 5.4 + Copyright (C) 2013-2022 Gary V. Vaughan +]] + +title = '@package@ @version@ Reference' +project = '@package@ @version@' +description = [[ +# LYAML binding for Lua + +This is a Lua binding for the fast libYAML C library for converting +between `%YAML 1.1` and Lua tables, with a flexible Lua language +API to load and save YAML documents. + +It works with Lua 5.1 (including LuaJIT), 5.2, 5.3 and 5.4. + +## LICENSE + +The code is copyright by its respective authors, and released under the +MIT license (the same license as Lua itself). There is no warranty. +]] + +dir = '../doc' + +file = { + '../lib/lyaml/init.lua', + '../lib/lyaml/explicit.lua', + '../lib/lyaml/functional.lua', + '../lib/lyaml/implicit.lua', +} + +format = 'markdown' +backtick_references = false +sort = false diff --git a/contrib/lyaml/build-aux/luke b/contrib/lyaml/build-aux/luke new file mode 100755 index 000000000000..3d61f784cbca --- /dev/null +++ b/contrib/lyaml/build-aux/luke @@ -0,0 +1,672 @@ +#!/usr/bin/env lua +--[[ minified code follows, see --help text for source location! ]] +local require=function(modname)if package.loaded[modname]==nil then +if type(package.preload[modname])~="function"then +io.stderr:write("module '" .. modname .. "' not found:\n no valid field package.preload['" .. modname .. "']\n") +return nil +end +package.loaded[modname]=package.preload[modname](modname,"package.preload")end +return package.loaded[modname]end +package.preload['luke._base']=function() +local _ENV=require'std.normalize'{}local function fatal(...)local msg=(...)if select('#',...)>1 then +msg=format(...)end +stderr:write('luke: fatal: '..msg..'\n')exit(1)end +return{diagnose=function(predicate,...)if not predicate then +fatal(...)end +end,fatal=fatal,} +end +package.preload['luke.cli']=function() +local _ENV=require'std.normalize'{'luke._base','luke.lukefile','luke.platforms','std.functional',}local function version()print[[ +luke (Luke) 0.2.3 +Written by Gary V. Vaughan , 2014 + +Copyright (C) 2022, Gary V. Vaughan +Luke comes with ABSOLUTELY NO WARRANTY. +You may redistribute copies of Luke under the terms of the MIT license; +it may be used for any purpose at absolutely no cost, without permission. +See for details. +]]exit(0)end +local function help()print[[ +Usage: luke [OPTION]... [VAR=VALUE]... [TARGET] + +Use the source, Luke! + + --help print this help, then exit + --version print version number, then exit + --file=FILE use FILE instead of lukefile + --value=NAME print the value of variable NAME + --quiet without any output + --verbose provide more progress output + +Each TARGET can be one of the module table keys from lukefile, or: + + all build all targets in lukefile + install copy all built targets to $PREFIX + +If no TARGET is given, 'all' is implied. + +Report bugs to https://github.com/gvvaughan/luke/issues.]]exit(0)end +local function opterr(...)local msg=(...)if select('#',...)>1 then +msg=format(...)end +msg=gsub(msg,'%.$','')stderr:write('luke: error: '..msg..'.\n')stderr:write("luke: try '"..arg[0].." --help' for help.\n")exit(2)end +local function display(...)return stdout:write(concat{...})end +local function dump(...)local s=concat(map(list(...),str))if len(s)>0 then +gsub(concat(map(list(...),str)),'\n*$','\n'):gsub('(.-)\n',function(line)stderr:write(' DEBUG: '..line..'\n')end)end +end +local function interpolate_to_substitute(s)return(gsub(s,'%$([%w_]+)','@%1@'))end +return{parse_arguments=function(args)local r={clidefs={},valreqs={},fname='lukefile',install={},log=nop,targets={},verbose=nop,write=display,}map(args,function(opt)case(opt,{['--debug']=function()r.log=dump +end,['%-%-file=(.+)']=function(optarg)r.fname=optarg +end,['%-%-value=(.+)']=function(optarg)r.valreqs[#r.valreqs+1]=optarg +end,['--quiet']=function()r.write=nop +end,['--verbose']=function()r.verbose=display +end,['--help']=help,['--version']=version,['([^-][^=]-)=(.+)']=function(name,value)r.clidefs[name]=value +end,function(opt)if match(opt,'^-')~=nil then +opterr("unrecognized option '%s'",opt)end +append(r.targets,opt)end,})end)return r +end,validate_arguments=function(parsed)local luke,err=loadluke(parsed.fname)diagnose(luke~=nil,'bad %s: %s',parsed.fname,err)if isempty(luke.modules or{})then +fatal("no modules table in '%s', nothing to build",parsed.fname)end +local targets=call(function()if isempty(parsed.targets)or contains(parsed.targets,'all')then +return except(flatten(parsed.targets,keys(luke.modules)),'all')end +local r=filter(parsed.targets,function(target)if target~='install'and luke.modules[target]==nil then +fatal("no rule to make target '%s'",target)end +return true +end)assert(len(r)>0,"no build targets specified")return r +end)local install +local build=pluck(targets,luke.modules)if contains(targets,'install')then +install=build or luke.modules +end +luke.modules=build +if isempty(luke.modules)then +luke.external_dependencies=nil +end +luke.substitute=merge(luke.substitute or{},{package=interpolate_to_substitute(luke.package),version=interpolate_to_substitute(luke.version),})luke.variables=merge(luke.variables or{},collect_variables(luke),{LUA_DIR='/usr',LUA_BINDIR='$LUA_DIR/bin',LUA_INCDIR='$LUA_DIR/include/lua$LUAVERSION',LUA_LIBDIR='$LUA_DIR/lib',objdir=platforms[1],package=luke.package,version=luke.version,})return{clidefs=parsed.clidefs,install=install,log=parsed.log,luke=luke,valreqs=parsed.valreqs,verbose=parsed.verbose,write=parsed.write,}end,} +end +package.preload['luke.compile']=function() +local _ENV=require'std.normalize'{'luke._base','luke.environment','std.functional','type.context-manager','type.path',SHELLMETACHARS='[%s%$"]',}local function spawn(env,...)local command=interpolate(env,concat({...},' '))return with(TmpFile(),TmpFile(),function(out,err)local pipe=concat{command,' >',out.filename,' 2>',err.filename,'; printf $?'}return tonumber(slurp(Pipe(pipe))),slurp(File(err.filename)),slurp(File(out.filename))end)end +local function run(L,env,command)L.write(interpolate(env,concat(command,' ')),'\n')local status,err,out=spawn(env,unpack(command))if status~=0 then +if L.write==nop then +stdout:write(concat(command,' ')..'\n')end +stderr:write(err..'\n')end +return status,out,err +end +local function defines(env,deftables)return zip_with(merge({},unpack(deftables)),function(name,value)local fmt=cond({[int(value)==1]='-D%s'},{[match(value,SHELLMETACHARS)~=nil]="-D%s='%s'"},{[true]='-D%s=%s'})return format(fmt,name,value)end)end +local function incdirs(...)return map(flatten(...),function(v)return'-I'..v +end)end +local function libdirs(...)return map(flatten(...),function(v)return'-L'..v +end)end +local function c_module_path(objdir,name)return format('%s/%s.$LIB_EXTENSION',objdir,gsub(name,'%.','/'))end +local function c_source(module,objdir)local path=gsub(module,'%.','/')local src=c_module_path(objdir,path)return src,(gsub('$INST_LIBDIR/'..path,'/[^/]+$',''))end +local function lua_source(module,src)local abspath='$INST_LUADIR/'..gsub(module,'%.','/')if match(src,'/init%.lua$')then +abspath=abspath..'/init'end +abspath=abspath..'.lua'return src,(gsub(abspath,'/[^/]+%.lua$',''))end +local function module_to_path(module,sources,objdir)return dropuntil(sources,function(source)return case(source,{['.*%.[ch]']=bind(c_source,{module,objdir}),['(.*%.[ch])%.in']=bind(c_source,{module,objdir}),['.*%.lua']=bind(lua_source,{module}),['(.*%.lua)%.in']=bind(lua_source,{module}),function(src)fatal("unsupported source type '%s'",src)end,})end)end +return{build_c_module=function(L,env,luke,name)local rules=luke.modules[name]local c_module=c_module_path(luke.variables.objdir,name)local command={'$MAKEDIRS',dirname(c_module)}local status,err,out=spawn(env,unpack(command))if status~=0 then +stdout:write(concat(command,' ')..'\n')stderr:write(err..'\n')exit(status)end +return run(L,env,flatten('$CC $CFLAGS $LIBFLAG $PKGFLAGS $CPPFLAGS',defines(env,except(list(rules.defines,luke.defines),nil)),incdirs(rules.incdirs,luke.incdirs),rules.sources,'-o',c_module,'$LDFLAGS',libdirs(rules.libdirs,luke.libdirs),'$LIBS',rules.libraries,luke.libraries))end,c_modules=function(modules)return filter(keys(modules),function(name)return dropuntil(modules[name].sources,bind(match,{[2]='%.[ch]$'}))end)end,incdirs=incdirs,install_modules=function(L,env,luke,modules)return reduce(keys(modules),0,function(status,name)if status==0 then +local src,dir=module_to_path(name,modules[name].sources,luke.variables.objdir)if not exists(interpolate(env,dir))then +status=run(L,env,{'$MAKEDIRS',dir})end +if status==0 then +status=run(L,env,{'$INSTALL',src,dir..'/'})end +end +return status +end)end,libdirs=libdirs,run_command=run,spawn=spawn,} +end +package.preload['luke.configure']=function() +local _ENV=require'std.normalize'{'luke._base','luke.compile','luke.environment','std.functional','type.context-manager','type.dict',CCPROGS={'cc','gcc','clang'},}local function logspawn(L,env,...)local status,err=spawn(env,...)if status~=0 and err~=''then +L.log(err)end +return status +end +local function checking(L,...)L.verbose('checking ',concat({...},' '),'... ')end +local function found_library(L,x)if x==nil or x==''then +L.verbose'none required'elseif isempty(x)then +L.verbose'not supported'else +L.verbose(x)end +L.verbose'\n'return x +end +local function found_prog(L,x)L.verbose(x and'yes\n'or'no\n')return x +end +local function found_result(L,x)L.verbose(x==0 and'yes\n'or'no\n')return x~=0 and 0 or 1 +end +local function bindirs(...)return map(flatten(...),function(v)return v..':'end)end +local function compile_command(L,env,config,filename)local command=flatten('$CC','-c','$CFLAGS',incdirs(config.incdir),'$CPPFLAGS',filename)L.log(interpolate(env,concat(command,' ')))return unpack(command)end +local function link_command(L,env,config,a_out,source,lib)local command=flatten('$CC','$CFLAGS',incdirs(config.incdir),'$CPPFLAGS','-o',a_out,source,libdirs(config.libdir),'$LDFLAGS',lib,'$libs',CONFIGENV.libs)L.log(interpolate(env,concat(command,' ')))return unpack(command)end +local function check_executable_in_path(L,env,config,prog)local PATH=concat(bindirs(config.bindir))..getenv('PATH')local found=dropuntil(gmatch(PATH,'[^:]+'),function(path)local progpath=path..'/'..prog +return with(File(progpath,'r'),function(h)return h and isfile(h.context)and progpath or nil +end)end)L.log(found and'found '..found or prog..' not found')return found~=nil +end +local function check_header_compile(L,env,config,header,extra_hdrs)return with(CTest(),function(conftest)conftest:write(format('%s\n#include "%s"\n',extra_hdrs,header))return logspawn(L,env,compile_command(L,env,config,conftest.filename))end)end +local function check_struct_member_compile(L,env,config,structname,member,extra_hdrs)return with(CTest(),function(conftest)conftest:write(format([[ +%s +int main () { +static %s aggr; +if (sizeof aggr.%s) + return 0; +return 0; +} +]],extra_hdrs,structname,member))return logspawn(L,env,compile_command(L,env,config,conftest.filename))end)end +local function try_link(L,env,config,lib,symbol)return with(CTest(),TmpFile(),function(conftest,a_out)conftest:write(format([[ +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +char %s (); +int main () { +return %s (); +} +]],symbol,symbol))return logspawn(L,env,link_command(L,env,config,a_out.filename,conftest.filename,lib))end)end +local function try_compile(L,env,config,headers)return with(CTest(),TmpFile(),function(conftest,a_out)conftest:write(format([[ +%s +#if !defined %s || %s == -1 +choke me +#endif +int +main() +{ +return 0; +} +]],headers,config.ifdef,config.ifdef))return logspawn(L,env,link_command(L,env,config,a_out.filename,conftest.filename))end)end +local function check_func_decl(L,env,config,fname,extra_hdrs)return with(CTest(),function(conftest)conftest:write(format([[ +%s +int +main() +{ +#ifndef %s +(void) %s; +#endif +return 0; +} +]],extra_hdrs,fname,fname))return logspawn(L,env,compile_command(L,env,config,conftest.filename))end)end +local function check_func_link(L,env,config,fname)return with(CTest(),TmpFile(),function(conftest,a_out)conftest:write(format([[ +/* Define to an innocous variant, in case declares it. + For example, HP-UX 11i declares gettimeofday. */ +#define %s innocuous_%s + +/* System header to define __stub macros and hopefully few prototypes, + which can conflict with declaration below. + Prefer to if __STDC__ is defined, since + exists even on freestanding compilers. */ + +#ifdef __STDC__ +# include +#else +# include +#endif + +#undef %s + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +char %s (); + +/* The GNU C library defines this for functions which it implements + to always fail with ENOSYS. Some functions are actually named + something starting with __ and the normal name is an alias. */ +#if defined __stub_%s || defined __stub__%s +choke me +#endif + +int main () { +return %s (); +} +]],fname,fname,fname,fname,fname,fname,fname))return logspawn(L,env,link_command(L,env,config,a_out.filename,conftest.filename))end)end +local function add_external_deps(env,config,prefix)if prefix~=nil then +for k,v in next,{bindir='$%s_BINDIR',incdir='$%s_INCDIR',libdir='$%s_LIBDIR'}do +local envvar=interpolate(env,format(v,prefix))if envvar~=''then +config[k]=envvar +end +end +end +end +local function format_includes(includes)return map(includes or{},function(include)return format('#include "%s"',include)end)end +local configure=setmetatable(OrderedDict({checkprog=function(L,env,config)return dropuntil(config.progs,function(prog)checking(L,'for',prog)if found_prog(L,check_executable_in_path(L,env,config,prog))then *** 6606 LINES SKIPPED *** From nobody Tue Jul 8 14:32: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 4bc3Tt5BRKz614qh; Tue, 08 Jul 2025 14:32: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bc3Tt3Sj3z49L8; Tue, 08 Jul 2025 14:32:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1751985138; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=PSN52kThE5FUCOkVGW86rTMlP0rczKh0/nbSGOSjwyQ=; b=ts38RFYCCiV+uKElTmI2VBgTKBxWpXu6cHCsKSRZJr7aub9i+y9mXUyjY7YZDLW9Xezp12 orK4EuEvfkp3CCReoBTTnwTyXcp1rH15WyaY7hUaQHkEzhweEq5aUFePR+laFj4c6Nol6Y ShaTzV5CtvIrQ63gjEgiRXQ6ZreVtoHyGW+LBYyCfceeeG65YRkvwZ5WpvHynK4U3k1uEu bBlMFoc5LXVzRsp/pb3MJKljf83EYPAwHwDOJpN0de/VbBpFqMRHDUynj2N2ROwCA4Cq5c yT0xngKJteYKdjn7LgckCHHFOevZam9WNkNRQVkXegYl/ADYjmNCKfLPhHA4tw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1751985138; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=PSN52kThE5FUCOkVGW86rTMlP0rczKh0/nbSGOSjwyQ=; b=vqDuhrx77PjpTm9t85N7ti1FNiKD1XCuAp2UkcV/CK7VUwtmoP2aBQgXedyJTMKUzYFDB7 5RsprhjmACtKWt8+HUmP7Gd0GY/Ozx1XVbx/fTMPe+6lRyRtsXYcMEo76cBePsskSQiDGM nnW/lNE6BB6Dgw+hNYbEkuePPfomus/R7Iv2g3avDCsAlpp7HbinESFg88vYs8TK5sAbAW aQYrH1IT637M7jBL8hntM0hUbVHwEFmVfLF77ohzivI6FtzcMXaaxeKGtQ3zCdrjiWJA+B fUorZP8NjBFiJJiyW5L1rdYOcYPxQvb/fc6Bf3zp9FJs6DB3GC4kG1hA0iIy7w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1751985138; a=rsa-sha256; cv=none; b=kv5o2hv0Fh8mZQbw75lhIE+QyOb4cND7FTo5ucqhGDdXJEnJJxPawChFriR90XZUp7ZZ1r rIIz6Jv57COq2p4hRJj3Fd240UuMOl2lw7qaMLrAIKjROMS5awWtsWse4vtnpiM2MUv410 Pfs3BNt7PSinnmDU7uTEOrN13+uvjl9txjWLaqUfVK9YMwGpn7SdAhLqR/Zyjf9H9x1SYx 9/PRV4bB/UFM1bDJVf02NVaFd8UntTX1Ney611v+r9hT3n2jaqlYIbodk3+yMMARY07M/y xo4CwjutvfgoaeoxyOwK1/NqMWfBPAbxmJs6wplA8yM9welSU9cTg4rcbGGx4Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4bc3Tt32b4zhGW; Tue, 08 Jul 2025 14:32: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 568EWIUo072231; Tue, 8 Jul 2025 14:32:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 568EWIXk072228; Tue, 8 Jul 2025 14:32:18 GMT (envelope-from git) Date: Tue, 8 Jul 2025 14:32:18 GMT Message-Id: <202507081432.568EWIXk072228@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Baptiste Daroussin Subject: git: cf48057f3ea9 - stable/14 - flua: move modules source into the main source directory List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bapt X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: cf48057f3ea9cf19e31fb03404bc2a73cc35ba43 Auto-Submitted: auto-generated The branch stable/14 has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=cf48057f3ea9cf19e31fb03404bc2a73cc35ba43 commit cf48057f3ea9cf19e31fb03404bc2a73cc35ba43 Author: Baptiste Daroussin AuthorDate: 2024-09-09 15:17:27 +0000 Commit: Baptiste Daroussin CommitDate: 2025-07-08 14:27:17 +0000 flua: move modules source into the main source directory Follow the path of what is done with bsnmp, build the modules along with the main binary, this allows to build the modules at a moment where all needed libraries are already built and available in the linker path instead of having to declare all the libraries which a flua module will be linked to in _prebuild_libs. Discused with: markj Reviewed by: markj, jrtc27, kevans, imp Accepted by: kevans, imp Differential Revision: https://reviews.freebsd.org/D46610 (cherry picked from commit 7899f917b1c0ea178f1d2be0cfb452086d079d23) --- Makefile.inc1 | 4 +--- lib/Makefile | 5 ----- lib/flua/Makefile | 6 ------ lib/flua/libfreebsd/sys/linker/Makefile | 12 ------------ lib/flua/libhash/Makefile | 14 -------------- libexec/flua/Makefile | 5 +++++ libexec/flua/Makefile.inc | 5 +++++ {lib => libexec}/flua/libfreebsd/Makefile | 0 libexec/flua/libfreebsd/Makefile.inc | 1 + {lib => libexec}/flua/libfreebsd/sys/Makefile | 0 libexec/flua/libfreebsd/sys/Makefile.inc | 1 + libexec/flua/libfreebsd/sys/linker/Makefile | 7 +++++++ .../flua/libfreebsd/sys/linker/freebsd.sys.linker.3lua | 0 {lib => libexec}/flua/libfreebsd/sys/linker/linker.c | 0 libexec/flua/libhash/Makefile | 9 +++++++++ {lib => libexec}/flua/libhash/hash.3lua | 0 {lib => libexec}/flua/libhash/lhash.c | 0 {lib => libexec}/flua/libhash/lhash.h | 0 {lib => libexec}/flua/libjail/Makefile | 5 ----- {lib => libexec}/flua/libjail/jail.3lua | 0 {lib => libexec}/flua/libjail/lua_jail.c | 0 {lib => libexec}/flua/libucl/Makefile | 3 --- stand/defs.mk | 2 +- 23 files changed, 30 insertions(+), 49 deletions(-) diff --git a/Makefile.inc1 b/Makefile.inc1 index cb193f677b30..d9ac4491ef77 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -3178,8 +3178,7 @@ _prebuild_libs= ${_kerberos5_lib_libasn1} \ lib/libutil lib/libpjdlog ${_lib_libypclnt} lib/libz lib/msun \ lib/libxo \ ${_secure_lib_libcrypto} ${_secure_lib_libssl} \ - ${_lib_libldns} ${_secure_lib_libssh} \ - lib/libucl + ${_lib_libldns} ${_secure_lib_libssh} .if ${MK_DIALOG} != "no" _prebuild_libs+= gnu/lib/libdialog @@ -3235,7 +3234,6 @@ _generic_libs+= ${_DIR} lib/libtacplus__L: lib/libmd__L lib/libpam/libpam__L lib/libxo__L: lib/libutil__L -lib/libucl__L: lib/msun__L .if ${MK_CDDL} != "no" _cddl_lib_libumem= cddl/lib/libumem diff --git a/lib/Makefile b/lib/Makefile index 855d7ca0279e..2fa992731715 100644 --- a/lib/Makefile +++ b/lib/Makefile @@ -149,11 +149,6 @@ SUBDIR_DEPEND_libpcap= ofed .endif SUBDIR_DEPEND_nss_tacplus= libtacplus -.if !defined(COMPAT_LIBCOMPAT) -SUBDIR+= flua -SUBDIR_DEPEND_flua= libjail libucl -.endif - # NB: keep these sorted by MK_* knobs SUBDIR.${MK_BEARSSL}+= libbearssl libsecureboot diff --git a/lib/flua/Makefile b/lib/flua/Makefile deleted file mode 100644 index d88e76f61062..000000000000 --- a/lib/flua/Makefile +++ /dev/null @@ -1,6 +0,0 @@ -SUBDIR+= libfreebsd -SUBDIR+= libhash -SUBDIR+= libjail -SUBDIR+= libucl - -.include diff --git a/lib/flua/libfreebsd/sys/linker/Makefile b/lib/flua/libfreebsd/sys/linker/Makefile deleted file mode 100644 index 572b5949d2a1..000000000000 --- a/lib/flua/libfreebsd/sys/linker/Makefile +++ /dev/null @@ -1,12 +0,0 @@ -SHLIB_NAME= linker.so -SHLIBDIR= ${LIBDIR}/flua/freebsd/sys - -SRCS+= linker.c - -CFLAGS+= \ - -I${SRCTOP}/contrib/lua/src \ - -I${SRCTOP}/lib/liblua \ - -MAN= freebsd.sys.linker.3lua - -.include diff --git a/lib/flua/libhash/Makefile b/lib/flua/libhash/Makefile deleted file mode 100644 index f166ff90a392..000000000000 --- a/lib/flua/libhash/Makefile +++ /dev/null @@ -1,14 +0,0 @@ -SHLIB_NAME= hash.so -SHLIBDIR= ${LIBDIR}/flua - -SRCS+= lhash.c - -CFLAGS+= \ - -I${SRCTOP}/contrib/lua/src \ - -I${SRCTOP}/lib/liblua \ - -LIBADD+= md - -MAN= hash.3lua - -.include diff --git a/libexec/flua/Makefile b/libexec/flua/Makefile index 4173e43baab2..4b4b2c94eca4 100644 --- a/libexec/flua/Makefile +++ b/libexec/flua/Makefile @@ -1,6 +1,11 @@ .include +SUBDIR+= libfreebsd +SUBDIR+= libhash +SUBDIR+= libjail +SUBDIR+= libucl + LUASRC?= ${SRCTOP}/contrib/lua/src .PATH: ${LUASRC} diff --git a/libexec/flua/Makefile.inc b/libexec/flua/Makefile.inc new file mode 100644 index 000000000000..34505d54d7df --- /dev/null +++ b/libexec/flua/Makefile.inc @@ -0,0 +1,5 @@ +SHLIBDIR?= ${LIBDIR}/flua + +CFLAGS+= \ + -I${SRCTOP}/contrib/lua/src \ + -I${SRCTOP}/lib/liblua diff --git a/lib/flua/libfreebsd/Makefile b/libexec/flua/libfreebsd/Makefile similarity index 100% rename from lib/flua/libfreebsd/Makefile rename to libexec/flua/libfreebsd/Makefile diff --git a/libexec/flua/libfreebsd/Makefile.inc b/libexec/flua/libfreebsd/Makefile.inc new file mode 100644 index 000000000000..01b5f23410c8 --- /dev/null +++ b/libexec/flua/libfreebsd/Makefile.inc @@ -0,0 +1 @@ +.include "../Makefile.inc" diff --git a/lib/flua/libfreebsd/sys/Makefile b/libexec/flua/libfreebsd/sys/Makefile similarity index 100% rename from lib/flua/libfreebsd/sys/Makefile rename to libexec/flua/libfreebsd/sys/Makefile diff --git a/libexec/flua/libfreebsd/sys/Makefile.inc b/libexec/flua/libfreebsd/sys/Makefile.inc new file mode 100644 index 000000000000..01b5f23410c8 --- /dev/null +++ b/libexec/flua/libfreebsd/sys/Makefile.inc @@ -0,0 +1 @@ +.include "../Makefile.inc" diff --git a/libexec/flua/libfreebsd/sys/linker/Makefile b/libexec/flua/libfreebsd/sys/linker/Makefile new file mode 100644 index 000000000000..1adf547b503c --- /dev/null +++ b/libexec/flua/libfreebsd/sys/linker/Makefile @@ -0,0 +1,7 @@ +SHLIB_NAME= linker.so + +SRCS+= linker.c + +MAN= freebsd.sys.linker.3lua + +.include diff --git a/lib/flua/libfreebsd/sys/linker/freebsd.sys.linker.3lua b/libexec/flua/libfreebsd/sys/linker/freebsd.sys.linker.3lua similarity index 100% rename from lib/flua/libfreebsd/sys/linker/freebsd.sys.linker.3lua rename to libexec/flua/libfreebsd/sys/linker/freebsd.sys.linker.3lua diff --git a/lib/flua/libfreebsd/sys/linker/linker.c b/libexec/flua/libfreebsd/sys/linker/linker.c similarity index 100% rename from lib/flua/libfreebsd/sys/linker/linker.c rename to libexec/flua/libfreebsd/sys/linker/linker.c diff --git a/libexec/flua/libhash/Makefile b/libexec/flua/libhash/Makefile new file mode 100644 index 000000000000..b7c8d7ee9948 --- /dev/null +++ b/libexec/flua/libhash/Makefile @@ -0,0 +1,9 @@ +SHLIB_NAME= hash.so + +SRCS+= lhash.c + +LIBADD+= md + +MAN= hash.3lua + +.include diff --git a/lib/flua/libhash/hash.3lua b/libexec/flua/libhash/hash.3lua similarity index 100% rename from lib/flua/libhash/hash.3lua rename to libexec/flua/libhash/hash.3lua diff --git a/lib/flua/libhash/lhash.c b/libexec/flua/libhash/lhash.c similarity index 100% rename from lib/flua/libhash/lhash.c rename to libexec/flua/libhash/lhash.c diff --git a/lib/flua/libhash/lhash.h b/libexec/flua/libhash/lhash.h similarity index 100% rename from lib/flua/libhash/lhash.h rename to libexec/flua/libhash/lhash.h diff --git a/lib/flua/libjail/Makefile b/libexec/flua/libjail/Makefile similarity index 50% rename from lib/flua/libjail/Makefile rename to libexec/flua/libjail/Makefile index c7649c724c0a..2786c9b0e8f3 100644 --- a/lib/flua/libjail/Makefile +++ b/libexec/flua/libjail/Makefile @@ -1,13 +1,8 @@ SHLIB_NAME= jail.so -SHLIBDIR= ${LIBDIR}/flua SRCS+= lua_jail.c -CFLAGS+= \ - -I${SRCTOP}/contrib/lua/src \ - -I${SRCTOP}/lib/liblua \ - LIBADD+= jail MAN= jail.3lua diff --git a/lib/flua/libjail/jail.3lua b/libexec/flua/libjail/jail.3lua similarity index 100% rename from lib/flua/libjail/jail.3lua rename to libexec/flua/libjail/jail.3lua diff --git a/lib/flua/libjail/lua_jail.c b/libexec/flua/libjail/lua_jail.c similarity index 100% rename from lib/flua/libjail/lua_jail.c rename to libexec/flua/libjail/lua_jail.c diff --git a/lib/flua/libucl/Makefile b/libexec/flua/libucl/Makefile similarity index 72% rename from lib/flua/libucl/Makefile rename to libexec/flua/libucl/Makefile index 7d2681b85fcb..a88c8bda6bfc 100644 --- a/lib/flua/libucl/Makefile +++ b/libexec/flua/libucl/Makefile @@ -1,5 +1,4 @@ SHLIB_NAME= ucl.so -SHLIBDIR= ${LIBDIR}/flua WARNS= 2 @@ -7,8 +6,6 @@ UCLSRC?= ${SRCTOP}/contrib/libucl .PATH: ${UCLSRC}/lua SRCS+= lua_ucl.c CFLAGS+= \ - -I${SRCTOP}/contrib/lua/src \ - -I${SRCTOP}/lib/liblua \ -I${UCLSRC}/include \ -I${UCLSRC}/src \ -I${UCLSRC}/uthash diff --git a/stand/defs.mk b/stand/defs.mk index a1cb39f8b4a0..9f4154d59219 100644 --- a/stand/defs.mk +++ b/stand/defs.mk @@ -69,7 +69,7 @@ BINDIR?= /boot # LUAPATH is where we search for and install lua scripts. LUAPATH?= /boot/lua FLUASRC?= ${SRCTOP}/libexec/flua -FLUALIB?= ${SRCTOP}/lib/flua +FLUALIB?= ${SRCTOP}/libexec/flua LIBSA= ${BOOTOBJ}/libsa/libsa.a .if ${MACHINE} == "i386" From nobody Tue Jul 8 14:32: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 4bc3Tv5z3tz614bT; Tue, 08 Jul 2025 14:32:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bc3Tv40JMz49Fh; Tue, 08 Jul 2025 14:32:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1751985139; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3rBiuGdh/d0dSh4g8IBzLt6fBIwEWoIcDIBitMIQz+Y=; b=beSDZa9am8qRlAr1ap3TZvBg/RPdBAbVTWaU+3LcE9vOyOMJ4Fa16a7XBXoVJ3QMbQlnpL L95NL19erAOeIQ/JgHoWf3kOhHa+T0t02/V/tM5p8Lzor2y9lEFwNKuj4PAGVNiDMJQ8A9 9STum525PLUQwfaAHahQRuOtCBGGe/tr2+9fnbIFX93uPOD28sr9/bIlPzJism1tMGBRo1 xO8PyQ1/YiPPMbO2/ze+h43HFmFUPQ+URkqyBEu3q24mzAAH9/0I5/U9iEINiH4QxG0EXv wb3nVFRt0PJrmPt5q40ZCUp6mdHJF+AxbcTTOjjjHEgFNj9/r8qPbAQk+rJLmw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1751985139; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3rBiuGdh/d0dSh4g8IBzLt6fBIwEWoIcDIBitMIQz+Y=; b=hBOin9uHB/y50kVWVnLHOrpJOD16Q2X+Tcokjt76X35evC222GKAsxfIzOqSLD48+sOhvx 7KVZA9S6CV5zYVbZ9kh/CsfKEsV63DB8y1OAAdsmB7FTX59nhZLO7AB+NCu3A+B4lhrzEE A53MBA7OL1/Bmpla8e9Sd8jnr/TZTPiz+c0H6H3jqhBB8prlFbdW/3o+kfsBi8BzlN1j9I xfyv5t3HwWsh/50PY6RBbc3N8BzGHnEqo5BxVcIOAcqw8ztWCkLrEvy9NVBe2xdCbmQT4x NCQEUL3TWqdLI9Zl8Vv14is+6RQJ7rfUV9UYs7GzEJCw0htPzsAvyAfDOm7A3g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1751985139; a=rsa-sha256; cv=none; b=oEVwiO/dt1K0wqshgCEfvoTDIBSwzZeMcm7qIQ2hQsHY194JpFk7vqYhupYJBvGZ7ZZZLt EK6y7QNJFjEOKHriCUPN4gjSSf5FXbPor6OZlmJStBOLZRxJWauj4zLlWaaJRjtlTknHa/ +99KxlmP4/cZY+ulqTIiEPpjBSoM6iA89eJV8E5nmgGwwC1msQ5pfzFMu2xDOQMJEYwx41 67Xs1duqN3WCDPjQ7lSltn9J3qN5ixlXU/YhJ/4pHTFwTehzXR7RzsjDt06+Ohk15vSGwX K9hr7Moga4pp9xQoUF3VU7nhN8pclB6gMgHTGWntmoXU47F/LA60V7jxVP9IGQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4bc3Tv3YdBzhSw; Tue, 08 Jul 2025 14:32: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 568EWJW1072263; Tue, 8 Jul 2025 14:32:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 568EWJ03072260; Tue, 8 Jul 2025 14:32:19 GMT (envelope-from git) Date: Tue, 8 Jul 2025 14:32:19 GMT Message-Id: <202507081432.568EWJ03072260@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Baptiste Daroussin Subject: git: 7a83385d4754 - stable/14 - flua: install linker in the right patch List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bapt X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 7a83385d4754542ddf4e1cac36787d3973ced86b Auto-Submitted: auto-generated The branch stable/14 has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=7a83385d4754542ddf4e1cac36787d3973ced86b commit 7a83385d4754542ddf4e1cac36787d3973ced86b Author: Baptiste Daroussin AuthorDate: 2024-09-12 12:42:01 +0000 Commit: Baptiste Daroussin CommitDate: 2025-07-08 14:27:55 +0000 flua: install linker in the right patch When moving the freebsd.sys.linker sources the installation path was lost. Fixes 7899f917b1c0ea178f1d2be0cfb452086d079d23 (cherry picked from commit cbf53f5e370e2f6ed0dbd2305b48719fcfc6cec8) --- libexec/flua/libfreebsd/sys/Makefile.inc | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libexec/flua/libfreebsd/sys/Makefile.inc b/libexec/flua/libfreebsd/sys/Makefile.inc index 01b5f23410c8..ca2630721733 100644 --- a/libexec/flua/libfreebsd/sys/Makefile.inc +++ b/libexec/flua/libfreebsd/sys/Makefile.inc @@ -1 +1,3 @@ +SHLIBDIR?= ${LIBDIR}/flua/freebsd/sys + .include "../Makefile.inc" From nobody Tue Jul 8 14:32: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 4bc3Ts5SMGz614ny; Tue, 08 Jul 2025 14:32: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bc3Ts2PxTz49My; Tue, 08 Jul 2025 14:32:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1751985137; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/xism9DI4PLGiY9repgLI+9E7QDJ7C4kXnkwvrJTB58=; b=iWY11aKxqvLMd7SeaoZEfXyuZi8p9+PxgsP4As7eLC8j9GpgO3ZS/s9ZjEMjL0nG5UFHsI sEoKoYS4SlAo6AD9rxSRONSY/pu/SqvDnHo9m5XTSlidRORfPk/FbI/DrUA2zfH0bmo0T+ oWfwRltYh7G/8oKEzoqk/6enQXlZ9Yo7IoFWMeafiD0Si1jWMXAIT/7M/MUEmaTvEJ+mjM UksD0Y+xdk7D0h7DYQ5X6Di6xBtFAAU3DpgplJRUncTJJq52Qgy3/6qeAPFa1sval6R4i3 iSUFrOBnRPq8P/dyp2ezJ5hCS70fcN2piJTWQl7rS9J+e48PA4aQGuWOE7ReNA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1751985137; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/xism9DI4PLGiY9repgLI+9E7QDJ7C4kXnkwvrJTB58=; b=gZ9pbISTd0K5Ol5HNSqGyvemT0GfJUNhQvha9yzXYjXvcHktwrKrHIe8ExS4IzIFWArCGE DQrhotTFFFf6D6JZB+d/wVg0VFNG/9LQvaminor8StNUoDhZMBwhlLCIvzOYFo3l2DxWal /Ik6kkNo53WYt1J7atU4N6L6L58nB3wH4PYLj5Yu0vY2NS11CSgoJsc1LMvOPIWomhYh1P NDSBawz0ogc2lIZCJZ7sWI5eqyZNEfpL0KEpbc6qULjDYZu93ECyX4JnMxj0qYXNpYxE40 +w9MdqOFTz7BuoKl4ISEvu41hdUCWSMsqX7tpEU1Jj7EbhR7zksjDPzjAlVIzw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1751985137; a=rsa-sha256; cv=none; b=Ps8xkfax/O4y0avzwIJhEk2GOEjqwFCyB8HmZZlOkS8Qzz7Dnq45BoD5rn9gjdX1FU9uYZ FhUCTXepQqCWl4idElutkVaWQwjryJMxi/OWJ6mI6qvlrJHJO8TCVj/mAKrRCe/Q35MUSj Cr+mnrvDxsKFlNcoDdbpqr4GkVTMZX3YgIexuRRC9DGta6JXJzwiXcal2sDOEZv6HEQI9u f1zwfM6cfAg4HnDXJ7w7R7hqFFHOTF8rKOpEQYxzGt3nbx31GMTorm1MXTpY1/Ut2ZEjHP AuTNW6mSy1C8XQmJcnyokSbmxoKTDoPYdLhullxD7lusXemSvY2dP760Hx04Ug== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4bc3Ts1mSKzh33; Tue, 08 Jul 2025 14:32: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 568EWHv0072199; Tue, 8 Jul 2025 14:32:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 568EWHYB072196; Tue, 8 Jul 2025 14:32:17 GMT (envelope-from git) Date: Tue, 8 Jul 2025 14:32:17 GMT Message-Id: <202507081432.568EWHYB072196@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Baptiste Daroussin Subject: git: 0b31a05166b3 - stable/14 - prebuild_libs: register libucl dependency on libm List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bapt X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 0b31a05166b3594ade1ca3ab28df73b746b8bdd1 Auto-Submitted: auto-generated The branch stable/14 has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=0b31a05166b3594ade1ca3ab28df73b746b8bdd1 commit 0b31a05166b3594ade1ca3ab28df73b746b8bdd1 Author: Baptiste Daroussin AuthorDate: 2024-09-07 12:19:33 +0000 Commit: Baptiste Daroussin CommitDate: 2025-07-08 14:25:58 +0000 prebuild_libs: register libucl dependency on libm Reported by: Rainer Hurling (cherry picked from commit 9f0f4e23a584b5aa965aae774bb2dc1e5892d24a) --- Makefile.inc1 | 1 + 1 file changed, 1 insertion(+) diff --git a/Makefile.inc1 b/Makefile.inc1 index 656f2df9c9f8..cb193f677b30 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -3235,6 +3235,7 @@ _generic_libs+= ${_DIR} lib/libtacplus__L: lib/libmd__L lib/libpam/libpam__L lib/libxo__L: lib/libutil__L +lib/libucl__L: lib/msun__L .if ${MK_CDDL} != "no" _cddl_lib_libumem= cddl/lib/libumem From nobody Tue Jul 8 14:32: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 4bc3V45J9Fz614tr; Tue, 08 Jul 2025 14:32:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bc3V42zKjz49Nh; Tue, 08 Jul 2025 14:32:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1751985148; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=U+sZ04YDH6lh9znMxopxsTuLXPdkGU1U4xsQWBiwFSg=; b=e4pLkGetuGK72McB9hYlXH3eOnwRsxAsgGQ0fET30MF0s8Ci+LNBIRf0TqJUHkgLPpiweg XVox47lGc73MgVkMbTxIy1sxizpoA1nOMsC4VsB2txMYNSnmMjBbniap+SrZLtHPenUZ1w aqhTCrTfyHZbwocjJSTG/PXWofSg9EhfuIlIpL9NpSWDnIKAEZG1bX+ynJ7eA0Xr3U45Pk wqllsLTwos45ycsHugJY+gzxFZyXGGOS7E7PIE/yh59U6I7TvIn/unN81j08mSOmjyRIxN W5q34jxIz6s8yKNQLkyfJdbOWbLUmj4yWgm80aqA+lwiAA7xrHvLc/EZl2Qj9g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1751985148; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=U+sZ04YDH6lh9znMxopxsTuLXPdkGU1U4xsQWBiwFSg=; b=J15UevlQqg2mu+BYmXKSeOFnOZcAdlG0lW7VwsOnDKJYst3CxMs+frz+MjbuEU6GgbNoex Xbx9NUmLKMWPWU2Sm2cbpfDtSlK17ldVkWE+Mlvo+3q5UAKwCuGOpC4E1YCx9X9RUYSJVa lU1Z5PzX1QKSjoj2PNa/3QxdMkAZ1XPjxr1AZ4Bab5ocM3mqF2Yhfhlkb6UZeG8L7v3hXV D0yXtatGnrpsgDMvVUbKeM8R4YGsraBJalaDyGO5UBD2Lx2lQ1DpDejQVoQAZjA6I/TCxi fNq9MkElYbv4X/OeNVPY7FBSeJVAihQCuo1kYCI7Yimnyqh6agLiKo14OjuzAA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1751985148; a=rsa-sha256; cv=none; b=kQJPFviMvhdfSxtVcuYqZ/C/PlD4mSJ3Y7f6qB7XodJ60gp6RtD6NTIzDsWLBiSpdOUlMw pDjiGlxh5GmXMYmCZbMO1pmwCzQvV58gfXJYNIE36Ih6avFP6SKiZyh3yeQSrplfanht5N SUrzjnXCAecTfAaUZj7lVlk3sBNxXPsHvJAnkeNg3wPE7KRTxBfVwP8b/SQMkMKJgbm1Tm s4efoRsqQxCIThQnQdSa9xR7UTtOTSx8VkJx3VCfKn/ZycVKlkquGtCfRW+XYgoYcoFujb UQDAtGbfoXzt5hx/0wz3B/CAD9yIq0CCwE/+AipZa2CR9ZIXtKV/Z171ej8Cqg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4bc3V42Z9szh3F; Tue, 08 Jul 2025 14:32: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 568EWSTJ073605; Tue, 8 Jul 2025 14:32:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 568EWSY8073600; Tue, 8 Jul 2025 14:32:28 GMT (envelope-from git) Date: Tue, 8 Jul 2025 14:32:28 GMT Message-Id: <202507081432.568EWSY8073600@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Baptiste Daroussin Subject: git: 7508443b1604 - stable/14 - nuageinit: enhance sudo support List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bapt X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 7508443b1604bf1adae99f866770deac1bcdce29 Auto-Submitted: auto-generated The branch stable/14 has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=7508443b1604bf1adae99f866770deac1bcdce29 commit 7508443b1604bf1adae99f866770deac1bcdce29 Author: Baptiste Daroussin AuthorDate: 2025-06-26 12:32:27 +0000 Commit: Baptiste Daroussin CommitDate: 2025-07-08 14:31:47 +0000 nuageinit: enhance sudo support from the cloudinit specification sudo rules can be a string or an array of string (cherry picked from commit b56d2195f124d48ce54369d179aa1d4663e5e64a) --- libexec/nuageinit/nuage.lua | 8 +++++++- libexec/nuageinit/nuageinit.7 | 2 +- libexec/nuageinit/tests/nuageinit.sh | 8 +++++++- 3 files changed, 15 insertions(+), 3 deletions(-) diff --git a/libexec/nuageinit/nuage.lua b/libexec/nuageinit/nuage.lua index cdc0fc6cf2a7..161b95c60d56 100644 --- a/libexec/nuageinit/nuage.lua +++ b/libexec/nuageinit/nuage.lua @@ -287,7 +287,13 @@ local function addsudo(pwd) warnmsg("impossible to open " .. sudoers) return end - f:write(pwd.name .. " " .. pwd.sudo .. "\n") + if type(pwd.sudo) == "string" then + f:write(pwd.name .. " " .. pwd.sudo .. "\n") + elseif type(pwd.sudo) == "table" then + for _, str in ipairs(pwd.sudo) do + f:write(pwd.name .. " " .. str .. "\n") + end + end f:close() if chmodsudoers then sys_stat.chmod(sudoers, 416) diff --git a/libexec/nuageinit/nuageinit.7 b/libexec/nuageinit/nuageinit.7 index 3bb440ebac95..327ce160e151 100644 --- a/libexec/nuageinit/nuageinit.7 +++ b/libexec/nuageinit/nuageinit.7 @@ -211,7 +211,7 @@ The list of other groups the user should belong to. .It Ic locked Boolean to determine if the user account should be locked. .It Ic sudo -An entry which should be appended to +A string or an array of strings which which should be appended to .Pa /usr/local/etc/sudoers.d/90-nuageinit-users .El .Pp diff --git a/libexec/nuageinit/tests/nuageinit.sh b/libexec/nuageinit/tests/nuageinit.sh index 639c87181f95..849f1c258b62 100644 --- a/libexec/nuageinit/tests/nuageinit.sh +++ b/libexec/nuageinit/tests/nuageinit.sh @@ -121,6 +121,10 @@ users: sudo: ALL=(ALL) NOPASSWD:ALL groups: users passwd: $6$j212wezy$7H/1LT4f9/N3wpgNunhsIqtMj62OKiS3nyNwuizouQc3u7MbYCarYeAHWYPYb2FT.lbioDm2RrkJPb9BZMN1O/ + - name: bla + sudo: + - "ALL=(ALL) NOPASSWD:/usr/sbin/pw" + - "ALL=(ALL) ALL" EOF atf_check /usr/libexec/nuageinit "${PWD}"/media/nuageinit nocloud atf_check /usr/libexec/nuageinit "${PWD}"/media/nuageinit postnet @@ -131,17 +135,19 @@ admingroup:*:1001:root,sys cloud-users:*:1002: freebsd:*:1003: foobar:*:1004: +bla:*:1005: EOF cat > expectedpasswd << 'EOF' root:*:0:0::0:0:Charlie &:/root:/bin/sh sys:*:1:0::0:0:Sys:/home/sys:/bin/sh freebsd:freebsd:1001:1003::0:0:FreeBSD User:/home/freebsd:/bin/sh foobar:$6$j212wezy$7H/1LT4f9/N3wpgNunhsIqtMj62OKiS3nyNwuizouQc3u7MbYCarYeAHWYPYb2FT.lbioDm2RrkJPb9BZMN1O/:1002:1004::0:0:Foo B. Bar:/home/foobar:/bin/sh +bla::1003:1005::0:0:bla User:/home/bla:/bin/sh EOF sed -i "" "s/freebsd:.*:1001/freebsd:freebsd:1001/" "${PWD}"/etc/master.passwd atf_check -o file:expectedpasswd cat "${PWD}"/etc/master.passwd atf_check -o file:expectedgroup cat "${PWD}"/etc/group - atf_check -o inline:"foobar ALL=(ALL) NOPASSWD:ALL\n" cat ${PWD}/usr/local/etc/sudoers.d/90-nuageinit-users + atf_check -o inline:"foobar ALL=(ALL) NOPASSWD:ALL\nbla ALL=(ALL) NOPASSWD:/usr/sbin/pw\nbla ALL=(ALL) ALL\n" cat ${PWD}/usr/local/etc/sudoers.d/90-nuageinit-users } nocloud_network_head() From nobody Tue Jul 8 14:32: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 4bc3V55QdKz614qp; Tue, 08 Jul 2025 14:32:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bc3V53qrhz49Yc; Tue, 08 Jul 2025 14:32:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1751985149; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=X20OwPly5HY3F0+zfLsjntudl634iu4T1Oqb8o+kEQ0=; b=Fm6gLtVzhC0acX5yCJanwi1Hf/oasag+aErdWqAvkS/H1Nx47STu2CZxpZ7CHfCXgwT47x n6OeG4JmzWjfl5SZ7MbymGsiG2XfRrAsM1l/OsG8WDBsAlPWYiZdrw3+u1PGQxVGtB/HGo GYNWT97cxnU4AHStm6dzeEz8LawDCpN9su5Ll1TTjfsPLb1mReY/Mdm/zNgJsGsBZs+nj2 BfQhUEbwQEjaQpGXu2QkmqbPrWv61T3Sb1gFBgTZFHZr8KqQeLytUrR4fX1Og1+ZjO3VLv JRqclVb7Q+ZFS5GC+cAt37hmYxXW0X0LEwc5w+0OERXOifvWAt/c0bh/dHj2yw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1751985149; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=X20OwPly5HY3F0+zfLsjntudl634iu4T1Oqb8o+kEQ0=; b=vbp9XSNreo21YGs1xbh588CX1sSVIlp0kOA8rFcSIq2qrwNNbGl+ly4kmmLaRAWu/vHCBd HB5VLPYgMi6YAroZRfimOtHueT4mCN1kyR31saURoM9uf6mG2iJCWO213hpAjef34ttAru cG0ASz51e2vusRu3djDhHUKjjRNTOfXQ1TXXuHLJSjZC9zTQSD1xUbjcIgfa3xnr3OLbYQ PCkTMOP5JIU2NT7t9mf3A/7++YhXHvBQdX9zV20JDOUWVZc9rRmul22LFC2WZoxD18hFGq j0wtSkv+c41ieKUJJyE10mt7hDJvQjeHXCrXF99M9RwTq3Bx+FkL2dtM16gMjw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1751985149; a=rsa-sha256; cv=none; b=jbIw28tmFLn6SKffMdySEQFMi9yjN1+e1SvZd31s4VSA5EpciwM+lyJbUh1LQESAXY6f/O eMdxwJUYNu5NCiRTxsCvJj5hGoZ8gv9JY0+bzn8KzW9zJpcsr2xLmQ+4SR3emxmUs0u5u0 xgi6lKP9sUbqOFZoTSsRx4GqkghBli3dJYy6k6X0LSoiTwqk4S88PgkNH6WfyMYuG/GLB8 TRcM6npx1rb4dm+acoMSGnfovObLnaaAlQlSKRljL6EBqupuZu/yZkxH2Eh1KgOPl10nm5 RobCwf7RBbr3gQaoVL+yPnDMsy+23BhmzI32ex9zsFSPq2ZLWnqehIsQ+WZzaw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4bc3V53HhMzgxb; Tue, 08 Jul 2025 14:32: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 568EWTs8073639; Tue, 8 Jul 2025 14:32:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 568EWTFE073636; Tue, 8 Jul 2025 14:32:29 GMT (envelope-from git) Date: Tue, 8 Jul 2025 14:32:29 GMT Message-Id: <202507081432.568EWTFE073636@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Baptiste Daroussin Subject: git: 56054f0c6521 - stable/14 - nuageinit: write_files fix typo breaking tests List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bapt X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 56054f0c6521d89d18e9f1b368e25ca0d4a1d958 Auto-Submitted: auto-generated The branch stable/14 has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=56054f0c6521d89d18e9f1b368e25ca0d4a1d958 commit 56054f0c6521d89d18e9f1b368e25ca0d4a1d958 Author: Baptiste Daroussin AuthorDate: 2025-06-26 12:25:12 +0000 Commit: Baptiste Daroussin CommitDate: 2025-07-08 14:31:48 +0000 nuageinit: write_files fix typo breaking tests (cherry picked from commit d9a4c24df1c438e7cd561396e57937be3b105135) --- libexec/nuageinit/nuage.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libexec/nuageinit/nuage.lua b/libexec/nuageinit/nuage.lua index 161b95c60d56..dc323a6accbf 100644 --- a/libexec/nuageinit/nuage.lua +++ b/libexec/nuageinit/nuage.lua @@ -523,11 +523,11 @@ local function addfile(file, defer) if file.permissions then -- convert from octal to decimal local perm = tonumber(file.permissions, 8) - sys_stat.chmod(file.path, perm) + sys_stat.chmod(filepath, perm) end if file.owner then local owner, group = string.match(file.owner, "([^:]+):([^:]+)") - unistd.chown(file.path, owner, group) + unistd.chown(filepath, owner, group) end return true end From nobody Tue Jul 8 14:32: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 4bc3V25jX2z614bW; Tue, 08 Jul 2025 14:32:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bc3V21zrQz49Fx; Tue, 08 Jul 2025 14:32:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1751985146; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ek/nIu9CZnL1a16nfJ2hGEnEQzorh6oh8oqZECtfc8k=; b=nskL307anhvJw3/R71tbdzsDdWxS3G6t/agYfOwIO1QvVZqxY7ut/W74nDNwJBEAJvt6Ey lmMUuOuk/Wq543Apk8swCNlTrBobcGwGqXjLVUufAgQwo4YcSkkTHvNricYC2f/Vh/tdTG PxdEWjgdiEFyRRsAiFkjbfUntVkNq/wCjSKe/LWoTBZXPinJE5c8PGNpY2/PT1m506j0by x1WE2jHyWVkhSfkhOt1bzQD4mVehrZy55doloyC8AXOhro/CC+YRJEKUKIBw2+CEBxLt5n JpkK4VP1kxFSdEyIR8bDXdJtarNoZp9BOQ2tGAhnoHs0ddDCynnj6mez1BUkjg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1751985146; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ek/nIu9CZnL1a16nfJ2hGEnEQzorh6oh8oqZECtfc8k=; b=Rfi6fkaFGk9t7No9xVgwCB/Sqf6VLMDNx+jVEgHJ/lpjdJVJHC38xzlbmL8WrkEGVsV/eg M819VY03a8bOEtNfsE1OVRsFelptiFhQK1nzWF+EXEJZDj3ZjxsNF1OONL2WFc8jwvvK4/ Y1DD6buCWd+ukbUZKzsijqO57dvp/vPgN0v+hEiKMhBj5XsfJGe9yrPW7tankn7GwcjFvb os1sQM8yzglpI/5+1yc2BgSkOQro/OiaEC6EYc/hi0Lnpa/bEUMd85Ly9wfCVtCY4zixXv gU80/f5/+4ZHwP4CINranZfr4NkYd8697+q/tejQ91QnYzxX5xYUfI7Nz86Bvw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1751985146; a=rsa-sha256; cv=none; b=njQ0eVeJJBxq56BPlDSXEc1pMlcoQC2aBM2bbOamqSbGQTljWgwmTnVdrPMT4RVR/BkG1z OKY1CYvD7IJrvH5Py1LHRRUks5xRbrX07S8UG2h3BYMVvSeCVO0m6GCWkVdGxeJCLgE9I5 OJlsDzPTkZqPJGvR+1lePTxylKlIPG8HoPjROUB0Rt3ZFNVQcVNvijczyf8caNtU6OTlOK U49OCxHxnmeT1bZch9ywzXJjS6TfTsypleQl1cGvccmKFkn/qqzitQFPTK6o//pw2Yray9 RtlBJVdkZ15+D+PefN0cT51HBC3iYniUOxXqX+be/YErnHCmQAffxSIwQqd51A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4bc3V21YZ9zh3D; Tue, 08 Jul 2025 14:32: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 568EWQuD073531; Tue, 8 Jul 2025 14:32:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 568EWQSh073528; Tue, 8 Jul 2025 14:32:26 GMT (envelope-from git) Date: Tue, 8 Jul 2025 14:32:26 GMT Message-Id: <202507081432.568EWQSh073528@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Baptiste Daroussin Subject: git: d056f72c358b - stable/14 - nuageinit: implement write_files List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bapt X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: d056f72c358b4f962b09f5c752567ff543fe87c6 Auto-Submitted: auto-generated The branch stable/14 has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=d056f72c358b4f962b09f5c752567ff543fe87c6 commit d056f72c358b4f962b09f5c752567ff543fe87c6 Author: Baptiste Daroussin AuthorDate: 2025-06-26 11:32:07 +0000 Commit: Baptiste Daroussin CommitDate: 2025-07-08 14:31:47 +0000 nuageinit: implement write_files write_files is a list of files that should be created at the first boot each file content can be either plain text or encoded in base64 (note that cloudinit specify that gzip is supported, but we do not support it yet.) All other specifier from cloudinit should work: by default all files will juste overwrite exesiting files except if "append" is set to true, permissions, ownership can be specified. The files are create before packages are being installed and user created. if "defer" is set to true then the file is being created after packages installation and package manupulation. This feature is requested for KDE's CI. (cherry picked from commit 19a7ea3cc4de5af80e2913fda70bd65ad72835c0) --- libexec/nuageinit/nuage.lua | 88 +++++++++++++++++++++++++++++++++++- libexec/nuageinit/nuageinit | 25 +++++++++- libexec/nuageinit/nuageinit.7 | 38 +++++++++++++++- libexec/nuageinit/tests/Makefile | 1 + libexec/nuageinit/tests/addfile.lua | 71 +++++++++++++++++++++++++++++ libexec/nuageinit/tests/nuage.sh | 10 +++- libexec/nuageinit/tests/nuageinit.sh | 37 ++++++++++++++- 7 files changed, 264 insertions(+), 6 deletions(-) diff --git a/libexec/nuageinit/nuage.lua b/libexec/nuageinit/nuage.lua index deb441ee25ba..cdc0fc6cf2a7 100644 --- a/libexec/nuageinit/nuage.lua +++ b/libexec/nuageinit/nuage.lua @@ -7,6 +7,39 @@ local unistd = require("posix.unistd") local sys_stat = require("posix.sys.stat") local lfs = require("lfs") +local function decode_base64(input) + local b = 'ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/' + input = string.gsub(input, '[^'..b..'=]', '') + + local result = {} + local bits = '' + + -- convert all characters in bits + for i = 1, #input do + local x = input:sub(i, i) + if x == '=' then + break + end + local f = b:find(x) - 1 + for j = 6, 1, -1 do + bits = bits .. (f % 2^j - f % 2^(j-1) > 0 and '1' or '0') + end + end + + for i = 1, #bits, 8 do + local byte = bits:sub(i, i + 7) + if #byte == 8 then + local c = 0 + for j = 1, 8 do + c = c + (byte:sub(j, j) == '1' and 2^(8 - j) or 0) + end + table.insert(result, string.char(c)) + end + end + + return table.concat(result) +end + local function warnmsg(str, prepend) if not str then return @@ -441,6 +474,58 @@ local function upgrade_packages() return run_pkg_cmd("upgrade") end +local function addfile(file, defer) + if type(file) ~= "table" then + return false, "Invalid object" + end + if defer and not file.defer then + return true + end + if not defer and file.defer then + return true + end + if not file.path then + return false, "No path provided for the file to write" + end + local content = nil + if file.content then + if file.encoding then + if file.encoding == "b64" or file.encoding == "base64" then + content = decode_base64(file.content) + else + return false, "Unsupported encoding: " .. file.encoding + end + else + content = file.content + end + end + local mode = "w" + if file.append then + mode = "a" + end + + local root = os.getenv("NUAGE_FAKE_ROOTDIR") + if not root then + root = "" + end + local filepath = root .. file.path + local f = assert(io.open(filepath, mode)) + if content then + f:write(content) + end + f:close() + if file.permissions then + -- convert from octal to decimal + local perm = tonumber(file.permissions, 8) + sys_stat.chmod(file.path, perm) + end + if file.owner then + local owner, group = string.match(file.owner, "([^:]+):([^:]+)") + unistd.chown(file.path, owner, group) + end + return true +end + local n = { warn = warnmsg, err = errmsg, @@ -456,7 +541,8 @@ local n = { install_package = install_package, update_packages = update_packages, upgrade_packages = upgrade_packages, - addsudo = addsudo + addsudo = addsudo, + addfile = addfile } return n diff --git a/libexec/nuageinit/nuageinit b/libexec/nuageinit/nuageinit index 5af1b84c1848..84133d4373c5 100755 --- a/libexec/nuageinit/nuageinit +++ b/libexec/nuageinit/nuageinit @@ -188,6 +188,25 @@ local function install_packages(packages) end end +local function write_files(files, defer) + if not files then + return + end + for n, file in pairs(files) do + local r, errstr = nuage.addfile(file, defer) + if not r then + nuage.warn("Skipping write_files entry number " .. n .. ": " .. errstr) + end + end +end + +local function write_files_not_defered(obj) + write_files(obj.write_files, false) +end + +local function write_files_defered(obj) + write_files(obj.write_files, true) +end -- Set network configuration from user_data local function network_config(obj) if obj.network == nil then return end @@ -456,13 +475,15 @@ if line == "#cloud-config" then ssh_authorized_keys, network_config, ssh_pwauth, - runcmd + runcmd, + write_files_not_defered, } local post_network_calls = { packages, users, - chpasswd + chpasswd, + write_files_defered, } f = io.open(ni_path .. "/" .. ud) diff --git a/libexec/nuageinit/nuageinit.7 b/libexec/nuageinit/nuageinit.7 index 1d2f83fe62e0..3bb440ebac95 100644 --- a/libexec/nuageinit/nuageinit.7 +++ b/libexec/nuageinit/nuageinit.7 @@ -2,7 +2,7 @@ .\" .\" Copyright (c) 2025 Baptiste Daroussin .\" -.Dd June 16, 2025 +.Dd June 26, 2025 .Dt NUAGEINIT 7 .Os .Sh NAME @@ -239,6 +239,42 @@ where x is a number, then the password is considered encrypted, otherwise the password is considered plaintext. .El .El +.It Ic write_files +An array of objects representing files to be created at first boot. +The files are being created before the installation of any packages +and the creation of the users. +The only mandatory field is: +.Ic path . +It accepts the following keys for each objects: +.Bl -tag -width "permissions" +.It Ic content +The content to be written to the file. +If this key is not existing then an empty file will be created. +.It Ic encoding +Specifiy the encoding used for content. +If not specified, then plain text is considered. +Only +.Ar b64 +and +.Ar base64 +are supported for now. +.It Ic path +The path of the file to be created. +.Pq Note intermerdiary directories will not be created . +.It Ic permissions +A string representing the permission of the file in octal. +.It Ic owner +A string representing the owner, two forms are possible: +.Ar user +or +.Ar user:group . +.It Ic append +A boolean to specify the content should be appended to the file if the file +exists. +.It Ic defer +A boolean to specify that the files should be created after the packages are +installed and the users are created. +.El .El .Sh EXAMPLES Here is an example of a YAML configuration for diff --git a/libexec/nuageinit/tests/Makefile b/libexec/nuageinit/tests/Makefile index ccb81c090445..0b813dbd98be 100644 --- a/libexec/nuageinit/tests/Makefile +++ b/libexec/nuageinit/tests/Makefile @@ -9,5 +9,6 @@ ${PACKAGE}FILES+= dirname.lua ${PACKAGE}FILES+= err.lua ${PACKAGE}FILES+= sethostname.lua ${PACKAGE}FILES+= warn.lua +${PACKAGE}FILES+= addfile.lua .include diff --git a/libexec/nuageinit/tests/addfile.lua b/libexec/nuageinit/tests/addfile.lua new file mode 100644 index 000000000000..98d020e557c0 --- /dev/null +++ b/libexec/nuageinit/tests/addfile.lua @@ -0,0 +1,71 @@ +#!/bin/libexec/flua + +local n = require("nuage") +local lfs = require("lfs") + +local f = { + content = "plop" +} + +local r, err = n.addfile(f, false) +if r or err ~= "No path provided for the file to write" then + n.err("addfile should not accept a file to write without a path") +end + +local function addfile_and_getres(file) + local r, err = n.addfile(file, false) + if not r then + n.err(err) + end + local root = os.getenv("NUAGE_FAKE_ROOTDIR") + if not root then + root = "" + end + local filepath = root .. file.path + local resf = assert(io.open(filepath, "r")) + local str = resf:read("*all") + resf:close() + return str +end + +-- simple file +f.path="/tmp/testnuage" +local str = addfile_and_getres(f) +if str ~= f.content then + n.err("Invalid file content") +end + +-- the file is overwriten +f.content = "test" + +str = addfile_and_getres(f) +if str ~= f.content then + n.err("Invalid file content, not overwritten") +end + +-- try to append now +f.content = "more" +f.append = true + +str = addfile_and_getres(f) +if str ~= "test" .. f.content then + n.err("Invalid file content, not appended") +end + +-- base64 +f.content = "YmxhCg==" +f.encoding = "base64" +f.append = false + +str = addfile_and_getres(f) +if str ~= "bla\n" then + n.err("Invalid file content, base64 decode") +end + +-- b64 +f.encoding = "b64" +str = addfile_and_getres(f) +if str ~= "bla\n" then + n.err("Invalid file content, b64 decode") + print("==>" .. str .. "<==") +end diff --git a/libexec/nuageinit/tests/nuage.sh b/libexec/nuageinit/tests/nuage.sh index 293a0a4a9a83..91260fc33a2f 100644 --- a/libexec/nuageinit/tests/nuage.sh +++ b/libexec/nuageinit/tests/nuage.sh @@ -1,5 +1,5 @@ #- -# Copyright (c) 2022 Baptiste Daroussin +# Copyright (c) 2022-2025 Baptiste Daroussin # # SPDX-License-Identifier: BSD-2-Clause # @@ -10,6 +10,7 @@ atf_test_case sethostname atf_test_case addsshkey atf_test_case adduser atf_test_case addgroup +atf_test_case addfile sethostname_body() { @@ -56,10 +57,17 @@ addgroup_body() atf_check -o inline:"impossible_groupname:*:1001:\n" grep impossible_groupname etc/group } +addfile_body() +{ + mkdir tmp + atf_check /usr/libexec/flua $(atf_get_srcdir)/addfile.lua +} + atf_init_test_cases() { atf_add_test_case sethostname atf_add_test_case addsshkey atf_add_test_case adduser atf_add_test_case addgroup + atf_add_test_case addfile } diff --git a/libexec/nuageinit/tests/nuageinit.sh b/libexec/nuageinit/tests/nuageinit.sh index 44830f67e4c8..639c87181f95 100644 --- a/libexec/nuageinit/tests/nuageinit.sh +++ b/libexec/nuageinit/tests/nuageinit.sh @@ -1,5 +1,5 @@ #- -# Copyright (c) 2022 Baptiste Daroussin +# Copyright (c) 2022-2025 Baptiste Daroussin # # SPDX-License-Identifier: BSD-2-Clause # @@ -29,6 +29,7 @@ atf_test_case config2_userdata_update_packages atf_test_case config2_userdata_upgrade_packages atf_test_case config2_userdata_shebang atf_test_case config2_userdata_fqdn_and_hostname +atf_test_case config2_userdata_write_files setup_test_adduser() { @@ -847,6 +848,39 @@ EOF fi } +config2_userdata_write_files_body() +{ + mkdir -p media/nuageinit + setup_test_adduser + printf "{}" > media/nuageinit/meta_data.json + cat > media/nuageinit/user_data < To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Baptiste Daroussin Subject: git: 8800003ecf9b - stable/14 - libyaml: add missing mtree entry List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bapt X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 8800003ecf9bbee04fba4447645f94c2d15cb74f Auto-Submitted: auto-generated The branch stable/14 has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=8800003ecf9bbee04fba4447645f94c2d15cb74f commit 8800003ecf9bbee04fba4447645f94c2d15cb74f Author: Baptiste Daroussin AuthorDate: 2025-06-26 11:31:12 +0000 Commit: Baptiste Daroussin CommitDate: 2025-07-08 14:31:47 +0000 libyaml: add missing mtree entry (cherry picked from commit 442472e1b72a8b540df3fe038ed96615fc0abd68) --- etc/mtree/BSD.usr.dist | 2 ++ 1 file changed, 2 insertions(+) diff --git a/etc/mtree/BSD.usr.dist b/etc/mtree/BSD.usr.dist index 3ff04fe4e716..39e5d925a109 100644 --- a/etc/mtree/BSD.usr.dist +++ b/etc/mtree/BSD.usr.dist @@ -30,6 +30,8 @@ .. ucl .. + yaml + .. zstd .. .. From nobody Tue Jul 8 14:32: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 4bc3V76gsPz614qq; Tue, 08 Jul 2025 14:32:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bc3V74mP3z49Yh; Tue, 08 Jul 2025 14:32:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1751985151; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=G1yClM9zcEjXUNpwZctwwKt3IqfqfT+QgACv0g72HCM=; b=smuF4b3V5Tmar9zQG//i4w8gM+VeO/yj10nDaDtcZUGXx6+y1NquSKnpfDIoWXfZAhE4BY KYloffBcdH8OvsuF2NEhRdcJSIdIKRaNdCk7lUYxrQ322BfmhFLIxHQh1B4StQ3+LyGpW0 1Rz6HVBCWHeuP2bKsekUu1lx6q/wohoz7w0a5ur9p0KT7oGsDsxfhjVJWY1HYd2O1wwJ5G hv/TvlY1CDUtj6yOJCAa5qnD7usmd4jODkmaO9PDhWRn433LMqarkZFE5JzFpnKhXQ+5Jo BEPEmcxDldwNsg74Syy4kGuIWaL2lJOKiaJkLm0rx5QtpAl2aW3G9kkQvH5cDQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1751985151; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=G1yClM9zcEjXUNpwZctwwKt3IqfqfT+QgACv0g72HCM=; b=ErOSSR7GLcBvtowj2ZzPT7umx96PYkmvYJHIYT6biAqqPZLztcKfmHZ+VqoQkNN0J/o0Wt jypiDD80Qry15tfVkcjYacte+b+D9xOi0IPOQacDLadYeTj/Cck1NVbVZK4izsmRdn+vkj r1f9X9M/eDPMTZl03J9hUUZ2/NFr342SnIOKv7mRAMM/qUfz+Kqyr4UK2vblPoPP+pnDmC vFOghv6WTMWGq1blWqx8oCzMga4HgoB6a2YjSmVbCAsaoCA8PhYFc60MlNOZDIZYCZvduo 9cXhJX9ihWj47yYrWB2cIE5bpjkqbhIMmr/+uUhpvVV4oC7q2tUFGijFHo4jIA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1751985151; a=rsa-sha256; cv=none; b=ujcjR2ac/WMGaM2tEBumDmuPSWdgoExAZqRe1/sk1R1+7qHglQXRQP0O7CHJYbbKYLNwtY hgmDIHwF8GqNfWXWuyh+AYfPLmPN7H5TFo0pCtN2siFxP28XRsxrgTMppBEONGimIZ2qTs fRY+1K8W5JhzpL+HAY2YpTjcR3Z0t4G0qKjUSCVvfE9g/HeWGkCn3k+RKzyvPhiuXAbe2P 65JAC3xMDkzsR8aXakLcpILcQz6mezoyagfcBky4mejQL0Uqx+ZhGQNOiAj8fXh9rvGe/D 8dn+mKLbMEe+yDn6TfLU853vE6jyxbp08N16vP1u7cVReRr/yDbpkBqPP2aR7A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4bc3V74LSYzhM7; Tue, 08 Jul 2025 14:32: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 568EWVrv073706; Tue, 8 Jul 2025 14:32:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 568EWVGt073703; Tue, 8 Jul 2025 14:32:31 GMT (envelope-from git) Date: Tue, 8 Jul 2025 14:32:31 GMT Message-Id: <202507081432.568EWVGt073703@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Baptiste Daroussin Subject: git: 0dabd0382cf7 - stable/14 - nuageinit: fix log name List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bapt X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 0dabd0382cf7bba6c94078589a65c9342b4d6479 Auto-Submitted: auto-generated The branch stable/14 has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=0dabd0382cf7bba6c94078589a65c9342b4d6479 commit 0dabd0382cf7bba6c94078589a65c9342b4d6479 Author: Sebastien Baylocq AuthorDate: 2025-06-27 14:27:49 +0000 Commit: Baptiste Daroussin CommitDate: 2025-07-08 14:31:48 +0000 nuageinit: fix log name (cherry picked from commit 7ad574b3e3a948113c3c16cbe90e27888dc7a423) --- libexec/rc/rc.d/nuageinit_user_data_script | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libexec/rc/rc.d/nuageinit_user_data_script b/libexec/rc/rc.d/nuageinit_user_data_script index cea7fb5c6aa0..decb6bf1483e 100755 --- a/libexec/rc/rc.d/nuageinit_user_data_script +++ b/libexec/rc/rc.d/nuageinit_user_data_script @@ -20,7 +20,7 @@ execute_user_data_script() /var/cache/nuageinit/runcmds 2>&1 | tee -a /var/log/nuageinit.log fi test -x /var/cache/nuageinit/user_data || return - echo "Executing user_data script" | tee -a /var/log/nuageinnit.log + echo "Executing user_data script" | tee -a /var/log/nuageinit.log /var/cache/nuageinit/user_data 2>&1 | tee -a /var/log/nuageinit.log } From nobody Tue Jul 8 14:32: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 4bc3V66D8xz614rL; Tue, 08 Jul 2025 14:32:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bc3V63yzqz49GJ; Tue, 08 Jul 2025 14:32:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1751985150; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=55wTfQKAgu12505xOZpCI+gHlkMxetSXCx40ho3qoEc=; b=r9fmCZw6JuBpiwTPx+P2vXOhh+P1SG7Dvz7Vh1TiePhM0oXWX0OfsWoAHo/3h4ninkdFY8 qqyzS1speVr209fXk+H9Wro3Rkdbk003fKxIlFDIuN6GcH5quCWf8vivkK/tPzhxoEV7+9 Tt6jbNFcOMDsrwYAhXfuWuYjh4aQNgZisErwlo2ANQWK1JXWUXO1eXcUbeOcXXE4wLoLFN eJK9zANe41giLsSJdz97MoQaijWgy9J1q9Lo0C6HlB9xson9Azycp23gK3hUy94qYDnsPx 76aiMeEivufkkJH+aKKW0E1Vj4kkcmYr9hUH1ho+ClWkHlTKKxg1/OAlxIFKow== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1751985150; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=55wTfQKAgu12505xOZpCI+gHlkMxetSXCx40ho3qoEc=; b=GJAEsI0ZPXO4fJzpCOKcH1Yp4YGIWCHO+IwWtjY9BD8buDoBckCJsuloL16GNlIjIWR2OS j7y1n/oSa/ZuIreLU6GPTG9QTuVKmbRvSjf3jsxQ8++znBvqVU0653Gi/QKrZomjTJD97c 3mj1psWa53AHn7Md+0Re8gJMthLD/45YrynTIkyLz/1qd2RvzxmrdcZTdTs6MpFzj9rM2h hUU+r0b1XKHmkEYZJknWs4BZQpTMzZycfE2o+F6dULQmVuokOIrmoNL7BN31gx6E81kR2f DrSMjvaK2/xRdZ+kI6TIBG2sFgHVyspKno+E6/Amvx6KXBJxc0mpHrF2kkWt8g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1751985150; a=rsa-sha256; cv=none; b=haYaDTULM/fe+bVVm9OP6aAkhxaP/LQjAe0SrH6QY4XZXNsO0ndlJmLx3wl8JweaucDaqA 1eb8DZupP3qOOeNTlp3RCmbggIez0l4bpavzr/lIzWiKvF939ueyUqypBhL8Dpx9sKMuzL 2PDdV1dtWv9Mh1M/9fFrF04eKCApEwFqi04qYVgulLoAbSJG73qSMrWy/kkPZodGPsMyQq 5B5hSm8S1leN1B6G+4uFcNFr9+tIBBUms123nDxjt76C5Rny69BHNxMRtAkib6f2ROj4RX 7cHUsk1ac88dO9QCSPT0stw7aPFIURAeOREMCCmf1JJ5SYMrs+k380+kgB09Bw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4bc3V63XnHzhM6; Tue, 08 Jul 2025 14:32: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 568EWUc5073672; Tue, 8 Jul 2025 14:32:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 568EWUES073669; Tue, 8 Jul 2025 14:32:30 GMT (envelope-from git) Date: Tue, 8 Jul 2025 14:32:30 GMT Message-Id: <202507081432.568EWUES073669@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Baptiste Daroussin Subject: git: 7151c780ac95 - stable/14 - nuageinit: fix setting owner when only the user is 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: bapt X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 7151c780ac95f90cc5f601eb06849f32e073d5b7 Auto-Submitted: auto-generated The branch stable/14 has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=7151c780ac95f90cc5f601eb06849f32e073d5b7 commit 7151c780ac95f90cc5f601eb06849f32e073d5b7 Author: Baptiste Daroussin AuthorDate: 2025-06-26 12:29:05 +0000 Commit: Baptiste Daroussin CommitDate: 2025-07-08 14:31:48 +0000 nuageinit: fix setting owner when only the user is set (cherry picked from commit 3969965c7f156f0fe3e1dc8799362375cb53208a) --- libexec/nuageinit/nuage.lua | 3 +++ 1 file changed, 3 insertions(+) diff --git a/libexec/nuageinit/nuage.lua b/libexec/nuageinit/nuage.lua index dc323a6accbf..11958e8b5cc2 100644 --- a/libexec/nuageinit/nuage.lua +++ b/libexec/nuageinit/nuage.lua @@ -527,6 +527,9 @@ local function addfile(file, defer) end if file.owner then local owner, group = string.match(file.owner, "([^:]+):([^:]+)") + if not owner then + owner = file.owner + end unistd.chown(filepath, owner, group) end return true From nobody Wed Jul 9 00:38: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 4bcJxr00Jxz60nqw; Wed, 09 Jul 2025 00:38:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bcJxp6m5Vz4BNQ; Wed, 09 Jul 2025 00:38:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1752021535; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=SoYjbedoTMd3VQYjG+RBil7n6u7wXO4cIQvEXx1wCOk=; b=T+vtKBglvCgJbfghHYjTTeS81w3ZCezOlXLlwnFiKrlBqfh2yP98eGJU7aqsgw8Xd/fc7H KWtEmir6FG85PqYDYvsXhvEh3oiMfdXx5wMBzuaQ4i6LUxAtlKTduBJ/axgEutklN/Hlwi DLvmEuESDm0M+ZmcU1rzniDV1uMtETRmPhL0A1fZ34acWtte374L3t/R1mszEHTTH+JwgV UDAJozl41X7bG8ZLYSWSu+Ydr9TolK/KJC/3nzntir2oOQACGwPS78PWE7E8qxLrlTwvzG FeCgZROClIyWN09F5YgJun52j5DeQwkIwsNMjuPYqhjkr6oF3zE9+yIsfglrCw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1752021535; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=SoYjbedoTMd3VQYjG+RBil7n6u7wXO4cIQvEXx1wCOk=; b=tGfIe7PhboaBv3QAZpJxQZIpYiOpiKChtQXcQi+8nZHow+ZmoFMcc3H7vpGWW3SRaYeNMe kFjB4sqvWxuogWKjylyaLsVBHUFFxmTDqdh6QBHwz8i+m7w6MhU2ch3sioa9t0ZPajX0JB mT1A2cX0BAkUkmpxSV09zh96OFL9KDAuXQBFLAZ9Vpqbdf6mo0Oh4KI6AEz6hD0XWdl2Ww b1QDBdO549nyB9KSb+WHDUcfaeMmwq/LP+zyncUEUzbpu/YDZiKNVPqmlrbf8SzsyVyylr RfUIP/6YZFZM4aF7JZl6d8l5yrDw7TuVB5J7U/6p6/QFI5ycUBpkpvSl1nwQ0g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1752021535; a=rsa-sha256; cv=none; b=QxDbL7udCoDaaO13Xp5QAng7hLu7MJVQJ/CVmQuVa10il0zQVpN9tZNIcjW2X9NpF6oYmy qPZKe329XBDcSVggBY4fGR23ay2b9Zcv51fDVbpSRuCKso5DTr5YjU2iFs2fLLfnZyuDc2 uj2h0Vc9iVJhaQmR6XF0QEy2RYvwAgrSBSzf6OZJSipJKX13jsFGUhN1ePttbEV6nbHDDu oIRjHb5IVlPO9XpyiSr55GvzG0X2bGSqoYYIaAJ31MsnTCJbrI/WgnIEFSFKyOusDoEuBD Ee2eVSlsL0OzfhdqZSV+bbH7WaqC/eaWcaPzU8bUQyHbOO03jxv1JuatY5/BJA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4bcJxp6MLMz108b; Wed, 09 Jul 2025 00:38:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5690cs4o004439; Wed, 9 Jul 2025 00:38:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5690cssx004436; Wed, 9 Jul 2025 00:38:54 GMT (envelope-from git) Date: Wed, 9 Jul 2025 00:38:54 GMT Message-Id: <202507090038.5690cssx004436@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 6750c124c71c - stable/14 - md: Restore guards in mddestroy() List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 6750c124c71c83eb6c4a6a349572ec24d7668441 Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=6750c124c71c83eb6c4a6a349572ec24d7668441 commit 6750c124c71c83eb6c4a6a349572ec24d7668441 Author: Mark Johnston AuthorDate: 2025-07-03 13:10:49 +0000 Commit: Konstantin Belousov CommitDate: 2025-07-09 00:28:29 +0000 md: Restore guards in mddestroy() (cherry picked from commit 5ae9f8e9ac5e1307fed4f7f2549347576f01b3fa) --- sys/dev/md/md.c | 25 ++++++++++++++++--------- 1 file changed, 16 insertions(+), 9 deletions(-) diff --git a/sys/dev/md/md.c b/sys/dev/md/md.c index e89c5e858c32..95926706443b 100644 --- a/sys/dev/md/md.c +++ b/sys/dev/md/md.c @@ -1561,19 +1561,26 @@ mddestroy(struct md_s *sc, struct thread *td) mtx_destroy(&sc->queue_mtx); switch (sc->type) { case MD_VNODE: - vn_lock(sc->s_vnode.vnode, LK_EXCLUSIVE | LK_RETRY); - sc->s_vnode.vnode->v_vflag &= ~VV_MD; - VOP_UNLOCK(sc->s_vnode.vnode); - (void)vn_close(sc->s_vnode.vnode, sc->flags & MD_READONLY ? - FREAD : (FREAD|FWRITE), sc->cred, td); - kva_free(sc->s_vnode.kva, maxphys + PAGE_SIZE); + if (sc->s_vnode.vnode != NULL) { + vn_lock(sc->s_vnode.vnode, LK_EXCLUSIVE | LK_RETRY); + sc->s_vnode.vnode->v_vflag &= ~VV_MD; + VOP_UNLOCK(sc->s_vnode.vnode); + (void)vn_close(sc->s_vnode.vnode, + sc->flags & MD_READONLY ? FREAD : (FREAD|FWRITE), + sc->cred, td); + } + if (sc->s_vnode.kva != 0) + kva_free(sc->s_vnode.kva, maxphys + PAGE_SIZE); break; case MD_SWAP: - vm_object_deallocate(sc->s_swap.object); + if (sc->s_swap.object != NULL) + vm_object_deallocate(sc->s_swap.object); break; case MD_MALLOC: - destroy_indir(sc, sc->s_malloc.indir); - uma_zdestroy(sc->s_malloc.uma); + if (sc->s_malloc.indir != NULL) + destroy_indir(sc, sc->s_malloc.indir); + if (sc->s_malloc.uma != NULL) + uma_zdestroy(sc->s_malloc.uma); break; case MD_PRELOAD: case MD_NULL: From nobody Wed Jul 9 00:44: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 4bcK4S10dwz60pBS; Wed, 09 Jul 2025 00:44: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bcK4R6fjvz4HgW; Wed, 09 Jul 2025 00:44:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1752021879; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Walp1zkXqIBxmFggRDwJwLG40aYhE8iLFhMf9I1nP2k=; b=rOuA+AaGstOPUIupNhE9wv7a3HATbMAxFvo/zVq796xq/KoZDLmszCBTIQ9cPDtAAv/69u +H9DdQxylj1QOXrO80AuKfVeyzWiboARfuU5aiH09enAuNYUlpbBBVsMG2FosX7DOzCBDp kx60WBeDwfKLXiTx12b62/zCK3ZSzJNL4dWDMK3tIQvfRivi7qlgZ7CmrA6uvXOE6MGtFC iwiSa0/N5AGHreGOIIVOAEs3UeY3HKa7O7LDyIfe0b0sVX4ICk6OrEkX5Y1l62n7BIuI1s zG0yuOrxWplrerch9Klv+DK2O56x6fsfYcobVs+RWeBZPk5oeeZkn9zUttWk1Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1752021879; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Walp1zkXqIBxmFggRDwJwLG40aYhE8iLFhMf9I1nP2k=; b=fT/wIFVkkFLWZyaQqnw/d34sa55IqELf4+dt4TuI/pd6CAc34e8yVgRaNgrOxftx0XCxCJ mfGCWSIoPam9ZcVI2q9bu0d8BubrCe2xq+T1IBgRZk+GnLahODc/1HYVVC0YN05/dz5MTh pajWp+izk0vD14uJS7UobhZwrZLja3wp6iC4tL1qBFj9cmzmJxcSpYdAhehZwoOQD+ocNd H+A4M3BFpdav9OfgNuOaDhChyUAfBwbNpQC3l++KlLUL+ne9kyuF4O6M1WGavK6ns/0NWP JwssQ4zLFoPBFBwKq044g+syv0kPBLs+V9khv9Cokv7SN+awzVmgsORqqDZ7lg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1752021879; a=rsa-sha256; cv=none; b=l66GlOk12vECXMGQow9DHWX6rDmIAZ5VdBvsXEpkHDUWDnLAVgTjRh1KuBHBFRnZd5ulJ2 K3ZS4gfkyyLLvP8TXmnXMvcY5xQzBbJbFMvlgkSzj425CMs6CxKkeKTGPQcAVr0EkLDoxU jBloD3wiute04FZQG3awSSwmm+Akj0SXo9sTqIGpnikLfVZ9dd7J6XRNuCkKdYPfpgWVnQ ycu6q0SxLkS0q5t40Olw979DGKZb9G7ryIZF/W5+LP+z3CLPMbdcUPH/UNvCisD5Zdo/qL /g+B/xgdw63i+ME9eBMzXg3BkMuhkTwgqFOotgutpFoKZaQwNzPX/0NmrgxV0Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4bcK4R68JMz10fl; Wed, 09 Jul 2025 00:44: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 5690id9L022505; Wed, 9 Jul 2025 00:44:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5690idNo022502; Wed, 9 Jul 2025 00:44:39 GMT (envelope-from git) Date: Wed, 9 Jul 2025 00:44:39 GMT Message-Id: <202507090044.5690idNo022502@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: d162d59c393d - stable/14 - localedef: Use consistent sorting order List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-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/14 X-Git-Reftype: branch X-Git-Commit: d162d59c393dacdcd6867e5ed7af2edc5cc0cddf Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=d162d59c393dacdcd6867e5ed7af2edc5cc0cddf commit d162d59c393dacdcd6867e5ed7af2edc5cc0cddf Author: Mark Johnston AuthorDate: 2025-06-20 16:10:37 +0000 Commit: Mark Johnston CommitDate: 2025-07-09 00:42:52 +0000 localedef: Use consistent sorting order In several modules we build up an RB tree keyed by wide characters. wchar_t has different signedness on different platforms, so iteration over such a tree results in platform-dependent ordering. The ctype module uses this ordering when writing the output file, which creates reproducibility problems when comparing the results of cross builds and native builds (e.g., native amd64 vs. cross-building on arm64). Modify such comparisons to always be unsigned. Introduce a helper function for this purpose. In the other modules I believe the sort order does not affect program output. On systems with signed wchar_t, of the files in /usr/share/locale this only affects zh_CN.GB18030/LC_CTYPE. MFC after: 2 weeks Sponsored by: The FreeBSD Foundation Sponsored by: Klara, Inc. Differential Revision: https://reviews.freebsd.org/D50756 (cherry picked from commit 770fba248daff6cc72ce0bfbd1f2a941c90dc99a) --- usr.bin/localedef/charmap.c | 2 +- usr.bin/localedef/collate.c | 2 +- usr.bin/localedef/ctype.c | 2 +- usr.bin/localedef/localedef.h | 15 +++++++++++++++ 4 files changed, 18 insertions(+), 3 deletions(-) diff --git a/usr.bin/localedef/charmap.c b/usr.bin/localedef/charmap.c index 1da4d8921ecb..a36d4ccd174e 100644 --- a/usr.bin/localedef/charmap.c +++ b/usr.bin/localedef/charmap.c @@ -236,7 +236,7 @@ cmap_compare_wc(const void *n1, const void *n2) const charmap_t *c1 = n1; const charmap_t *c2 = n2; - return ((c1->wc < c2->wc) ? -1 : (c1->wc > c2->wc) ? 1 : 0); + return (wchar_cmp(c1->wc, c2->wc)); } void diff --git a/usr.bin/localedef/collate.c b/usr.bin/localedef/collate.c index da3f26b4d0ba..39f1ba250be6 100644 --- a/usr.bin/localedef/collate.c +++ b/usr.bin/localedef/collate.c @@ -422,7 +422,7 @@ collchar_compare(const void *n1, const void *n2) wchar_t k1 = ((const collchar_t *)n1)->wc; wchar_t k2 = ((const collchar_t *)n2)->wc; - return (k1 < k2 ? -1 : k1 > k2 ? 1 : 0); + return (wchar_cmp(k1, k2)); } RB_GENERATE_STATIC(collchars, collchar, entry, collchar_compare); diff --git a/usr.bin/localedef/ctype.c b/usr.bin/localedef/ctype.c index ab7b76e57b2d..f86a267b0b32 100644 --- a/usr.bin/localedef/ctype.c +++ b/usr.bin/localedef/ctype.c @@ -93,7 +93,7 @@ ctype_compare(const void *n1, const void *n2) const ctype_node_t *c1 = n1; const ctype_node_t *c2 = n2; - return (c1->wc < c2->wc ? -1 : c1->wc > c2->wc ? 1 : 0); + return (wchar_cmp(c1->wc, c2->wc)); } void diff --git a/usr.bin/localedef/localedef.h b/usr.bin/localedef/localedef.h index 4b141ac8dc09..25e75eab8a7b 100644 --- a/usr.bin/localedef/localedef.h +++ b/usr.bin/localedef/localedef.h @@ -38,6 +38,7 @@ #include #include #include +#include extern int com_char; extern int esc_char; @@ -173,5 +174,19 @@ void werr(const char *, ...); const char *get_wide_encoding(void); int max_wide(void); +/* + * A helper function to compare wide characters when sorting. Forcibly cast to + * an unsigned type to help ensure that output is consistent no matter the + * signedness of wchar_t. + */ +static inline int +wchar_cmp(const wchar_t a, const wchar_t b) +{ + return ((uint32_t)a < (uint32_t)b ? -1 : + ((uint32_t)a > (uint32_t)b ? 1 : 0)); +} +_Static_assert(sizeof(wchar_t) == sizeof(uint32_t), + "wchar_t must be 32 bits wide"); + //#define _(x) gettext(x) #define INTERR fprintf(stderr,"internal fault (%s:%d)\n", __FILE__, __LINE__) From nobody Wed Jul 9 00:44: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 4bcK4R192fz60pBR; Wed, 09 Jul 2025 00:44: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bcK4Q5hB0z4Hd4; Wed, 09 Jul 2025 00:44:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1752021878; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qFhzRBV0iKRc5cejpkCRx72/+I9M7GC4W7oUKk31JeE=; b=nQCkSp2Vtbx0BTTu2S/0XPyNOntxrghWkpRm6vxU6IJevT3uSH1+ZkrnwlQBMV0EhdgPzH UYYbbkmkYJ1HR+Q4Z4yMGbS4UJkDiwe7PJESe+qtCtMwmaxov7vIL8/oIwvpAIFj7W0P6G AQNpnrjmS+H2V2XVvp8M9Waer79HTAUg9mU9tpOwJM6bK6nPBM2J1DJm/BTxl0uOv83zpq Y90kjW1ZUEvTKW6HAmcqSaJDOkoC9tD4dgy9pxT//Uc/cgMor9Wgev7QW9tE+bA54/Ziwx 8dSZzZf6ttzWDBAnPYX3rOOKEJo+2OWbql925oWRw7WgFV4VpcsP9lm2TmIsGA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1752021878; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qFhzRBV0iKRc5cejpkCRx72/+I9M7GC4W7oUKk31JeE=; b=yt/wuecZNcExO5BGH0pKEaLfcvWlFRe/Bvy7UDdoXAyfhG2F+Z9scUPaaliZ+zsSGcjgOb 775nugbqCIfJ52Z+MmvFgz86/7OjCOjsUSSgsZ8u+l6jHkhVOkVt4f0b1X80DShoLzC+uL wUvpWKCVc1wXnCpcWHveW86nuCDG2A7WIfOa59JWoqVyq2u4ESClndKjT4+WPaVqUV4OLX FxuBgAH1kfpALqqLNJQV4qqv4mbX6b46ahIBN5gHDQCsru/JzIdfC+pUJzze4mdL7MqPmR O/i8E9a3GCo8/fPNFsixEbN/FhgRRQHoduzUT5LGri/oUekDy6rrpU3VnQvZ/g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1752021878; a=rsa-sha256; cv=none; b=Ov4KFJ3cFhheTnH7MjfuWo3m9iD+9XoFhEmOK6ojK8rsTmkC2d9a/zOOSzJzwnbJGDiGND RQ0o19nudk1U9j2V8vxSh3Z9OLynDFFcYT+ZjxBeaaP4VC1D/odkZvlZ71lVed2GOsz090 d0yQZIUt+NqPXXshfwRMXRUQAnPzd2K22tSygcv/xyNnI0tzhfo/0OWn5PbiUOIpRzO2bj xA5k+RhGGQRbsYNnFqDFvxqpVureApWotv6NjzgEffWRyfuE6VXvjv16oeOwx90b2lezau 4e6qk/mDVdSnlffxQo/mcFMVW6BAmSIHQ+z/xX/lNxiS1FrwrsY2xA7kORqNTw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4bcK4Q5D42z1097; Wed, 09 Jul 2025 00:44: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 5690icZ0022467; Wed, 9 Jul 2025 00:44:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5690iciP022464; Wed, 9 Jul 2025 00:44:38 GMT (envelope-from git) Date: Wed, 9 Jul 2025 00:44:38 GMT Message-Id: <202507090044.5690iciP022464@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: 10d14a37206e - stable/14 - localedef: Fix a wchar_t comparison List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-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/14 X-Git-Reftype: branch X-Git-Commit: 10d14a37206e77e050676c8fbd96600f9101cf8b Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=10d14a37206e77e050676c8fbd96600f9101cf8b commit 10d14a37206e77e050676c8fbd96600f9101cf8b Author: Mark Johnston AuthorDate: 2025-06-20 16:10:57 +0000 Commit: Mark Johnston CommitDate: 2025-07-09 00:42:52 +0000 localedef: Fix a wchar_t comparison The intent here is to characterize wide characters which fit in a single byte. When wchar_t is signed, this comparison is insufficient. On systems with signed wchar_t, of the files in /usr/share/locale this only affects zh_CN.GB18030/LC_COLLATE. MFC after: 2 weeks Sponsored by: The FreeBSD Foundation Sponsored by: Klara, Inc. Differential Revision: https://reviews.freebsd.org/D50757 (cherry picked from commit a37bc4cb8d2c5c8402341c9df75580f60bb34186) --- usr.bin/localedef/collate.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr.bin/localedef/collate.c b/usr.bin/localedef/collate.c index 2a080773a95e..da3f26b4d0ba 100644 --- a/usr.bin/localedef/collate.c +++ b/usr.bin/localedef/collate.c @@ -1273,7 +1273,7 @@ dump_collate(void) RB_FOREACH(cc, collchars, &collchars) { int undef = 0; /* we already gathered those */ - if (cc->wc <= UCHAR_MAX) + if ((uint32_t)cc->wc <= UCHAR_MAX) continue; for (j = 0; j < NUM_WT; j++) { if ((pri = get_weight(cc->ref[j], j)) < 0) { From nobody Wed Jul 9 12:28: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 4bcchm6D0Wz61c9f; Wed, 09 Jul 2025 12:28: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bcchm5c58z42PS; Wed, 09 Jul 2025 12:28:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1752064120; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3w5U5tSyVvjiiWE14RsOzlDkC1eO71Rkvppgc+B8ZFI=; b=uK4+vSZllA9QLpYF8ONQTK5z4fSC4Ci+2HFxFom/KFODrjefNUczHP944AFJF2mv+256k4 VsLdDmb0aWE9jYqbkkNSPXB8ijNZ8ePuPrg75WV/mW1QBKVQ6zqkYObCPDHoMggGlEyzXU +8yiP/PdXMQhWojMNlNK4scrnh3zRMPpsIdHc+ggVkTxNk7Scmri2dRGwHB28Ahi6mWiiq e+gLjG+mFIkMxqKiV9rovW4diOx5GLr3SmVv3/GgLZ8yzsPDfXtAzCxVkOkP88Lzj+h80B 6vbu4YoEtRvEPJp9+FTrd2/ExzyvLenN52joZznBkPhTGOMhx66aVtN/pOCNyg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1752064120; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3w5U5tSyVvjiiWE14RsOzlDkC1eO71Rkvppgc+B8ZFI=; b=F4SMMe0SQsOrirXYrGiV78qeLHWgVrukUpg0NkiWHgdiTyZ6C1kfzcDuyo5/lKKa5x1woK +A2G8N/TnyfBmoHuFWZq+GqdXsy+19PchDjLWmqy+Duvepp7sIalryv2isGmbxIZjTjU71 8qj7SDh0RkASuVnQFmtWIkuSMBuj0C7dXaos7WwpLMlw48+hUcryC0KUATJ0Zl5jcMTntK Q9pj9FhaJLu86JyffejGiVfN/Kg6kKR+biNd49RNNjYLqJ7Av5cMGxx2QIvnloUIqulCH+ 666kFDleO6BS4AU3TOWOV8NxyOGya0rVTxQhdy50TLa399kFDX5jMu7NcYZ8+w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1752064120; a=rsa-sha256; cv=none; b=NuhQlFsYste0y3LebsOixDS38S08duvk4duyQAznFnIw04RB5C2wZ/hXPj36au2XTSdCEa YI6ZLWCdkfgLOTq6EI3PaSKx48IYbacNhWKnGfa+6sIrtQkBQ93WKZkUT/MPTTBXt8AWQN 8YjrRw/VkfZ9AV/0CHDGiDF1AswglntyNO2w2TkToDmmPCkHA36rGSM5V5FEF/sPgmTrG0 yfAWaJM+SdylCMmG7kI5wDWzJWEgcKrojekfKChifHu18PjffJRx+6rKBnAS4TP1JeNE5M PBe7g0ULQIkwydKXvaTtcMcbzpyiYqQpaDu9L7EqtcLgYYDdttZ/SmoSt70DtQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4bcchm5CVgz6Zr; Wed, 09 Jul 2025 12:28: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 569CSefF041740; Wed, 9 Jul 2025 12:28:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 569CSeDb041737; Wed, 9 Jul 2025 12:28:40 GMT (envelope-from git) Date: Wed, 9 Jul 2025 12:28:40 GMT Message-Id: <202507091228.569CSeDb041737@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: 7a96c75098af - stable/14 - pf: limit extra SCTP states List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-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/14 X-Git-Reftype: branch X-Git-Commit: 7a96c75098afe071e49755f1beccaaf08f9ae13f Auto-Submitted: auto-generated The branch stable/14 has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=7a96c75098afe071e49755f1beccaaf08f9ae13f commit 7a96c75098afe071e49755f1beccaaf08f9ae13f Author: Kristof Provost AuthorDate: 2025-06-21 09:13:22 +0000 Commit: Kristof Provost CommitDate: 2025-07-09 08:08:50 +0000 pf: limit extra SCTP states For SCTP we create states for all combinations of endpoints, to allow multihoming to work. Malicious users could abuse this to fill our state table more easily than they otherwise could, because we create states between all combinations of endpoints. Limit this to no more than 8 extra endpoints for each side of the connection. MFC after: 2 weeks Sponsored by: Orange Business Services (cherry picked from commit cd0169c9379c400ec75b77e87ca770e37f964276) --- sys/netpfil/pf/pf.c | 11 +++++++++++ tests/sys/netpfil/pf/sctp.py | 28 ++++++++++++++++++++++++++++ 2 files changed, 39 insertions(+) diff --git a/sys/netpfil/pf/pf.c b/sys/netpfil/pf/pf.c index 2ba2f2213fb7..f067c2b6bdf4 100644 --- a/sys/netpfil/pf/pf.c +++ b/sys/netpfil/pf/pf.c @@ -191,6 +191,8 @@ VNET_DEFINE(size_t, pf_allrulecount); VNET_DEFINE(struct pf_krule *, pf_rulemarker); #endif +#define PF_SCTP_MAX_ENDPOINTS 8 + struct pf_sctp_endpoint; RB_HEAD(pf_sctp_endpoints, pf_sctp_endpoint); struct pf_sctp_source { @@ -6374,6 +6376,7 @@ pf_sctp_multihome_add_addr(struct pf_pdesc *pd, struct pf_addr *a, uint32_t v_ta }; struct pf_sctp_source *i; struct pf_sctp_endpoint *ep; + int count; PF_SCTP_ENDPOINTS_LOCK(); @@ -6392,13 +6395,21 @@ pf_sctp_multihome_add_addr(struct pf_pdesc *pd, struct pf_addr *a, uint32_t v_ta } /* Avoid inserting duplicates. */ + count = 0; TAILQ_FOREACH(i, &ep->sources, entry) { + count++; if (pf_addr_cmp(&i->addr, a, pd->af) == 0) { PF_SCTP_ENDPOINTS_UNLOCK(); return; } } + /* Limit the number of addresses per endpoint. */ + if (count >= PF_SCTP_MAX_ENDPOINTS) { + PF_SCTP_ENDPOINTS_UNLOCK(); + return; + } + i = malloc(sizeof(*i), M_PFTEMP, M_NOWAIT); if (i == NULL) { PF_SCTP_ENDPOINTS_UNLOCK(); diff --git a/tests/sys/netpfil/pf/sctp.py b/tests/sys/netpfil/pf/sctp.py index 230dbae0d327..da42ce527195 100644 --- a/tests/sys/netpfil/pf/sctp.py +++ b/tests/sys/netpfil/pf/sctp.py @@ -426,6 +426,34 @@ class TestSCTP(VnetTestTemplate): assert re.search(r"all sctp 192.0.2.4:.*192.0.2.3:1234", states) assert re.search(r"all sctp 192.0.2.4:.*192.0.2.2:1234", states) + @pytest.mark.require_user("root") + def test_limit_addresses(self): + srv_vnet = self.vnet_map["vnet2"] + + ifname = self.vnet_map["vnet1"].iface_alias_map["if1"].name + for i in range(0, 16): + ToolsHelper.print_output("/sbin/ifconfig %s inet alias 192.0.2.%d/24" % (ifname, 4 + i)) + + ToolsHelper.print_output("/sbin/pfctl -e") + ToolsHelper.pf_rules([ + "block proto sctp", + "pass on lo", + "pass inet proto sctp to 192.0.2.0/24"]) + + # Set up a connection, which will try to create states for all addresses + # we have assigned + client = SCTPClient("192.0.2.3", 1234) + client.send(b"hello", 0) + rcvd = self.wait_object(srv_vnet.pipe) + print(rcvd) + assert rcvd['ppid'] == 0 + assert rcvd['data'] == "hello" + + # But the number should be limited to 9 (original + 8 extra) + states = ToolsHelper.get_output("/sbin/pfctl -ss | grep 192.0.2.2") + print(states) + assert(states.count('\n') <= 9) + @pytest.mark.require_user("root") def test_disallow_related(self): srv_vnet = self.vnet_map["vnet2"] From nobody Wed Jul 9 15:53: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 4bcjFJ1tMmz60c3B; Wed, 09 Jul 2025 15:53: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bcjFJ0ZT9z3jsr; Wed, 09 Jul 2025 15:53:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1752076420; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=EuhCDhivrlZOHkvPT49MQ4F7DR0Hc5SJk5errYq7uc8=; b=p0yR7UTgUq4ibkprKcbkzLHCH4ZiCL8XJvYaA1ulC58JRymJlTSrATWV8TQ0gJP/mc1Xh8 yjHsZolnC1BlWBDljeMIBjt/4wl5Xy0YAy3ErWqwx+QILsEwpv1ugnSvv7OXR61tjNaYGj KR3uYJcjwxNNTPJjY5DWZUqdHxu66AR366BtjMXT7AwEdiN1zoinA+FxBAFICyxCdiC4js hsv3a5SiBa3FwV481JwAQgxKGUkSqmciNuS+Evexn/0Ou0jaEF2Oawp8tLBschBjf23acJ n6RiBXkMhlUEJ+I63M1iV3S6/GN+gbABZWDFOLQIbLlnOxQi/E91HrWjnoyUQQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1752076420; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=EuhCDhivrlZOHkvPT49MQ4F7DR0Hc5SJk5errYq7uc8=; b=M3GfJAc8ziF7q5JxfcsmrOifgL953bgrW4cO3g0VmjjWXIX07iTS97u2X22MZkrQ91EgbH 2uhSzM7zCO3qICFmEVlaYMxSNPWDMQ8e0usSMUM0loVfD6Ba+dObt6sQVgTr7qAT9lFqEy J1coPZNMVKdC0sp70kEdckVuF96t6lUYbxpN5D4c3Fc6qE6AZGl8M3SPLghTrNxabmJtY4 xgY6H9pZ2RO5+9IqqLHhAWtWKVGeyjrumXnryv2pNWtjuPv/5giKCdZfRVi55tbUBql4c9 EbyPG69CKBnqD+3MwWrwaQAqWpzMoQo9HlO3EjTeirZHsXN2BaR/rzvT4KBKEw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1752076420; a=rsa-sha256; cv=none; b=fciRhH0IN1HNI0Cp3Dj6e0A/ebBW4fnNH8APK18kQJAFHwe/qu0YhSI2XDJReP70fVgCEX B95+Bmv7vyZuWDO+4Bi+UNjONditi0Tglt37eYDeXAleE6XqJgNVJ0qZlvRzVvxuJCwMvZ hQQQJKYiC+tYG4NaIZTYjZlPx3ETWV1pnmC5+d8vSxBMCIAgQ9TaraSwvb9NZo669MGUvi NwAx5F/7Runh716rNzTwYBwnDLJxB9h1DuMYSt/ZpspERfm3GJuF9GIOgYZnyYEJDwNI4m fBmGWrfd4VoaOisuUz/S3sDyBCmH6xtqaLAerkUdTo2caojQrqK6/9C2ndWO4w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4bcjFJ02LFzCBd; Wed, 09 Jul 2025 15:53: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 569FrdI6036100; Wed, 9 Jul 2025 15:53:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 569FrdXR036099; Wed, 9 Jul 2025 15:53:39 GMT (envelope-from git) Date: Wed, 9 Jul 2025 15:53:39 GMT Message-Id: <202507091553.569FrdXR036099@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Philip Paeps Subject: git: d46df0eabbbb - Create tag release/13.5.0-p2 List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: philip X-Git-Repository: src X-Git-Refname: refs/tags/release/13.5.0-p2 X-Git-Reftype: annotated tag X-Git-Commit: d46df0eabbbb80df640c25e37f1b32aa2071d333 Auto-Submitted: auto-generated The annotated tag release/13.5.0-p2 has been created by philip: URL: https://cgit.FreeBSD.org/src/tag/?h=release/13.5.0-p2 tag release/13.5.0-p2 Tagger: Philip Paeps TaggerDate: 2025-07-09 15:52:53 +0000 Tag FreeBSD 13.5-RELEASE-p2 commit 341d92aef027d903b37412363a111840afa290fc Author: Gordon Tetlow AuthorDate: 2025-07-02 06:01:59 +0000 Commit: Gordon Tetlow CommitDate: 2025-07-02 06:01:59 +0000 Add UPDATING entries and bump version. Approved by: so From nobody Wed Jul 9 15:54: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 4bcjGP4l6Qz60c1J; Wed, 09 Jul 2025 15:54: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bcjGP35klz3kKS; Wed, 09 Jul 2025 15:54:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1752076477; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XbV1V06npTLyTfHBpQqaY9TQ0vtwPM/rReWfd4TSREM=; b=pZb6mYR5mVAePgJvUaL7pSeGkbZs6m45FAkLo53tv8Ep4ub/hQ0NkZ42lmDlLr66c/jX1b LjvUrDmxfMHxeqq8n/AM16s2b/LoJLFXOTnrOs7wKxuz+QHkVAnVh6nxxNBP4hZ/W90oRq 2j8NMyYU4nfZfm/kGoG5a0pcZlWGfOoDOIfmWNPnhs5DDfXjLuWS2hWg5PkYLKanaE+jKx nNA0p3/XzrudnwMNlkCNgZVXdjT2dw7HeskAXofQGfWpgWSYB3iG8CGFXA6+fEDTWfBBgG PZdtSANun+pXCg+VUMrWHxWDbGLIVBQA+U+A06gH9FuBfeqg8EA/MBR5tzumPA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1752076477; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XbV1V06npTLyTfHBpQqaY9TQ0vtwPM/rReWfd4TSREM=; b=npdhRznwYaUrmg+pcgGqLsV0nMlEvxMhycPkF5cFBiuff5Y5DefbVTmMkHrq2mFcBa3sHn bBG+8oDkpeEKbjcB03ThjB2LwfkwA7ua3jIxwDzUY9wUPgIjfPyNkWo1oUZJVeD2Sx/vW3 wOY+7QYP+xgLDIwqyqHxDz6C1nN7PzXzmHV4M5AR131Fc+BcQQ4Frar/ERXQTGUUrFYJON QZTvu4aLjh5aYzSee11kByAy4pN0+xOG30UVTehwKxAgKrcihcZKvB5tA+f4GXxjWtiyP1 8lr+25PMp38530FtW3mrh//ZTcENORFT45V+7ftktnd0dSZlAVVaNezynso3Cw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1752076477; a=rsa-sha256; cv=none; b=pvUvZCo3+X220sBdqAM8NhwZPbpUk6cayLNdGnxTG0nofbeY9c6kIvdZkfSJqisaZYWDKi G1et+A80Vra+kxIo7C90nLepCirWLr4ry3TvpeH3injeyKr5NDfuHt86Yi2/XeQgVZbQg6 ujLQZKMzjcdRP18WhS4qMHEOlfdrkB7a/vag5shT9PYJtQ424DyuH1LigSnSkRNRcNCGI4 /ZGYh/6aZSmy/JcFf2rqXx1svk5ByR5f2FsWj2497xRGua1duJY1yaSCD1th+P9ydWBM8r tKuMC2KSGRPFMpOlxVy0PYlPdnrXpJ9eQKqPId1ZgM6Quin7+D5gKJ30TacIlQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4bcjGP2bc2zCF9; Wed, 09 Jul 2025 15:54: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 569FsbFV036453; Wed, 9 Jul 2025 15:54:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 569FsbDA036452; Wed, 9 Jul 2025 15:54:37 GMT (envelope-from git) Date: Wed, 9 Jul 2025 15:54:37 GMT Message-Id: <202507091554.569FsbDA036452@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Philip Paeps Subject: git: 3356c50fc938 - Create tag release/14.2.0-p4 List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: philip X-Git-Repository: src X-Git-Refname: refs/tags/release/14.2.0-p4 X-Git-Reftype: annotated tag X-Git-Commit: 3356c50fc9386e075efcacb4c27848f6a647d438 Auto-Submitted: auto-generated The annotated tag release/14.2.0-p4 has been created by philip: URL: https://cgit.FreeBSD.org/src/tag/?h=release/14.2.0-p4 tag release/14.2.0-p4 Tagger: Philip Paeps TaggerDate: 2025-07-09 15:54:02 +0000 Tag FreeBSD 14.2-RELEASE-p4 commit d9352700f9357aa170c1e4dc144537998ec66025 Author: Gordon Tetlow AuthorDate: 2025-07-02 06:03:15 +0000 Commit: Gordon Tetlow CommitDate: 2025-07-02 06:03:15 +0000 Add UPDATING entries and bump version. Approved by: so From nobody Wed Jul 9 15:56: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 4bcjJf287cz60cKn; Wed, 09 Jul 2025 15:56:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bcjJd63yFz3ktj; Wed, 09 Jul 2025 15:56:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1752076593; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/EWkEGwc4q+blp0PL2xYLg5/gzVc3AfYxcUf1uw5boI=; b=Xc2FGXvRLn9z+WaFcw1iN/DjRue6lolfx1jaiN4NEK0XyMxVBt0B/0WwUJCKTELBd65o4T +bMk4EljFe1GXhrZ87lJ+w92DSyQW3CM+tuAt4YHmm8+LLUc8bWOj2LLgtIeJda510zAjC OVSaA2fOoNgLTHaPfr/GhBnsqeYairEf2VWot2augLKtBOGSSn2R2YmbNizpRvr6Bx0cNR YWW5f3DeFdsR14v5TCT0wfv+z0jAsAtos8hz1SHZzTi3ZMRS77gblrVVpACdWZLwQ6Nmaj YBZf2a77ml4JlJcF5D/4xqeFhP58oLbJGOG/H50ZHDLS5w0E2vWIsYo/pdZTeg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1752076593; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/EWkEGwc4q+blp0PL2xYLg5/gzVc3AfYxcUf1uw5boI=; b=vHz31v5zu9K/t/xLZYDdkVicDZjiT6PrgF63dJ7i4hsuRyueTkGsxVYrjzMnb8CQ08frr+ hhigtnsPlPDsAH2KqeRzBYx5ubnJ1FBnz/6dPG5aA5zSzcc/81Nkr4E/NeHthyg7dDx7kr X2UEX5TwV3NYKfl4eX316lFF5mrjgjghmsHdtWsRQLSpnCIURaXoIIXWqfgcLs6WZttGy7 a5HAHsUi3bfbGkj73ilh/wXckffTEBbR1LipnKM+WsoBirmow8ampYPlErlaR99Vyxwm8n THwrxUKuIr1R/uhGzKwGtJCkjkiDJylWwfX1jvdKYtLnFMUrdmHWY7bPk88mqA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1752076593; a=rsa-sha256; cv=none; b=vPA4j2FpDFgZWhtIGxEgiN311YWJHF4nElkgDlgqwpYOKR2JX6W4CyNMFgZsNAMOgLFMIJ EJUQ+3EWybAcJN18QPVIjkLjPRaWLlXTAeZElY9lv0tsr3FYBcjaELzzkcrpAixcP9s9wu ko6VC1DejO+oPqulR8U5xGP2Tcv2IXlI9QFb+inv9+UtC4RKXVQR+1Q5M7Oh6cq2UEFUdZ +l7RNONvyJf7pNkfNPE5p2IsuS9eFsVy6sW/62BM9CRwAgUv2Naaj0tHLR7Bqgq4sStYwi Qg5zL9cXf2/OP+W8tL5pPdr7FMlPZ8maBB0NYCV8ZcwaJWX7hnLqXFp9HMqdFw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4bcjJd5TbpzCJ3; Wed, 09 Jul 2025 15:56: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 569FuXns037142; Wed, 9 Jul 2025 15:56:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 569FuX82037141; Wed, 9 Jul 2025 15:56:33 GMT (envelope-from git) Date: Wed, 9 Jul 2025 15:56:33 GMT Message-Id: <202507091556.569FuX82037141@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Philip Paeps Subject: git: 8b9b063ecceb - Create tag release/14.3.0-p1 List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: philip X-Git-Repository: src X-Git-Refname: refs/tags/release/14.3.0-p1 X-Git-Reftype: annotated tag X-Git-Commit: 8b9b063ecceb96c9f9ae0b992f0fb5606ae365df Auto-Submitted: auto-generated The annotated tag release/14.3.0-p1 has been created by philip: URL: https://cgit.FreeBSD.org/src/tag/?h=release/14.3.0-p1 tag release/14.3.0-p1 Tagger: Philip Paeps TaggerDate: 2025-07-09 15:56:10 +0000 Tag FreeBSD 14.3-RELEASE-p1 commit 2ea99b8ed14208286ec3c8d6ccc997537c13d195 Author: Gordon Tetlow AuthorDate: 2025-07-02 06:04:23 +0000 Commit: Gordon Tetlow CommitDate: 2025-07-02 06:04:23 +0000 Add UPDATING entries and bump version. Approved by: so From nobody Thu Jul 10 20:06: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 4bdQpr6yd7z61Tv1; Thu, 10 Jul 2025 20:06: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bdQpr621Yz3Wbp; Thu, 10 Jul 2025 20:06:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1752178004; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=iGOH43g1OvKTWEd86G9iX40FgXaTMsm3feLJU1a6lns=; b=VsolSk8Z++2GoLDd/CQiUaX9cShe6j0Q2GL6MJXzSDCtfmmTRTM2nSi7T2RTz6TQOG6cbS M9C1p79SewEw3a2eXuf78LJVF2BmqWxdG+LlJcEogU1W7q5CN11oXZdtqehbCXcMk3jg68 Kx6feCvV3ctGZFPyIkPaBAszKROApirZFH8Tf7P5EIsoiY35jnwO77cjBrgRRNp3+hO/kU h3FJV3hcb7HhqssmrA0VU5dzCrr93TjNZrqdwpb9X3FciB4ZYbYDl7j4m2qHkgQ+LdTUaf p2iKUr/25q4OlZipYPqhBHYMifJmvw79tf8//hFgRQiUbYe1iL1KtPZjcxhGNA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1752178004; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=iGOH43g1OvKTWEd86G9iX40FgXaTMsm3feLJU1a6lns=; b=YwOGg5L28MYDy2bwfH+6uNiRwrJvsQWqRgltQ9hq9xW3wbXSnDbGBkRenGsqmUOdH4S3p1 OAoau0vivSgdcbd6qn3pu/6TEoD8MBylgNnrdfk6VHsFln9GpsTjQ+PR/g3EHSjyMgqAqP eyJ+NWwH8raKedEStthhTW93vzdDvYwhOPnaoFbKkwWgJ3SJfNVQ6rZta/2Vy8Rwpt97Op Xvn9kzbJ/ZEuVCDS9iCHJdorhrmgSebrVmrA1K8Aan8xcAx5WnJ9YHw6HUKZyxsJgCcD/P Rrierb8lP7zrs4HwEqknUPAvaMKjTqwwtr3xDd069P3UlX0ua88cPV7nrUoMSg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1752178004; a=rsa-sha256; cv=none; b=CeQ4cywkS+j9kDMnVV6Z3PAX+nYq44823BJ/wHLpe/E7JXH76YreSOTzCb5aDRz1bEJKK2 AGMXJhWTcLjFxT7tC1G3xZj1J5Mcz+fIDvmBSFx8WW78KhDRgAxgxPyjE0WpwPefb9ghEb cxonQTQuWru76UFhRjSqxMSmrsgsMl94QHYqXWCDftxGu4pduiaV29/zZGZ+5nLHbfvDh7 5YNuwGXk5HmY6VosYhFEm8yMaLpf5W2zzTcU0kvv7ufu5Z6AxjqHLf4pmY8oYUgQ/hg16S 8ozoTuTTurMDQ1BlR1a9lUliMRy6qAG1ABna0pR0/Nvex78eL1fUpYc6S2UvCQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4bdQpr4TS7z1LHm; Thu, 10 Jul 2025 20:06: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 56AK6i06016631; Thu, 10 Jul 2025 20:06:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 56AK6iSH016628; Thu, 10 Jul 2025 20:06:44 GMT (envelope-from git) Date: Thu, 10 Jul 2025 20:06:44 GMT Message-Id: <202507102006.56AK6iSH016628@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: 11d1a5c57900 - stable/14 - random: Move entropy harvest queue lock macros to random_harvestq.c List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-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/14 X-Git-Reftype: branch X-Git-Commit: 11d1a5c57900b9cc77c6b56516c7be3fda4ecc0e Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=11d1a5c57900b9cc77c6b56516c7be3fda4ecc0e commit 11d1a5c57900b9cc77c6b56516c7be3fda4ecc0e Author: Mark Johnston AuthorDate: 2025-07-03 17:21:37 +0000 Commit: Mark Johnston CommitDate: 2025-07-10 13:51:41 +0000 random: Move entropy harvest queue lock macros to random_harvestq.c They can't be used externally, so it makes no sense to have them in a header. No functional change intended. Reviewed by: cem MFC after: 1 week Sponsored by: Stormshield Sponsored by: Klara, Inc. Differential Revision: https://reviews.freebsd.org/D51111 (cherry picked from commit 4b8b872a9c55c040eb83f917fc8fd2bf908b96a9) --- sys/dev/random/random_harvestq.c | 5 +++++ sys/dev/random/random_harvestq.h | 4 ---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/sys/dev/random/random_harvestq.c b/sys/dev/random/random_harvestq.c index 92af14446e9c..b5e733dcb8e3 100644 --- a/sys/dev/random/random_harvestq.c +++ b/sys/dev/random/random_harvestq.c @@ -162,6 +162,11 @@ static struct harvest_context { } hc_entropy_fast_accumulator; } harvest_context; +#define RANDOM_HARVEST_INIT_LOCK() mtx_init(&harvest_context.hc_mtx, \ + "entropy harvest mutex", NULL, MTX_SPIN) +#define RANDOM_HARVEST_LOCK() mtx_lock_spin(&harvest_context.hc_mtx) +#define RANDOM_HARVEST_UNLOCK() mtx_unlock_spin(&harvest_context.hc_mtx) + static struct kproc_desc random_proc_kp = { "rand_harvestq", random_kthread, diff --git a/sys/dev/random/random_harvestq.h b/sys/dev/random/random_harvestq.h index 69a9dfabd44a..edeb4ff7a17f 100644 --- a/sys/dev/random/random_harvestq.h +++ b/sys/dev/random/random_harvestq.h @@ -40,8 +40,4 @@ struct harvest_event { uint8_t he_source; /* origin of the entropy */ }; -#define RANDOM_HARVEST_INIT_LOCK(x) mtx_init(&harvest_context.hc_mtx, "entropy harvest mutex", NULL, MTX_SPIN) -#define RANDOM_HARVEST_LOCK(x) mtx_lock_spin(&harvest_context.hc_mtx) -#define RANDOM_HARVEST_UNLOCK(x) mtx_unlock_spin(&harvest_context.hc_mtx) - #endif /* SYS_DEV_RANDOM_RANDOM_HARVESTQ_H_INCLUDED */ From nobody Thu Jul 10 20:06: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 4bdQpt08Vlz61Tv5; Thu, 10 Jul 2025 20:06:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bdQps5l17z3Whj; Thu, 10 Jul 2025 20:06:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1752178005; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=A4jMd/vLGVXcC3bGno5e0dwOO+TQ+4o2gXV209go5fA=; b=e9MEebvdoDfhzZydp2dkrYfxIcbOnTUPhvjdPXlOV8q47UWqGCjnRrlXzQ+3yLZ4rSpV8W FNnoekUkke/MyXIlRmZkr860s6W+DNnrIlEgOfXhV95I6ZZyFMD1yFkjBSw2psgmnN9XTH r5yegzLO6k81/f+aYjbZpdavrWHFQs5UPDgctWbuieqgKGIF72Kew56jecr73Bfxs6CDUb pBihdX8945UbH+AXu7GXKaYmCFg7cNTZ+YU07NbTRv7lU2el+xPVdW1bynDxeRP+eXC+ZA mi7RKGo/e0TaRgKRghllLnRdbiLqdbVO/3z/sHoMnRzIk87jUDq1YILopPgwDg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1752178005; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=A4jMd/vLGVXcC3bGno5e0dwOO+TQ+4o2gXV209go5fA=; b=wkrch+7P2LN2OLDs27YR5KBrt7F8JYKpDsOGdM26LdX4riuGIb/SSJ5U6+10b7Yl+PuE9j lUmI5yczg8EdXB7ZE2Z4+fA29Z3i67q2eR1U4pplB24gQKQ5MVSM6WQu9UO4zcdVzgAS5s TmR49O2A50GeHMAnjX0ct0JUIDCNRg81PDtSdsk8ZWv0k+Kz26Arb6lwKceezsSBM7Tb0p ibHvTb6/1VMT0yAT80bJFMhiqWZcm5IWsSTPXlWS+G0fBFQoI8dXlLPbdRtDIt21iovvAs h563jKmhgSrlG0qR5dlLtkU4oup3vgK5t3urRMX8I0XT50wxR/m9bvuYYyg3mA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1752178005; a=rsa-sha256; cv=none; b=XcQuNFcUy3CqT8ad0ULuBhEeU6l1V7I+SF1xpHK/3K3o7VXN7lfkTza1/fmW3G7nzs0L+3 s3e9rqg/GZ28nQ1yTVExn+xabtLlRWIfbWUNKXsQGx4MsdXcCCJ972PTtoolaecU0WN1DF 3dmmIcL+sc7HqiTEDgB8hK/rK7fWqwESgowfehMFJZGTnUwV4HNOsheNax+bKHTENv0AXq 6/dk5Sr3NJ2C6Xb9JEkAIvRnslmfNdi7m1sVKhbE275dJscibOIRjyM95xbbuqpAlPqwpR KtoFWdiPCRRpSp3gv/Qc/QITcgMrb8m2DvQJGMRd1pSuvsl8nYMrYvjxNim5vQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4bdQps586Vz1LT0; Thu, 10 Jul 2025 20:06: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 56AK6jn4016664; Thu, 10 Jul 2025 20:06:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 56AK6j5V016661; Thu, 10 Jul 2025 20:06:45 GMT (envelope-from git) Date: Thu, 10 Jul 2025 20:06:45 GMT Message-Id: <202507102006.56AK6j5V016661@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: 475a36762f9d - stable/14 - random: Define a macro for getting the CPU cycle count List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-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/14 X-Git-Reftype: branch X-Git-Commit: 475a36762f9df862b8cce310fccaed3b36ae3cc6 Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=475a36762f9df862b8cce310fccaed3b36ae3cc6 commit 475a36762f9df862b8cce310fccaed3b36ae3cc6 Author: Mark Johnston AuthorDate: 2025-07-03 17:27:47 +0000 Commit: Mark Johnston CommitDate: 2025-07-10 13:51:42 +0000 random: Define a macro for getting the CPU cycle count Entropy queue entries always include the low 32 bits of a CPU cycle count reading. Introduce a macro for this instead of hard-coding get_cyclecount() calls everywhere; this is handy for testing purposes since this way, random(4)'s use of the cycle counter (e.g., the number of bits we use) can be changed in one place. No functional change intended. Reviewed by: cem, delphij MFC after: 1 week Sponsored by: Stormshield Sponsored by: Klara, Inc. Differential Revision: https://reviews.freebsd.org/D51113 (cherry picked from commit e2a96b83404fcee0a079a3c3adbb448b86a38d1e) --- sys/dev/random/random_harvestq.c | 9 +++++---- sys/dev/random/random_harvestq.h | 9 +++++++++ sys/dev/random/randomdev.c | 6 +++--- 3 files changed, 17 insertions(+), 7 deletions(-) diff --git a/sys/dev/random/random_harvestq.c b/sys/dev/random/random_harvestq.c index b5e733dcb8e3..a8eaa932e0b2 100644 --- a/sys/dev/random/random_harvestq.c +++ b/sys/dev/random/random_harvestq.c @@ -459,7 +459,7 @@ random_early_prime(char *entropy, size_t len) return (0); for (i = 0; i < len; i += sizeof(event.he_entropy)) { - event.he_somecounter = (uint32_t)get_cyclecount(); + event.he_somecounter = random_get_cyclecount(); event.he_size = sizeof(event.he_entropy); event.he_source = RANDOM_CACHED; event.he_destination = @@ -566,7 +566,7 @@ random_harvest_queue_(const void *entropy, u_int size, enum random_entropy_sourc if (ring_in != harvest_context.hc_entropy_ring.out) { /* The ring is not full */ event = harvest_context.hc_entropy_ring.ring + ring_in; - event->he_somecounter = (uint32_t)get_cyclecount(); + event->he_somecounter = random_get_cyclecount(); event->he_source = origin; event->he_destination = harvest_context.hc_destination[origin]++; if (size <= sizeof(event->he_entropy)) { @@ -595,7 +595,8 @@ random_harvest_fast_(const void *entropy, u_int size) u_int pos; pos = harvest_context.hc_entropy_fast_accumulator.pos; - harvest_context.hc_entropy_fast_accumulator.buf[pos] ^= jenkins_hash(entropy, size, (uint32_t)get_cyclecount()); + harvest_context.hc_entropy_fast_accumulator.buf[pos] ^= + jenkins_hash(entropy, size, random_get_cyclecount()); harvest_context.hc_entropy_fast_accumulator.pos = (pos + 1)%RANDOM_ACCUM_MAX; } @@ -612,7 +613,7 @@ random_harvest_direct_(const void *entropy, u_int size, enum random_entropy_sour KASSERT(origin >= RANDOM_START && origin < ENTROPYSOURCE, ("%s: origin %d invalid\n", __func__, origin)); size = MIN(size, sizeof(event.he_entropy)); - event.he_somecounter = (uint32_t)get_cyclecount(); + event.he_somecounter = random_get_cyclecount(); event.he_size = size; event.he_source = origin; event.he_destination = harvest_context.hc_destination[origin]++; diff --git a/sys/dev/random/random_harvestq.h b/sys/dev/random/random_harvestq.h index edeb4ff7a17f..7804bf52aa4f 100644 --- a/sys/dev/random/random_harvestq.h +++ b/sys/dev/random/random_harvestq.h @@ -27,6 +27,9 @@ #ifndef SYS_DEV_RANDOM_RANDOM_HARVESTQ_H_INCLUDED #define SYS_DEV_RANDOM_RANDOM_HARVESTQ_H_INCLUDED +#include +#include + #define HARVESTSIZE 2 /* Max length in words of each harvested entropy unit */ /* These are used to queue harvested packets of entropy. The entropy @@ -40,4 +43,10 @@ struct harvest_event { uint8_t he_source; /* origin of the entropy */ }; +static inline uint32_t +random_get_cyclecount(void) +{ + return ((uint32_t)get_cyclecount()); +} + #endif /* SYS_DEV_RANDOM_RANDOM_HARVESTQ_H_INCLUDED */ diff --git a/sys/dev/random/randomdev.c b/sys/dev/random/randomdev.c index 16f0b2c64f1f..69f7fe58f8a3 100644 --- a/sys/dev/random/randomdev.c +++ b/sys/dev/random/randomdev.c @@ -304,14 +304,14 @@ randomdev_accumulate(uint8_t *buf, u_int count) /* Extra timing here is helpful to scrape scheduler jitter entropy */ randomdev_hash_init(&hash); - timestamp = (uint32_t)get_cyclecount(); + timestamp = random_get_cyclecount(); randomdev_hash_iterate(&hash, ×tamp, sizeof(timestamp)); randomdev_hash_iterate(&hash, buf, count); - timestamp = (uint32_t)get_cyclecount(); + timestamp = random_get_cyclecount(); randomdev_hash_iterate(&hash, ×tamp, sizeof(timestamp)); randomdev_hash_finish(&hash, entropy_data); for (i = 0; i < RANDOM_KEYSIZE_WORDS; i += sizeof(event.he_entropy)/sizeof(event.he_entropy[0])) { - event.he_somecounter = (uint32_t)get_cyclecount(); + event.he_somecounter = random_get_cyclecount(); event.he_size = sizeof(event.he_entropy); event.he_source = RANDOM_CACHED; event.he_destination = destination++; /* Harmless cheating */ From nobody Thu Jul 10 20:06: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 4bdQpv3vwMz61Tv6; Thu, 10 Jul 2025 20:06:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bdQpv04Y2z3Wn2; Thu, 10 Jul 2025 20:06:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1752178007; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fdhrtNJcelq+PJ2EUjE9DpZyn/bMZP6vdp39VFReG0E=; b=V8oK/xmKtwSY7VoaTg2f9JX3PhTjtvA3Y77uJLoT5NJtNx7kbljOk/6kqxH1yDDtgtb25W ay0YMYCvWCOg1VcmhHUjetKPhwKK6mvXxXD8nvvKu42SxjBz1V3KNeSmtv/VVDK5y7PCC5 A+D/XMe27qe2qD0M+mfCyk5+mujKA3ORkEf7HmZecDNwdYZJQRTDRaUIBO+hif028hUMNx MUK2IJKx0qoWvFSgyX+3MCaFBHmSJ59fwDhiBo8loAOPmGggJ0/5StuO+GGGz92vtgc5ug DktoQroD4Rutqhsf2aSEZlusvJHNA/p9CYK4EjPn/O7XSgdaVeI2i6P9EynOJA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1752178007; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fdhrtNJcelq+PJ2EUjE9DpZyn/bMZP6vdp39VFReG0E=; b=yzalAfgdXKGqkjyGFj45JC458yOnHQ2MRP23wSOiNUZfOi5ebDzgriOkr1GTSMbWfgsjRL tXVmHeKI6GrhwGLmSgd7zZb67v0cHTlwhQqN64K/1Bm4ptjnvuQj7iyCM0PcqOXcL2f6XL pfYMDa5qR6YZ/KWgelBhO375bfGZiox+5N/PqThfo92bubRCCLeVQ0IGRwrQUukoSjx02h ecbZxAXBKS7evH4Txhhrjab9CaT6L1BQ91evmKp+QB2VOevqbI06P2mCY+/3RplfERIcHz jlsk+Zv324ulyV3Z75JBeJXcVsVj93PHXpDIpAAlR0LAwEVq4N/xw/F1wy0J9Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1752178007; a=rsa-sha256; cv=none; b=vUkrolvb5ndJbgoSXbLI1oqTrJBAgMUK8RI1Rhdm8tl8quGiK4pWVjwY+Q2qZWtFLn+LPW yMD+LXgPe8LQrK3+0ykrjLq8uoGFmpKH3fZhxziOPVGYpDjvpGQR4mD4ESNYSmWPaEtp9V QgwZ2VfW+gSoYG1BT2dKMmJgIuoojKD6vDEmbd59pIXFSUfI0lVkW8vfZeAJ2q0urWiu/d s5mAWXMcAheC9pdDXC2/eCoogEn0YIZufyuCLnUuUSMHG5y0UJdDZU00SZSZAT8WLiscOu 8pAv72YZV6wqQEpVYqdLUPo4emEXeQb+SWH1JPr7he0aaperRFHmof3I995z0g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4bdQpt6PMQz1LF5; Thu, 10 Jul 2025 20:06: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 56AK6kaW016701; Thu, 10 Jul 2025 20:06:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 56AK6kQG016698; Thu, 10 Jul 2025 20:06:46 GMT (envelope-from git) Date: Thu, 10 Jul 2025 20:06:46 GMT Message-Id: <202507102006.56AK6kQG016698@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: 791ac36668d5 - stable/14 - random: Remove ARGSUSED annotations from random_harvestq.c List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-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/14 X-Git-Reftype: branch X-Git-Commit: 791ac36668d518b3fff35c21176a31cab66c4e9b Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=791ac36668d518b3fff35c21176a31cab66c4e9b commit 791ac36668d518b3fff35c21176a31cab66c4e9b Author: Mark Johnston AuthorDate: 2025-07-03 17:28:10 +0000 Commit: Mark Johnston CommitDate: 2025-07-10 13:51:44 +0000 random: Remove ARGSUSED annotations from random_harvestq.c Such annotations are obsolete, the compiler tells us when parameters are unused. No functional change intended. Reviewed by: cem MFC after: 1 week Sponsored by: Stormshield Sponsored by: Klara, Inc. Differential Revision: https://reviews.freebsd.org/D51114 (cherry picked from commit 5e213d8a7462968e10370506a4905eab0dd48e65) --- sys/dev/random/random_harvestq.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/sys/dev/random/random_harvestq.c b/sys/dev/random/random_harvestq.c index a8eaa932e0b2..4cf40edb0ab4 100644 --- a/sys/dev/random/random_harvestq.c +++ b/sys/dev/random/random_harvestq.c @@ -312,7 +312,6 @@ random_sources_feed(void) explicit_bzero(entropy, sizeof(entropy)); } -/* ARGSUSED */ static int random_check_uint_harvestmask(SYSCTL_HANDLER_ARGS) { @@ -343,7 +342,6 @@ SYSCTL_PROC(_kern_random_harvest, OID_AUTO, mask, random_check_uint_harvestmask, "IU", "Entropy harvesting mask"); -/* ARGSUSED */ static int random_print_harvestmask(SYSCTL_HANDLER_ARGS) { @@ -396,7 +394,6 @@ static const char *random_source_descr[ENTROPYSOURCE] = { /* "ENTROPYSOURCE" */ }; -/* ARGSUSED */ static int random_print_harvestmask_symbolic(SYSCTL_HANDLER_ARGS) { @@ -429,7 +426,6 @@ SYSCTL_PROC(_kern_random_harvest, OID_AUTO, mask_symbolic, random_print_harvestmask_symbolic, "A", "Entropy harvesting mask (symbolic)"); -/* ARGSUSED */ static void random_harvestq_init(void *unused __unused) { @@ -499,7 +495,6 @@ random_prime_loader_file(const char *type) * known to the kernel, and inserting it directly into the hashing * module, currently Fortuna. */ -/* ARGSUSED */ static void random_harvestq_prime(void *unused __unused) { @@ -528,7 +523,6 @@ random_harvestq_prime(void *unused __unused) } SYSINIT(random_device_prime, SI_SUB_RANDOM, SI_ORDER_MIDDLE, random_harvestq_prime, NULL); -/* ARGSUSED */ static void random_harvestq_deinit(void *unused __unused) { From nobody Thu Jul 10 21:04: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 4bdS5B089zz61YVb; Thu, 10 Jul 2025 21:04: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bdS596TkKz44TW; Thu, 10 Jul 2025 21:04:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1752181453; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fnQAuTmxd3QZu0SVwOq6NJ16DDkxqmmSAD3YLF/C1GM=; b=vaHfUVXT5frkskbwwEnzAtxhrzRtPz76lhLEZZYmILCk5/jPw0lkuguhnMzQ7fThskX61a 0wuG9vXD3G50M13i9K2L09loeYELb2+QnX5w/anGcoo/ijC2VSFc9VTy5M9L/gV77+wkND p7l16+QP1VW+aTX3kqV7eZSNhIPmcHR6I5uq7p37sqRYgN0WQaQaUzOax/VCxq0YSIQmAj 6FERXIlC3zzjn4g5BlXZ9PKIUnPr9g//fJinHkTEjiGQAeJxEhRkcM/PqVzRg4ENWk8HjP ++9rLm9N0XCciBTZ1ufJxICjxHUrx3IZaV/k31JVE62UMa+83EpYD3WFJp/Duw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1752181453; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fnQAuTmxd3QZu0SVwOq6NJ16DDkxqmmSAD3YLF/C1GM=; b=lr5xwSUF5QTJwZQxhDkmPoZgh5Dl8X7MxI8XT25Rrv8SqOgcXdF+By/71L7yxcZ9R4gZ/l WY/F/rsJI7Jy8LcBpJcz2otQGLQAkMV5XpiunYI9hFDjMb3igiFtHrBUoFR2p7Ak6cnydN aDbOb16Vl43okpqyMCTusD8V5vmBMUHvMZQIrT3c39x9M1PI1PPqvtb7W1Dwvehs6gHFsR eCpgMOIDZPOGB68DKMYAr/QjRTmvrrMLPxVR1gLb7x49kvsXkx9FYjANR1M1rLS0zIk0Hx zBpwsOgstrP7yy1iig1kOwUmXhpEEmsypCeBxytloWVyFYJJ7D3HIYme6fwykQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1752181453; a=rsa-sha256; cv=none; b=Va9+7zj6uCGEstPmKsuK8XycjzfmWmkkuadHKBcCoxlr2mZrG27+zgd81Oq1Cc753lqahy sEdmD9HdWIGtAZwc6nw0j7yyl7mWPsXoVxd+ZuAmt2zdwatoY1NpfS5UCJd3BAWYgz/wfc efUgHVvgoILxAue4Vh4ATLbz2OBdrJB3ozpW69fUV5rEZ4FlMOyn/fJrHlqg390r5mqw+9 Kqf9X+uXJVfVJYj8K4yXf28hwO1tyceaVf/gxMP0DVr6ew+/8L+bZu4nDDPeHFCiK4lTYy AADWY17gBdNB9ljDndguP97CcJzxVKzkf/IPI3rDlFwdBus903O4ktgfNZkpgw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4bdS596111z1MGw; Thu, 10 Jul 2025 21:04:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 56AL4DPr028593; Thu, 10 Jul 2025 21:04:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 56AL4DB5028590; Thu, 10 Jul 2025 21:04:13 GMT (envelope-from git) Date: Thu, 10 Jul 2025 21:04:13 GMT Message-Id: <202507102104.56AL4DB5028590@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: 103763fab4f7 - stable/14 - vm_pageout_scan_inactive: take a lock break List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-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/14 X-Git-Reftype: branch X-Git-Commit: 103763fab4f7349df53f7367816f1f4ca2881005 Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=103763fab4f7349df53f7367816f1f4ca2881005 commit 103763fab4f7349df53f7367816f1f4ca2881005 Author: Ryan Libby AuthorDate: 2024-05-24 15:52:58 +0000 Commit: Mark Johnston CommitDate: 2025-07-10 21:00:34 +0000 vm_pageout_scan_inactive: take a lock break In vm_pageout_scan_inactive, release the object lock when we go to refill the scan batch queue so that someone else has a chance to acquire it. This improves access latency to the object when the pagedaemon is processing many consecutive pages from a single object, and also in any case avoids a hiccup during refill for the last touched object. Reviewed by: alc, markj (previous version) Sponsored by: Dell EMC Isilon Differential Revision: https://reviews.freebsd.org/D45288 (cherry picked from commit a216e311a70cc87a5646f4306e36c60a51706699) --- sys/vm/vm_pageout.c | 16 +++++++++++++++- sys/vm/vm_pagequeue.h | 6 ++++++ 2 files changed, 21 insertions(+), 1 deletion(-) diff --git a/sys/vm/vm_pageout.c b/sys/vm/vm_pageout.c index c2c5281b87af..83f655eb852e 100644 --- a/sys/vm/vm_pageout.c +++ b/sys/vm/vm_pageout.c @@ -1468,7 +1468,21 @@ vm_pageout_scan_inactive(struct vm_domain *vmd, int page_shortage) pq = &vmd->vmd_pagequeues[PQ_INACTIVE]; vm_pagequeue_lock(pq); vm_pageout_init_scan(&ss, pq, marker, NULL, pq->pq_cnt); - while (page_shortage > 0 && (m = vm_pageout_next(&ss, true)) != NULL) { + while (page_shortage > 0) { + /* + * If we need to refill the scan batch queue, release any + * optimistically held object lock. This gives someone else a + * chance to grab the lock, and also avoids holding it while we + * do unrelated work. + */ + if (object != NULL && vm_batchqueue_empty(&ss.bq)) { + VM_OBJECT_WUNLOCK(object); + object = NULL; + } + + m = vm_pageout_next(&ss, true); + if (m == NULL) + break; KASSERT((m->flags & PG_MARKER) == 0, ("marker page %p was dequeued", m)); diff --git a/sys/vm/vm_pagequeue.h b/sys/vm/vm_pagequeue.h index 70122fef9fff..43cb67a252b5 100644 --- a/sys/vm/vm_pagequeue.h +++ b/sys/vm/vm_pagequeue.h @@ -357,6 +357,12 @@ vm_batchqueue_init(struct vm_batchqueue *bq) bq->bq_cnt = 0; } +static inline bool +vm_batchqueue_empty(const struct vm_batchqueue *bq) +{ + return (bq->bq_cnt == 0); +} + static inline int vm_batchqueue_insert(struct vm_batchqueue *bq, vm_page_t m) { From nobody Fri Jul 11 03:12: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 4bdcGN2MLyz61vYF; Fri, 11 Jul 2025 03:12: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bdcGN0rTsz3jXs; Fri, 11 Jul 2025 03:12:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1752203564; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=un0KhpsgbvLRTVq0YIb0iLR6ddLV1keXatgxA8jxtns=; b=dzQ7grwtf9YanEVzjxTjPZ/v90Z98cX0A3eSR5PW72E/nVn9V0WO8S5J4LkWm0AoDcwxhT muBq+MeGWeSNdgwv2RR1xTtVeHHqNpAPaOuAIs0XJnUzzdiFSxqZrugyMky6QyIKvLqaKV RrfjZ5lHtFowYjhpkguO1HzP0R2/LpLb+UIdCStU7uUkgGGST91+wGPNN20Eg9zQiqfuXJ cKyPHmxcWnIM18qTy6O0vAR29fXZE227ZyoMfNYd/tNt6zpKjBb+vztWoEHYyD9iSsFt38 ZcLaFTwCDBt9Ghj7SFyUR1GNIW8t3wtVs0Y4JQv/OIkyuo+IU1DmSvG8uNUhWA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1752203564; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=un0KhpsgbvLRTVq0YIb0iLR6ddLV1keXatgxA8jxtns=; b=EAbhYtAqSlKevXWs9mCDFpnQMJNVwsIoNLBWgJb8Qw45jpGj1dTPpaCPyXFWTXj0nCMWeO BOFagfIRx7JgkMYGQgqFTw3en1zvn5m0zmKmxL1TXeNjew4SKdk24gGqYEX/GDlhwCDqXG nOMwBZBKUX8JuHbEaP0i4luXJoZz6tT0gk3hSXgwiyqrHbgVFB2u9UNF6+3pFu7Jp5gXUe ecKUUgaxaohKa0gy6ogsZdkD5etRIyUIkpZQDbKWzAHIrGHfO1tWiaSn7E+q0ffjcweDlb xGEvzHlSh+m34eWL7odQmovh0E7jLwifJxNAqYwIhz73PuVAgFWYskh9/UvTTA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1752203564; a=rsa-sha256; cv=none; b=WDrXib9kiX3BuuWeE6k7tO4EGXWDk77fyWBwmGU8SR1phwWNDp28gUy3VZcWWDuq8EVg5j 6vTRf+VLU3E3VI/rkC9LQY+/ZCslmhKwVdlVzAZwDu6JPx08D+gasNS6iYair13HTXHs4c TfKAQOXd1R04CwommFZjZ0BFHwoPta2akHguKrBM6XsiHCNelpSP24afGC7cNq3u82tC84 comfEBIzBY8K2NN91OK9by3o/7akk966w9L3vSAYthYm52vr3bUWcvZ2wvjxwkuT2fmG/F DcF++rn1etj4xRI7slQCdHFHNWIZJTMjpx+YfebUdJGkh1GiHx7iHEZDI4S75w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4bdcGN0Qygz4lX; Fri, 11 Jul 2025 03:12: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 56B3ChLl022013; Fri, 11 Jul 2025 03:12:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 56B3Ch2e022010; Fri, 11 Jul 2025 03:12:43 GMT (envelope-from git) Date: Fri, 11 Jul 2025 03:12:43 GMT Message-Id: <202507110312.56B3Ch2e022010@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: 1821af77efef - stable/14 - clang: install clang-scan-deps List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-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/14 X-Git-Reftype: branch X-Git-Commit: 1821af77efefd25ecdade590074f21fa976d086f Auto-Submitted: auto-generated The branch stable/14 has been updated by ivy: URL: https://cgit.FreeBSD.org/src/commit/?id=1821af77efefd25ecdade590074f21fa976d086f commit 1821af77efefd25ecdade590074f21fa976d086f Author: Lexi Winter AuthorDate: 2025-07-06 20:42:58 +0000 Commit: Lexi Winter CommitDate: 2025-07-11 03:11:48 +0000 clang: install clang-scan-deps clang-scan-deps is used to generate dependency information from C++20 modules according to proposed standard ISO/IEC WG21 P1689R5[0]. It is required by common build tools (e.g., CMake) to build C++ sources that use modules. Since this is a core build tool, install it by default, not gated behind MK_CLANG_EXTRAS. [0] https://www.open-std.org/JTC1/SC22/WG21/docs/papers/2022/p1689r5.html MFC after: 3 days Reviewed by: kevans, dim Approved by: kevans (mentor) Requested by: jbo Differential Revision: https://reviews.freebsd.org/D51044 (cherry picked from commit d3c06bed2c16b434dd49958dee5de8c55ad00b85) --- lib/clang/libclang/Makefile | 6 +++++ usr.bin/clang/Makefile | 4 ++++ usr.bin/clang/clang-scan-deps/Makefile | 26 ++++++++++++++++++++++ .../clang-scan-deps/clang-scan-deps-driver.cpp | 18 +++++++++++++++ 4 files changed, 54 insertions(+) diff --git a/lib/clang/libclang/Makefile b/lib/clang/libclang/Makefile index 5e20b37c1183..9b9e0cbadcd7 100644 --- a/lib/clang/libclang/Makefile +++ b/lib/clang/libclang/Makefile @@ -842,6 +842,11 @@ SRCS_MIN+= Tooling/ArgumentsAdjusters.cpp SRCS_MIN+= Tooling/CommonOptionsParser.cpp SRCS_MIN+= Tooling/CompilationDatabase.cpp SRCS_MIN+= Tooling/Core/Replacement.cpp +SRCS_MIN+= Tooling/DependencyScanning/DependencyScanningFilesystem.cpp +SRCS_MIN+= Tooling/DependencyScanning/DependencyScanningService.cpp +SRCS_MIN+= Tooling/DependencyScanning/DependencyScanningTool.cpp +SRCS_MIN+= Tooling/DependencyScanning/DependencyScanningWorker.cpp +SRCS_MIN+= Tooling/DependencyScanning/ModuleDepCollector.cpp SRCS_MIN+= Tooling/ExpandResponseFilesCompilationDatabase.cpp SRCS_MIN+= Tooling/FileMatchTrie.cpp SRCS_MIN+= Tooling/GuessTargetAndModeCompilationDatabase.cpp @@ -849,6 +854,7 @@ SRCS_MIN+= Tooling/Inclusions/HeaderIncludes.cpp SRCS_MIN+= Tooling/Inclusions/IncludeStyle.cpp SRCS_MIN+= Tooling/InterpolatingCompilationDatabase.cpp SRCS_MIN+= Tooling/JSONCompilationDatabase.cpp +SRCS_MIN+= Tooling/LocateToolCompilationDatabase.cpp SRCS_MIN+= Tooling/Refactoring.cpp SRCS_MIN+= Tooling/RefactoringCallbacks.cpp SRCS_MIN+= Tooling/Tooling.cpp diff --git a/usr.bin/clang/Makefile b/usr.bin/clang/Makefile index 30ec1ab65e0f..d883048b7ed9 100644 --- a/usr.bin/clang/Makefile +++ b/usr.bin/clang/Makefile @@ -6,6 +6,10 @@ SUBDIR+= clang .endif .if !defined(TOOLS_PREFIX) +.if ${MK_CLANG} != "no" +SUBDIR+= clang-scan-deps +.endif + # LLVM binutils are needed to support features such as LTO, so we build them # by default if clang is enabled. If MK_LLVM_BINUTILS is set, we also use them # as the default binutils (ar,nm,addr2line, etc.). diff --git a/usr.bin/clang/clang-scan-deps/Makefile b/usr.bin/clang/clang-scan-deps/Makefile new file mode 100644 index 000000000000..16fecdb88867 --- /dev/null +++ b/usr.bin/clang/clang-scan-deps/Makefile @@ -0,0 +1,26 @@ +.include + +PROG_CXX= clang-scan-deps +MAN= + +SRCDIR= clang/tools/clang-scan-deps +SRCS+= ClangScanDeps.cpp \ + clang-scan-deps-driver.cpp + +.include "${SRCTOP}/lib/clang/clang.pre.mk" + +CFLAGS+= -I${.OBJDIR} +TDFILE= Opts.td +INCFILE= ${TDFILE:.td=.inc} +GENOPT= -gen-opt-parser-defs + +${INCFILE}: ${TDFILE} + ${LLVM_TBLGEN} ${GENOPT} -I ${LLVM_SRCS}/include -d ${.TARGET:C/$/.d/} \ + -o ${.TARGET} ${.ALLSRC} +TGHDRS+= ${INCFILE} + +DEPENDFILES+= ${TGHDRS:C/$/.d/} +DPSRCS+= ${TGHDRS} +CLEANFILES+= ${TGHDRS} ${TGHDRS:C/$/.d/} + +.include "../clang.prog.mk" diff --git a/usr.bin/clang/clang-scan-deps/clang-scan-deps-driver.cpp b/usr.bin/clang/clang-scan-deps/clang-scan-deps-driver.cpp new file mode 100644 index 000000000000..f941cc434ff6 --- /dev/null +++ b/usr.bin/clang/clang-scan-deps/clang-scan-deps-driver.cpp @@ -0,0 +1,18 @@ +//===-- driver-template.cpp -----------------------------------------------===// +// +// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. +// See https://llvm.org/LICENSE.txt for license information. +// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception +// +//===----------------------------------------------------------------------===// + +#include "llvm/Support/LLVMDriver.h" +#include "llvm/ADT/ArrayRef.h" +#include "llvm/Support/InitLLVM.h" + +int clang_scan_deps_main(int argc, char **, const llvm::ToolContext &); + +int main(int argc, char **argv) { + llvm::InitLLVM X(argc, argv); + return clang_scan_deps_main(argc, argv, {argv[0], nullptr, false}); +} From nobody Fri Jul 11 03:13: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 4bdcGz5nshz61vPn; Fri, 11 Jul 2025 03:13: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bdcGz4Hd8z3jrf; Fri, 11 Jul 2025 03:13:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1752203595; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=IYIB1jkmXZvzUOz1SIjlM5Or0z/BO+gPYXim6vvkzOI=; b=j6XPbSmor+zH1UhR6022u9JDSmcxZiISJo/9M0SVvBzegG30Dy/gHKkoyb3yr/zPidu0Zm ZsA1tS/ZT2i8qdvEmk9oGeY/5s2aUponcBxP3o+nWuTBG7EDW9BMSnFGosSY9RbytmrBix 4OHAI291Hauw8lhLQvg4AKs74Z0axawkNfJxEnfZGsCUJRaSIsErC8OB3c0/vqqiRjAmUI YWWVwWBkslWLjfoMUtk/vZ9Kxs6GE9gLBJdJh6B/hTnn7PYd0WJKIClC/QMFepWXxuFsdD nagSb0VsQBLBNa9Pl9xi2JPqlXNFVeVaWE0XuwLZhbEQQ1dDsx7dJNULLiHD0A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1752203595; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=IYIB1jkmXZvzUOz1SIjlM5Or0z/BO+gPYXim6vvkzOI=; b=Xd5CZTrCWBCOTCSfy3nMI7Grs7wKr3DYrQcoYHd3mekkJ21NY32dcgjvazLcDYX+1MWxCs MleF4YduznyxIRPtckKKcbdLBQDQI4WznsIcTZrsbV+Y9E4zSjd1WhKNO2mCUpEeLhNSyN WZHkXEc4SLhVWyenA05PHE+rgqttOcr1ACcJZeob8IyLz6AJSKerjfaGTSOJWj8gRAVMSO T6cnLKDq3gD+rPEApWAcr2hFA54CHUBTRrQPwd6a5OIwS32onmmTvnwd+HqmCpHNuoX2Tt hAOag6JRkWCQ73D/u2kIgDn57zL1HpiPGa9V96mj6BtXPROFGVcSwubVY7L7Dg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1752203595; a=rsa-sha256; cv=none; b=pCB5NAzaJ9Qm7EtAUgtmjdDrghuc8tds/7Ft3qWeXScxJviHQSZKT/gUeAy2zcHozVihtO qfQGVZdV+J633jMEgDF4QNVnLS06DI27J+sOPwLSx9EB3SkdkY1ixkdnGsHCejOaMsgCHx qas39meITbOHO5AAEop2u7yYw9wZHwgodl3ZmX/ytbYBLpyQqEauX2PXN6av0xy9mJEdF3 +uS0gDIVHanxa9csRs/S3DGjPZjSdpbXZnIanChrYTaOSv+3c2zVaX4QP4khxVqq1n2cZ9 xav+dyvtAL9M06niccRsWvypiwuZ6tMDubP9D/UkDSreq0DyS4uf7ZTl8Sd7uA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4bdcGz3gzCz4R6; Fri, 11 Jul 2025 03:13: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 56B3DFBH022267; Fri, 11 Jul 2025 03:13:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 56B3DF1p022264; Fri, 11 Jul 2025 03:13:15 GMT (envelope-from git) Date: Fri, 11 Jul 2025 03:13:15 GMT Message-Id: <202507110313.56B3DF1p022264@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: 778f5aaa890f - stable/13 - clang: install clang-scan-deps List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-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/13 X-Git-Reftype: branch X-Git-Commit: 778f5aaa890fdc16b8d6d708af1b94d9af467f76 Auto-Submitted: auto-generated The branch stable/13 has been updated by ivy: URL: https://cgit.FreeBSD.org/src/commit/?id=778f5aaa890fdc16b8d6d708af1b94d9af467f76 commit 778f5aaa890fdc16b8d6d708af1b94d9af467f76 Author: Lexi Winter AuthorDate: 2025-07-06 20:42:58 +0000 Commit: Lexi Winter CommitDate: 2025-07-09 16:55:51 +0000 clang: install clang-scan-deps clang-scan-deps is used to generate dependency information from C++20 modules according to proposed standard ISO/IEC WG21 P1689R5[0]. It is required by common build tools (e.g., CMake) to build C++ sources that use modules. Since this is a core build tool, install it by default, not gated behind MK_CLANG_EXTRAS. [0] https://www.open-std.org/JTC1/SC22/WG21/docs/papers/2022/p1689r5.html MFC after: 3 days Reviewed by: kevans, dim Approved by: kevans (mentor) Requested by: jbo Differential Revision: https://reviews.freebsd.org/D51044 (cherry picked from commit d3c06bed2c16b434dd49958dee5de8c55ad00b85) --- lib/clang/libclang/Makefile | 6 +++++ usr.bin/clang/Makefile | 4 ++++ usr.bin/clang/clang-scan-deps/Makefile | 26 ++++++++++++++++++++++ .../clang-scan-deps/clang-scan-deps-driver.cpp | 18 +++++++++++++++ 4 files changed, 54 insertions(+) diff --git a/lib/clang/libclang/Makefile b/lib/clang/libclang/Makefile index 5e20b37c1183..9b9e0cbadcd7 100644 --- a/lib/clang/libclang/Makefile +++ b/lib/clang/libclang/Makefile @@ -842,6 +842,11 @@ SRCS_MIN+= Tooling/ArgumentsAdjusters.cpp SRCS_MIN+= Tooling/CommonOptionsParser.cpp SRCS_MIN+= Tooling/CompilationDatabase.cpp SRCS_MIN+= Tooling/Core/Replacement.cpp +SRCS_MIN+= Tooling/DependencyScanning/DependencyScanningFilesystem.cpp +SRCS_MIN+= Tooling/DependencyScanning/DependencyScanningService.cpp +SRCS_MIN+= Tooling/DependencyScanning/DependencyScanningTool.cpp +SRCS_MIN+= Tooling/DependencyScanning/DependencyScanningWorker.cpp +SRCS_MIN+= Tooling/DependencyScanning/ModuleDepCollector.cpp SRCS_MIN+= Tooling/ExpandResponseFilesCompilationDatabase.cpp SRCS_MIN+= Tooling/FileMatchTrie.cpp SRCS_MIN+= Tooling/GuessTargetAndModeCompilationDatabase.cpp @@ -849,6 +854,7 @@ SRCS_MIN+= Tooling/Inclusions/HeaderIncludes.cpp SRCS_MIN+= Tooling/Inclusions/IncludeStyle.cpp SRCS_MIN+= Tooling/InterpolatingCompilationDatabase.cpp SRCS_MIN+= Tooling/JSONCompilationDatabase.cpp +SRCS_MIN+= Tooling/LocateToolCompilationDatabase.cpp SRCS_MIN+= Tooling/Refactoring.cpp SRCS_MIN+= Tooling/RefactoringCallbacks.cpp SRCS_MIN+= Tooling/Tooling.cpp diff --git a/usr.bin/clang/Makefile b/usr.bin/clang/Makefile index 30ec1ab65e0f..d883048b7ed9 100644 --- a/usr.bin/clang/Makefile +++ b/usr.bin/clang/Makefile @@ -6,6 +6,10 @@ SUBDIR+= clang .endif .if !defined(TOOLS_PREFIX) +.if ${MK_CLANG} != "no" +SUBDIR+= clang-scan-deps +.endif + # LLVM binutils are needed to support features such as LTO, so we build them # by default if clang is enabled. If MK_LLVM_BINUTILS is set, we also use them # as the default binutils (ar,nm,addr2line, etc.). diff --git a/usr.bin/clang/clang-scan-deps/Makefile b/usr.bin/clang/clang-scan-deps/Makefile new file mode 100644 index 000000000000..16fecdb88867 --- /dev/null +++ b/usr.bin/clang/clang-scan-deps/Makefile @@ -0,0 +1,26 @@ +.include + +PROG_CXX= clang-scan-deps +MAN= + +SRCDIR= clang/tools/clang-scan-deps +SRCS+= ClangScanDeps.cpp \ + clang-scan-deps-driver.cpp + +.include "${SRCTOP}/lib/clang/clang.pre.mk" + +CFLAGS+= -I${.OBJDIR} +TDFILE= Opts.td +INCFILE= ${TDFILE:.td=.inc} +GENOPT= -gen-opt-parser-defs + +${INCFILE}: ${TDFILE} + ${LLVM_TBLGEN} ${GENOPT} -I ${LLVM_SRCS}/include -d ${.TARGET:C/$/.d/} \ + -o ${.TARGET} ${.ALLSRC} +TGHDRS+= ${INCFILE} + +DEPENDFILES+= ${TGHDRS:C/$/.d/} +DPSRCS+= ${TGHDRS} +CLEANFILES+= ${TGHDRS} ${TGHDRS:C/$/.d/} + +.include "../clang.prog.mk" diff --git a/usr.bin/clang/clang-scan-deps/clang-scan-deps-driver.cpp b/usr.bin/clang/clang-scan-deps/clang-scan-deps-driver.cpp new file mode 100644 index 000000000000..f941cc434ff6 --- /dev/null +++ b/usr.bin/clang/clang-scan-deps/clang-scan-deps-driver.cpp @@ -0,0 +1,18 @@ +//===-- driver-template.cpp -----------------------------------------------===// +// +// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. +// See https://llvm.org/LICENSE.txt for license information. +// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception +// +//===----------------------------------------------------------------------===// + +#include "llvm/Support/LLVMDriver.h" +#include "llvm/ADT/ArrayRef.h" +#include "llvm/Support/InitLLVM.h" + +int clang_scan_deps_main(int argc, char **, const llvm::ToolContext &); + +int main(int argc, char **argv) { + llvm::InitLLVM X(argc, argv); + return clang_scan_deps_main(argc, argv, {argv[0], nullptr, false}); +} From nobody Sat Jul 12 01:44: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 4bfBFv1TLvz617qh; Sat, 12 Jul 2025 01:44:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bfBFt5kxlz3Fwv; Sat, 12 Jul 2025 01:44:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1752284658; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=BE7K0fXIJZo2dxhER4D2QLrxVjP+Hqud/eOduSda3rg=; b=cuf1XsurA9VNRRs3Wn/+T8LTiur4bQy4UfQZANoRyoQYdzrjgK/XUDL22BtX9JyUjm/+Gs WzK2f/mDB/HJlpxv/IIr2Qg7aPytSz6LSmCWlkFafFCH/WhtGAEawniUt+cDlEr8yHqUFM 7rDU3EP8aI0ckKTdB5G5PpsX7Xw9Adh6UZJ3F4GAGf10Ft6WYoH5OE6YZpLUpAlZcwZpbM FRIMdaSdQgf/ZkMBgJEBZGnBThwzNsPYY14oc5qh1psztOrCli+OA2MB5Ml/YyZgFzePYc AjYzx6bClutjxO7+IDFuNKV7wHrfXVF4HAhSOC4UcH2CpflXtOjwN3+yJBY8aQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1752284658; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=BE7K0fXIJZo2dxhER4D2QLrxVjP+Hqud/eOduSda3rg=; b=cGf3T+Gg2+FU36fBoLjtnui0EX83aBzXYcCbjgWNPKKk5dhSRbvBku+r154W9ppcsfCraC Xcw03oDwfDCiDijaz26Na44askQNpQwdmW5d0eKUiVoJiugJ3yenm5xT+VLyWLmukrGqIk lW1gA4hyW5bP+kAc2JXnyMO1aDY3OrAcstM0zBXH5s7DvfKswQeV3L6SoYhURh3pVzOtzy SutTiIkloMBdpeBvMo+5x3crqSUkOtj35WeZZvzWeL0GCI2ng8e+jGUKAepTA3rw1dQ6Te TTH2EAx1qV0Xj/4liLqSVyH0rTmBQtr9Yn+2Y1FDksZIiK7NlNXEDw8G8LUvow== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1752284658; a=rsa-sha256; cv=none; b=DS231XEhxRhiPuaPmvSoBx6i3NhWhMaT0H6r0iBL5w3giAIyFaANZggW40djDFSspi7M2I IczlDZwiXM8RM91UnA4VQvJg5Nrl/1NMfIuF+mSflfFBKlusy+aa7kuCJXia0kJegN64wK 5tWkdgxlle5I7Ghk+HSCeplvZOLwfg7GvEpEDwUYQ2CFDYaAtdYKrQa6Vyytal2KoxpD/q cJzDVEyk77lsPNZT2Kj2s5ypvZs6fpbMRvsipyDDZ8woY067ovK0dd9B3UjJ7/r+2X3E3F NZ/LQmlPRLPl05wbbSY47SOe8FOC3AS/10jNgq0SII52GZaySMP3CAkj8XNK0g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4bfBFt4xzvz127C; Sat, 12 Jul 2025 01:44: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 56C1iIjR050465; Sat, 12 Jul 2025 01:44:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 56C1iIEf050462; Sat, 12 Jul 2025 01:44:18 GMT (envelope-from git) Date: Sat, 12 Jul 2025 01:44:18 GMT Message-Id: <202507120144.56C1iIEf050462@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 4c82dff1082b - stable/14 - dev/mem: use sx instead of rw lock List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 4c82dff1082bc1f8e7d6ae69a3ecd2cc97c2e758 Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=4c82dff1082bc1f8e7d6ae69a3ecd2cc97c2e758 commit 4c82dff1082bc1f8e7d6ae69a3ecd2cc97c2e758 Author: Konstantin Belousov AuthorDate: 2025-06-22 16:35:23 +0000 Commit: Konstantin Belousov CommitDate: 2025-07-12 01:41:32 +0000 dev/mem: use sx instead of rw lock (cherry picked from commit ca554a7dea3f90f39fc2b7d25813d0be944e12e2) --- sys/dev/mem/memutil.c | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/sys/dev/mem/memutil.c b/sys/dev/mem/memutil.c index 8f296520c348..20ce337df0ab 100644 --- a/sys/dev/mem/memutil.c +++ b/sys/dev/mem/memutil.c @@ -26,16 +26,14 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include -#include +#include #include #include #include #include -#include -#include +#include -static struct rwlock mr_lock; +static struct sx mr_lock; /* * Implementation-neutral, kernel-callable functions for manipulating @@ -47,7 +45,7 @@ mem_range_init(void) if (mem_range_softc.mr_op == NULL) return; - rw_init(&mr_lock, "memrange"); + sx_init(&mr_lock, "memrange"); mem_range_softc.mr_op->init(&mem_range_softc); } @@ -57,7 +55,7 @@ mem_range_destroy(void) if (mem_range_softc.mr_op == NULL) return; - rw_destroy(&mr_lock); + sx_destroy(&mr_lock); } int @@ -68,12 +66,12 @@ mem_range_attr_get(struct mem_range_desc *mrd, int *arg) if (mem_range_softc.mr_op == NULL) return (EOPNOTSUPP); nd = *arg; - rw_rlock(&mr_lock); + sx_slock(&mr_lock); if (nd == 0) *arg = mem_range_softc.mr_ndesc; else bcopy(mem_range_softc.mr_desc, mrd, nd * sizeof(*mrd)); - rw_runlock(&mr_lock); + sx_sunlock(&mr_lock); return (0); } @@ -84,8 +82,8 @@ mem_range_attr_set(struct mem_range_desc *mrd, int *arg) if (mem_range_softc.mr_op == NULL) return (EOPNOTSUPP); - rw_wlock(&mr_lock); + sx_xlock(&mr_lock); ret = mem_range_softc.mr_op->set(&mem_range_softc, mrd, arg); - rw_wunlock(&mr_lock); + sx_xunlock(&mr_lock); return (ret); } From nobody Sat Jul 12 01:44: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 4bfBFx1w6Zz617hc; Sat, 12 Jul 2025 01:44:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bfBFw6dnGz3G20; Sat, 12 Jul 2025 01:44:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1752284661; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=onrfvQJLWpIbFFxkeHR4DxzV8PtRUcD9xfOWOA+l1yM=; b=yAS+5HGDEsV3xwKfsJ7GkIMpMhNh54ICb+zTMqCjEMCr9mJnmqehrNsYMcs8/xOgEGOB5W 3bSOgSS/RfQp/WLuoihPqvaWW368oZQQ3s/HNt2hdGHNwk1nL2GQ712xxOmbQlEUDQD3XQ rQGrKNWUBTsEs5hMRVHoKRj8ik5cVLOhy5JAr9PVPs2AZ4430fbXVbITfTQIzYhG5+izHN uMDoZT4WsX5dWKZy+G2wHLbUmcjXfsV0Q8Z3+IXYmZqAVARPMm3M8ziyPCZgTiYTUAFgzi NaDCe/zVGYNsdc/ItixTKWLOb6DPRjf//aznSsqIJIc9ACzwt2yBxY0EyIviNQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1752284661; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=onrfvQJLWpIbFFxkeHR4DxzV8PtRUcD9xfOWOA+l1yM=; b=v319P2AN7/sEdcIDNn+VOLL6M4Jkvsat0spIhbJe3ozEcGzWs/04OT/zsAyyOSQl+dDFwl T02FAfkhSVsMylBrEYhKwBWZ/6apMCg6uuolSXqBKVfJrDmo+3VNY2lUbvg/r3s5kZNuUn raYb/g1h8J9XEDViGQcAX14/8NzvNvJ1csJHOPlxc/05HDc1STDfpjxDukRuhc/2wVEizP 8lIp9JzLdYtj7JNNXYnpfCNTVrkjMNofk2Hxo5jx6nTMXQ98xCq/YI6BAmXVn7NVGzDF5e rJuNT/LeWKuV6dGbNct8UuM0DZcswKZGSuCr2niSeJcCvIHDSCV3HmT4bPojaw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1752284661; a=rsa-sha256; cv=none; b=OKi1I1E8NeyRkmk0Ntug+GlP9HHM6mIkAGTFHgUOtEiGhPVxgY2hrkBIIUUrrjkIFYv6ZC MwKy0zzEHmzcdz69R8mChVMUtD7f5ZCa8YROjAeu3C/dY5KxWtW6SLc+dxJA3CPufOoppg i7vcKCRo4VjA+oqRIFDtdUqU6g3tJsvhWiBccsb7njDomPxqHgL2pgTwAJdW0Vq2mtO2RE FSK67VcOu56qU2Z8Xp02QL2cIJP2uAp53nPyV2GC+oL2lpenCEy001u1VpLbGu1dsMhTlZ oP/kcpYTPCbc3bsFbM53SFQwk/STwSc9I+diKFN2WxGiuCjzDX9pfY4xst96jA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4bfBFw68W5z11yc; Sat, 12 Jul 2025 01:44: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 56C1iK4a050538; Sat, 12 Jul 2025 01:44:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 56C1iKqG050535; Sat, 12 Jul 2025 01:44:20 GMT (envelope-from git) Date: Sat, 12 Jul 2025 01:44:20 GMT Message-Id: <202507120144.56C1iKqG050535@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 7b2ec2a56215 - stable/14 - amd64 pmap: update comment in pmap_demote_DMAP() explaining the len List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 7b2ec2a562154c84f79140f1b174f649bfa0752f Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=7b2ec2a562154c84f79140f1b174f649bfa0752f commit 7b2ec2a562154c84f79140f1b174f649bfa0752f Author: Konstantin Belousov AuthorDate: 2025-06-22 16:49:45 +0000 Commit: Konstantin Belousov CommitDate: 2025-07-12 01:41:33 +0000 amd64 pmap: update comment in pmap_demote_DMAP() explaining the len NBPDP. Since the demotion does not + * change any attributes of the mapping, a TLB invalidation is not + * mandatory. The caller may, however, request a TLB invalidation. */ void pmap_demote_DMAP(vm_paddr_t base, vm_size_t len, boolean_t invalidate) From nobody Sat Jul 12 01:44: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 4bfBFw2NM1z617kM; Sat, 12 Jul 2025 01:44: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bfBFv65whz3G6r; Sat, 12 Jul 2025 01:44:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1752284659; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zqR/dZwEtJK+grVhFW73GkA7Yck5Tc0+L7qRGwdV2X8=; b=Sfyu57w2Pg0OKNh4G7lXTlplUbRcuou6Ds0S4hWPVlTVFMeoDDBdFm7+3eS+A+pmxJwXmu xulVTinQCJLM056z2qmcJxdaBRb7+pa6+ReioMPFoZxrrYS31612f2djJeM1PbZOIStFz0 nKk0MT3yDip7jagZMxYpu6h8DJApfPqFeXeh8FJoNCxbBhmFh3uhuBim7gdiN20oJrM77X u/hoE52q2eg3ZNwy+x/AF2hngzCwoOP/xWtS34fXurtRPuDgCFRumuUXu8wKgerf37wUzc lVwQv47q4qQq0XfT3t8Clxc5sV4XywWdqALgNgcFnXmos1ZmGvs8RQpX5j6tZQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1752284659; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zqR/dZwEtJK+grVhFW73GkA7Yck5Tc0+L7qRGwdV2X8=; b=NHl9WDbVvjQE5W99cRouAu8Q10T4vP32qQ2NJd7Sw/fKIWSXt4TR89J7DHTAAoBZQvDC2l VePUAx3AXCdU4xmzwfkHgazdZMK9OqUSfyaOnMHEw9P9lCRKOJj25SD2IYLWf6QKdqItGB MAeF/1b0jUVM8bq1ukDtFdAbU1Dqdnqk1lbN0JLYFSI0ogvHQowuLKSdQvbVbuDKPTP+wQ TpImsD4PtcdpWG8W02zcAr45RJA8WtMVF31AKGNK2ewWgcG0vMWkBbKs6XdgKItMZqm1PC MnoMfcVRWGmiRAfg3Zz3fWPVsg39QTcC7enlOr4IkiIcBIN+4yXawnvSiZZyIw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1752284659; a=rsa-sha256; cv=none; b=btNBBxz/qCge6niLcQowJvU1U1F5dSpG0QvlI/aFOMEVAi/imDq6UixSGT7eABdy6oYgE3 f07b8fJ3VoPHZ8elerApWkVGjhLBrqpnCnBXqP5GhrBfmDnE5bWVC49CXxqtuGZjttAZCQ TUtvsfo6tqEaVElt8TLt+LNcPWb3EL0edfuHWln08Cg4ZD6O2zS0va+wfhrHgec/dPHtf4 7mrSH2J4HHVCCVQezfDoBLi5zJ43dFMv1y3GnrE5Ng8qYJ5gFHRZlA4an3QJ/IT10kkJ7m 5Ex1QhopXs+wPiElw6a3BKiqKOhliSAbTGkpoJUx9h+O5JI46mHqvmghGgQZpQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4bfBFv5Xgqz129w; Sat, 12 Jul 2025 01:44: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 56C1iJMD050500; Sat, 12 Jul 2025 01:44:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 56C1iJ5H050497; Sat, 12 Jul 2025 01:44:19 GMT (envelope-from git) Date: Sat, 12 Jul 2025 01:44:19 GMT Message-Id: <202507120144.56C1iJ5H050497@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: e02ab0b92fe2 - stable/14 - amd64 pmap: preallocate pt page for pmap_demote_pdpe() in pmap_demote_DMAP() List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: e02ab0b92fe253fba7052f5cd14a0a42a4bea76a Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=e02ab0b92fe253fba7052f5cd14a0a42a4bea76a commit e02ab0b92fe253fba7052f5cd14a0a42a4bea76a Author: Konstantin Belousov AuthorDate: 2025-06-22 03:38:12 +0000 Commit: Konstantin Belousov CommitDate: 2025-07-12 01:41:32 +0000 amd64 pmap: preallocate pt page for pmap_demote_pdpe() in pmap_demote_DMAP() (cherry picked from commit 6eb141a2c4731130bfac670708a8b90f7cdff742) --- sys/amd64/amd64/pmap.c | 53 ++++++++++++++++++++++++++++++++++++-------------- 1 file changed, 38 insertions(+), 15 deletions(-) diff --git a/sys/amd64/amd64/pmap.c b/sys/amd64/amd64/pmap.c index 84cab304af6d..6259ad33c6a1 100644 --- a/sys/amd64/amd64/pmap.c +++ b/sys/amd64/amd64/pmap.c @@ -1303,8 +1303,8 @@ static int pmap_change_props_locked(vm_offset_t va, vm_size_t size, static boolean_t pmap_demote_pde(pmap_t pmap, pd_entry_t *pde, vm_offset_t va); static boolean_t pmap_demote_pde_locked(pmap_t pmap, pd_entry_t *pde, vm_offset_t va, struct rwlock **lockp); -static boolean_t pmap_demote_pdpe(pmap_t pmap, pdp_entry_t *pdpe, - vm_offset_t va); +static bool pmap_demote_pdpe(pmap_t pmap, pdp_entry_t *pdpe, + vm_offset_t va, vm_page_t m); static int pmap_enter_2mpage(pmap_t pmap, vm_offset_t va, vm_page_t m, vm_prot_t prot, struct rwlock **lockp); static int pmap_enter_pde(pmap_t pmap, vm_offset_t va, pd_entry_t newpde, @@ -9529,8 +9529,8 @@ pmap_unmapdev(void *p, vm_size_t size) /* * Tries to demote a 1GB page mapping. */ -static boolean_t -pmap_demote_pdpe(pmap_t pmap, pdp_entry_t *pdpe, vm_offset_t va) +static bool +pmap_demote_pdpe(pmap_t pmap, pdp_entry_t *pdpe, vm_offset_t va, vm_page_t m) { pdp_entry_t newpdpe, oldpdpe; pd_entry_t *firstpde, newpde, *pde; @@ -9547,12 +9547,19 @@ pmap_demote_pdpe(pmap_t pmap, pdp_entry_t *pdpe, vm_offset_t va) oldpdpe = *pdpe; KASSERT((oldpdpe & (PG_PS | PG_V)) == (PG_PS | PG_V), ("pmap_demote_pdpe: oldpdpe is missing PG_PS and/or PG_V")); - pdpg = pmap_alloc_pt_page(pmap, va >> PDPSHIFT, - VM_ALLOC_WIRED | VM_ALLOC_INTERRUPT); - if (pdpg == NULL) { - CTR2(KTR_PMAP, "pmap_demote_pdpe: failure for va %#lx" - " in pmap %p", va, pmap); - return (FALSE); + if (m == NULL) { + pdpg = pmap_alloc_pt_page(pmap, va >> PDPSHIFT, + VM_ALLOC_WIRED); + if (pdpg == NULL) { + CTR2(KTR_PMAP, + "pmap_demote_pdpe: failure for va %#lx in pmap %p", + va, pmap); + return (false); + } + } else { + pdpg = m; + pdpg->pindex = va >> PDPSHIFT; + pmap_pt_page_count_adj(pmap, 1); } pdpgpa = VM_PAGE_TO_PHYS(pdpg); firstpde = (pd_entry_t *)PHYS_TO_DMAP(pdpgpa); @@ -9762,7 +9769,7 @@ pmap_change_props_locked(vm_offset_t va, vm_size_t size, vm_prot_t prot, tmpva += NBPDP; continue; } - if (!pmap_demote_pdpe(kernel_pmap, pdpe, tmpva)) + if (!pmap_demote_pdpe(kernel_pmap, pdpe, tmpva, NULL)) return (ENOMEM); } pde = pmap_pdpe_to_pde(pdpe, tmpva); @@ -9931,25 +9938,37 @@ pmap_demote_DMAP(vm_paddr_t base, vm_size_t len, boolean_t invalidate) { pdp_entry_t *pdpe; pd_entry_t *pde; + vm_page_t m; vm_offset_t va; - boolean_t changed; + bool changed; if (len == 0) return; KASSERT(powerof2(len), ("pmap_demote_DMAP: len is not a power of 2")); KASSERT((base & (len - 1)) == 0, ("pmap_demote_DMAP: base is not a multiple of len")); + WITNESS_WARN(WARN_GIANTOK | WARN_SLEEPOK, NULL, "pmap_demote_DMAP"); + if (len < NBPDP && base < dmaplimit) { va = PHYS_TO_DMAP(base); - changed = FALSE; + changed = false; + + /* + * Assume that it is fine to sleep there. + * The only existing caller of pmap_demote_DMAP() is the + * x86_mr_split_dmap() function. + */ + m = vm_page_alloc_noobj(VM_ALLOC_WIRED | VM_ALLOC_WAITOK); + PMAP_LOCK(kernel_pmap); pdpe = pmap_pdpe(kernel_pmap, va); if ((*pdpe & X86_PG_V) == 0) panic("pmap_demote_DMAP: invalid PDPE"); if ((*pdpe & PG_PS) != 0) { - if (!pmap_demote_pdpe(kernel_pmap, pdpe, va)) + if (!pmap_demote_pdpe(kernel_pmap, pdpe, va, m)) panic("pmap_demote_DMAP: PDPE failed"); - changed = TRUE; + changed = true; + m = NULL; } if (len < NBPDR) { pde = pmap_pdpe_to_pde(pdpe, va); @@ -9964,6 +9983,10 @@ pmap_demote_DMAP(vm_paddr_t base, vm_size_t len, boolean_t invalidate) if (changed && invalidate) pmap_invalidate_page(kernel_pmap, va); PMAP_UNLOCK(kernel_pmap); + if (m != NULL) { + vm_page_unwire_noq(m); + vm_page_free(m); + } } } From nobody Sat Jul 12 01:44: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 4bfBFz33phz617qk; Sat, 12 Jul 2025 01:44:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bfBFz1lkNz3G9B; Sat, 12 Jul 2025 01:44:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1752284663; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ac0U/ggDN+Xer4qOJ14Q3t626aesOFImxP/8fFzm6gI=; b=sghNFJyYPPKKfXCyi6LK4VaZICNsXWh3eSC4vf148d3bpakZaNEWAtlx5TxAR3KmWRkOCU wMEtBWRkDgNEh+Urnp3yqNLhFRzBVOWsHYa8vKJcK5HEzxSDG+kFkkdRWV4Mg+N6TpqDKC uX7XeXJmb68S343tV2uLlLZCN6o0w9KMZVjmvmcUxq6N2a/j9kcgZmqLyC2HX23JOuKfAq EGI99JYcqGKKaCakS6FvPf7bEIKn/Jfl/IoBUcfU+29tMloFwEDByTsmsSvbvtSlchvjAk bIZwdX3FFfYEhUjoqbAD/IKTvvb2aCLpwPrvH8nAYLfWfau2sqkHQO+jJG8lTQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1752284663; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ac0U/ggDN+Xer4qOJ14Q3t626aesOFImxP/8fFzm6gI=; b=C7NhFK2lgbQ6CZf1OH9EZ1j4n8wvHAVJt0/2MPEVSJyEz3tENtT4NUhXjUl6eP6FQ/5YsQ ug63Wj1+1c2sNDZfxc+ttJhiZCApEi4wUXWJpxtydaH/m8diG6ZoFOXg7ALW/a+vnKTlzV elLeeOPby1Og7Kj+m8FlSgbP8/cx2YoLU+/uV0JkG6OVDkCiICRIwvCzCoGnDVVMO1tMLA cKKJzRqXuAXWK6W0RCjedXu4TW0hm1ISQYT1Zllmd1AmzH4cnHiTKcaAwekHyEBDrCe2SL YYVnQeYeLPzYeJbyEUu21fS6Ki2nBjbHooV9C6jb7nd5VPdquENyG4ra5Xly+A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1752284663; a=rsa-sha256; cv=none; b=ps28V7GNbFuvuR0zkr9JXAGyiHi+1OVJYzaLVl7EUXLCw0kx9sUx5QoxJVaFLFAVQ7fNIt VAPEQKK74iZpW38VMeZfjEbSy7tZfL9Mb2GH81msBK+6wly7VKeqRykiphIihXwSirvSkh YwGVShHYBkzwa8fcCc3idPKGTzvyQ8sqclasDhFVJE2TzUto/RnEh5aVR6DUsunO1VB4qO rn0IfiQkuOyeMBdLSUpW5iRZ4OBptTA/NavtdxorPjSznS0FCkkcfTHPjuj6rBMbP3D4Ld Yxpr3ndzuv5JlxLbM+ynch3sbLPSo0eK8oBPIkYwQA1FW8y8vcFMP8ziKQsT4g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4bfBFz1KVVz12Cw; Sat, 12 Jul 2025 01:44: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 56C1iNJW050604; Sat, 12 Jul 2025 01:44:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 56C1iNZF050601; Sat, 12 Jul 2025 01:44:23 GMT (envelope-from git) Date: Sat, 12 Jul 2025 01:44:23 GMT Message-Id: <202507120144.56C1iNZF050601@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 48172ad390f7 - stable/14 - aio: make aio_init_aioinfo() and aio_aqueue() static List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 48172ad390f7be9a0c6b6c141cdc266304157ca8 Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=48172ad390f7be9a0c6b6c141cdc266304157ca8 commit 48172ad390f7be9a0c6b6c141cdc266304157ca8 Author: Konstantin Belousov AuthorDate: 2025-07-04 18:32:01 +0000 Commit: Konstantin Belousov CommitDate: 2025-07-12 01:41:34 +0000 aio: make aio_init_aioinfo() and aio_aqueue() static (cherry picked from commit c44439942cdb56cad8c7630444ff84447ca3866a) --- sys/kern/vfs_aio.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/sys/kern/vfs_aio.c b/sys/kern/vfs_aio.c index 291ac46babef..91137fa1e0dd 100644 --- a/sys/kern/vfs_aio.c +++ b/sys/kern/vfs_aio.c @@ -309,7 +309,7 @@ static TAILQ_HEAD(,kaiocb) aio_jobs; /* (c) Async job list */ static struct unrhdr *aiod_unr; static void aio_biocleanup(struct bio *bp); -void aio_init_aioinfo(struct proc *p); +static void aio_init_aioinfo(struct proc *p); static int aio_onceonly(void); static int aio_free_entry(struct kaiocb *job); static void aio_process_rw(struct kaiocb *job); @@ -317,7 +317,7 @@ static void aio_process_sync(struct kaiocb *job); static void aio_process_mlock(struct kaiocb *job); static void aio_schedule_fsync(void *context, int pending); static int aio_newproc(int *); -int aio_aqueue(struct thread *td, struct aiocb *ujob, +static int aio_aqueue(struct thread *td, struct aiocb *ujob, struct aioliojob *lio, int type, struct aiocb_ops *ops); static int aio_queue_file(struct file *fp, struct kaiocb *job); static void aio_biowakeup(struct bio *bp); @@ -431,7 +431,7 @@ aio_onceonly(void) * Init the per-process aioinfo structure. The aioinfo limits are set * per-process for user limit (resource) management. */ -void +static void aio_init_aioinfo(struct proc *p) { struct kaioinfo *ki; @@ -1494,7 +1494,7 @@ static struct aiocb_ops aiocb_ops_osigevent = { * Queue a new AIO request. Choosing either the threaded or direct bio VCHR * technique is done in this code. */ -int +static int aio_aqueue(struct thread *td, struct aiocb *ujob, struct aioliojob *lj, int type, struct aiocb_ops *ops) { From nobody Sat Jul 12 01:44: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 4bfBFy4P17z617kN; Sat, 12 Jul 2025 01:44: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bfBFy1mWjz3G95; Sat, 12 Jul 2025 01:44:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1752284662; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=cKDxC0JtH0QqFvryF04FXBIC12ze/kfTfW8AERDpS8g=; b=tjvLLOoCKPFCJiOuyiJuwo2SD8v2WXxYImNxnq3YoFLtJ0EIx2rztrYiyiiKJDvVA5w7tq 5WjNI33Ps//ea9TuODXa2ATpr/5185mIlBViD3oNuV0JUmBbD4NOpLyjwpwabdgAsAyg+a 5AK0qnXquxNq2RAoGo5jXWWvNDGCpfIK746IsuA2yXx+WdoKpWnu3PWqo8p45ncyTHnYa4 ldFNE2ofe03hKOB+Y/wlbi5RQfODErzWaL8zehqPNrrZo3Ji8PVjZoN9NcMZjD28MGJkyY welp9mR8Zz2XoGQTfz/0g7vXucQtvHP0MTAgrCFN0UKW74p9/iVkkqs4w+YLtw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1752284662; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=cKDxC0JtH0QqFvryF04FXBIC12ze/kfTfW8AERDpS8g=; b=vjkX3SxA9jsI3iUzXVvT2pTtaS5/S0znmg1wlSgKAZiAurymXFGwLjikxbw3mHV3L0YSq2 yz5tf/gIS/tA1ABEQcKUqh+SIoj63t5YEPPw+stojn+E8PDwgR3mutPTMdy1cltZzKLJn4 lFu/Hh7eezAVk39oOJ3GIr/Wvg3Fw3uOnu5YQhANszq9gQtdPjpdPrN38s1Qd/jOlrD8J6 zUcQ3+wnATgBPV8eu9mOrox06GRrgYTW5d/LlApggB3ZbHllq8drU21sQ1NwTaL5XEPAlr Za1SRAlH5s87cnxFO5xnXiY/S/JWCpWLYSIHu2taxuwfdJTB+UhTX7+95tIwZQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1752284662; a=rsa-sha256; cv=none; b=SmmhkZ7ZZaVtpZXOoebZHlNlhWkOmqibEm7PMpdeXbjNpZMbYodZTHIBV+TsvIYNF6tOz/ CGGmGv6//yJtEXmmIki+3UJ6NrgloWb8uSGbqMjhU/ARG2N3A5jYAACU+wLgP5gSNn+nX2 shZwkxfCjncBKmSvsad7l+wia/t57tDsO5tZIKzPVU8J5c3cCF3f7F4d/xqZ99H3C3TzaR 1tp96b6PMEsOt2vmVRyh/iQliovpsXNi10wlAOuSoQOI0pnO1YBCIzMIVbDjypKNO43gRy GWtDyg0laM5N3dmeAqipeFnPsrsxFecQ6H9rmeCFJvQ72doST6Xj90FDkkNcgw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4bfBFy0MMrz12Cv; Sat, 12 Jul 2025 01:44: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 56C1iLbf050571; Sat, 12 Jul 2025 01:44:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 56C1iLnF050568; Sat, 12 Jul 2025 01:44:21 GMT (envelope-from git) Date: Sat, 12 Jul 2025 01:44:21 GMT Message-Id: <202507120144.56C1iLnF050568@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: dcb7a2befdeb - stable/14 - amd64 pmap: do not panic on inability to insert ptp into trie List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: dcb7a2befdeb26a3a7ed9e4f66ae649fc8266581 Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=dcb7a2befdeb26a3a7ed9e4f66ae649fc8266581 commit dcb7a2befdeb26a3a7ed9e4f66ae649fc8266581 Author: Konstantin Belousov AuthorDate: 2025-06-24 22:58:32 +0000 Commit: Konstantin Belousov CommitDate: 2025-07-12 01:41:34 +0000 amd64 pmap: do not panic on inability to insert ptp into trie (cherry picked from commit 476d2d8f290f60cbbe6b546272a3485ef0316356) --- sys/amd64/amd64/pmap.c | 54 ++++++++++++++++++++++++++++++++++---------------- 1 file changed, 37 insertions(+), 17 deletions(-) diff --git a/sys/amd64/amd64/pmap.c b/sys/amd64/amd64/pmap.c index 77a836df46ad..34c7c1c94737 100644 --- a/sys/amd64/amd64/pmap.c +++ b/sys/amd64/amd64/pmap.c @@ -1336,7 +1336,7 @@ static pdp_entry_t *pmap_pti_pdpe(vm_offset_t va); static pd_entry_t *pmap_pti_pde(vm_offset_t va); static void pmap_pti_wire_pte(void *pte); static int pmap_remove_pde(pmap_t pmap, pd_entry_t *pdq, vm_offset_t sva, - struct spglist *free, struct rwlock **lockp); + bool remove_pt, struct spglist *free, struct rwlock **lockp); static int pmap_remove_pte(pmap_t pmap, pt_entry_t *ptq, vm_offset_t sva, pd_entry_t ptepde, struct spglist *free, struct rwlock **lockp); static vm_page_t pmap_remove_pt_page(pmap_t pmap, vm_offset_t va); @@ -5996,7 +5996,7 @@ pmap_demote_pde_abort(pmap_t pmap, vm_offset_t va, pd_entry_t *pde, SLIST_INIT(&free); sva = trunc_2mpage(va); - pmap_remove_pde(pmap, pde, sva, &free, lockp); + pmap_remove_pde(pmap, pde, sva, true, &free, lockp); if ((oldpde & pmap_global_bit(pmap)) == 0) pmap_invalidate_pde_page(pmap, sva, oldpde); vm_page_free_pages_toq(&free, true); @@ -6150,7 +6150,8 @@ pmap_demote_pde_locked(pmap_t pmap, pd_entry_t *pde, vm_offset_t va, * pmap_remove_kernel_pde: Remove a kernel superpage mapping. */ static void -pmap_remove_kernel_pde(pmap_t pmap, pd_entry_t *pde, vm_offset_t va) +pmap_remove_kernel_pde(pmap_t pmap, pd_entry_t *pde, vm_offset_t va, + bool remove_pt) { pd_entry_t newpde; vm_paddr_t mptepa; @@ -6158,7 +6159,10 @@ pmap_remove_kernel_pde(pmap_t pmap, pd_entry_t *pde, vm_offset_t va) KASSERT(pmap == kernel_pmap, ("pmap %p is not kernel_pmap", pmap)); PMAP_LOCK_ASSERT(pmap, MA_OWNED); - mpte = pmap_remove_pt_page(pmap, va); + if (remove_pt) + mpte = pmap_remove_pt_page(pmap, va); + else + mpte = vm_radix_lookup(&pmap->pm_root, pmap_pde_pindex(va)); if (mpte == NULL) panic("pmap_remove_kernel_pde: Missing pt page."); @@ -6190,7 +6194,7 @@ pmap_remove_kernel_pde(pmap_t pmap, pd_entry_t *pde, vm_offset_t va) * pmap_remove_pde: do the things to unmap a superpage in a process */ static int -pmap_remove_pde(pmap_t pmap, pd_entry_t *pdq, vm_offset_t sva, +pmap_remove_pde(pmap_t pmap, pd_entry_t *pdq, vm_offset_t sva, bool remove_pt, struct spglist *free, struct rwlock **lockp) { struct md_page *pvh; @@ -6231,7 +6235,7 @@ pmap_remove_pde(pmap_t pmap, pd_entry_t *pdq, vm_offset_t sva, } } if (pmap == kernel_pmap) { - pmap_remove_kernel_pde(pmap, pdq, sva); + pmap_remove_kernel_pde(pmap, pdq, sva, remove_pt); } else { mpte = pmap_remove_pt_page(pmap, sva); if (mpte != NULL) { @@ -6473,7 +6477,8 @@ pmap_remove1(pmap_t pmap, vm_offset_t sva, vm_offset_t eva, bool map_delete) */ if ((ptpaddr & PG_G) == 0) anyvalid = 1; - pmap_remove_pde(pmap, pde, sva, &free, &lock); + pmap_remove_pde(pmap, pde, sva, true, &free, + &lock); continue; } else if (!pmap_demote_pde_locked(pmap, pde, sva, &lock)) { @@ -7542,13 +7547,36 @@ pmap_enter_pde(pmap_t pmap, vm_offset_t va, pd_entry_t newpde, u_int flags, /* * The reference to the PD page that was acquired by * pmap_alloc_pde() ensures that it won't be freed. - * However, if the PDE resulted from a promotion, then + * However, if the PDE resulted from a promotion, and + * the mapping is not from kernel_pmap, then * a reserved PT page could be freed. */ - (void)pmap_remove_pde(pmap, pde, va, &free, lockp); + (void)pmap_remove_pde(pmap, pde, va, + pmap != kernel_pmap, &free, lockp); if ((oldpde & PG_G) == 0) pmap_invalidate_pde_page(pmap, va, oldpde); } else { + if (va >= VM_MAXUSER_ADDRESS) { + /* + * Try to save the ptp in the trie + * before any changes to mappings are + * made. Abort on failure. + */ + mt = PHYS_TO_VM_PAGE(*pde & PG_FRAME); + if (pmap_insert_pt_page(pmap, mt, false, false)) { + if (pdpg != NULL) + pdpg->ref_count--; + CTR1(KTR_PMAP, + "pmap_enter_pde: cannot ins kern ptp va %#lx", + va); + return (KERN_RESOURCE_SHORTAGE); + } + /* + * Both pmap_remove_pde() and + * pmap_remove_ptes() will zero-fill + * the kernel page table page. + */ + } pmap_delayed_invl_start(); if (pmap_remove_ptes(pmap, va, va + NBPDR, pde, &free, lockp)) @@ -7562,14 +7590,6 @@ pmap_enter_pde(pmap_t pmap, vm_offset_t va, pd_entry_t newpde, u_int flags, } else { KASSERT(SLIST_EMPTY(&free), ("pmap_enter_pde: freed kernel page table page")); - - /* - * Both pmap_remove_pde() and pmap_remove_ptes() will - * leave the kernel page table page zero filled. - */ - mt = PHYS_TO_VM_PAGE(*pde & PG_FRAME); - if (pmap_insert_pt_page(pmap, mt, false, false)) - panic("pmap_enter_pde: trie insert failed"); } } From nobody Sat Jul 12 01:44: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 4bfBG10Hxbz617kP; Sat, 12 Jul 2025 01:44: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bfBG030Qkz3G02; Sat, 12 Jul 2025 01:44:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1752284664; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XswG37Kak6GMo8N6bX5i8mO1apvgNI4/mEgpe/EW98k=; b=AMHJVXMKRf0MFLcAB9TBSy4rHClVouiyU0tp2uC1fZlkYYYerkvbfRDhgpwz82Z8bPzKXB P4RfDx/4u19PsU67DnvlE/JbFhQBPYKE2KKK4sLP23bw7Kx3tNudBLVnXxBYyrg2ivKNe2 UjD+ydOX5EHNwy1QynqjetqQyXqqQU5EkfI74MwDI5u5z78bXn6bQXxXPNsRlGBf8vKyNo VFnXiJNizMTsGfijxhJDzFVPx6evZyuP9Fvn1ENrdPIjNtMOLE6Vt3KSLbPz2NspPBQS3/ 4E88K+a1Z6y5oKe8Ceua2+sJjHsoX+s/H23EifhVMVM5qCYtaIkLNci2EcR9HA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1752284664; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XswG37Kak6GMo8N6bX5i8mO1apvgNI4/mEgpe/EW98k=; b=luPvwuGWJET3DZVvVIEyT4EaJcBPWKAaDfzxPJNJLjwQxewlgyJ4hRnrfMaQt+b7flHFCU pxSgB4WVsbzv/wtVf9Eri75b6z5hZOg2oFyFodWzmXNa+xY3f5A8lxAl245xbA0iXwNyUQ +/mCy8A8Pa5qNh87JzFzkTZ9yrwcAgLhUeHff+Ese4f7vQW8ToVirYxuT8uf8TE4xZdZpf zDN5jhVsLVljE+heZtShiQPrrLjN9YN0usxQSPVBcHGjUsPrleccw2oVpE6SyzU4cQK6xi sI71B6Q2gDECY3Xc3TioyYBiF7jyZqYr7KQSV3idMaOVkU0gq7TLjChg9qRePA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1752284664; a=rsa-sha256; cv=none; b=ujkBBzJXSRWz80j9iWuH/H/1R21O645WiB31LVmvjusZsl4WFpSSyXvOXQaGG6lHo0zRD+ 9CBrl4nO92KfJgWZAFmwsRaDF3wfe7FkXHIHRQ6gjCUWvPZBpnjWCqYSf1iezJUEbIqTw+ bjxUSZ59FpadRlthY4jMbcyP0/lWKMDy12yWYpLc9QrKMOQVrUS929rTl2Mzz8Z0xFsKlO GJTM95y/HCvFYgK5kgOSDW6Ehl3iZhBy5NWC4jtTU0OpofSUm8hpLQa9rv758HldKuRKgC HucBbwGUDSXR4D9ea2LnjyJQk8+QiSxW3Tnx7a2H4TzfyswBvaG6jDCgO+TLjQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4bfBG02FsPz12Cx; Sat, 12 Jul 2025 01:44: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 56C1iOeY050637; Sat, 12 Jul 2025 01:44:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 56C1iOtK050634; Sat, 12 Jul 2025 01:44:24 GMT (envelope-from git) Date: Sat, 12 Jul 2025 01:44:24 GMT Message-Id: <202507120144.56C1iOtK050634@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: bd5f7669c0fd - stable/14 - aio: handle errors from fork List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: bd5f7669c0fd14eec352552cb569915c5421e7c0 Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=bd5f7669c0fd14eec352552cb569915c5421e7c0 commit bd5f7669c0fd14eec352552cb569915c5421e7c0 Author: Konstantin Belousov AuthorDate: 2025-07-04 18:30:31 +0000 Commit: Konstantin Belousov CommitDate: 2025-07-12 01:41:34 +0000 aio: handle errors from fork (cherry picked from commit 4685fa8e4bef169e6a1ceaf07f149232326de805) --- sys/kern/vfs_aio.c | 35 +++++++++++++++++++++++++---------- 1 file changed, 25 insertions(+), 10 deletions(-) diff --git a/sys/kern/vfs_aio.c b/sys/kern/vfs_aio.c index 91137fa1e0dd..ff1e522f7cf2 100644 --- a/sys/kern/vfs_aio.c +++ b/sys/kern/vfs_aio.c @@ -309,7 +309,7 @@ static TAILQ_HEAD(,kaiocb) aio_jobs; /* (c) Async job list */ static struct unrhdr *aiod_unr; static void aio_biocleanup(struct bio *bp); -static void aio_init_aioinfo(struct proc *p); +static int aio_init_aioinfo(struct proc *p); static int aio_onceonly(void); static int aio_free_entry(struct kaiocb *job); static void aio_process_rw(struct kaiocb *job); @@ -431,10 +431,11 @@ aio_onceonly(void) * Init the per-process aioinfo structure. The aioinfo limits are set * per-process for user limit (resource) management. */ -static void +static int aio_init_aioinfo(struct proc *p) { struct kaioinfo *ki; + int error; ki = uma_zalloc(kaio_zone, M_WAITOK); mtx_init(&ki->kaio_mtx, "aiomtx", NULL, MTX_DEF | MTX_NEW); @@ -460,8 +461,13 @@ aio_init_aioinfo(struct proc *p) uma_zfree(kaio_zone, ki); } - while (num_aio_procs < MIN(target_aio_procs, max_aio_procs)) - aio_newproc(NULL); + error = 0; + while (num_aio_procs < MIN(target_aio_procs, max_aio_procs)) { + error = aio_newproc(NULL); + if (error != 0) + break; + } + return (error); } static int @@ -1509,8 +1515,11 @@ aio_aqueue(struct thread *td, struct aiocb *ujob, struct aioliojob *lj, int jid; u_short evflags; - if (p->p_aioinfo == NULL) - aio_init_aioinfo(p); + if (p->p_aioinfo == NULL) { + error = aio_init_aioinfo(p); + if (error != 0) + goto err1; + } ki = p->p_aioinfo; @@ -2241,8 +2250,11 @@ kern_lio_listio(struct thread *td, int mode, struct aiocb * const *uacb_list, if (nent < 0 || nent > max_aio_queue_per_proc) return (EINVAL); - if (p->p_aioinfo == NULL) - aio_init_aioinfo(p); + if (p->p_aioinfo == NULL) { + error = aio_init_aioinfo(p); + if (error != 0) + return (error); + } ki = p->p_aioinfo; @@ -2531,8 +2543,11 @@ kern_aio_waitcomplete(struct thread *td, struct aiocb **ujobp, timo = tvtohz(&atv); } - if (p->p_aioinfo == NULL) - aio_init_aioinfo(p); + if (p->p_aioinfo == NULL) { + error = aio_init_aioinfo(p); + if (error != 0) + return (error); + } ki = p->p_aioinfo; error = 0; From nobody Sat Jul 12 01:44: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 4bfBG14hG5z617ql; Sat, 12 Jul 2025 01:44: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bfBG13FBNz3G9L; Sat, 12 Jul 2025 01:44:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1752284665; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=O18oxrWmylbZ8ZuUAJLa4ajrNd+nJgpIqTiscG8YQDA=; b=XH9Sa4Q42e4bHXNQxOSAVLebletGh1zidl72osZSM4sKTme4lsbV5c0aT75ZwNuQEcFDBS 9HEfJ/BUsWEcjTUNJvnoxJayvxXwcHkUuXSi9YAImB0ZhD5l/GgoF0px6IVp/IxiHqGTfF vNMJpZf0Sktkmk1zJ4SiiEotVK69oNRz7iuNEAAVFeKOxFfJFCv1uY2bIY8+P9hMhHNA+2 bpHb28mVMUTl7P8DFgsEDq5e9bowwfJ3nSAZ9rE9z1X6yq9z7r6f9tXbg1NShAAVfOHF1F /Dpn3hcQC2DQF8nwFEy/amZL5OP/JYNgZvZspGIPtXQbT8HgII6okGcAuTLnIg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1752284665; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=O18oxrWmylbZ8ZuUAJLa4ajrNd+nJgpIqTiscG8YQDA=; b=q70Za/5/ocQ38cITAFGbX7AcVBC/iyZyV/PrI36YskQncp3EbnmYOWgQc6RhFGYoCWmuAj 3VLso0/O7oC7wDVX2Fa5EgYP9Ub8mW7ZAjx0XHtKxKEyTOXoT9Uloi7hyopE+T4ynuDKCI yQQuNuWkx0j9bID+bxkgnQzvz5DHSM2OzjZNWxbO85W1bTSvlpz94AcigdzjpyKuU4u+Lj YGysGANorgMKSMQL3iPcu+l3hRX9EyufpZL7OmRIAGNhN7kfdwGTsBG2GJx2zNdnzGgEpN NJDBNpXWz0asNBbB20qmz3e1rOYgY6yllirtW/aBMqjV/35jmy1LeLUDzRH1dA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1752284665; a=rsa-sha256; cv=none; b=hG+BcWO3t9g4kn3dcgmwojlL/JuCeU87QdvccxbwcywhHrJja3VQ/7xXfp57umHscsysNa 4CdOgF5VycRib1rLmG/b78Vx27nsWfvLtn2Xb2XMTPMkQH1bddDesg8jWqhhjQ/3NrGv/h tuDWi1Dih/RPzwd59ERfwCASELUALop8JkGSoeqVpiFTEItss4mzCxPZ/PJFLeT5JFkXoW RMWNEN4W7sO5UqYAhjHP0jzjV3ugI6RiZRIZaHPZb86mFXKCkWoIJ2O7n/vy1wkWDiZTfZ oRRX7UIe7b3E/Il5v3Z/LWWDnjjZYSZgbCISxnm7qlauY9I/Vnn9/0eS3cHvIA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4bfBG12rPRz129x; Sat, 12 Jul 2025 01:44: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 56C1iPp9050670; Sat, 12 Jul 2025 01:44:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 56C1iPGi050668; Sat, 12 Jul 2025 01:44:25 GMT (envelope-from git) Date: Sat, 12 Jul 2025 01:44:25 GMT Message-Id: <202507120144.56C1iPGi050668@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: bc0d313bc84d - stable/14 - aio: if there is at least one aio thread, hide an error from aio_init_aioinfo() List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: bc0d313bc84d3ef11be8c77ee65fe89cac73183b Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=bc0d313bc84d3ef11be8c77ee65fe89cac73183b commit bc0d313bc84d3ef11be8c77ee65fe89cac73183b Author: Konstantin Belousov AuthorDate: 2025-07-07 14:35:11 +0000 Commit: Konstantin Belousov CommitDate: 2025-07-12 01:41:35 +0000 aio: if there is at least one aio thread, hide an error from aio_init_aioinfo() (cherry picked from commit 0c38e3dbbf6eaa2755d34189149c9140cacd4bb1) --- sys/kern/vfs_aio.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/sys/kern/vfs_aio.c b/sys/kern/vfs_aio.c index ff1e522f7cf2..a14865f6b20c 100644 --- a/sys/kern/vfs_aio.c +++ b/sys/kern/vfs_aio.c @@ -464,8 +464,15 @@ aio_init_aioinfo(struct proc *p) error = 0; while (num_aio_procs < MIN(target_aio_procs, max_aio_procs)) { error = aio_newproc(NULL); - if (error != 0) + if (error != 0) { + /* + * At least one worker is enough to have AIO + * functional. Clear error in that case. + */ + if (num_aio_procs > 0) + error = 0; break; + } } return (error); } From nobody Sat Jul 12 01:44: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 4bfBG26YpYz617kS; Sat, 12 Jul 2025 01:44:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bfBG249hrz3G0M; Sat, 12 Jul 2025 01:44:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1752284666; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=I3YO5gxZXFrSZQbJ0VRso47o7ZZPy0m1o490byz6OHQ=; b=lHX8qPkJoQsrV7OrtbJbCavmOFahmmKlsuoaMsjYh+6ddkDFexsmxaBpRRBqIsrEahof4l rY41u9bbjtL12IRK3V4SuuxYrQs/am+rKSOQDScT1nfdzrEfucP4FU3MN9kHgMRv4U8h/4 5j1sz+zQdf/BmnYEH2g+AN/n+lsesUVo/PkRwZ0XEdIbqnbAryUf0vPigrzYPmFiHsvHMB ROXX3i3J4hLDADCqmOS/hEa2UZ1+aK5rQ9BkEtYeghtOGBZ6fZ9DO6FyAB3fPUCcglg5EB 9gY6z9PGT2c9pU4x2chk5SSjwMyYJFbVeGZOsQ7kORPjJwy/WfnYTMnd4nlYLg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1752284666; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=I3YO5gxZXFrSZQbJ0VRso47o7ZZPy0m1o490byz6OHQ=; b=FkrAtaxRgx+V+U9gB6PrFJUggXE3y9lfcUBi+7OmQmnjuKsbTvIGxZLBq0P5UjMdo3QvWS fzEGi7PqsQu7eNeQ948NmoT1MEPqvcGxoO8lzAqQn0NZQrtjoCDtLwgtA1oWRuzU3dRdfU Q7+NBJwtMt3/rtt9MU8pmnhKBoPSykYTH6NNbMbTTWOqeegcnJxvMGeylLoOgSFPfqh1GX 0Vqt+ZXrwOiniGRICWeOSiQaotWY8PQdoud0lywCfttKGkVZrpgm8sdAz9asMgVjS+IkFV YZzMqOR+3H5tbnbJgOIkSyoWQPkMOlfPYDSFN62DR7NzZ+3UI/YVisCUH1ZdkQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1752284666; a=rsa-sha256; cv=none; b=t0ZiGPkbOTrwa4QV7LotyZ92Ccr9yexY6yfJX8v4cWQ3oXgEeIoFffIFlidxgV61U0MwqC n72CtVitemy90j8gegDLA4yoQ9Oo1HIKofaw/pqAj6x+rpzJppurKqBqhDAfiybJZodAc5 /V0iI88y3Nt9rAXXBOsEns5st/3a8xnmYzYsiNcBSxL6vpwOE/W+aLN4nQXdGXHnM/KuXZ Pq8rUVdj1+8n71RiSx97VLr3ybmTbm2y0oD4j9OW9vhKKfPYV2IabW6Jt2VfwI705H3HPb lpDwq1W7SPCfKyewrrxeXUtm0VhAIeYvbFpyI7uZ9MLqOOj77dMRamg+fTcw5g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4bfBG23lLKz12Cy; Sat, 12 Jul 2025 01:44: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 56C1iQQi050709; Sat, 12 Jul 2025 01:44:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 56C1iQkl050706; Sat, 12 Jul 2025 01:44:26 GMT (envelope-from git) Date: Sat, 12 Jul 2025 01:44:26 GMT Message-Id: <202507120144.56C1iQkl050706@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: d9290ae86570 - stable/14 - sys/sysent.h: use two nibbles for flags, and remove unused SY_THR_FLAGMASK List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: d9290ae8657094879674ed280ee6ebfd89679eae Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=d9290ae8657094879674ed280ee6ebfd89679eae commit d9290ae8657094879674ed280ee6ebfd89679eae Author: Konstantin Belousov AuthorDate: 2025-07-06 12:13:50 +0000 Commit: Konstantin Belousov CommitDate: 2025-07-12 01:41:35 +0000 sys/sysent.h: use two nibbles for flags, and remove unused SY_THR_FLAGMASK (cherry picked from commit baa15beed7f1f51c213ae434d3655c6664da8786) --- sys/sys/sysent.h | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/sys/sys/sysent.h b/sys/sys/sysent.h index a23c338f9ce2..a120c13f39cd 100644 --- a/sys/sys/sysent.h +++ b/sys/sys/sysent.h @@ -79,11 +79,10 @@ struct sysent { /* system call table */ */ #define SYF_CAPENABLED 0x00000001 -#define SY_THR_FLAGMASK 0x7 -#define SY_THR_STATIC 0x1 -#define SY_THR_DRAINING 0x2 -#define SY_THR_ABSENT 0x4 -#define SY_THR_INCR 0x8 +#define SY_THR_STATIC 0x01 +#define SY_THR_DRAINING 0x02 +#define SY_THR_ABSENT 0x04 +#define SY_THR_INCR 0x08 #ifdef KLD_MODULE #define SY_THR_STATIC_KLD 0 From nobody Sat Jul 12 01:44: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 4bfBG371Vrz617qs; Sat, 12 Jul 2025 01:44:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bfBG358DYz3G2g; Sat, 12 Jul 2025 01:44:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1752284667; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pk/qVi2eQiBfFNgwOLpdcepAPBicsaog8P9URbF8vGw=; b=v1bT4ak6wD3MtsrzWG5Jv4+TiNaycjI8lbrcCA59qgV8K1yOWlq8OcNE4EsFnMocMXwknP cLKNG7u5y1lyeHg0oMbZ6n1OWlVxdGrc8iApY1U2GYWIPC4ZBXYlGzK2FYksz4uBFauP9Z B9lwkAFkHx+YpIZUwjNWOL+w3GeafIXE54CnFhw3kgvcK6tx1WKccrpWEfGVOpJ3uAPo+c u9YCBRvf7k5qFlv37nEUMVtkC1cAeAxI3UdwkYk4msMGooVrkyfe8WPOXmtbALQLe7k3Xa wbold5+8GC0rZ1Opkz0Lwp4H0U0QAev369S3tlyQ8zwbOEkEiNjF2B2Vy2NFZQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1752284667; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pk/qVi2eQiBfFNgwOLpdcepAPBicsaog8P9URbF8vGw=; b=TkLHlxjdCkQWm8g/JarhbSSpv+BH3wFINiC/jN0NyYfv4iEuUp1MM5vavgjKoW25lGMIme 6EBxThnWKLNHI4v6nFe+odlRY3h1INCiWJaODZnsrSELE/NzzUD/Z78xKqHen0FTI1Dr+/ gXBcBNvqBfpYclirW09tFtFr9IZjyd4OfMX7MnJBKd6xwqhQfFuGZIEn/W8dJBAekSyzpD UPHwpccOwuN+RK50WCI6wKnHoCCKoDq17KMf2MmDg5wHT+RSU52jjPxfqwG9f5X6eyUmqn IYQ9R1YL5dSJkQIGTB0qLbIC6ZS7X8PKGSQ/xX+GeRolaZjoyH5s6o6HcHAhUg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1752284667; a=rsa-sha256; cv=none; b=XWnfejgMFe6j1u7UWt39krZ289A4YUOxUqV0WMo5mrhdtMUNWDFjgH8EUaLIewIFEhXG0O L7DXAkGrEEam0bficKPcUHS5w2Nq1mzOS/h+mzhN6ypcs1EYINjXoRF3yzt05O5Id9MEty xIKQT6GveKI4QxPs9dMwykRyL/ZtQiwMUINWTPiHLpIDX9AolSF9nk5Mc0nD3hr0/EAvUM ANvV3lhSadEXVnJwMFSaeu+e9yAL03nyRYXtGQY87TppgJxzI40z1BLtIIXeytlnAeA166 2mDwRS6WPOknPo7wGEMNaT3SEVvdg5m4Xz1VhJugKcelLShTXhdyntn1ft7eMw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4bfBG34kksz11yd; Sat, 12 Jul 2025 01:44: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 56C1iR4B050742; Sat, 12 Jul 2025 01:44:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 56C1iR2k050739; Sat, 12 Jul 2025 01:44:27 GMT (envelope-from git) Date: Sat, 12 Jul 2025 01:44:27 GMT Message-Id: <202507120144.56C1iR2k050739@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 98e530b33891 - stable/14 - kern: add kern_nosys() and use it instead of type-punning the sys_nosys() arg List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 98e530b33891735cc573c538a90cdfde7ae99a96 Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=98e530b33891735cc573c538a90cdfde7ae99a96 commit 98e530b33891735cc573c538a90cdfde7ae99a96 Author: Konstantin Belousov AuthorDate: 2025-07-06 12:18:11 +0000 Commit: Konstantin Belousov CommitDate: 2025-07-12 01:41:35 +0000 kern: add kern_nosys() and use it instead of type-punning the sys_nosys() arg (cherry picked from commit 26061e4e542d220c577fb3437a9a9f108dc27698) --- sys/kern/kern_sig.c | 9 +++++++-- sys/kern/kern_syscalls.c | 5 +++-- sys/kern/sysv_msg.c | 2 +- sys/kern/sysv_sem.c | 2 +- sys/kern/sysv_shm.c | 2 +- sys/sys/syscallsubr.h | 1 + 6 files changed, 14 insertions(+), 7 deletions(-) diff --git a/sys/kern/kern_sig.c b/sys/kern/kern_sig.c index 0291c2647da6..d8be29779386 100644 --- a/sys/kern/kern_sig.c +++ b/sys/kern/kern_sig.c @@ -1042,8 +1042,7 @@ osigaction(struct thread *td, struct osigaction_args *uap) int osigreturn(struct thread *td, struct osigreturn_args *uap) { - - return (nosys(td, (struct nosys_args *)uap)); + return (kern_nosys(td, 0)); } #endif #endif /* COMPAT_43 */ @@ -4298,6 +4297,12 @@ struct nosys_args { /* ARGSUSED */ int nosys(struct thread *td, struct nosys_args *args) +{ + return (kern_nosys(td, args->dummy)); +} + +int +kern_nosys(struct thread *td, int dummy) { struct proc *p; diff --git a/sys/kern/kern_syscalls.c b/sys/kern/kern_syscalls.c index f923211cb6c8..e330f8a2ba09 100644 --- a/sys/kern/kern_syscalls.c +++ b/sys/kern/kern_syscalls.c @@ -36,6 +36,7 @@ #include #include #include +#include #include #include #include @@ -51,14 +52,14 @@ int lkmnosys(struct thread *td, struct nosys_args *args) { - return (nosys(td, args)); + return (kern_nosys(td, 0)); } int lkmressys(struct thread *td, struct nosys_args *args) { - return (nosys(td, args)); + return (kern_nosys(td, 0)); } struct sysent nosys_sysent = { diff --git a/sys/kern/sysv_msg.c b/sys/kern/sysv_msg.c index 1e84d151b4af..354a01fa7e3f 100644 --- a/sys/kern/sysv_msg.c +++ b/sys/kern/sysv_msg.c @@ -1724,7 +1724,7 @@ freebsd32_msgsys(struct thread *td, struct freebsd32_msgsys_args *uap) return (sys_msgsys(td, (struct msgsys_args *)uap)); } #else - return (nosys(td, NULL)); + return (kern_nosys(td, 0)); #endif } diff --git a/sys/kern/sysv_sem.c b/sys/kern/sysv_sem.c index ad4243464a96..076851235ffa 100644 --- a/sys/kern/sysv_sem.c +++ b/sys/kern/sysv_sem.c @@ -1904,7 +1904,7 @@ freebsd32_semsys(struct thread *td, struct freebsd32_semsys_args *uap) return (sys_semsys(td, (struct semsys_args *)uap)); } #else - return (nosys(td, NULL)); + return (kern_nosys(td, 0)); #endif } diff --git a/sys/kern/sysv_shm.c b/sys/kern/sysv_shm.c index 60e3fe92a4b7..8d1a469127c6 100644 --- a/sys/kern/sysv_shm.c +++ b/sys/kern/sysv_shm.c @@ -1474,7 +1474,7 @@ freebsd32_shmsys(struct thread *td, struct freebsd32_shmsys_args *uap) return (EINVAL); } #else - return (nosys(td, NULL)); + return (kern_nosys(td, 0)); #endif } diff --git a/sys/sys/syscallsubr.h b/sys/sys/syscallsubr.h index 4450a28dc4dd..8fafb8ace311 100644 --- a/sys/sys/syscallsubr.h +++ b/sys/sys/syscallsubr.h @@ -249,6 +249,7 @@ int kern_munlock(struct thread *td, uintptr_t addr, size_t size); int kern_munmap(struct thread *td, uintptr_t addr, size_t size); int kern_nanosleep(struct thread *td, struct timespec *rqt, struct timespec *rmt); +int kern_nosys(struct thread *td, int dummy); int kern_ntp_adjtime(struct thread *td, struct timex *ntv, int *retvalp); int kern_ogetdirentries(struct thread *td, struct ogetdirentries_args *uap, long *ploff); From nobody Sat Jul 12 15:36: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 4bfXjv1M7Rz620t6; Sat, 12 Jul 2025 15:36:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bfXjv0dr5z48lv; Sat, 12 Jul 2025 15:36:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1752334579; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ok1wNH4cPnCXWzXP+b/Xdxu6c4ayKFaKThvkF7pqJmc=; b=WwTCKQ9rPeOWuzU8TkgpdbVk2R4HomqMZREJ/MlD/r4Y3+YfFNuY/CIv+PY7w15/55orVg fjcwXobAM63RU+J7+GEsQ8a545APh0t6njzn6orag3+dJAj2HGZq8zWg+kGEmqyEouTV1J 1qIpvSjpq0sdsTfkx+x6X6Ysp8FWbehtx2J3CoA/nyCs6aL8A+lZYQb6c9rNtW0gnaYAL0 Q/9H/jAcz8s+8k0dqhGHJ0xbEKmv48czStkYAguqZ+GgTF2ODmT9d56V74iIhlkmXDlyvv hHJkrL3Ma48OYScKZu6rnuiccoB42lNh1X7WRlSNDxhknfaXKWZD2PA4d8SWxQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1752334579; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ok1wNH4cPnCXWzXP+b/Xdxu6c4ayKFaKThvkF7pqJmc=; b=yGWWIiwrZ3AofahxYw3GvwcQy1WtHHgIe5As3mEeEDBtop/MjWKQi2Rh29ZthSPpGs/709 2b9n2xfJjMWtTuCOqCyMmiEriVr3LFW5i8HTCsdHTgZV0eRfmL5h9AdajPuZk7q38UU0oh JLBvehFPZmrfnk2OKBwU0k6/WXn3RUlUpTlVadmBMJ8DwXVR3eYZpENHlZXMOoSF77Ake5 zj5GhPC/3v+Ym9ns5UtGVaCkx3WA4Yt4UZcvaD7tMMkyKInWhUDtoOBhAqbN1z27zWbiIv 3m5z5e0JcDmv7CJ0P1pY4rdFwVltfsDhJ0yh+jlbDq6bp9lr1l3Et98leWhOcA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1752334579; a=rsa-sha256; cv=none; b=pu2PqK55WNPrLYF8HmDmb7vOwTXNNJAjuWFazOrviIRFrYQ6TfPptLwqxmAiybT/Fna+r4 yqLOjauKXr9lLChivv+v2ruG+JkCwzqreDy7plqKdrO1TLaSlVjR6FKx73ORXWD+KGsAsR TGabaN3ayo1Uk9HGVkwQbkNB/Nckf8OCHMCWkh8qkpjuwYDseL/n4xBH854sk9osQRact8 9bZ+dQm/33Dsxx8uNBquVzulsLd/Ezo3AE2aVpwO1uhN0xaOWJufLCNYrtGAnoNNPcqK+U Ii4b3jwJg7dsGzN5Hv51VYv7wIgL9V4+SxsoE5EN2uOF1Kg0MpQkpxZoQdrAwA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4bfXjv070czDHx; Sat, 12 Jul 2025 15:36: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 56CFaIga014924; Sat, 12 Jul 2025 15:36:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 56CFaIkq014921; Sat, 12 Jul 2025 15:36:18 GMT (envelope-from git) Date: Sat, 12 Jul 2025 15:36:18 GMT Message-Id: <202507121536.56CFaIkq014921@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: 0f15030a6eb6 - stable/14 - pf: fix ICMP ECHO handling of ID conflicts List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-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/14 X-Git-Reftype: branch X-Git-Commit: 0f15030a6eb6e4e0d7f22bffa27eb9be9ab233f8 Auto-Submitted: auto-generated The branch stable/14 has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=0f15030a6eb6e4e0d7f22bffa27eb9be9ab233f8 commit 0f15030a6eb6e4e0d7f22bffa27eb9be9ab233f8 Author: Damir Bikmuhametov AuthorDate: 2025-06-26 17:26:14 +0000 Commit: Kristof Provost CommitDate: 2025-07-12 07:50:18 +0000 pf: fix ICMP ECHO handling of ID conflicts After applying FreeBSD-SA-24:05.pf, a problem with ICMP ECHO passing through PF NAT was raised: two or more Windows workstations cannot ping the same destination address at the same time. More precisely, only one workstation pings normally, while the pings of the others are rejected by the packet filter. The thing is that Windows always uses the same ICMP ID (1). Therefore, the state is created only for the workstation that started pinging earlier. In the pf_get_sport() function, we compare *nport with the ICMP_ECHO constant, while icmptype (virtual_type actually) is passed in the pd->ndport parameter. MFC after: 2 weeks Reviewed by: kp (cherry picked from commit e7abf8829d8d496a8753946f67fb2016851b4f7c) --- sys/netpfil/pf/pf_lb.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/netpfil/pf/pf_lb.c b/sys/netpfil/pf/pf_lb.c index 2623a22db86b..a9cbc71cb5f4 100644 --- a/sys/netpfil/pf/pf_lb.c +++ b/sys/netpfil/pf/pf_lb.c @@ -233,7 +233,7 @@ pf_get_sport(sa_family_t af, u_int8_t proto, struct pf_krule *r, return (1); if (proto == IPPROTO_ICMP) { - if (*nport == htons(ICMP_ECHO)) { + if (dport == htons(ICMP_ECHO)) { low = 1; high = 65535; } else @@ -241,7 +241,7 @@ pf_get_sport(sa_family_t af, u_int8_t proto, struct pf_krule *r, } #ifdef INET6 if (proto == IPPROTO_ICMPV6) { - if (*nport == htons(ICMP6_ECHO_REQUEST)) { + if (dport == htons(ICMP6_ECHO_REQUEST)) { low = 1; high = 65535; } else From nobody Sat Jul 12 15:37: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 4bfXkn6MlJz621L9; Sat, 12 Jul 2025 15:37: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bfXkn5c6jz49M0; Sat, 12 Jul 2025 15:37:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1752334625; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=JO8aVWbmUCBVJF4hGqZPnefqK75yXXIBtRDsslPN/iI=; b=lmwPGrdWLA3B3cW7EG36szzvtA1i1W9/KEXlH8gWxxuKa1YhQVPYWjjhr6FA2Buuywi7/l BbTe8RfhaZXVgPEmsDXvvjonpnmce9vNtZt9h6fKe5YSEXrcNwY0mS+3qtV3VrKg/43QOF +NSlWC9npVHcJJYseuyhIWCU/OuGMEnF0iy8qJieCA27Yg5C1v6E5qP16A6Aiagy5TEexJ M7IgLtwxSLFpVSlyd26m39nCSGMOaaPf3q0l+KP+gUDlFQl26gPzqT23dkrHYFR7qRAzCQ U0qOYz5uIA2CWIcKnuGlX6xVEowAgAOv4Dd9hd3EbIRpmzWGcbNeSwvUyw0qfg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1752334625; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=JO8aVWbmUCBVJF4hGqZPnefqK75yXXIBtRDsslPN/iI=; b=YHxFBF/Zbui6Bd90SYhhIDffRxbks92Il6a3ZMuSpSEgo8bTd54J0+sBWx4+MNcizoc/I6 vlKHGFz1gtJ/jmNUJOCt+kOG4D7tZPeDlyY779goT6DqCcjblj/xDM5JJJAzSpWy2buPXt wUDxRhzf1AMkQdkiPGLsr/1yPErKMjWvUHxfwGPk02byE2UcUkE221nGsM44dDQhH1nOY7 iwXwGCZQzaI1DnT6b6TwWmu7Yx56+F5E550qPpzEIOG1tLVA2PWP8eta+SJr2JsxVUTQjh qVlXH2EmF9vGMr3TelCuypEdBg7ZbVpN4USaHHnYOuWmgHxFb5NiBbURqBMsCQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1752334625; a=rsa-sha256; cv=none; b=mzTQ3UYVD0SNaveOhW0zXbUxHBAh+KR/2Wv9KpgGgK+zmQzNdO6Fx2x7Y/V3m7QlxB5G29 ea0dXIpYVcMrU5rmj5OK6qPilNzZ5U5O6jTX1SDjAvmhclIYAwSWwRCjJFb1tyPYcs3OUr vdUuZxg6ksu77gnPh0IlhLIYPefXLZJPRA5JT5uUXNIJbHp3eywSPoXJDxtAgF4mVOvsUe FeB9WwTUsncfIkff2wk+NXa9nCybBKyP9eSCU7CtNcavmb19hZ5fsKzhDG3askGEpHjIfD J/8duZph/YBi92Kfb/7K/lBGp8NG+uK8TgdPq3I6kAxqrN6gtF4IqAw9KviFGg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4bfXkn5BbbzD9G; Sat, 12 Jul 2025 15:37: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 56CFb5BZ015290; Sat, 12 Jul 2025 15:37:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 56CFb5Kh015287; Sat, 12 Jul 2025 15:37:05 GMT (envelope-from git) Date: Sat, 12 Jul 2025 15:37:05 GMT Message-Id: <202507121537.56CFb5Kh015287@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: 57c652dfa1c0 - stable/13 - pf: fix ICMP ECHO handling of ID conflicts List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-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/13 X-Git-Reftype: branch X-Git-Commit: 57c652dfa1c08a361e29b7edb7fe05b63ffae235 Auto-Submitted: auto-generated The branch stable/13 has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=57c652dfa1c08a361e29b7edb7fe05b63ffae235 commit 57c652dfa1c08a361e29b7edb7fe05b63ffae235 Author: Damir Bikmuhametov AuthorDate: 2025-06-26 17:26:14 +0000 Commit: Kristof Provost CommitDate: 2025-07-12 07:50:55 +0000 pf: fix ICMP ECHO handling of ID conflicts After applying FreeBSD-SA-24:05.pf, a problem with ICMP ECHO passing through PF NAT was raised: two or more Windows workstations cannot ping the same destination address at the same time. More precisely, only one workstation pings normally, while the pings of the others are rejected by the packet filter. The thing is that Windows always uses the same ICMP ID (1). Therefore, the state is created only for the workstation that started pinging earlier. In the pf_get_sport() function, we compare *nport with the ICMP_ECHO constant, while icmptype (virtual_type actually) is passed in the pd->ndport parameter. MFC after: 2 weeks Reviewed by: kp (cherry picked from commit e7abf8829d8d496a8753946f67fb2016851b4f7c) --- sys/netpfil/pf/pf_lb.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/netpfil/pf/pf_lb.c b/sys/netpfil/pf/pf_lb.c index 2571a0c5312e..001f26c13d48 100644 --- a/sys/netpfil/pf/pf_lb.c +++ b/sys/netpfil/pf/pf_lb.c @@ -223,7 +223,7 @@ pf_get_sport(sa_family_t af, u_int8_t proto, struct pf_krule *r, return (1); if (proto == IPPROTO_ICMP) { - if (*nport == htons(ICMP_ECHO)) { + if (dport == htons(ICMP_ECHO)) { low = 1; high = 65535; } else @@ -231,7 +231,7 @@ pf_get_sport(sa_family_t af, u_int8_t proto, struct pf_krule *r, } #ifdef INET6 if (proto == IPPROTO_ICMPV6) { - if (*nport == htons(ICMP6_ECHO_REQUEST)) { + if (dport == htons(ICMP6_ECHO_REQUEST)) { low = 1; high = 65535; } else From nobody Sun Jul 13 11:45: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 4bg3Xc4Tktz60qGr; Sun, 13 Jul 2025 11:45: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bg3Xc3j0Rz3TC5; Sun, 13 Jul 2025 11:45:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1752407104; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=cjza6yskqe+gYmnhgQgtiXwOedUAo55HH3UwAOVNndU=; b=ceR+NFkIRBVgsxObu0XrSVwhpmXVxcIcRpIFKs2AhPJdxujmMr7WAuvGQsOaGgcfprQazR zfEND4CuhrpnTDMlwEzbaIry5dqEM+2w6BPjHmxRnXNohyHd8auNkmNnOPFfbG7XJ6AOS7 4BdhV2IG2KcviM+Ft++9xC5rpdN21ttsKV7R/mBiK1w4WuzfCMY6xbFH41nkcy7jW12lTQ k5k9FV9Ziq8nwQzBk3LgyE7Pj+UKezZ3QJgwEtpQhKdHq34sLNTdd9j+I+MwnItAzy0jzU n/sbaXtlqpYLQbQYWTDavcxk0lRUHdwGG9R8QwpnmSGeLkzxN9uIN36ESRWGYw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1752407104; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=cjza6yskqe+gYmnhgQgtiXwOedUAo55HH3UwAOVNndU=; b=e8l4vod/oEuOGWbpcuFOuxd3FdEtPkrQgDmDfw1oPj59o8HuLX3gqnFzAluaRNuVtNajs5 Km8HWyaXJH82TLxSeQhWMRnnscQ4I5DTSBimqaEi+WvkO+bDHnZe4l99+Y+ROZz45e0+e1 gQvgHbY96ElXyp3BnZsgXrHK/zGaBCHWGqlDyMnfaLsGwhmA6kvJ5XvDLjLfo1Et8FNzLF 5Z+jcrmRcc5OoulZPe1ks8ea6uVLyi5JClFNRlSQDsnh73nhpxxKUimiG+JlJGURe2wBiC 9oNwY64HLR2okftMgt5ZIQaQxVgc8y4/y0duZ/IlD+/Qr/BCB46q6NOMU6A7fQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1752407104; a=rsa-sha256; cv=none; b=yuVqJfciwJaACJoTp3//itEweLguc32omV3jgXO3LyqseMWlmNUs5dmvL5UUiFt2ZZMIz/ K2z51ofli40HSIwk6HZSkg1TdYifRt1+PRTeNVVaIjZ9LsEJBLDf0hDyhOw3qGq8yzKG7e XWK/alWYWNsfNmoBW2aZExaH2yJ3fs4WJjRw/O+S7T1vW+d92xgq98msxIQ9fabUvSjDHV 32Yaws0IK7ktLMbwweRwrqMj05OrQXSY/XCx6O2kGtcRjbWB5tqUAqE32+R+mG9oXwsuD8 jvJzu13TXmemqaU/bTeFeHJ9/TQL9BMuz+PflCBLazmilvAXPjbh2FwwqrlOyQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4bg3Xc3HmPz16NW; Sun, 13 Jul 2025 11:45: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 56DBj4mH084177; Sun, 13 Jul 2025 11:45:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 56DBj4a0084174; Sun, 13 Jul 2025 11:45:04 GMT (envelope-from git) Date: Sun, 13 Jul 2025 11:45:04 GMT Message-Id: <202507131145.56DBj4a0084174@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ronald Klop Subject: git: 9d80d681ee9d - stable/14 - swapon: parse md.eli device for encrypted swapfile from fstab List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ronald X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 9d80d681ee9ddfb7a403924c877eac26d12e9077 Auto-Submitted: auto-generated The branch stable/14 has been updated by ronald: URL: https://cgit.FreeBSD.org/src/commit/?id=9d80d681ee9ddfb7a403924c877eac26d12e9077 commit 9d80d681ee9ddfb7a403924c877eac26d12e9077 Author: Ronald Klop AuthorDate: 2025-02-06 21:50:46 +0000 Commit: Ronald Klop CommitDate: 2025-07-13 11:44:35 +0000 swapon: parse md.eli device for encrypted swapfile from fstab Summary: Although fstab(5) suggests usage of md(4) and an .eli suffix in the same paragraph, the combination did not work. This patch adds a bit of parsing, creates the md device and then passes that device to the *_geli function. Add unit tests. PR: 186252 Approved by: delphij MFC after: 2 weeks Relnotes: yes Differential Revision: https://reviews.freebsd.org/D48874 (cherry picked from commit 1ee33e3a578c35ff0e8ef5db87a8005f1f99546a) --- etc/mtree/BSD.tests.dist | 2 + sbin/swapon/Makefile | 5 ++ sbin/swapon/swapon.c | 50 ++++++++--- sbin/swapon/tests/Makefile | 5 ++ sbin/swapon/tests/swapon_test.sh | 181 +++++++++++++++++++++++++++++++++++++++ 5 files changed, 233 insertions(+), 10 deletions(-) diff --git a/etc/mtree/BSD.tests.dist b/etc/mtree/BSD.tests.dist index 4e014025f623..f29fad1395f8 100644 --- a/etc/mtree/BSD.tests.dist +++ b/etc/mtree/BSD.tests.dist @@ -481,6 +481,8 @@ .. savecore .. + swapon + .. sysctl .. .. diff --git a/sbin/swapon/Makefile b/sbin/swapon/Makefile index 4cca18367c1e..7696fc51b463 100644 --- a/sbin/swapon/Makefile +++ b/sbin/swapon/Makefile @@ -10,4 +10,9 @@ MLINKS+=swapon.8 swapctl.8 LIBADD= util +.include + +HAS_TESTS= +SUBDIR.${MK_TESTS}+= tests + .include diff --git a/sbin/swapon/swapon.c b/sbin/swapon/swapon.c index b9b865c0fc09..f7ec26decb1d 100644 --- a/sbin/swapon/swapon.c +++ b/sbin/swapon/swapon.c @@ -66,6 +66,8 @@ static char sccsid[] = "@(#)swapon.c 8.1 (Berkeley) 6/5/93"; #include #include +#define DOT_ELI ".eli" + static void usage(void) __dead2; static const char *swap_on_off(const char *, int, char *); static const char *swap_on_off_gbde(const char *, int); @@ -243,8 +245,11 @@ swap_on_off(const char *name, int doingall, char *mntops) (fnmatch(_PATH_DEV MD_NAME "[0-9]*", name, 0) == 0 || fnmatch(MD_NAME "[0-9]*", name, 0) == 0 || strncmp(_PATH_DEV MD_NAME, name, - sizeof(_PATH_DEV) + sizeof(MD_NAME)) == 0 || - strncmp(MD_NAME, name, sizeof(MD_NAME)) == 0)) + sizeof(_PATH_DEV MD_NAME)) == 0 || + strncmp(MD_NAME, name, sizeof(MD_NAME)) == 0 || + strncmp(_PATH_DEV MD_NAME DOT_ELI, name, + sizeof(_PATH_DEV MD_NAME DOT_ELI)) == 0 || + strncmp(MD_NAME DOT_ELI, name, sizeof(MD_NAME DOT_ELI)) == 0)) return (swap_on_off_md(name, mntops, doingall)); basebuf = strdup(name); @@ -257,7 +262,7 @@ swap_on_off(const char *name, int doingall, char *mntops) } /* Swap on encrypted device by GEOM_ELI. */ - if (fnmatch("*.eli", base, 0) == 0) { + if (fnmatch("*" DOT_ELI, base, 0) == 0) { free(basebuf); return (swap_on_off_geli(name, mntops, doingall)); } @@ -399,6 +404,8 @@ swap_on_geli_args(const char *mntops) return (NULL); } Tflag = " -T "; + } else if ((p = strstr(token, "file=")) == token) { + /* ignore known option */ } else if (strcmp(token, "late") == 0) { /* ignore known option */ } else if (strcmp(token, "noauto") == 0) { @@ -488,24 +495,38 @@ swap_on_off_md(const char *name, char *mntops, int doingall) char *p, *vnodefile; size_t linelen; u_long ul; + const char *suffix; + char *devbuf, *dname; + int name_len; fd = -1; sfd = NULL; - if (strlen(name) == (sizeof(MD_NAME) - 1)) + devbuf = strdup(name); + name_len = strlen(name) - strlen(DOT_ELI); + if (name_len > 0 && strcmp(suffix = &name[name_len], DOT_ELI) == 0) { + suffix++; + devbuf[name_len] = '\0'; + } else + suffix = NULL; + /* dname will be name without /dev/ prefix and .eli suffix */ + dname = basename(devbuf); + if (strlen(dname) == (sizeof(MD_NAME) - 1)) mdunit = -1; else { errno = 0; - ul = strtoul(name + 2, &p, 10); + ul = strtoul(dname + 2, &p, 10); if (errno == 0) { if (*p != '\0' || ul > INT_MAX) errno = EINVAL; } if (errno) { - warn("Bad device unit: %s", name); + warn("Bad device unit: %s", dname); + free(devbuf); return (NULL); } mdunit = (int)ul; } + free(devbuf); vnodefile = NULL; if ((p = strstr(mntops, "file=")) != NULL) { @@ -645,10 +666,19 @@ swap_on_off_md(const char *name, char *mntops, int doingall) } } } - snprintf(mdpath, sizeof(mdpath), "%s%s%d", _PATH_DEV, - MD_NAME, mdunit); - mdpath[sizeof(mdpath) - 1] = '\0'; - ret = swap_on_off_sfile(mdpath, doingall); + + if (suffix != NULL && strcmp("eli", suffix) == 0) { + /* Swap on encrypted device by GEOM_ELI. */ + snprintf(mdpath, sizeof(mdpath), "%s%s%d" DOT_ELI, _PATH_DEV, + MD_NAME, mdunit); + mdpath[sizeof(mdpath) - 1] = '\0'; + ret = swap_on_off_geli(mdpath, mntops, doingall); + } else { + snprintf(mdpath, sizeof(mdpath), "%s%s%d", _PATH_DEV, + MD_NAME, mdunit); + mdpath[sizeof(mdpath) - 1] = '\0'; + ret = swap_on_off_sfile(mdpath, doingall); + } if (which_prog == SWAPOFF) { if (ret != NULL) { diff --git a/sbin/swapon/tests/Makefile b/sbin/swapon/tests/Makefile new file mode 100644 index 000000000000..aa0c9cf202d6 --- /dev/null +++ b/sbin/swapon/tests/Makefile @@ -0,0 +1,5 @@ +ATF_TESTS_SH= swapon_test + +TEST_METADATA.swapon_test+= required_user="root" + +.include diff --git a/sbin/swapon/tests/swapon_test.sh b/sbin/swapon/tests/swapon_test.sh new file mode 100755 index 000000000000..3c4286cd6815 --- /dev/null +++ b/sbin/swapon/tests/swapon_test.sh @@ -0,0 +1,181 @@ +# Copyright (c) 2025 Ronald Klop +# +# 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. Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in the +# documentation and/or other materials provided with the distribution. +# +# 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. +# +# + +atf_test_case attach_mdX cleanup +attach_mdX_head() +{ + atf_set "descr" "mdX device should attach" +} +attach_mdX_body() +{ + # if the swapfile is too small (like 1k) then mdconfig hangs looking up the md + atf_check -s exit:0 -x "truncate -s 10k swapfile" + atf_check -s exit:0 -o save:fstab.out -x "echo 'md3 none swap sw,file=swapfile 0 0'" + atf_check -s exit:0 -o match:"swapon: adding /dev/md3 as swap device" -x "swapon -F fstab.out -a" +} +attach_mdX_cleanup() +{ + swapoff -F fstab.out -a +} + +### +atf_test_case attach_dev_mdX cleanup +attach_dev_mdX_head() +{ + atf_set "descr" "/dev/mdX device should attach" +} +attach_dev_mdX_body() +{ + # if the swapfile is too small (like 1k) then mdconfig hangs looking up the md + atf_check -s exit:0 -x "truncate -s 10k swapfile" + atf_check -s exit:0 -o save:fstab.out -x "echo '/dev/md3 none swap sw,file=swapfile 0 0'" + atf_check -s exit:0 -o match:"swapon: adding /dev/md3 as swap device" -x "swapon -F fstab.out -a" +} +attach_dev_mdX_cleanup() +{ + swapoff -F fstab.out -a +} + +### +atf_test_case attach_md cleanup +attach_md_head() +{ + atf_set "descr" "mdX device should attach" +} +attach_md_body() +{ + # if the swapfile is too small (like 1k) then mdconfig hangs looking up the md + atf_check -s exit:0 -x "truncate -s 10k swapfile" + atf_check -s exit:0 -o save:fstab.out -x "echo 'md none swap sw,file=swapfile 0 0'" + atf_check -s exit:0 -o match:"swapon: adding /dev/md0 as swap device" -x "swapon -F fstab.out -a" +} +attach_md_cleanup() +{ + swapoff -F fstab.out -a +} + +### +atf_test_case attach_dev_md cleanup +attach_dev_md_head() +{ + atf_set "descr" "/dev/md device should attach" +} +attach_dev_md_body() +{ + # if the swapfile is too small (like 1k) then mdconfig hangs looking up the md + atf_check -s exit:0 -x "truncate -s 10k swapfile" + atf_check -s exit:0 -o save:fstab.out -x "echo '/dev/md none swap sw,file=swapfile 0 0'" + atf_check -s exit:0 -o match:"swapon: adding /dev/md0 as swap device" -x "swapon -F fstab.out -a" +} +attach_dev_md_cleanup() +{ + swapoff -F fstab.out -a +} + +### +atf_test_case attach_mdX_eli cleanup +attach_mdX_eli_head() +{ + atf_set "descr" "mdX.eli device should attach" +} +attach_mdX_eli_body() +{ + # if the swapfile is too small (like 1k) then mdconfig hangs looking up the md + atf_check -s exit:0 -x "truncate -s 10k swapfile" + atf_check -s exit:0 -o save:fstab.out -x "echo 'md3.eli none swap sw,file=swapfile 0 0'" + atf_check -s exit:0 -o match:"swapon: adding /dev/md3.eli as swap device" -x "swapon -F fstab.out -a" +} +attach_mdX_eli_cleanup() +{ + swapoff -F fstab.out -a +} + +### +atf_test_case attach_dev_mdX_eli cleanup +attach_dev_mdX_eli_head() +{ + atf_set "descr" "/dev/mdX.eli device should attach" +} +attach_dev_mdX_eli_body() +{ + # if the swapfile is too small (like 1k) then mdconfig hangs looking up the md + atf_check -s exit:0 -x "truncate -s 10k swapfile" + atf_check -s exit:0 -o save:fstab.out -x "echo '/dev/md3.eli none swap sw,file=swapfile 0 0'" + atf_check -s exit:0 -o match:"swapon: adding /dev/md3.eli as swap device" -x "swapon -F fstab.out -a" +} +attach_dev_mdX_eli_cleanup() +{ + swapoff -F fstab.out -a +} + +### +atf_test_case attach_md_eli cleanup +attach_md_eli_head() +{ + atf_set "descr" "md.eli device should attach" +} +attach_md_eli_body() +{ + # if the swapfile is too small (like 1k) then mdconfig hangs looking up the md + atf_check -s exit:0 -x "truncate -s 10k swapfile" + atf_check -s exit:0 -o save:fstab.out -x "echo 'md.eli none swap sw,file=swapfile 0 0'" + atf_check -s exit:0 -o match:"swapon: adding /dev/md0.eli as swap device" -x "swapon -F fstab.out -a" +} +attach_md_eli_cleanup() +{ + swapoff -F fstab.out -a +} + +### +atf_test_case attach_dev_md_eli cleanup +attach_dev_md_eli_head() +{ + atf_set "descr" "/dev/md.eli device should attach" +} +attach_dev_md_eli_body() +{ + # if the swapfile is too small (like 1k) then mdconfig hangs looking up the md + atf_check -s exit:0 -x "truncate -s 10k swapfile" + atf_check -s exit:0 -o save:fstab.out -x "echo '/dev/md.eli none swap sw,file=swapfile 0 0'" + atf_check -s exit:0 -o match:"swapon: adding /dev/md0.eli as swap device" -x "swapon -F fstab.out -a" +} +attach_dev_md_eli_cleanup() +{ + swapoff -F fstab.out -a +} + +### +atf_init_test_cases() +{ + atf_add_test_case attach_mdX + atf_add_test_case attach_dev_mdX + atf_add_test_case attach_md + atf_add_test_case attach_dev_md + + atf_add_test_case attach_mdX_eli + atf_add_test_case attach_dev_mdX_eli + atf_add_test_case attach_md_eli + atf_add_test_case attach_dev_md_eli +} From nobody Sun Jul 13 11:45: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 4bg3Xd6GFgz60qGs; Sun, 13 Jul 2025 11:45: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bg3Xd4lkyz3TF7; Sun, 13 Jul 2025 11:45:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1752407105; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=IGRTOMkBp9jqFtcmZGxEYGTVJvjT1qldEDZCAac7xgM=; b=WxddqVj4He24vQIx0MY8wW83Uu6rAi4nU9rVpQa7jUcZVKSdn2KKscx2DY1Y85cJC2NVrB 88EingIfj9AJfrMy/DZWwxZys7qwfawf/G8B+IBISADQqBY4Qc/Z0aSmxE7C3QDUOyd+VS 1iF69m23Z/OcniIqpX2GzXYU57kTHHeAbBfn2Xr0Eom6JER1ca9hvmXHAbjIwcODX3jgve xuwCLxh0VKY0cOqDi+jNpprOFHeX1Wqs+jN45XL2lfODKcLIm2+P/4qocniOQuh/cBb6Wi l+YU+Mn2D3Wn04q7M0q17Yz0Eo7tHIIj3Z1kcngIRUe6ySO2vYROAAVMUb1uRA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1752407105; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=IGRTOMkBp9jqFtcmZGxEYGTVJvjT1qldEDZCAac7xgM=; b=cdLlymeyydhp/iG52+Lb32PbcQi5pyn+NlqzXhJNd2IZoBoMAbMr++l3x0uRKCBUXEdnLV mvaXRCdqexoidA/ffJLY757exWxz7ZYywVRMwH44PJvstWXWcMsQ1YgxFhLlWdgZwJ+xrk mv8a5+Nh8g8hFfNpzXtWKtjoSvnA/DRzOWGEIKGZ5puzAfd48C4pHBfstHgqwchexpvKpA Kv1uSt6zazELARe1BHoDMwewrxkisMWY9/svAi0qhyL01dY/C1Q2Zlgoi1qHiCcX++VlAf W8XZTbvfr5k+y+fJZDQ/2tr6m0ZYEd3eFyZd0UVSporZWW+Z7UkxXcIK/eIsww== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1752407105; a=rsa-sha256; cv=none; b=pcY43gJol38o10BJQhecf8mDuOyKoseqZ8UB2K4CEZ4TG2gnxUrHB749kQOmo83YlodpJn Iu7lCIU+JOBhfzKtQSCrrvx+TxKFEOCWJCh6iirKkeJpqRNDLzWNVU6Wakx+qqS7eatg+0 Wo3wcydJGGEUUt3gz9Zy9Has9a8EEW8B7XOrk6ScKHGrTxE+vGMAvxWKNxXedFDmZdJKeA jItejyE/QECUgCWUst2sJuYBbXlSthurh0h8u4da/b1q9oEgXIw6oWiMvhs1d4G2Ua2x7M 631Wpz+tSLwXWFmd1AQdp+yuSmEGCiwjkBt1N0zgm875u3+0z5v52jqaIe1sjQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4bg3Xd40m7z16NX; Sun, 13 Jul 2025 11:45: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 56DBj5gC084213; Sun, 13 Jul 2025 11:45:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 56DBj5gd084210; Sun, 13 Jul 2025 11:45:05 GMT (envelope-from git) Date: Sun, 13 Jul 2025 11:45:05 GMT Message-Id: <202507131145.56DBj5gd084210@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ronald Klop Subject: git: af8af9b28c9d - stable/14 - fix parallel execution of swapon tests List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ronald X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: af8af9b28c9d7c60f6f37971dc5b734c7f1bc413 Auto-Submitted: auto-generated The branch stable/14 has been updated by ronald: URL: https://cgit.FreeBSD.org/src/commit/?id=af8af9b28c9d7c60f6f37971dc5b734c7f1bc413 commit af8af9b28c9d7c60f6f37971dc5b734c7f1bc413 Author: Siva Mahadevan AuthorDate: 2025-07-01 09:57:29 +0000 Commit: Ronald Klop CommitDate: 2025-07-13 11:44:36 +0000 fix parallel execution of swapon tests And apparantly the CI env already has an md device so be relaxed about which md device is added. PR: 186252 Reported by: markj Fixes: 1ee33e3a578c35ff0e8ef5db87a8005f1f99546a "swapon: parse md.eli device for encrypted swapfile from fstab" Pull Request: https://github.com/freebsd/freebsd-src/pull/1747 (cherry picked from commit 83b08f40264177ecf03fce808474815816f9846f) --- sbin/swapon/tests/swapon_test.sh | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/sbin/swapon/tests/swapon_test.sh b/sbin/swapon/tests/swapon_test.sh index 3c4286cd6815..b6d31ecaeed0 100755 --- a/sbin/swapon/tests/swapon_test.sh +++ b/sbin/swapon/tests/swapon_test.sh @@ -32,8 +32,8 @@ attach_mdX_body() { # if the swapfile is too small (like 1k) then mdconfig hangs looking up the md atf_check -s exit:0 -x "truncate -s 10k swapfile" - atf_check -s exit:0 -o save:fstab.out -x "echo 'md3 none swap sw,file=swapfile 0 0'" - atf_check -s exit:0 -o match:"swapon: adding /dev/md3 as swap device" -x "swapon -F fstab.out -a" + atf_check -s exit:0 -o save:fstab.out -x "echo 'md31 none swap sw,file=swapfile 0 0'" + atf_check -s exit:0 -o match:"swapon: adding /dev/md31 as swap device" -x "swapon -F fstab.out -a" } attach_mdX_cleanup() { @@ -50,8 +50,8 @@ attach_dev_mdX_body() { # if the swapfile is too small (like 1k) then mdconfig hangs looking up the md atf_check -s exit:0 -x "truncate -s 10k swapfile" - atf_check -s exit:0 -o save:fstab.out -x "echo '/dev/md3 none swap sw,file=swapfile 0 0'" - atf_check -s exit:0 -o match:"swapon: adding /dev/md3 as swap device" -x "swapon -F fstab.out -a" + atf_check -s exit:0 -o save:fstab.out -x "echo '/dev/md32 none swap sw,file=swapfile 0 0'" + atf_check -s exit:0 -o match:"swapon: adding /dev/md32 as swap device" -x "swapon -F fstab.out -a" } attach_dev_mdX_cleanup() { @@ -62,14 +62,14 @@ attach_dev_mdX_cleanup() atf_test_case attach_md cleanup attach_md_head() { - atf_set "descr" "mdX device should attach" + atf_set "descr" "md device should attach" } attach_md_body() { # if the swapfile is too small (like 1k) then mdconfig hangs looking up the md atf_check -s exit:0 -x "truncate -s 10k swapfile" atf_check -s exit:0 -o save:fstab.out -x "echo 'md none swap sw,file=swapfile 0 0'" - atf_check -s exit:0 -o match:"swapon: adding /dev/md0 as swap device" -x "swapon -F fstab.out -a" + atf_check -s exit:0 -o match:"swapon: adding /dev/md[0-9][0-9]* as swap device" -x "swapon -F fstab.out -a" } attach_md_cleanup() { @@ -87,7 +87,7 @@ attach_dev_md_body() # if the swapfile is too small (like 1k) then mdconfig hangs looking up the md atf_check -s exit:0 -x "truncate -s 10k swapfile" atf_check -s exit:0 -o save:fstab.out -x "echo '/dev/md none swap sw,file=swapfile 0 0'" - atf_check -s exit:0 -o match:"swapon: adding /dev/md0 as swap device" -x "swapon -F fstab.out -a" + atf_check -s exit:0 -o match:"swapon: adding /dev/md[0-9][0-9]* as swap device" -x "swapon -F fstab.out -a" } attach_dev_md_cleanup() { @@ -104,8 +104,8 @@ attach_mdX_eli_body() { # if the swapfile is too small (like 1k) then mdconfig hangs looking up the md atf_check -s exit:0 -x "truncate -s 10k swapfile" - atf_check -s exit:0 -o save:fstab.out -x "echo 'md3.eli none swap sw,file=swapfile 0 0'" - atf_check -s exit:0 -o match:"swapon: adding /dev/md3.eli as swap device" -x "swapon -F fstab.out -a" + atf_check -s exit:0 -o save:fstab.out -x "echo 'md33.eli none swap sw,file=swapfile 0 0'" + atf_check -s exit:0 -o match:"swapon: adding /dev/md33.eli as swap device" -x "swapon -F fstab.out -a" } attach_mdX_eli_cleanup() { @@ -122,8 +122,8 @@ attach_dev_mdX_eli_body() { # if the swapfile is too small (like 1k) then mdconfig hangs looking up the md atf_check -s exit:0 -x "truncate -s 10k swapfile" - atf_check -s exit:0 -o save:fstab.out -x "echo '/dev/md3.eli none swap sw,file=swapfile 0 0'" - atf_check -s exit:0 -o match:"swapon: adding /dev/md3.eli as swap device" -x "swapon -F fstab.out -a" + atf_check -s exit:0 -o save:fstab.out -x "echo '/dev/md34.eli none swap sw,file=swapfile 0 0'" + atf_check -s exit:0 -o match:"swapon: adding /dev/md34.eli as swap device" -x "swapon -F fstab.out -a" } attach_dev_mdX_eli_cleanup() { @@ -141,7 +141,7 @@ attach_md_eli_body() # if the swapfile is too small (like 1k) then mdconfig hangs looking up the md atf_check -s exit:0 -x "truncate -s 10k swapfile" atf_check -s exit:0 -o save:fstab.out -x "echo 'md.eli none swap sw,file=swapfile 0 0'" - atf_check -s exit:0 -o match:"swapon: adding /dev/md0.eli as swap device" -x "swapon -F fstab.out -a" + atf_check -s exit:0 -o match:"swapon: adding /dev/md[0-9][0-9]*.eli as swap device" -x "swapon -F fstab.out -a" } attach_md_eli_cleanup() { @@ -159,7 +159,7 @@ attach_dev_md_eli_body() # if the swapfile is too small (like 1k) then mdconfig hangs looking up the md atf_check -s exit:0 -x "truncate -s 10k swapfile" atf_check -s exit:0 -o save:fstab.out -x "echo '/dev/md.eli none swap sw,file=swapfile 0 0'" - atf_check -s exit:0 -o match:"swapon: adding /dev/md0.eli as swap device" -x "swapon -F fstab.out -a" + atf_check -s exit:0 -o match:"swapon: adding /dev/md[0-9][0-9]*.eli as swap device" -x "swapon -F fstab.out -a" } attach_dev_md_eli_cleanup() { From nobody Sun Jul 13 15:40: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 4bg8m71Ch9z617Bf; Sun, 13 Jul 2025 15:40:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bg8m65XSyz42pD; Sun, 13 Jul 2025 15:40:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1752421222; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Z9Y78t1anJnupUmvEjx+wq6fdd8UZmCpZy/OBzkdpbQ=; b=PkfPLEWVfQCinPm2dZthNOYgEXWIw4lkCcnKrq1GKjDNU6FAvQ3TZI5guOYLXk/Nra2lov j9lFv9DjcVenOQGHUzttgNUArq7ZmLUj8U91EH0xKpnho25bKxbMGQnoH/RMC9wKdYKcn2 sLK74UJG4ucRwZ/4LD8pXwO6oR9pq0MYJcij/0WBa55I0SxCtYwKm/zN1Hf3e73vulfzbC 4fHxEKLbB8b4cMbjsr/r2o1WHotQIzA4U0OQ4pM7BAcjHmaob0E1E9yljcN4PFMSMJO8a7 uJNlyL+/git/PvC+47LZ6ul1hLG7gN3Xqyw826Vp4bt1QiAXiY55HPaB/ic5mw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1752421222; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Z9Y78t1anJnupUmvEjx+wq6fdd8UZmCpZy/OBzkdpbQ=; b=P9KY9tzhvX6fd70T3JqH/wMltFmjdOBmqa0BQGHIqWMl69eZhm0M7EneMyhgTfLDXP1BNh lBJWdqRDmmjGA8YHNiG1IKjWB70yD3B5pTmlU73qafiyVLBes2o126AWvNjyETK+odd9xv kguQm3at5smbQGtF/IfcfQ1dl/t3Mb753ZzEt71aQiN+7QijSli6y5UQAGtodmC1C4XqX8 2aSQFPRAVIdADCMAvGWPkh5JudRJbUVVTyfi7eUZAASi1Fj4T9aMp88Mi/4Ap8Buk/e9wY m11MNW3xZEe2BHerGY9GvfKudPm6uAM4wEteNdsgkFyxyY+TOhV9dG0+a3NaGw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1752421222; a=rsa-sha256; cv=none; b=ex0QVvREBdvC7lAJ59AcJuIUa0m+IayXiFaJdfQIXd65GiYpiU+zp/zA0M3eApZdFoibGk FSCIhw/yVzZ9ThuHtt1KUSKMpXohUka5xo0lOs3OeQmrNCrPHACWzumCIVi9exoxZNo73s cwZtfJh0Ysx4zB4QZja2wfuKviLcRTe5M5+Zw/ozLmmH7l9xUV/T4ymoD/KAtZpsQjF5PY 6pObteyIDX0P8tevmhuA9KTWTGDvujpQutf43Wlv442bjF6nQJ+4f628JoAIOAbDfiHdYz 9euOIaaip2HugQB45iFT/dKiMJbadYfERMcbIyVnX1m0ZVgY0DAJQx7DgzvB5Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4bg8m64gg1zRm; Sun, 13 Jul 2025 15:40: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 56DFeMkj032828; Sun, 13 Jul 2025 15:40:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 56DFeMNn032825; Sun, 13 Jul 2025 15:40:22 GMT (envelope-from git) Date: Sun, 13 Jul 2025 15:40:22 GMT Message-Id: <202507131540.56DFeMNn032825@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Eugene Grosbein Subject: git: 8f43b39b1c38 - stable/14 - ifconfig_netlink.c: MFC: optimise non-listing case List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: eugen X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 8f43b39b1c38bde166314d4682daae7bf15a5445 Auto-Submitted: auto-generated The branch stable/14 has been updated by eugen: URL: https://cgit.FreeBSD.org/src/commit/?id=8f43b39b1c38bde166314d4682daae7bf15a5445 commit 8f43b39b1c38bde166314d4682daae7bf15a5445 Author: Alexander V. Chernikov AuthorDate: 2025-07-01 13:16:57 +0000 Commit: Eugene Grosbein CommitDate: 2025-07-13 15:38:58 +0000 ifconfig_netlink.c: MFC: optimise non-listing case This change produced by melifaro and the commit is concerted with him as he is pretty busy IRL these days. The change restores performance of /sbin/ifconfig utility for non-listing case after it switched from rtsock to netlink(4) API in FreeBSD 14+. PR: 287872 (cherry picked from commit b1b17432aa1be670564161232d110461a5dde4ce) --- sbin/ifconfig/ifconfig_netlink.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/sbin/ifconfig/ifconfig_netlink.c b/sbin/ifconfig/ifconfig_netlink.c index 03fe1e418082..11b3595dafe6 100644 --- a/sbin/ifconfig/ifconfig_netlink.c +++ b/sbin/ifconfig/ifconfig_netlink.c @@ -162,7 +162,7 @@ struct ifmap { * Memory is allocated using snl temporary buffers */ static struct ifmap * -prepare_ifmap(struct snl_state *ss) +prepare_ifmap(struct snl_state *ss, const char *ifname) { struct snl_writer nw = {}; @@ -170,6 +170,8 @@ prepare_ifmap(struct snl_state *ss) struct nlmsghdr *hdr = snl_create_msg_request(&nw, RTM_GETLINK); hdr->nlmsg_flags |= NLM_F_DUMP; snl_reserve_msg_object(&nw, struct ifinfomsg); + if (ifname != NULL) + snl_add_msg_attr_string(&nw, IFLA_IFNAME, ifname); if (! (hdr = snl_finalize_msg(&nw)) || !snl_send_message(ss, hdr)) return (NULL); @@ -457,7 +459,7 @@ list_interfaces_nl(struct ifconfig_args *args) nl_init_socket(&ss); - struct ifmap *ifmap = prepare_ifmap(&ss); + struct ifmap *ifmap = prepare_ifmap(&ss, args->ifname); struct iface **sorted_ifaces = snl_allocz(&ss, ifmap->count * sizeof(void *)); for (uint32_t i = 0, num = 0; i < ifmap->size; i++) { if (ifmap->ifaces[i] != NULL) { From nobody Sun Jul 13 15:46: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 4bg8tw57V3z617rl; Sun, 13 Jul 2025 15:46: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bg8tw1l0tz45B2; Sun, 13 Jul 2025 15:46:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1752421576; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Vb6Mig0hCPg7zmImDguDxXkUyTEILL1iIqC0JQOTY78=; b=l1MERIaxG8q7CSOUNF5eP5Md6d17CHN5xQi0Je7TDcbYP0lsqjb3ahvaieBpskSkFWee5j UpAB7pWLVTAK/u+f/7YOz3nWWGs0qCHs1bra3RjDCnXDLkVj8t0kJdI/j0F0hM8y40fzux s1FIMqbbMfGEzm96z1ApIWb//bhjwRjWwGGHfbG79v//ivhiKUKm/MgZvGkYMzK2cNsOPn H0tcuvJoB4YyKKxED/3PlC4dVzmJ+LbNWmr057kW7Sl+sHpo5hN6eOZbBL90yzPgaKUdhB XUjVnH+zz3Xe0MjloCaNIi6JG7yLLdbKqrdxo2u84Bk1RKWB3nYoihZcAnMUjg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1752421576; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Vb6Mig0hCPg7zmImDguDxXkUyTEILL1iIqC0JQOTY78=; b=mqgqCQpdspCj1pojox9vKIUNHv5LGnXtrqo+Ot5FaoPHDzsdFhRl8ErpjcAG1Gze96+g5m fqeXkyCZe8oOEjvaJ835sY8VaUF7Nb/X1NpD3gRQOABnTFB42eyzQEKK2M1EnPaFf32jcM ZQEb0+7lNuVL00QqaalnGYqTAM5+y2iJ6xCXhDIHLych7oCORtCZy7mZuYtOLjQnPR3Ytl AzpZJAHpm1d4LeLgQNKGVsaC91CM+AbGnKmAN8YLLXRz7pMpGTqVz7ksqiZpcCMnqKZV/c yw+K4pQTj1qySZmZyW+HZ8qTYrVWdrKOBB5m2XV4IpJPEsY8DrPypMHCxMNAXA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1752421576; a=rsa-sha256; cv=none; b=uDExggq7LtMkygiiELZv9adhp3CyAv2QvCIiIebI67oVHuvBuyGUgtsUuOGRN4sniSf5mO 3EvL9kNBzBkTJHo4O3sBTv+Y307nNtO8n64RtyRINuZz5H4LvoUFD/YOX/UCQdL2GTrN0E C2gVbDihLWVd30IEDxjI0LWcY2BKbvvFffmhC9y5ufufinmAePeuBWr993S9EWYaO/UBiP 7tD3L/b2czuoraFPK2M33jWks9t3DYUIGKmAwc+RsbojhupDR1szYvXYQJgS2p8ZBX1t3r IsAs5zHVppFkg7x8vicizLbs68dBBzC+B9jsBd3lqC9oL/xsd2/k2+uvCpkFhw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4bg8tw15SCz1CmB; Sun, 13 Jul 2025 15:46: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 56DFkGTt042424; Sun, 13 Jul 2025 15:46:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 56DFkGlF042421; Sun, 13 Jul 2025 15:46:16 GMT (envelope-from git) Date: Sun, 13 Jul 2025 15:46:16 GMT Message-Id: <202507131546.56DFkGlF042421@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Eugene Grosbein Subject: git: a5b6a029eb5e - stable/14 - libexec/rc: MFC: improve performance of pccard_ether script List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: eugen X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: a5b6a029eb5ea6cfd5d285f7a5c08cb2c3b7b052 Auto-Submitted: auto-generated The branch stable/14 has been updated by eugen: URL: https://cgit.FreeBSD.org/src/commit/?id=a5b6a029eb5ea6cfd5d285f7a5c08cb2c3b7b052 commit a5b6a029eb5ea6cfd5d285f7a5c08cb2c3b7b052 Author: Eugene Grosbein AuthorDate: 2025-07-01 14:13:10 +0000 Commit: Eugene Grosbein CommitDate: 2025-07-13 15:44:07 +0000 libexec/rc: MFC: improve performance of pccard_ether script Replace "ifconfig -ul" with "ifconfig -n" because netlink-enabled /sbin/ifconfig utility has sub-optimal performance for listing. Combined with the commit b1b17432aa1be670564161232d110461a5dde4ce, these changes mostly eliminate performance regression of the command "service devd start" for a system having hundreds of network interfaces created before devd starts, after FreeBSD 14+ switched /sbin/ifconfig to netlink(4) PR: 287872 (cherry picked from commit 6d3bc576abbd84f736d917f5bfec4e3fe7e6c125) --- libexec/rc/network.subr | 20 ++++++++++++++++++++ libexec/rc/pccard_ether | 17 +++++++++-------- 2 files changed, 29 insertions(+), 8 deletions(-) diff --git a/libexec/rc/network.subr b/libexec/rc/network.subr index 931fbec19a60..2113a3f66f0f 100644 --- a/libexec/rc/network.subr +++ b/libexec/rc/network.subr @@ -653,6 +653,26 @@ ifexists() ${IFCONFIG_CMD} -n $1 > /dev/null 2>&1 } +# ifisup if +# Returns 0 if the interface exists and UP, +# returns 1 if the interface exists and not UP, +# returns 2 otherwise. +ifisup() +{ + local _if + + [ -z "$1" ] && return 1 + _if="$1" + + set -- $(${IFCONFIG_CMD} -n ${_if} 2>/dev/null) + case "$1$2" in + ${_if}:*']*) return 0 ;; + ${_if}:*) return 1 ;; + esac + + return 2 +} + # ipv4_up if # add IPv4 addresses to the interface $if ipv4_up() diff --git a/libexec/rc/pccard_ether b/libexec/rc/pccard_ether index 7ca58f210085..957983e55a8e 100755 --- a/libexec/rc/pccard_ether +++ b/libexec/rc/pccard_ether @@ -69,16 +69,17 @@ checkauto() pccard_ether_start() { - ifexists $ifn || exit 1 - - if [ -z "$rc_force" ]; then - for uif in `ifconfig -ul`; do - if [ "${uif}" = "${ifn}" ]; then - # Interface is already up, so ignore it. + ifisup $ifn + case $? in + 0) # Interface is already up, so ignore it. + if [ -z "$rc_force"]; then exit 0 fi - done - fi + ;; + 2) # Interface does not exist. + exit 1 + ;; + esac /etc/rc.d/netif quietstart $ifn From nobody Sun Jul 13 15:46: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 4bg8tx4n1Vz617lj; Sun, 13 Jul 2025 15:46: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bg8tx2Qgxz45Gp; Sun, 13 Jul 2025 15:46:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1752421577; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=g7sGl0PtOjzlNhJeF4x349LRvpzaxgpmU3/dnu16qzM=; b=jgLCnwzeuTyg/lWl/P03QjowDB7/odsZLTI6XX9wHI9SvLdtUZZoaRt2k/widcxQTQ+3+f XKAUvYRfqZmitSgTwCq+Z4R9mNYNkYrJWviVAA7DTIqt8z1a49K5wlsdFm25G0wrXKfvPJ ggO1xMbZoT8XWXSSmsrhRkYsuaFCWY9RFaLr2eRGkQEb17mzUpwqngFMmiCxxiMKRdsWwx eXX+/K6MAFopG5PPGZkTO9Cqwyse8+Cka4oWYYYZJUzkGNK+ciPePVAFJR5UAqXCJCV2eF cIPM+8jQ2ntb7lUi8YkyCF9KHuKwwzTGHzAzQLOKCwsitThVHADsB2NaSajC0g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1752421577; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=g7sGl0PtOjzlNhJeF4x349LRvpzaxgpmU3/dnu16qzM=; b=AwL+Xyx2onJCZqkpWUdUqejpTBA55fivOK8st8MvNPKjYt9rztRJDJUgZ+rQ1kw7MzI5nb afmHzVg4MLhk0qr7SPUeLE7kdzIVaFwItTFoRRY8oh2bCmG5x4zmyzMKWunZyiHmjb3+cE Qi+nXLTX4FwXME4zEs6JA9SA3aVaNfzWV9PDY4FIR42tPepWy/WYOzqk+oViJJwwCe80wF wUG9K2OMZbSUvszExe/PBcjhO3FjLSRPwf5FO5CnJnX+AwZPbsYOpTtSw+8R9yFBHSySDD yso7rz9ia/33gWYmg5U0HBL9bw+9pfTKu5jcetHuuhKEC2TSL+o7V6rXZVzKGQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1752421577; a=rsa-sha256; cv=none; b=dTWYEx1ZlkgoLD6npTSTuqdkXdJWH7/vTLDsMwuuOSQNi9PJyRcD8Xn94GgI/9EyDsmDb2 hHiY15KJztgQ+NppuBC3RuUgtbVG/YIUhPPzYKfBIzXjMQ04RFt4+ysq+2I58bpisQQPdI ODzBi/yxMYOadaejAlKH6Ha8kf32XLeKKABdlr6yPoaA7IY+pOGI1hj/j3+HSYH+t6/zxy /85laYXNBHhWCbBKGuZjF+9hD0uJY8MXx/5jdS+8V8nnqsInntCdZLXwcwWYx4IM3IzbC1 3Jvp/vtBmzWFCQfvpsQyR81eMHZWb0nVfjYmRgh4dpPYtMVTCLkdqu+Qd6OThA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4bg8tx20h1zDN; Sun, 13 Jul 2025 15:46: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 56DFkHJl042463; Sun, 13 Jul 2025 15:46:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 56DFkH88042460; Sun, 13 Jul 2025 15:46:17 GMT (envelope-from git) Date: Sun, 13 Jul 2025 15:46:17 GMT Message-Id: <202507131546.56DFkH88042460@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Eugene Grosbein Subject: git: c4673251c979 - stable/14 - network.subr: MFC: correct return code in case of bad call to ifisup() List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: eugen X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: c4673251c9793353d52ed2e56b54fd6557466ac1 Auto-Submitted: auto-generated The branch stable/14 has been updated by eugen: URL: https://cgit.FreeBSD.org/src/commit/?id=c4673251c9793353d52ed2e56b54fd6557466ac1 commit c4673251c9793353d52ed2e56b54fd6557466ac1 Author: Eugene Grosbein AuthorDate: 2025-07-01 14:33:19 +0000 Commit: Eugene Grosbein CommitDate: 2025-07-13 15:45:41 +0000 network.subr: MFC: correct return code in case of bad call to ifisup() This is rather cosmetic correction. PR: 287872 (cherry picked from commit 24e8ed535ff673b9ea751c3d3b2a68ef0a29b0e2) --- libexec/rc/network.subr | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libexec/rc/network.subr b/libexec/rc/network.subr index 2113a3f66f0f..5e4f2c1f39a0 100644 --- a/libexec/rc/network.subr +++ b/libexec/rc/network.subr @@ -661,7 +661,7 @@ ifisup() { local _if - [ -z "$1" ] && return 1 + [ -z "$1" ] && return 2 _if="$1" set -- $(${IFCONFIG_CMD} -n ${_if} 2>/dev/null) From nobody Sun Jul 13 15:49: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 4bg8yQ2w11z617mK; Sun, 13 Jul 2025 15:49: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bg8yP3sNGz46qH; Sun, 13 Jul 2025 15:49:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1752421757; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+xULdIiDagW9gW0u3fF/2vF+tR/xuWTdMo7V4hMj9lU=; b=I3EwC7xeGpBKXS0EfijNI8UyuEPRIc3A56pQ1LzEhz7WiDjsQFvSWx3NhpfZmdv+QDrski Ft/2341B9dTolrv76J3kyzibqmbW/Rrm6V6/KERgujs9B2tCTZx6XV8mqK+zkE2COaVJOu jLWum5eM6WriJevfAoHpro63WY2VzF5sO6Yjg9X5jj4VIIZT2d13j0skIqP/Diroguh/9u xvNA0tPJdSbtd7VJ+xj8G2K4PDvef1wPYsYFvrNgBebo8X5eRkkSe5rd/yaqb970rtNyZ9 PFP7NG3g6gONfk2D+3jVMxV+jSVjvplQmH3F5uhHImZpvyqfWkIcoWF8xErsmA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1752421757; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+xULdIiDagW9gW0u3fF/2vF+tR/xuWTdMo7V4hMj9lU=; b=SJQcEPS35wqXp5AJXnM4BlWT4PMLZytX/INWq6Nmkim2En9RUh/yYe/GGfmf9yQPa/NkwS PFUuBVTVHzTRNKW9fGKWn72elZJc7bL1gD21fuuaeC2mOvCBzfnNVzfSMCzr7S59UScT9K MtJY3AiPk23vcSQ0FZhUjOrBmwvjQY7Sl0GtthXgGixkxOHf/AWpbP9l7Aof1ewJduDwWD aG4yXxtXeBAShwVHlve3RoOqI9hwhMAGEbjhmf+d3gVCpuK3dMGcsh0sPSUm6/OqBpzNV2 i1NhZ52B2JFEbdsPU3emt+NWrI1zlk3okAOxqJQ+zCSYHW66z9Ayq0suTMh3aQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1752421757; a=rsa-sha256; cv=none; b=G2Aq1N6O95wzT3GcaKarn0AqfzkahkdslrkFJkd3bRlgKxV1/2R7KWFazmAikce7zDoBE+ 5NLyAPDYf9G+l1deobEGPvuHTL9Tams4msn9GS4Hw0uYmlE6rdHUp2W7UbKnbuBrF17fMy x++zDJamORmMcnRGlBUFP4JUR6NsHU/ZKDcCqgD6YtK0AzBOT9wTZZZmX37fVXItwQRt5P dTAwXXC7wPNChKaIR4TJCzps57sTjSf72G9tZ5WRc3aV3MSefBInmwQISBgk3EoWcaBDUD gH0DOjwci5wVWH3FbiWH8U+wnlhPkIdagmUjvpM0kRsL7wrZMp2xzPVINz0wuw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4bg8yP2shtz9p; Sun, 13 Jul 2025 15:49: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 56DFnHlM043477; Sun, 13 Jul 2025 15:49:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 56DFnHBR043474; Sun, 13 Jul 2025 15:49:17 GMT (envelope-from git) Date: Sun, 13 Jul 2025 15:49:17 GMT Message-Id: <202507131549.56DFnHBR043474@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Eugene Grosbein Subject: git: 5d15e09a26c6 - stable/13 - libexec/rc: MFC: improve performance of pccard_ether script List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: eugen X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 5d15e09a26c6b08fc0d5cd7deca082ba5b9cabd4 Auto-Submitted: auto-generated The branch stable/13 has been updated by eugen: URL: https://cgit.FreeBSD.org/src/commit/?id=5d15e09a26c6b08fc0d5cd7deca082ba5b9cabd4 commit 5d15e09a26c6b08fc0d5cd7deca082ba5b9cabd4 Author: Eugene Grosbein AuthorDate: 2025-07-01 14:13:10 +0000 Commit: Eugene Grosbein CommitDate: 2025-07-13 15:48:37 +0000 libexec/rc: MFC: improve performance of pccard_ether script Replace "ifconfig -ul" with "ifconfig -n" because netlink-enabled /sbin/ifconfig utility has sub-optimal performance for listing. Combined with the commit b1b17432aa1be670564161232d110461a5dde4ce, these changes mostly eliminate performance regression of the command "service devd start" for a system having hundreds of network interfaces created before devd starts, after FreeBSD 14+ switched /sbin/ifconfig to netlink(4) PR: 287872 (cherry picked from commit 6d3bc576abbd84f736d917f5bfec4e3fe7e6c125) (cherry picked from commit 24e8ed535ff673b9ea751c3d3b2a68ef0a29b0e2) --- libexec/rc/network.subr | 20 ++++++++++++++++++++ libexec/rc/pccard_ether | 17 +++++++++-------- 2 files changed, 29 insertions(+), 8 deletions(-) diff --git a/libexec/rc/network.subr b/libexec/rc/network.subr index 931fbec19a60..5e4f2c1f39a0 100644 --- a/libexec/rc/network.subr +++ b/libexec/rc/network.subr @@ -653,6 +653,26 @@ ifexists() ${IFCONFIG_CMD} -n $1 > /dev/null 2>&1 } +# ifisup if +# Returns 0 if the interface exists and UP, +# returns 1 if the interface exists and not UP, +# returns 2 otherwise. +ifisup() +{ + local _if + + [ -z "$1" ] && return 2 + _if="$1" + + set -- $(${IFCONFIG_CMD} -n ${_if} 2>/dev/null) + case "$1$2" in + ${_if}:*']*) return 0 ;; + ${_if}:*) return 1 ;; + esac + + return 2 +} + # ipv4_up if # add IPv4 addresses to the interface $if ipv4_up() diff --git a/libexec/rc/pccard_ether b/libexec/rc/pccard_ether index 7ca58f210085..957983e55a8e 100755 --- a/libexec/rc/pccard_ether +++ b/libexec/rc/pccard_ether @@ -69,16 +69,17 @@ checkauto() pccard_ether_start() { - ifexists $ifn || exit 1 - - if [ -z "$rc_force" ]; then - for uif in `ifconfig -ul`; do - if [ "${uif}" = "${ifn}" ]; then - # Interface is already up, so ignore it. + ifisup $ifn + case $? in + 0) # Interface is already up, so ignore it. + if [ -z "$rc_force"]; then exit 0 fi - done - fi + ;; + 2) # Interface does not exist. + exit 1 + ;; + esac /etc/rc.d/netif quietstart $ifn From nobody Sun Jul 13 19:31: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 4bgFtG1WzQz61NCs; Sun, 13 Jul 2025 19:31:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bgFtG0ZdCz3k09; Sun, 13 Jul 2025 19:31:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1752435062; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8b58XgNvL8NPPwQ8e7wsD2XtVOD/NzrSHjyGEgXt+nU=; b=Qona6dos7gPN4CokOtjVQMtOrwCr1FNXR5d6A9kjgcKuLtS8tggOjRhvZN6ngkIzlP632M xI1Lye9ZrbDOOV5SzRqKiNJxRyMaH9qzEJJPPs8CpWYn/Erz2N2OaCSWy6v44i25n0xQfn uOeGIeO88h2uUYj0digPKzF2WLaVT+Yi6dhpqBdpJBWccJkAdFjbGNvJoVFbCW6B5Ak95E I4yeVWqIlyqEkprG2Y66bvLsUnlTje6/UzMia/kTUWyNifpVC90jNu/kNagg2rXbHnexch C8fYDdFC58kEKaN+NhxELXQ5pPaa43fyu8dKPKv1X6MS/fS/7NLL+0J5Nnpbtw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1752435062; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8b58XgNvL8NPPwQ8e7wsD2XtVOD/NzrSHjyGEgXt+nU=; b=SRuVWp0/zpsBCbfKrb89+NostADwHL3U2YIaLxyGPupVSU5TqkwLZ6g++4lZXqo6zClDNJ YReMigdVe+Tvd6GyXvevsZnvGI5BKCZpoxLYRsOz+SE+Tzw2dHhoJC3Tq6KMfLWGBjk+tr vnOjGtydkNMjjPehmW5PX6JjeYBtqtd7UliOqYbidC5UEHKYhK/uNu9uXYqXgXPjrqOgP6 B/qR12ywg2AnIUtbrHVKqkgu/gRzZGe9q4UGPGxaQfpgNL8OIYaxDKdmzMWgWLSwT62UUH h0aFFTQJIhK3ACVqhuRrYe6G8J1LCiwkYvuNSkm/KBn+yACJOQZav+kOVRV8aQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1752435062; a=rsa-sha256; cv=none; b=u8wUm/OkoIDWCRojEUPSs1Tt9HiUINbanIJxyC5g0MWqlcbudKsD+u6B4DCwsv9bE03vOo OL0HIUFq734z2MFuKxGGiaHJ00H7FOpyJsAil2juMVh27CcWQ2R+O1//1iUMN056zw22O5 pO2ZBo0C1xG42I/WmOpVLYcic1EQCqsjVB0wFVjtOzZoQTv0Ta4/dt0TyOql64ue6dB1u6 m4pJ1CYf01nZF+o1/+AWjaiZViIMMdRwz4Lp2XHMwswG65Rd4d9o4Qlx4+kJvQvC5TbKpY UgXcEYMzMvJ/u5CUUMjCc2p3PFNXWiRLQYTh+mht7+4bZZbJ93vN7vzS9CIzqw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4bgFtG07M2z69v; Sun, 13 Jul 2025 19:31:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 56DJV1mf069455; Sun, 13 Jul 2025 19:31:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 56DJV1tr069452; Sun, 13 Jul 2025 19:31:01 GMT (envelope-from git) Date: Sun, 13 Jul 2025 19:31:01 GMT Message-Id: <202507131931.56DJV1tr069452@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: c87176dd16ab - stable/14 - fwget: pci_intel_video: do no log on no match List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-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/14 X-Git-Reftype: branch X-Git-Commit: c87176dd16abdf3d957589eccf5c2864687e2674 Auto-Submitted: auto-generated The branch stable/14 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=c87176dd16abdf3d957589eccf5c2864687e2674 commit c87176dd16abdf3d957589eccf5c2864687e2674 Author: Bjoern A. Zeeb AuthorDate: 2025-06-18 16:50:18 +0000 Commit: Bjoern A. Zeeb CommitDate: 2025-07-13 19:25:01 +0000 fwget: pci_intel_video: do no log on no match We should never "log" a statement on no match for a given device we do not know about. We do not control the PCI ID assignments and thus cannot predict if we would even support such a device. This also triggers an invalid output in the installer. Leave it as log_verbose for now. Sponsored by: The FreeBSD Foundation PR: 287639 Reviewed by: manu, emaste Differential Revision: https://reviews.freebsd.org/D50916 (cherry picked from commit f1f71cc717aa672caf046ffe1f3dd77e622b8b35) --- usr.sbin/fwget/pci/pci_video_intel | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr.sbin/fwget/pci/pci_video_intel b/usr.sbin/fwget/pci/pci_video_intel index 3824c4a49ffb..2f9012ed1f52 100644 --- a/usr.sbin/fwget/pci/pci_video_intel +++ b/usr.sbin/fwget/pci/pci_video_intel @@ -72,7 +72,7 @@ pci_video_intel() addpkg "gpu-firmware-intel-kmod-alderlake gpu-firmware-intel-kmod-tigerlake" ;; *) - log "No package found for device $1" + log_verbose "No package found for device $1" ;; esac } From nobody Sun Jul 13 19:31: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 4bgFtH49Zgz61NFq; Sun, 13 Jul 2025 19:31: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bgFtH26Myz3k0L; Sun, 13 Jul 2025 19:31:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1752435063; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Sp4CqLkLYU3uCftCUyGaiPFsT6sQOMJnWCeqm9w6m50=; b=hq0Xw09CQYxFwT7WeGJ9FMWEBlBJgIVoUxjSMxO1kt2R/EP+ur6wBjI4zIzClZj5AXknd5 DT/fEj57VA3Qdlm430K/1oEfxRzH09q9H1gNM1J6ZbDs9jThhMHklHHvE87XGsXI+Q0WQ3 EVQWeJv8mutnQyGt/UHypVoYYuODb/47HMflPd1mzDNfNcnNg3KWGZv1BeSAh9oDvcsr4C iLWSp+SqY6/yhZG/6Ds1H+A/klLwBRZ/naZk0jw8yCdAi/szlM268gtzYHD7KU6sPZ2eUv IhaYELcJND/+34SLK/m/5DNhUovqNTinTiWyf4/Obb/tWvmQ3HY4+3BU7c2gOQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1752435063; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Sp4CqLkLYU3uCftCUyGaiPFsT6sQOMJnWCeqm9w6m50=; b=a3TJ3HgtLTEdM4/YsOvmRbFFSCAZFJtq7mVw5gnvAbJdZC5HWcda6ZBh1QCpjehJFdQd1s kPkk9pGM+8eNs7ufL/s3s8FZ8SDqkcmuzJtOJW0IAuzgw5fVoG7kgaL9IHSe+2pwv6MwnD auOmbcxbHlecDcYehCfzQ7V2ds6SACDG7BOarJFVkoGn6tRtcp20x44/Vtoj00GCYzRnO+ 6IRMB1b4i6kARy79/FqqPkRaHvDVtQKD1MF81FfOxYcnjFhXKVKR+AD5SqtVLJpnsrrLDv wLlYibsX5/JlS8cpR2vHHNLyvkNQWPK2lwupwhKrH3H/miOujApenPQYntBYDw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1752435063; a=rsa-sha256; cv=none; b=BAKQAvoswKEa3dapWjeiEC3t/46RadXISeqS+HTrlzF/O3h5ubeOF+0ydYvCeDPfrv+9Wt V6i4GBvWHyEPGo/JjjjiH7ncnoyitPGsuX1QeooS8ja1eO+iALX5ohUqcPmnygU62ApL+m qlO1dir0s5D0uadH3ELwEwEIweRPVHinA1DXnwhEd3Bfx6exALaGNyDbvAhnWPq/vb18h+ BELBfRw6fdGMaW+PD0+zYqyhzl+lOqiFMChuhK5gmcAmOnotQZDP0ix67xnI54Xu5uG8uG aJpl9q9HVCz87IpSAOeD+kWJOCIvaddZJQ8rANQWE5HqzcneVrkT1Z0rAxkWDA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4bgFtH0tD0z6Yk; Sun, 13 Jul 2025 19:31: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 56DJV3Zq069496; Sun, 13 Jul 2025 19:31:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 56DJV3wJ069493; Sun, 13 Jul 2025 19:31:03 GMT (envelope-from git) Date: Sun, 13 Jul 2025 19:31:03 GMT Message-Id: <202507131931.56DJV3wJ069493@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: 5c16917bac65 - stable/14 - net80211: in ieee80211_sta_join() only do_ht if HT is avail List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-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/14 X-Git-Reftype: branch X-Git-Commit: 5c16917bac65f6d44ec8208861ace61835d38825 Auto-Submitted: auto-generated The branch stable/14 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=5c16917bac65f6d44ec8208861ace61835d38825 commit 5c16917bac65f6d44ec8208861ace61835d38825 Author: Bjoern A. Zeeb AuthorDate: 2025-06-18 21:58:20 +0000 Commit: Bjoern A. Zeeb CommitDate: 2025-07-13 19:25:02 +0000 net80211: in ieee80211_sta_join() only do_ht if HT is avail In ieee80211_sta_join() there are currently two ways to set "do_ht": (1) after checking HT IEs are avail, and (2) after checking VHT IEs are avail and we are not on 2GHz. In the latter case no one checks that HT IEs are available and when we hit ieee80211_ht_updateparams_final() htinfo may be NULL and we panic. Avoid this by only checking for VHT if do_ht was set. No VHT without HT IEs. While here switch do_ht to be a bool. Sponsored by: The FreeBSD Foundation PR: 287625 Fixes: 51172f62a753f Reviewed by: adrian Differential Revision: https://reviews.freebsd.org/D50923 (cherry picked from commit f51c794cbc80682931d47264e3c18329bae0a2c1) --- sys/net80211/ieee80211_node.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/sys/net80211/ieee80211_node.c b/sys/net80211/ieee80211_node.c index ae22dc036bb6..288f25ec9681 100644 --- a/sys/net80211/ieee80211_node.c +++ b/sys/net80211/ieee80211_node.c @@ -939,7 +939,7 @@ ieee80211_sta_join(struct ieee80211vap *vap, struct ieee80211_channel *chan, { struct ieee80211com *ic = vap->iv_ic; struct ieee80211_node *ni; - int do_ht = 0; + bool do_ht; ni = ieee80211_alloc_node(&ic->ic_sta, vap, se->se_macaddr, __func__, __LINE__); @@ -1015,6 +1015,7 @@ ieee80211_sta_join(struct ieee80211vap *vap, struct ieee80211_channel *chan, * association request/response, the only appropriate place * to setup the HT state is here. */ + do_ht = false; if (ni->ni_ies.htinfo_ie != NULL && ni->ni_ies.htcap_ie != NULL && vap->iv_flags_ht & IEEE80211_FHT_HT) { @@ -1022,7 +1023,7 @@ ieee80211_sta_join(struct ieee80211vap *vap, struct ieee80211_channel *chan, ieee80211_ht_updateparams(ni, ni->ni_ies.htcap_ie, ni->ni_ies.htinfo_ie); - do_ht = 1; + do_ht = true; } /* @@ -1031,7 +1032,7 @@ ieee80211_sta_join(struct ieee80211vap *vap, struct ieee80211_channel *chan, * * For now, don't allow 2GHz VHT operation. */ - if (ni->ni_ies.vhtopmode_ie != NULL && + if (do_ht && ni->ni_ies.vhtopmode_ie != NULL && ni->ni_ies.vhtcap_ie != NULL && vap->iv_vht_flags & IEEE80211_FVHT_VHT) { if (IEEE80211_IS_CHAN_2GHZ(ni->ni_chan)) { From nobody Sun Jul 13 19:31: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 4bgFtJ4f8Cz61N7W; Sun, 13 Jul 2025 19:31: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bgFtJ2R11z3jsD; Sun, 13 Jul 2025 19:31:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1752435064; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=TervRr0d2+L6Gsf4rVBSzJiBJ+uNjCRY/03R3Hx5D20=; b=NTfnNH/xqHwa6CLtDddiYTtVtR2jDQjOYaTUbZECKH7VcurYpseVVqCBjhv7QxDZddAptv ZN0foD83snxp3ATbKzklAJHxAtJesvHuFjFqEYhEdPnKu2UWosyIEZFNRPYczyimxaGZ7N oIOVDlYCELi0JLppsT29ho0t0cttVqJF7kIoLdYLe8xpknhcLnXgRjWDqQe4vq2Gdufo8y SBOlayKmvU4ymzycKj1O9G8jR+armviAB7uWEa8IxzaJqNnXuRZG/Sn0JEjx+tkvisNcTp o1qjqYytpMiC0zyfDWhQxZLI0EocX8ZUNvRWR7mZ3uE/tdxuQml07gN2AigteA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1752435064; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=TervRr0d2+L6Gsf4rVBSzJiBJ+uNjCRY/03R3Hx5D20=; b=yH9r5zRnyXSLYLGlMiIukye028PBJeR8y4xI1be4BtLFOd1FPgbuOUnWvV+GVVHwXjb4VA 9IqU9cAShuEGUQcI4WYMhgNbrMI/ut73IKSLxYgwnnZqnwXD5xhcgxkJp7GhQdzB5dyuO/ 4vFopMA2xU+LhH5BB3yKyh1Gd5MLkCoTYw2s167H4LJ5nOYdrN49Nam1O4oQSjkyWk4x56 ncdmWWkl2RtslxJG66ZKaYqw2DDWedyimafCE0O6DZoevByICmqESjhaic3Bmx6VSoYgDg 67c7qn/Z1U7A9WRkAV2kUbsY64uxBdHd3fcO+me6kEbc7i2gpxJ6TVijCRuc0Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1752435064; a=rsa-sha256; cv=none; b=wprNpIatc4931d+liolw56x4zAQjUhWJVMz0DP2Gn2SDG1ODoWY2RSQZerwGv078VK8Jka ex8IBhVKpx8ME99ScPwEBK6PQpAFqHkuX7zG3dYXKfzfyzzU2N+Q6yVAEWSKCAXJdLmelZ dElq1BAF0Pl1kDaKycjcfR7wq1t4/DNZT+zpOY9NziMPAT5QGElS2lep/qodHToG1iVsLI H848/IJySZEwb5G1uibT3asseNCbIWl9n8/a9G75A/zfyOTnMXIW09bmoWDoEBMfcnx+4n /a64rt+3jbQy2qguSytTg5rG8QI27H2FpmxZBdWi6+JhveW2kwFlms8VIXjDGg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4bgFtJ1qMYz6Fx; Sun, 13 Jul 2025 19:31: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 56DJV4wr069544; Sun, 13 Jul 2025 19:31:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 56DJV4ns069541; Sun, 13 Jul 2025 19:31:04 GMT (envelope-from git) Date: Sun, 13 Jul 2025 19:31:04 GMT Message-Id: <202507131931.56DJV4ns069541@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: 1f2679e83362 - stable/14 - net80211: regdomain: ETSI: add missing 11a and 11na entries List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 1f2679e83362eb49d036a2f8b66c602c68ec5c04 Auto-Submitted: auto-generated The branch stable/14 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=1f2679e83362eb49d036a2f8b66c602c68ec5c04 commit 1f2679e83362eb49d036a2f8b66c602c68ec5c04 Author: Bjoern A. Zeeb AuthorDate: 2025-07-05 01:47:13 +0000 Commit: Bjoern A. Zeeb CommitDate: 2025-07-13 19:25:02 +0000 net80211: regdomain: ETSI: add missing 11a and 11na entries The frequency range 5745-5865 (channels 149-173) wrongly has a VHT160 channel listed (going up to 5885/177 which is not avail in ETSI) but no 11a, 11na listed. Add the 11a and 11na in addition to the 11ac 20/40 and 80. Turns out the VHT40 entry for 5805-5845 was also missing. We already had the neccessary setting for taiwan, so just adjust the freqband ref. The problem is that without the 11a base channel ieee80211_find_channel() in ieee80211_lookup_channel_rxstatus() will fail and sta_recv_mgmt() will not get the correct channel but will use ic->ic_curchan (which is not updated on scan offloading) and the scan result entry will be added as channel 1. Sponsored by: The FreeBSD Foundation Reviewed by: adrian (previous version) Differential Revision: https://reviews.freebsd.org/D51163 (cherry picked from commit 07948e050808158567c0ca7d345ad035115c0d88) --- lib/lib80211/regdomain.xml | 44 ++++++++++++++++++++++++++++++++++++-------- 1 file changed, 36 insertions(+), 8 deletions(-) diff --git a/lib/lib80211/regdomain.xml b/lib/lib80211/regdomain.xml index 9116e54c31cf..16b74445f429 100644 --- a/lib/lib80211/regdomain.xml +++ b/lib/lib80211/regdomain.xml @@ -494,6 +494,10 @@ IEEE80211_CHAN_PASSIVE IEEE80211_CHAN_DFS + + + 13 + @@ -548,6 +552,14 @@ IEEE80211_CHAN_PASSIVE IEEE80211_CHAN_DFS + + + 13 + + + + 13 + @@ -645,7 +657,7 @@ IEEE80211_CHAN_DFS - + 13 IEEE80211_CHAN_HT40 IEEE80211_CHAN_VHT40 @@ -658,13 +670,6 @@ IEEE80211_CHAN_VHT80 IEEE80211_CHAN_DFS - - - 13 - IEEE80211_CHAN_HT40 - IEEE80211_CHAN_VHT160 - IEEE80211_CHAN_DFS - @@ -2304,6 +2309,29 @@ 20 20 IEEE80211_CHAN_A + + 5745 + 5865 + 20 + 20 + IEEE80211_CHAN_A + + + 5745 + 5865 + 20 + 20 + IEEE80211_CHAN_A + IEEE80211_CHAN_HT20 + + + 5745 + 5845 + 40 + 20 + IEEE80211_CHAN_A + IEEE80211_CHAN_HT40 + 5660 5700 20 20 From nobody Sun Jul 13 19:31: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 4bgFtK6xrtz61N0k; Sun, 13 Jul 2025 19:31: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bgFtK4G8rz3k7R; Sun, 13 Jul 2025 19:31:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1752435065; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zijFVUNoeO5Y6mHlcnl65iyA5covviLopwZt/Ddztlk=; b=lWKt9o7yySltd0Vh8d/ah09i+jTnAuRn9jwgvl/9mNlvcZz8ydF2NCTtKCHzIuWSwcVFOJ riqTc8mAb/Rtz7KQbb+/3z7MzoVYoCQf1lXCmi8GOlkQFdEzzPw9ILUisMevv6zMi9jb8n 9vnycBihkizMgGHgotF58+6IkCRN6bRYdVz7grh8U+rO4syJ8DgVCJlu56b8fSu0FczNoB nuhrnMxi0nFrR59auLiRZeRDy3J5lS8S/woX/8IsfiDzWV4lgyST5/6liub0gc/reNWOE4 VeEdNGj5U/qBUq9/ticSO7guXn577PRQJctQdr/FfYpcv+qacrjyYyiwZPd5Tw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1752435065; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zijFVUNoeO5Y6mHlcnl65iyA5covviLopwZt/Ddztlk=; b=akKmzKpx4i+U4SwOxfChe0nblK3G7AzkqQarnO6wka0WU8uGu0dJ5g3n3jpKZKe3qvNgSS X93oXcJACzIWRcELTtEglEMveGL6m7a9gXPbgOpx7lv7esH+fJvQr5wNuTigCUlxTEcfzu DHM1Dr7+zOtrBPsUU6/FRvbvhWyuc4wQimUdZ5htsjCalILvQpYXNukCYChrYGoUEzV/hH SMp2perKJUKwOqfgae3Hi9eVecUv1bL66cC1JPrA20OCKstkaiEs46sPeVeve/jwrRXwmP ykakdeCZZrsotx8ZJa1EK22ZyyK6MRIj5ID3gr6Q2bYC5EgYICqErtoSxpbmBA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1752435065; a=rsa-sha256; cv=none; b=ktZxBt9SbbLjxV+yL8zDRI7q56t5e20dglcr/ozuHUXOm4wDzwWQ12d6Xv2TBcu6sWpwqM AAK3JDybUCJfF/dPFd3/Ejc+UMUwpgEVDs7mwgWdG97tNBJmcxaf/xKrKzfQYC5j0PsPAZ LH0f8Eb1MSdbdB4Fl7SXbMTmpQt9hRiNFcV3MF7MkEG/WWEN5hODIV8SjOPdoAgwudwjlb ezoSPO/RtuclvYjw01SEp+lV5CKoFCpqJZpHF2aOCAZNk2yKEiy8Pda2JJLUrQe7KgPcsE tc9cNn2lFks13Q2CZEZ81EnfFDOPapYhDmBYLkmOJz8PXM56nRK1KvnnfMq9Xg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4bgFtK3kh8z6S2; Sun, 13 Jul 2025 19:31: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 56DJV5be069580; Sun, 13 Jul 2025 19:31:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 56DJV5sq069577; Sun, 13 Jul 2025 19:31:05 GMT (envelope-from git) Date: Sun, 13 Jul 2025 19:31:05 GMT Message-Id: <202507131931.56DJV5sq069577@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: 48c4eac328ea - stable/14 - bwn(4): BWN_GPL_PHY: make compile again List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-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/14 X-Git-Reftype: branch X-Git-Commit: 48c4eac328eaffe4eed0461d75e6c2bb463b3efc Auto-Submitted: auto-generated The branch stable/14 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=48c4eac328eaffe4eed0461d75e6c2bb463b3efc commit 48c4eac328eaffe4eed0461d75e6c2bb463b3efc Author: Bjoern A. Zeeb AuthorDate: 2025-06-22 00:15:38 +0000 Commit: Bjoern A. Zeeb CommitDate: 2025-07-13 19:25:02 +0000 bwn(4): BWN_GPL_PHY: make compile again compiler complains about error: comparison of different enumeration types ('bwn_phy_band_t' and 'bwn_band_t'); so use the correct enum value. Sponsored by: The FreeBSD Foundation PR: 287695 Reported by: (tom.mcclean gmail.com) (cherry picked from commit 2f16c8d4fa0f5788d52d74fa875c386c475249ec) --- sys/gnu/dev/bwn/phy_n/if_bwn_phy_n_ppr.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/gnu/dev/bwn/phy_n/if_bwn_phy_n_ppr.c b/sys/gnu/dev/bwn/phy_n/if_bwn_phy_n_ppr.c index edba922ffb58..ec1f0f69f615 100644 --- a/sys/gnu/dev/bwn/phy_n/if_bwn_phy_n_ppr.c +++ b/sys/gnu/dev/bwn/phy_n/if_bwn_phy_n_ppr.c @@ -247,7 +247,7 @@ bool bwn_ppr_load_max_from_sprom(struct bwn_mac *mac, struct bwn_ppr *ppr, } } - if (band == BWN_BAND_2G) { + if (band == BWN_PHY_BAND_2G) { uint16_t ck2gpo; error = bhnd_nvram_getvar_uint16(sc->sc_dev, BHND_NVAR_CCK2GPO, From nobody Sun Jul 13 19:31:06 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4bgFtL4pPxz61N1s; Sun, 13 Jul 2025 19:31: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bgFtL3Mh9z3k2g; Sun, 13 Jul 2025 19:31:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1752435066; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=EYdi4Xyhin51kEdn0Hs7Nr6s68rSK1/Ts8V3QTDhmc0=; b=jyQXgYRpM0VosHe4khJpEToCG8qbPrVgfVouVDWc59YLkn7hodnqijv5zv9mCC8G8VbA3s fmdUhkghdSQfnGX1Hleetzua582d+0IHm1K5JoQE070mio+kvGd6Ys/K9iiSmyBl4mhv3m ruFc1/lBE1Ra+eWUwYfGWGqgVV1wiCTOJALWjXhGAXjaByv0+qEGNGCQBBgokA2jeHMMNJ 9V/pK6h2IllFhb+sLSUXiMw5HcpdUvLOoiiUGL0pD/dI4j2I8bijlkAc8mg8yyIpoZ3FsM OcMJEQbsuw5FCgEjRkzoQJOiw6uf77o4OL6CzXiLAZ8qYQEDqJDzOrM+e3zIxA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1752435066; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=EYdi4Xyhin51kEdn0Hs7Nr6s68rSK1/Ts8V3QTDhmc0=; b=nSrovRBaWi1wdaCJNYLUOigJq81axtIqYRr8Yh6xKjPZkv+4zswOmh+u42RBvurN1K6e+a rvfDPTuQiubOrHkJ8zfTYC8TT2JHL6QWywoLS2Fo573+5/ivpAkDkHr5OJlblF/4ZEgsv9 HARtlxyTW37L/9K0YlJVCHqC3/y+oPB2QfqMmgnpvkFrXqSE8fIcP2Jy70t/YzrpMIL2mq JPE8OGpjwB8FKNelz55N/5KUaAA7mWNSQwm31E91crPT9DtTFXXscH7VSB8mCPadsDmT5z OSMn4hBCs9K45I1dxFHeLTftKYuUu2mXFUdhlYUcRvdi1XzJ5gne0t1SQA/uLA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1752435066; a=rsa-sha256; cv=none; b=cuOU1RlC7ZjQAsrg+Z6AcyEKkUCPoD/jv3s9QBrC3NvuArktr0JhO2hERGlfjdokwFB/dx keHAZVemKWk93p3pq0sPhs0FXMzwsHljqZqUUPFLz1wno9RdefVO/2YzI2t1u3IVtNvsYB vADhrY5z5DCbBk1cy64FlVO0HFGGUWh0VPjm1kWWH4lTYxcMfqZSSAfgTuQBP+9fkrIITu RFb4rI3cOFRgX4JTsBHeRnU2ySvQHkHbOsdFhPBqW2ha+lxEJcUH+hQlfnhc4SqZ7ho3CN vd/iHUF8SuX899U9V0OgFrvEo/5aBOMw5oBxyf11asWcqkZt8AKa0wCA35BGvw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4bgFtL2ykrz650; Sun, 13 Jul 2025 19:31:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 56DJV6db069617; Sun, 13 Jul 2025 19:31:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 56DJV6v5069614; Sun, 13 Jul 2025 19:31:06 GMT (envelope-from git) Date: Sun, 13 Jul 2025 19:31:06 GMT Message-Id: <202507131931.56DJV6v5069614@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: dbd83c481e1c - stable/14 - LinuxKPI: add missing bus_dmamap_sync() calls or exclude them List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-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/14 X-Git-Reftype: branch X-Git-Commit: dbd83c481e1c9ccf9432f5c4cd482a8a53921d60 Auto-Submitted: auto-generated The branch stable/14 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=dbd83c481e1c9ccf9432f5c4cd482a8a53921d60 commit dbd83c481e1c9ccf9432f5c4cd482a8a53921d60 Author: Bjoern A. Zeeb AuthorDate: 2024-05-21 22:32:19 +0000 Commit: Bjoern A. Zeeb CommitDate: 2025-07-13 19:25:02 +0000 LinuxKPI: add missing bus_dmamap_sync() calls or exclude them Rename linux_dma_unmap() to lkpi_dma_unmap(), and linux_dma_map_phys() to lkpi_dma_map_phys() so that we get the full set of function arguments (direction and attributes were missing). Leave the old functions as wrappers as they are called from drm-kmod linuxkpi/bsd still, and leaving them also allows us to MFC this change. Add missing bus_dmamap_sync() calls. Rather than inlining them in each inline function push them down to the actual implementation. From there do not inline them either but call the appropriate function dealing with the sync so that we do not have the same code splattered in many places. Adhere to the DMA_ATTR_SKIP_CPU_SYNC attribute and skip synching when requested. A previous, less complete version of this change already allowed me to load firmware on arm64 for iwlwifi (again). There are four more places which are not currently done as the functions which came with an OFED sync a long time ago seem to be unused these days. Leaving a pr_debug("TODO") call there. Also dma_[un]map_resource() when brought in from drm-kmod/linuxkpi/bsd (D30933) should be adjusted to pass the full arguments as the amdgpu callers are requesting to skip synching. Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D45294 (cherry picked from commit f99d393f7f787ff080c12b92243adcc310ac7c58) --- .../linuxkpi/common/include/linux/dma-mapping.h | 50 ++++++++++++---------- sys/compat/linuxkpi/common/src/linux_pci.c | 49 ++++++++++++++++++--- 2 files changed, 70 insertions(+), 29 deletions(-) diff --git a/sys/compat/linuxkpi/common/include/linux/dma-mapping.h b/sys/compat/linuxkpi/common/include/linux/dma-mapping.h index 84f0361de765..09d5e4b6bc22 100644 --- a/sys/compat/linuxkpi/common/include/linux/dma-mapping.h +++ b/sys/compat/linuxkpi/common/include/linux/dma-mapping.h @@ -96,13 +96,17 @@ void *linux_dma_alloc_coherent(struct device *dev, size_t size, dma_addr_t *dma_handle, gfp_t flag); void *linuxkpi_dmam_alloc_coherent(struct device *dev, size_t size, dma_addr_t *dma_handle, gfp_t flag); -dma_addr_t linux_dma_map_phys(struct device *dev, vm_paddr_t phys, size_t len); -void linux_dma_unmap(struct device *dev, dma_addr_t dma_addr, size_t size); +dma_addr_t linux_dma_map_phys(struct device *dev, vm_paddr_t phys, size_t len); /* backward compat */ +dma_addr_t lkpi_dma_map_phys(struct device *, vm_paddr_t, size_t, + enum dma_data_direction, unsigned long); +void linux_dma_unmap(struct device *dev, dma_addr_t dma_addr, size_t size); /* backward compat */ +void lkpi_dma_unmap(struct device *, dma_addr_t, size_t, + enum dma_data_direction, unsigned long); int linux_dma_map_sg_attrs(struct device *dev, struct scatterlist *sgl, - int nents, enum dma_data_direction dir __unused, + int nents, enum dma_data_direction direction, unsigned long attrs __unused); void linux_dma_unmap_sg_attrs(struct device *dev, struct scatterlist *sg, - int nents __unused, enum dma_data_direction dir __unused, + int nents __unused, enum dma_data_direction direction, unsigned long attrs __unused); void linuxkpi_dma_sync(struct device *, dma_addr_t, size_t, bus_dmasync_op_t); @@ -173,16 +177,17 @@ dma_free_coherent(struct device *dev, size_t size, void *cpu_addr, dma_addr_t dma_addr) { - linux_dma_unmap(dev, dma_addr, size); + lkpi_dma_unmap(dev, dma_addr, size, DMA_BIDIRECTIONAL, 0); kmem_free(cpu_addr, size); } static inline dma_addr_t dma_map_page_attrs(struct device *dev, struct page *page, size_t offset, - size_t size, enum dma_data_direction dir, unsigned long attrs) + size_t size, enum dma_data_direction direction, unsigned long attrs) { - return (linux_dma_map_phys(dev, page_to_phys(page) + offset, size)); + return (lkpi_dma_map_phys(dev, page_to_phys(page) + offset, size, + direction, attrs)); } /* linux_dma_(un)map_sg_attrs does not support attrs yet */ @@ -197,7 +202,8 @@ dma_map_page(struct device *dev, struct page *page, unsigned long offset, size_t size, enum dma_data_direction direction) { - return (linux_dma_map_phys(dev, page_to_phys(page) + offset, size)); + return (lkpi_dma_map_phys(dev, page_to_phys(page) + offset, size, + direction, 0)); } static inline void @@ -205,7 +211,7 @@ dma_unmap_page(struct device *dev, dma_addr_t dma_address, size_t size, enum dma_data_direction direction) { - linux_dma_unmap(dev, dma_address, size); + lkpi_dma_unmap(dev, dma_address, size, direction, 0); } static inline void @@ -263,28 +269,33 @@ dma_sync_single_for_device(struct device *dev, dma_addr_t dma, linuxkpi_dma_sync(dev, dma, size, op); } +/* (20250329) These four seem to be unused code. */ static inline void dma_sync_sg_for_cpu(struct device *dev, struct scatterlist *sg, int nelems, enum dma_data_direction direction) { + pr_debug("%s:%d: TODO dir %d\n", __func__, __LINE__, direction); } static inline void dma_sync_sg_for_device(struct device *dev, struct scatterlist *sg, int nelems, enum dma_data_direction direction) { + pr_debug("%s:%d: TODO dir %d\n", __func__, __LINE__, direction); } static inline void dma_sync_single_range_for_cpu(struct device *dev, dma_addr_t dma_handle, - unsigned long offset, size_t size, int direction) + unsigned long offset, size_t size, enum dma_data_direction direction) { + pr_debug("%s:%d: TODO dir %d\n", __func__, __LINE__, direction); } static inline void dma_sync_single_range_for_device(struct device *dev, dma_addr_t dma_handle, - unsigned long offset, size_t size, int direction) + unsigned long offset, size_t size, enum dma_data_direction direction) { + pr_debug("%s:%d: TODO dir %d\n", __func__, __LINE__, direction); } #define DMA_MAPPING_ERROR (~(dma_addr_t)0) @@ -306,24 +317,17 @@ static inline unsigned int dma_set_max_seg_size(struct device *dev, static inline dma_addr_t _dma_map_single_attrs(struct device *dev, void *ptr, size_t size, - enum dma_data_direction direction, unsigned long attrs __unused) + enum dma_data_direction direction, unsigned long attrs) { - dma_addr_t dma; - - dma = linux_dma_map_phys(dev, vtophys(ptr), size); - if (!dma_mapping_error(dev, dma)) - dma_sync_single_for_device(dev, dma, size, direction); - - return (dma); + return (lkpi_dma_map_phys(dev, vtophys(ptr), size, + direction, attrs)); } static inline void _dma_unmap_single_attrs(struct device *dev, dma_addr_t dma, size_t size, - enum dma_data_direction direction, unsigned long attrs __unused) + enum dma_data_direction direction, unsigned long attrs) { - - dma_sync_single_for_cpu(dev, dma, size, direction); - linux_dma_unmap(dev, dma, size); + lkpi_dma_unmap(dev, dma, size, direction, attrs); } static inline size_t diff --git a/sys/compat/linuxkpi/common/src/linux_pci.c b/sys/compat/linuxkpi/common/src/linux_pci.c index 2c2f92082a4e..52d9120fed5a 100644 --- a/sys/compat/linuxkpi/common/src/linux_pci.c +++ b/sys/compat/linuxkpi/common/src/linux_pci.c @@ -1511,17 +1511,34 @@ linux_dma_map_phys_common(struct device *dev __unused, vm_paddr_t phys, #endif dma_addr_t -linux_dma_map_phys(struct device *dev, vm_paddr_t phys, size_t len) +lkpi_dma_map_phys(struct device *dev, vm_paddr_t phys, size_t len, + enum dma_data_direction direction, unsigned long attrs) { struct linux_dma_priv *priv; + dma_addr_t dma; priv = dev->dma_priv; - return (linux_dma_map_phys_common(dev, phys, len, priv->dmat)); + dma = linux_dma_map_phys_common(dev, phys, len, priv->dmat); + if (dma_mapping_error(dev, dma)) + return (dma); + + if ((attrs & DMA_ATTR_SKIP_CPU_SYNC) == 0) + dma_sync_single_for_device(dev, dma, len, direction); + + return (dma); +} + +/* For backward compat only so we can MFC this. Remove before 15. */ +dma_addr_t +linux_dma_map_phys(struct device *dev, vm_paddr_t phys, size_t len) +{ + return (lkpi_dma_map_phys(dev, phys, len, DMA_NONE, 0)); } #if defined(__i386__) || defined(__amd64__) || defined(__aarch64__) void -linux_dma_unmap(struct device *dev, dma_addr_t dma_addr, size_t len) +lkpi_dma_unmap(struct device *dev, dma_addr_t dma_addr, size_t len, + enum dma_data_direction direction, unsigned long attrs) { struct linux_dma_priv *priv; struct linux_dma_obj *obj; @@ -1538,6 +1555,10 @@ linux_dma_unmap(struct device *dev, dma_addr_t dma_addr, size_t len) return; } LINUX_DMA_PCTRIE_REMOVE(&priv->ptree, dma_addr); + + if ((attrs & DMA_ATTR_SKIP_CPU_SYNC) == 0) + dma_sync_single_for_cpu(dev, dma_addr, len, direction); + bus_dmamap_unload(obj->dmat, obj->dmamap); bus_dmamap_destroy(obj->dmat, obj->dmamap); DMA_PRIV_UNLOCK(priv); @@ -1546,11 +1567,19 @@ linux_dma_unmap(struct device *dev, dma_addr_t dma_addr, size_t len) } #else void -linux_dma_unmap(struct device *dev, dma_addr_t dma_addr, size_t len) +lkpi_dma_unmap(struct device *dev, dma_addr_t dma_addr, size_t len, + enum dma_data_direction direction, unsigned long attrs) { } #endif +/* For backward compat only so we can MFC this. Remove before 15. */ +void +linux_dma_unmap(struct device *dev, dma_addr_t dma_addr, size_t len) +{ + lkpi_dma_unmap(dev, dma_addr, len, DMA_NONE, 0); +} + void * linux_dma_alloc_coherent(struct device *dev, size_t size, dma_addr_t *dma_handle, gfp_t flag) @@ -1652,7 +1681,7 @@ linuxkpi_dma_sync(struct device *dev, dma_addr_t dma_addr, size_t size, int linux_dma_map_sg_attrs(struct device *dev, struct scatterlist *sgl, int nents, - enum dma_data_direction direction, unsigned long attrs __unused) + enum dma_data_direction direction, unsigned long attrs) { struct linux_dma_priv *priv; struct scatterlist *sg; @@ -1686,6 +1715,9 @@ linux_dma_map_sg_attrs(struct device *dev, struct scatterlist *sgl, int nents, sg_dma_address(sg) = seg.ds_addr; } + if ((attrs & DMA_ATTR_SKIP_CPU_SYNC) != 0) + goto skip_sync; + switch (direction) { case DMA_BIDIRECTIONAL: bus_dmamap_sync(priv->dmat, sgl->dma_map, BUS_DMASYNC_PREWRITE); @@ -1699,6 +1731,7 @@ linux_dma_map_sg_attrs(struct device *dev, struct scatterlist *sgl, int nents, default: break; } +skip_sync: DMA_PRIV_UNLOCK(priv); @@ -1708,7 +1741,7 @@ linux_dma_map_sg_attrs(struct device *dev, struct scatterlist *sgl, int nents, void linux_dma_unmap_sg_attrs(struct device *dev, struct scatterlist *sgl, int nents __unused, enum dma_data_direction direction, - unsigned long attrs __unused) + unsigned long attrs) { struct linux_dma_priv *priv; @@ -1716,6 +1749,9 @@ linux_dma_unmap_sg_attrs(struct device *dev, struct scatterlist *sgl, DMA_PRIV_LOCK(priv); + if ((attrs & DMA_ATTR_SKIP_CPU_SYNC) != 0) + goto skip_sync; + switch (direction) { case DMA_BIDIRECTIONAL: bus_dmamap_sync(priv->dmat, sgl->dma_map, BUS_DMASYNC_POSTREAD); @@ -1730,6 +1766,7 @@ linux_dma_unmap_sg_attrs(struct device *dev, struct scatterlist *sgl, default: break; } +skip_sync: bus_dmamap_unload(priv->dmat, sgl->dma_map); bus_dmamap_destroy(priv->dmat, sgl->dma_map); From nobody Sun Jul 13 19:31: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 4bgFtM6vxPz61Mwm; Sun, 13 Jul 2025 19:31:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bgFtM4dtMz3k2n; Sun, 13 Jul 2025 19:31:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1752435067; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=GxmZlHi8uIVYRBxXGAeqjirTCiW9awW0qYnSPq8Q+/U=; b=YbXMEXvcX6l1KLBWSFiM5F3/4yloxA8rCzbZB5rmuMmp0NnkohnJS5VORalQkiCcQqnDR9 2KhN6adzXgythgrP9VrhweIy+NOKXKKSoYnELnXcb34BJXQd1MswLp2fqPeMmd+WaiRLQb MzdgUNE6DkiJgcu3S4r2ykh4ZbYYLN3V9d7bPWZUVmhAVyIQ+GGmPvJ+F8slcmmRkMnyUX Bpg0J2B50/UZ87D/8TRX8IfgI6fGCys5R9Q6ynV+rGxH0KOD4Y/DicKY5xvVK7YHLZOnU9 rA7txyYThi9tGzjX845o5wy3BkFlM+qFk1kgYwSR9jv6J6BE5ZjL/y+7D8yWOw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1752435067; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=GxmZlHi8uIVYRBxXGAeqjirTCiW9awW0qYnSPq8Q+/U=; b=Jc6pis8JDp+HNunWpTzC08lVM72zejyx6TELWynYPe5kQoiOcNSBkQPWYlsg12frzhAPy0 Liz5zxV7QW4rAXXqBmIRK4Rpyaf8DoU6CroaQJ4bTXbR2FNaldHaEdkdj4qzSquBb5y6te 32IcRhAnp+w8Ev0s/X92XesJfOQeh0kyReckRVBdm5ItHqLQSBFj0G6/U8GHkXgWDHfkNp okP9bbCXvud4WbArQsFAfBsfzfQi+ZZxpB2H9gFcHFfsX8Owv8qhHkF5H9hc4ZmTmoaMmI a8SlGxQgsCKHODQZXHoC/vuUl9GKX6dK/Eslyot1Tub1R351aKkQBrUIhKwxiQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1752435067; a=rsa-sha256; cv=none; b=S6XtOrJe4kiotrHLRfAcK75Yj06NJgd4aJwTcA/3mbg++GbFExxX8t8KmyEzI0W/RrH33Z 9qp5fJfolQbO73vs8JimZYw0oZ5PMIP26+msSbDOkF91ebH0L475NLmq7X9sTPpOB+KME/ pxccThAwPjYczU8Np0n9BVAUUSH04jxuFQwDjGCjIVOwagoTW5ABQKlAIHStWCmCAjyI0N n2eImZBTUadmOsjIX3PjZTnaBTYhze3dQQJbIqjuk/KcYOVRNCQrFqDavJ/5VjoeRBiMeg 9rrEZ925SnEExsDsiHtzx4TYwEPUkKKINJZZNsJvjfukZz71lwjG8zN7oQXbtw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4bgFtM3SDxz6Ym; Sun, 13 Jul 2025 19:31: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 56DJV7vJ070012; Sun, 13 Jul 2025 19:31:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 56DJV7cZ069997; Sun, 13 Jul 2025 19:31:07 GMT (envelope-from git) Date: Sun, 13 Jul 2025 19:31:07 GMT Message-Id: <202507131931.56DJV7cZ069997@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: 106294d5801f - stable/14 - LinuxKPI: Implement dma_map_resource/dma_unmap_resource functions List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 106294d5801f6c617812534f773ea101bfbc7655 Auto-Submitted: auto-generated The branch stable/14 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=106294d5801f6c617812534f773ea101bfbc7655 commit 106294d5801f6c617812534f773ea101bfbc7655 Author: Bjoern A. Zeeb AuthorDate: 2025-04-01 14:51:03 +0000 Commit: Bjoern A. Zeeb CommitDate: 2025-07-13 19:25:03 +0000 LinuxKPI: Implement dma_map_resource/dma_unmap_resource functions dma_map_resource() and dma_unmap_resource() functions are used to map and unmap of memory-mapped IO resources so they can be accessed by the device. Required by drm-kmod v5.5 to be built. While for drm-kmod 6.6-lts only amdgpu uses these in one place and the code apparently has not been exercised a lot it has been around like this for years. With changing the underlying implementations bring it into the tree; should we find errors with it they can also be fixed here. Bump __FreeBSD version to be able to detect this change. Obtained from: D30933 (by wulf) Sponsored by: The FreeBSD Foundation Reviewed by: dumbbell Differential Revision: https://reviews.freebsd.org/D49625 (cherry picked from commit a02180cf60a6a0102669b678e9c81ad9f1aa4d91) --- UPDATING | 4 ++++ sys/compat/linuxkpi/common/include/linux/dma-mapping.h | 14 ++++++++++++++ 2 files changed, 18 insertions(+) diff --git a/UPDATING b/UPDATING index c1778cc50d83..4d06a05650bf 100644 --- a/UPDATING +++ b/UPDATING @@ -12,6 +12,10 @@ Items affecting the ports and packages system can be found in /usr/ports/UPDATING. Please read that file before updating system packages and/or ports. +20250713: + LinuxKPI dma-mapping.h were pulled into the tree from drm-kmod. + Bump _FreeBSD_version to 1403503 to be able to detect this change. + 20250707: Commit f5195b1a63df removed in6_maxmtu and its setter in6_setmaxmtu(). in6_maxmtu is used to store the max IPv6 MTU of all interfaces, diff --git a/sys/compat/linuxkpi/common/include/linux/dma-mapping.h b/sys/compat/linuxkpi/common/include/linux/dma-mapping.h index 09d5e4b6bc22..2d8e1196d3d3 100644 --- a/sys/compat/linuxkpi/common/include/linux/dma-mapping.h +++ b/sys/compat/linuxkpi/common/include/linux/dma-mapping.h @@ -214,6 +214,20 @@ dma_unmap_page(struct device *dev, dma_addr_t dma_address, size_t size, lkpi_dma_unmap(dev, dma_address, size, direction, 0); } +static inline dma_addr_t +dma_map_resource(struct device *dev, phys_addr_t paddr, size_t size, + enum dma_data_direction direction, unsigned long attrs) +{ + return (lkpi_dma_map_phys(dev, paddr, size, direction, attrs)); +} + +static inline void +dma_unmap_resource(struct device *dev, dma_addr_t dma, size_t size, + enum dma_data_direction direction, unsigned long attrs) +{ + lkpi_dma_unmap(dev, dma, size, direction, attrs); +} + static inline void dma_sync_single_for_cpu(struct device *dev, dma_addr_t dma, size_t size, enum dma_data_direction direction) From nobody Sun Jul 13 19:31: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 4bgFtP1gVrz61NDH; Sun, 13 Jul 2025 19:31:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bgFtN4p19z3k7k; Sun, 13 Jul 2025 19:31:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1752435068; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/MiBTIp89e6sblPWZuz6kOb/jKTtos2LWcBtEKZRIuw=; b=FkiDu975EKaXjj98+ROjUdtJgMlBVlqyu0/CxORlrnlYgHkMLV0KSNWeSF/rA2WK/cyj+f l7SKnhtfKvJOSZBrEy80L3EoU1G6DId9qbxcEbt0ggJxp7vE0f9GVSj7RON8g2psOx31ej TrWtVYIb8uOX0sviE+7El6+rpL/nMz0xZ8A1SGY286u/7dupD0hjjKNY1IRQwU8KwQwBdI bAb6lhkdxqejYtqdq/60Ga1/2ta3Q732nUCgGGoEHH1uULViF663Cci8JXHAcbZdhmygIr oSr2bODBeFC2nBWBQVn3o0p5UqQ9FdHgBvEu8g3FkQGwAZmWyvfpqmCluTO25A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1752435068; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/MiBTIp89e6sblPWZuz6kOb/jKTtos2LWcBtEKZRIuw=; b=TqeJhfSzT3JQCep7Jg6rc+0jHebgWMcLbfJpmhOFexLM0kLarI9NB3OQ5dRcOqBzBTZbAs Niyw4jjfzIXmFsHB5vMenLDVIFtgQ1fbQS4B9569vme32lppTXwUtOvNiPffbdEysUlPDG MI9ssLiqqupzWidDPBiUsnAmIMizio4quUZ/BPlKp+o81AWJ8PC9JfPtsQ2DbcZviFwu28 ofKelrAjannSso+jHx0wEkUEGC9qLuSV7nMI37Cv2lzMNLmXpCPmJdhVAc15cDy2ZyCF8m F4d2azNxiM8mURyGQdB7M25yc0ki3hlHaQChCBJT6wT/9blh0hLo/+nvD8vwXQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1752435068; a=rsa-sha256; cv=none; b=J6cfkocgR9fxsx08Av4tGRRRndFgAL9CyuzqYomES7eBcmrAbaPjhj5K0o2TIaKhgqRV40 +aUmDEaOH+AviEjpTe9En8MFhx/XHKIfitoe/VW6aw0zpqjCNzgKdZe7KoTELdG4JdpkoB YMARvrU1KJO6wvYUvTQ9ZZvbmOuGy4PAB94IEAzw/3MA1tCPX2a1ZZNLbUwcQjMvTqTaup Mc6VHEjluAkTTN72c6Kbwlm8JXIEaWMrXpxfXqWvyMSc3OPC6lTbNzXF1xeS07zDWWddf+ 8mUA3KTIPHbyUzavFJdlD4R34JV1xm/S9XxI4QUfV5oMOX+BSfFq4Ov1qoyM9A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4bgFtN4Pltz66k; Sun, 13 Jul 2025 19:31: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 56DJV8wg070750; Sun, 13 Jul 2025 19:31:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 56DJV8kh070747; Sun, 13 Jul 2025 19:31:08 GMT (envelope-from git) Date: Sun, 13 Jul 2025 19:31:08 GMT Message-Id: <202507131931.56DJV8kh070747@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: 00544b72f65f - stable/14 - LinuxKPI: MODULE_DEVICE_TABLE() remove hard coded pci List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-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/14 X-Git-Reftype: branch X-Git-Commit: 00544b72f65f3f160d829445a0b8a26b375bfab9 Auto-Submitted: auto-generated The branch stable/14 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=00544b72f65f3f160d829445a0b8a26b375bfab9 commit 00544b72f65f3f160d829445a0b8a26b375bfab9 Author: Bjoern A. Zeeb AuthorDate: 2025-06-22 22:44:40 +0000 Commit: Bjoern A. Zeeb CommitDate: 2025-07-13 19:25:03 +0000 LinuxKPI: MODULE_DEVICE_TABLE() remove hard coded pci While we currently only use MODULE_DEVICE_TABLE() for pci (or so I thought [*]), this may soon change. Remove a hard coded "pci" for the bus and use the bus name passed in as _bus. [*] see follow-up change Sponsored by: The FreeBSD Foundation Reviewed by: imp, dumbbell Differential Revision: https://reviews.freebsd.org/D51048 (cherry picked from commit f58e032410c93d67c83d6bce8a3e6711f377a4be) --- sys/compat/linuxkpi/common/include/linux/pci.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/compat/linuxkpi/common/include/linux/pci.h b/sys/compat/linuxkpi/common/include/linux/pci.h index ccf86c7778e9..15fedb87e6e6 100644 --- a/sys/compat/linuxkpi/common/include/linux/pci.h +++ b/sys/compat/linuxkpi/common/include/linux/pci.h @@ -83,7 +83,7 @@ static driver_t _ ## _bus ## _ ## _table ## _driver = { \ 0 \ }; \ \ -DRIVER_MODULE(lkpi_ ## _table, pci, _ ## _bus ## _ ## _table ## _driver,\ +DRIVER_MODULE(lkpi_ ## _table, _bus, _ ## _bus ## _ ## _table ## _driver,\ 0, 0); \ \ MODULE_PNP_INFO("U32:vendor;U32:device;V32:subvendor;V32:subdevice", \ From nobody Sun Jul 13 19:31: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 4bgFtR1cQWz61N0n; Sun, 13 Jul 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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bgFtP5y1Rz3k1b; Sun, 13 Jul 2025 19:31:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1752435069; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rEaiX0gvhP87QlnOutCWP23EviEnXBJDG6xtMaeYm5E=; b=kpzFepIA0mVqvjp6Ifxc/Nw0ovDWQfNmTvzTFAoXYJk46rdlcDXzq+bqog+tcspom+hQc8 GgKiPllwoFG874F4TsuRLh/LIsWx+fb8jzk0+Sj+FAZDlRWBFUzB0iqNOIsQm7RGqilAAd R4rB12zH9cArt6RNfwwnO5SM3X+tLQ3gc/HiPh33XSB6GssDwjLnyVxWKUt4jqjPYH0YFD Y9CoPyBRC6444rjS7qMX1Pm1+cLNV0BJvCaa1J9QRJb3QBt1XH9xDng7DMCKxsls4ENTQl JXNEYTOVHRAmR7cspn6ZF5BuRsVKer8hJ3LcU52RpIly46hQ9MP7VOicHPaimQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1752435069; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rEaiX0gvhP87QlnOutCWP23EviEnXBJDG6xtMaeYm5E=; b=EzyoQNMS28C66yAKKiyeFvpXcUZemcuHTE/G0CCi5Id0c3gpEE8EfiUtFW/lALOn9C45k+ TAkwBFhEp7ZBtvE0o4jBugkxxPo6Gk8e355XfJZ+U5FN3oPoedwvyWuXyogQIxeH0AR6wc k4II2+/HSYYm6JqqxvVpcU0EF6wTyblfxL0jwpa/8MUMETNlgZKGPTQRr4sc1ZZwj+Y7TS w+KRJ/FL6val/f5NKZlZD7vYP/AeF0ZvD5tQhWMrASBR2FBj0w5MphOxrFRPMnmh6nyXtp 6853eVvylSQKQtm3ar52qO67gO6z5n0pgRqOmn6vh4SKM8mFSsSsfVSP4s4l2g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1752435069; a=rsa-sha256; cv=none; b=jWRg8MFZXahIxH9cA9GLSX2hwfvhystIujlrBo9tQeh+P+DwCZA7OPbNm4r964MU0bk3bH DKTgOs7nHoVthiadI7rk98A+NvnXx0VIzELr7SmcfFjkTbDXP1WKTvdMcSmV+Et2xPg2/3 YPukDG6HlLIJqTgoA5P3mUkTXIgyr1iXzeafotZsQOqqC4CqqSWTQNkMCvpZ98i8tdsrfd x1MbayLnudAoZ7SXLF87jhPcVIxo709fNiuAVAYIbwC+o4+q1Y9KQkR8vk5N68BzaAO3Ht 10j83YkoXJ39Ei2itmswn59j9WLc6m7iZ2BJinALBVoKXZr8FWaGCy///sHC8w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4bgFtP5GNzz6S4; Sun, 13 Jul 2025 19:31: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 56DJV9T0070789; Sun, 13 Jul 2025 19:31:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 56DJV9iI070786; Sun, 13 Jul 2025 19:31:09 GMT (envelope-from git) Date: Sun, 13 Jul 2025 19:31:09 GMT Message-Id: <202507131931.56DJV9iI070786@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: 87e6f90667e5 - stable/14 - LinuxKPI: MODULE_DEVICE_TABLE() factor out the bus specific MODULE_PNP_INFO() List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-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/14 X-Git-Reftype: branch X-Git-Commit: 87e6f90667e5a841592d8a2522f90981fd3e3fff Auto-Submitted: auto-generated The branch stable/14 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=87e6f90667e5a841592d8a2522f90981fd3e3fff commit 87e6f90667e5a841592d8a2522f90981fd3e3fff Author: Bjoern A. Zeeb AuthorDate: 2025-06-22 22:50:33 +0000 Commit: Bjoern A. Zeeb CommitDate: 2025-07-13 19:25:03 +0000 LinuxKPI: MODULE_DEVICE_TABLE() factor out the bus specific MODULE_PNP_INFO() In order to be able to use MODULE_DEVICE_TABLE() with multiple bus attachments, factor out the bus-specfic MODULE_PNP_INFO() and place it next to the structure defining the table. As it turns out bnxt(4) has been using the MODULE_DEVICE_TABLE() with PCI attachments for the "auxillary" bus so far. That makes little sense. Define the MODULE_PNP_INFO() to nothing for that. We may consider pulling these LinucKPI bits in semi-native drivers into LinuxKPI one day as that route is not really sustainabke. Sponsored by: The FreeBSD Foundation Reviewed by: imp, dumbbell Differential Revision: https://reviews.freebsd.org/D51049 (cherry picked from commit 2f5666c1727c949491f73e6c3277b7b542131714) --- sys/compat/linuxkpi/common/include/linux/pci.h | 7 +++++-- sys/dev/bnxt/bnxt_en/bnxt_auxbus_compat.h | 1 + 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/sys/compat/linuxkpi/common/include/linux/pci.h b/sys/compat/linuxkpi/common/include/linux/pci.h index 15fedb87e6e6..9d0725089269 100644 --- a/sys/compat/linuxkpi/common/include/linux/pci.h +++ b/sys/compat/linuxkpi/common/include/linux/pci.h @@ -70,6 +70,10 @@ struct pci_device_id { uintptr_t driver_data; }; +#define MODULE_DEVICE_TABLE_BUS_pci(_bus, _table) \ +MODULE_PNP_INFO("U32:vendor;U32:device;V32:subvendor;V32:subdevice", \ + _bus, lkpi_ ## _table, _table, nitems(_table) - 1) + /* Linux has an empty element at the end of the ID table -> nitems() - 1. */ #define MODULE_DEVICE_TABLE(_bus, _table) \ \ @@ -86,8 +90,7 @@ static driver_t _ ## _bus ## _ ## _table ## _driver = { \ DRIVER_MODULE(lkpi_ ## _table, _bus, _ ## _bus ## _ ## _table ## _driver,\ 0, 0); \ \ -MODULE_PNP_INFO("U32:vendor;U32:device;V32:subvendor;V32:subdevice", \ - _bus, lkpi_ ## _table, _table, nitems(_table) - 1) +MODULE_DEVICE_TABLE_BUS_ ## _bus(_bus, _table) #define PCI_ANY_ID -1U diff --git a/sys/dev/bnxt/bnxt_en/bnxt_auxbus_compat.h b/sys/dev/bnxt/bnxt_en/bnxt_auxbus_compat.h index 1d844a67c928..c4c9e789cf3e 100644 --- a/sys/dev/bnxt/bnxt_en/bnxt_auxbus_compat.h +++ b/sys/dev/bnxt/bnxt_en/bnxt_auxbus_compat.h @@ -39,6 +39,7 @@ struct auxiliary_device_id { char name[AUXILIARY_NAME_SIZE]; uint64_t driver_data; }; +#define MODULE_DEVICE_TABLE_BUS_auxiliary(_bus, _table) struct auxiliary_device { struct device dev; From nobody Sun Jul 13 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 4bgFtR4pyzz61N0p; Sun, 13 Jul 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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bgFtQ74qQz3k1s; Sun, 13 Jul 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=1752435071; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3eeUdS5pLfPIbUpQHWZK0uP3iYZkh1N+iaIf9pI9Zn0=; b=eB3b8QbwycIfkf+CIVBweHeiCkTQhzumOqMPDHP5ZEeAmv7pcM+5i/jQEJxeB3GxMr2jVq 6rNgtQX6LqQqnLXdaydVXlDeYZzMLjYpLPwHDfJlDZeT4/Qkxcs4CQJ6mVZFE2YaLm6LvZ +5Qw12x9Si7tnmRvnKU1oUba7nKneFTOvQlrCjEi+Xpjse+OuEONolWIGXRRh3aL5K+I/2 6EfgpdLWbu3i/bEcke9cqtR3UNGhGMvxbaPlEkx7vWAMfzLesFPnyVPOHoaBsAe9viqqFk hYrAWsKHON5VkKd3QAYAe0VqsOTsobRHtFnNrWRW8TKpO4ceJNdXitencRPAEQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1752435071; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3eeUdS5pLfPIbUpQHWZK0uP3iYZkh1N+iaIf9pI9Zn0=; b=cI/17J1l55PHvY07iTqUU4k2OBL9VpsLvqBVQHRQbusSmkXje5uHQo8tGHDz7I/8l+P4lk KLo8Uv3Vzo1jRaMw4cvc5D116D25KRFUb1MUjDy2NW7t5h0a84Ae5mf0svYNr/tuI4eejT mZTmurdrIoTgTCYb20B1MVxd8HFaxGPwquOpINyqlJwVv/qHzAI/HzZNtzZeTfsq52VhHF +rWMnZaCAkbyIcmnsMYOmB0Mkl1sic4NktiSaUgiJVOUkDFD4ym3qD7KUHLXmBA/i+T7w1 huwwFAFfYr9lvPyk51nJ6AzYWSmu1/BpvFqKrqSh7cBLPcllVB9SJghvcIZxFA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1752435071; a=rsa-sha256; cv=none; b=DnsNU0KRkk9mJEznf9ZwIEEIfKmZZKYy2eJ1A9uyHK3m6J5k3g9gK+VtT/3eruyZHuEvxv +oNw0Sm9nX/4YibEDufht5NjZwTKWQTOgobpiev2dxKqvm+sMXkpAsdyCoCOj2EJfkYQPk N4GwfOoTnZZJM0S9g6bImEctlPW2JTsV2Eiac2AXpicDgXrmlKYY7/eMYLi1Dj0+jLsJzn Fn8KFYUwtzk2Ej6tYaBZinPB8sO9h3Easllg9eQS4rOkyg5tMeQq7+hqr0pUVMaLRg/StA UiiFOjUQeeZYFWRiSwpajvKKSAmqQXvmwdYCFSpOYSj574TDmChF9VPdR6BbWA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4bgFtQ5wX2z6S5; Sun, 13 Jul 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 56DJVAse070828; Sun, 13 Jul 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 56DJVAsK070825; Sun, 13 Jul 2025 19:31:10 GMT (envelope-from git) Date: Sun, 13 Jul 2025 19:31:10 GMT Message-Id: <202507131931.56DJVAsK070825@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: ddf9cecb559d - stable/14 - LinuxKPI: acpi: provide union [linuxkpi]_acpi_(object|buffer) List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-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/14 X-Git-Reftype: branch X-Git-Commit: ddf9cecb559d1504d5024648e983a46ab3136739 Auto-Submitted: auto-generated The branch stable/14 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=ddf9cecb559d1504d5024648e983a46ab3136739 commit ddf9cecb559d1504d5024648e983a46ab3136739 Author: Bjoern A. Zeeb AuthorDate: 2025-06-15 10:38:56 +0000 Commit: Bjoern A. Zeeb CommitDate: 2025-07-13 19:25:03 +0000 LinuxKPI: acpi: provide union [linuxkpi]_acpi_(object|buffer) Provide union acpi_(object|buffer) as linuxkpi_ versions and in Linux native lower case spelling so that driver code compiles unmodified. Use the linuxkpi_ prefix to avoid name clashes with the native ACPI implementation which uses CamelCase. Use the linuxkpi_ names internally and redefine the linuxkpi_ unions to their native names so they are avail as expected in drivers. As a transition to not break drm-kmod which has in-place (no #ifdef) changes from Linux spelling ot FreeBSD spelling, introduce LINUXKPI_WANT_LINUX_ACPI so we have the Linux spelling as an opt-in. That way the transition can happen gracefully and once "top-of-trees" are all sorted we can remove the #ifdefs here again. Bump __FreeBSD_version to be able to detect this change. Sponsored by: The FreeBSD Foundation Reviewed by: wulf (previous version), dumbbell Differential Revision: https://reviews.freebsd.org/D50863 (cherry picked from commit 2ddfcc013c251f13c8c9b24970b8134ddd49afea) --- sys/compat/linuxkpi/common/include/acpi/acpi.h | 76 ++++++++++++++++++++++++-- 1 file changed, 71 insertions(+), 5 deletions(-) diff --git a/sys/compat/linuxkpi/common/include/acpi/acpi.h b/sys/compat/linuxkpi/common/include/acpi/acpi.h index e0218bdde12e..1e398d05ba20 100644 --- a/sys/compat/linuxkpi/common/include/acpi/acpi.h +++ b/sys/compat/linuxkpi/common/include/acpi/acpi.h @@ -3,6 +3,10 @@ * * Copyright (c) 2017 Mark Johnston * Copyright (c) 2020 Vladimir Kondratyev + * Copyright (c) 2025 The FreeBSD Foundation + * + * Portions of this software were developed by Björn Zeeb + * under sponsorship from the FreeBSD Foundation. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are @@ -30,6 +34,13 @@ #ifndef _LINUXKPI_ACPI_ACPI_H_ #define _LINUXKPI_ACPI_ACPI_H_ +/* + * LINUXKPI_WANT_LINUX_ACPI is a temporary workaround to allow drm-kmod + * to update all needed branches without breaking builds. + * Once that happened and checks are implemented based on __FreeBSD_verison + * we will remove these conditions again. + */ + /* * FreeBSD import of ACPICA has a typedef for BOOLEAN which conflicts with * amdgpu driver. Workaround it on preprocessor level. @@ -46,8 +57,8 @@ typedef int64_t INT64; #include #undef BOOLEAN +typedef ACPI_IO_ADDRESS acpi_io_address; typedef ACPI_HANDLE acpi_handle; -typedef ACPI_OBJECT acpi_object; typedef ACPI_OBJECT_HANDLER acpi_object_handler; typedef ACPI_OBJECT_TYPE acpi_object_type; typedef ACPI_STATUS acpi_status; @@ -55,12 +66,62 @@ typedef ACPI_STRING acpi_string; typedef ACPI_SIZE acpi_size; typedef ACPI_WALK_CALLBACK acpi_walk_callback; +union linuxkpi_acpi_object { + acpi_object_type type; + struct { + acpi_object_type type; + UINT64 value; + } integer; + struct { + acpi_object_type type; + UINT32 length; + char *pointer; + } string; + struct { + acpi_object_type type; + UINT32 length; + UINT8 *pointer; + } buffer; + struct { + acpi_object_type type; + UINT32 count; + union linuxkpi_acpi_object *elements; + } package; + struct { + acpi_object_type type; + acpi_object_type actual_type; + acpi_handle handle; + } reference; + struct { + acpi_object_type type; + UINT32 proc_id; + acpi_io_address pblk_address; + UINT32 pblk_length; + } processor; + struct { + acpi_object_type type; + UINT32 system_level; + UINT32 resource_order; + } power_resource; +}; + +#ifdef LINUXKPI_WANT_LINUX_ACPI +struct linuxkpi_acpi_buffer { + acpi_size length; /* Length in bytes of the buffer */ + void *pointer; /* pointer to buffer */ +}; + +typedef struct linuxkpi_acpi_buffer lkpi_acpi_buffer_t; +#else +typedef ACPI_BUFFER lkpi_acpi_buffer_t; +#endif + static inline ACPI_STATUS acpi_evaluate_object(ACPI_HANDLE Object, ACPI_STRING Pathname, - ACPI_OBJECT_LIST *ParameterObjects, ACPI_BUFFER *ReturnObjectBuffer) + ACPI_OBJECT_LIST *ParameterObjects, lkpi_acpi_buffer_t *ReturnObjectBuffer) { return (AcpiEvaluateObject( - Object, Pathname, ParameterObjects, ReturnObjectBuffer)); + Object, Pathname, ParameterObjects, (ACPI_BUFFER *)ReturnObjectBuffer)); } static inline const char * @@ -83,9 +144,9 @@ acpi_get_data(ACPI_HANDLE ObjHandle, ACPI_OBJECT_HANDLER Handler, void **Data) } static inline ACPI_STATUS -acpi_get_name(ACPI_HANDLE Object, UINT32 NameType, ACPI_BUFFER *RetPathPtr) +acpi_get_name(ACPI_HANDLE Object, UINT32 NameType, lkpi_acpi_buffer_t *RetPathPtr) { - return (AcpiGetName(Object, NameType, RetPathPtr)); + return (AcpiGetName(Object, NameType, (ACPI_BUFFER *)RetPathPtr)); } static inline ACPI_STATUS @@ -101,4 +162,9 @@ acpi_put_table(ACPI_TABLE_HEADER *Table) AcpiPutTable(Table); } +#ifdef LINUXKPI_WANT_LINUX_ACPI +#define acpi_object linuxkpi_acpi_object +#define acpi_buffer linuxkpi_acpi_buffer +#endif + #endif /* _LINUXKPI_ACPI_ACPI_H_ */ From nobody Sun Jul 13 19:31:11 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4bgFtS6YlYz61NDN; Sun, 13 Jul 2025 19:31: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bgFtS0RYxz3k8G; Sun, 13 Jul 2025 19:31:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1752435072; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=S2VdhuarmuhycBN4uN/FFyQevA+caxP8naI6FXWHRh8=; b=Um/cScsGCUxtrW0FQbt60ZNYeeT/91N0bXxQdqgbMVB/U5yVFGItGZvt8e++2PruJvvIve wplBP1wXW+ESLkd2uaxsfNptkYEKcg+3zfQeknR0R4ii/pRbs3jeaSx6bX9ahGnLs07fQG Do9CKA4e62eUASJnsC9JiVv14pNWrXz6sKlRE6mThQjUv2oXOpDAEU8XikKzXiA7h2ACRp lczSzznjutb5qSZ3U6gOgoGXci2MBdymleFG0QE1eOwUzTJM7giWWES/cFcyIpA8C9R/GM 1mHXEjtpGY8o9RofIo9YepYawkXeU0fEik7G8rRVUfGxhZoO78qnpoK1+WJM3g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1752435072; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=S2VdhuarmuhycBN4uN/FFyQevA+caxP8naI6FXWHRh8=; b=nD8QrteLjjJugzSa6ph8BlgYetDMYqWs51z6TYl420apvtlqsZEwb6r+hi4B9SniuBmA+T 2gq6ewwrUSebVlwarWDK65TeYen9mZOOdRsa6hXnvo9AXXbHTmYl/Qt5MFQDDxz2a8c6X0 0/qPT7OBGGmoRznoW4odmDf3cDPEtvOFfeImqYi3o/S9GQdyvK0+uhunnx6ZEJg4ceyJh5 vp2A1WT081beZLL8z8/N81ZuGeldfLaFTqUH89mZpFU7GRHTBCgBce6Sv25WOgMq+8+nt4 w0xknywR1a3iG0BAuzab/KvqddFO88Ws+t0QX8GWmbkcOrHFp/JWX9TODlrLug== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1752435072; a=rsa-sha256; cv=none; b=ZR7GFIA6DG93bAvCP+Cr9KcBrOLiAmrcVroJnZ8sFzJKuLXo3DdYo2HJcsZJKjr76dntsz cF6/TsHmvQFj/oAELuEaoXkJAdf4MOtq16ugT7WMl4qjVcn6K9luSwM2Qz2qpX9XhhwyST F85imTNCQWRH4S7PQrKnDOxwSX4SovsocpEiHtk/dF1EA9RvP8hNfAV4PV2YIw/EfrdJdh f1wqotlbtAonS+/K7jm0hywFsT8sifIZBsMrG6oRDE/j77AhqxVWfth8TM0CBTMaNJw6HS SIWi2dHc9+6p6fuoHmffqdKMNk5DR+xNpgt32UzUTzkl6iUYSAJS83qbGMlx2Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4bgFtR6cTgz6S6; Sun, 13 Jul 2025 19:31:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 56DJVBAv070863; Sun, 13 Jul 2025 19:31:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 56DJVBKI070860; Sun, 13 Jul 2025 19:31:11 GMT (envelope-from git) Date: Sun, 13 Jul 2025 19:31:11 GMT Message-Id: <202507131931.56DJVBKI070860@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: 45f0c867803b - stable/14 - LinuxKPI: acpi: add acpi_evaluate_dsm() List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-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/14 X-Git-Reftype: branch X-Git-Commit: 45f0c867803bed4251b9c1bc65d610796e6e1cac Auto-Submitted: auto-generated The branch stable/14 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=45f0c867803bed4251b9c1bc65d610796e6e1cac commit 45f0c867803bed4251b9c1bc65d610796e6e1cac Author: Bjoern A. Zeeb AuthorDate: 2025-06-15 10:43:18 +0000 Commit: Bjoern A. Zeeb CommitDate: 2025-07-13 19:25:03 +0000 LinuxKPI: acpi: add acpi_evaluate_dsm() Add a acpi_evaluate_dsm() wrapper around the native implementation as needd by wireless drivers. Sponsored by: The FreeBSD Foundation Reviewed by: dumbbell Differential Revision: https://reviews.freebsd.org/D50864 (cherry picked from commit ba6460df5607e572e9c868413c75ce9bc5ce9a00) --- sys/compat/linuxkpi/common/include/acpi/acpi_bus.h | 6 ++++++ sys/compat/linuxkpi/common/src/linux_acpi.c | 19 +++++++++++++++++++ 2 files changed, 25 insertions(+) diff --git a/sys/compat/linuxkpi/common/include/acpi/acpi_bus.h b/sys/compat/linuxkpi/common/include/acpi/acpi_bus.h index 65bcbe7f1bdd..47195e7d66a6 100644 --- a/sys/compat/linuxkpi/common/include/acpi/acpi_bus.h +++ b/sys/compat/linuxkpi/common/include/acpi/acpi_bus.h @@ -58,4 +58,10 @@ bool lkpi_acpi_dev_present(const char *hid, const char *uid, struct acpi_device *lkpi_acpi_dev_get_first_match_dev(const char *hid, const char *uid, int64_t hrv); +union linuxkpi_acpi_object; + +union linuxkpi_acpi_object * +acpi_evaluate_dsm(ACPI_HANDLE ObjHandle, const guid_t *guid, + UINT64 rev, UINT64 func, union linuxkpi_acpi_object *arg); + #endif /* _LINUXKPI_ACPI_ACPI_BUS_H_ */ diff --git a/sys/compat/linuxkpi/common/src/linux_acpi.c b/sys/compat/linuxkpi/common/src/linux_acpi.c index 6a9afb3ddff0..d18c69d9210d 100644 --- a/sys/compat/linuxkpi/common/src/linux_acpi.c +++ b/sys/compat/linuxkpi/common/src/linux_acpi.c @@ -39,6 +39,7 @@ #include #include +#include #include #include @@ -99,6 +100,17 @@ acpi_evaluate_dsm_typed(ACPI_HANDLE handle, const char *uuid, int rev, argv4, &buf, type)) ? (ACPI_OBJECT *)buf.Pointer : NULL); } +union linuxkpi_acpi_object * +acpi_evaluate_dsm(ACPI_HANDLE ObjHandle, const guid_t *guid, + UINT64 rev, UINT64 func, union linuxkpi_acpi_object *pkg) +{ + ACPI_BUFFER buf; + + return (ACPI_SUCCESS(acpi_EvaluateDSM(ObjHandle, (const uint8_t *)guid, + rev, func, (ACPI_OBJECT *)pkg, &buf)) ? + (union linuxkpi_acpi_object *)buf.Pointer : NULL); +} + static void linux_handle_power_suspend_event(void *arg __unused) { @@ -323,6 +335,13 @@ acpi_evaluate_dsm_typed(ACPI_HANDLE handle, const char *uuid, int rev, return (NULL); } +union linuxkpi_acpi_object * +acpi_evaluate_dsm(ACPI_HANDLE ObjHandle, const guid_t *guid, + UINT64 rev, UINT64 func, union linuxkpi_acpi_object *pkg) +{ + return (NULL); +} + int register_acpi_notifier(struct notifier_block *nb) { From nobody Sun Jul 13 19:31: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 4bgFtV0bZSz61N0x; Sun, 13 Jul 2025 19:31: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bgFtT1Bd3z3kGv; Sun, 13 Jul 2025 19:31:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1752435073; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ueFIp5Bv/jq1/h5FlyRZglBdaziwDrBl0xFQyg+NkWc=; b=RMJ0nPrbMJDRWKOj/EmbhXoQFgzUY9U1UG3ySij0iEYstJRpPR2oqDz+zwtvnX06qEUCeC NqDWV9UL7oktl9YqvBELIj5v7X0Xv2cxo/1hxiffp5Imdld/96mdwwWLfMbKWNtBCzO+iH 9YNx9kX8brhSbSbPMBp20oZeKIektXaQqY7w1XjCUYxiWyRHHZsNM11ijCTq2cl/Rr0lRC jpXhbagv+aeMU/QUhEXRivxv21TAdQk+yUE5jCO4QHUzlPfhjV0OmlPnhDjuSKXB/bhcUQ EKssEZrBD+IfDMd0LfbJLVk1H8chECxcUHAxE3dQFalVzGoGKDfsUNXcNAKDPw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1752435073; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ueFIp5Bv/jq1/h5FlyRZglBdaziwDrBl0xFQyg+NkWc=; b=Tc48rgGviSgng/84KqUgAqeBV8avBLrsMnDEr1SPJQVrgbsx+liZcnmdD9aBPi9i7QP/Su Cz1quBBWOSvNb8Wp1hHwRsX8VN7n+KhwPYoWdFJ2ON/+ylltSbQrFPs7+v1io8hyFLYkEU nxe3WBqFziPZUtOvl3S36iQIZLbOdL6N255gc1Z9aRLmASUiPFthAWqY9JZcJ54G6d6K04 6EX+4sE0NLqL7UGP1DG/bWVdgk1dGKWSKck3I85srciYQEo1P2IdYE7BUc0OnDQuJiHdPO CcKoYWoeD0H4KNrqparh8k6eeK/DoZLf1XzPa6TrDE/MFSjzIqEqResRDeZsMg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1752435073; a=rsa-sha256; cv=none; b=HUPvyr6nSucK2d707iM4iGTnRO+3fzOwaZvn3Bkkar6NoZOuOZnWdGVhGnm9uxwA7z9MEI 5K0LqGbYtG/UYtfgJVOg5BJVMZfOvfXpQainhx4wzKDuY1RoFJ7+TohFTkU1IFwfaTr3LY kuAL78x0aka9cfa7JjAqLafDBHE3J95cd5c8kXw0BxDmrDq5eQT/2yi1WC2KAMgw3gv77Q zu/QjSom4BAteCl+J2KD6QFNt8mTl/sRoeECrklcuB7DqH+BlBr0Xa4x7fWAh1f1RA2NHI PCnwvgXxAS13ZrXNhF2fd68Z5SaD3g0SwvZn1QBaIMHiJWJn+G9E0ou353LakQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4bgFtT0khHz66m; Sun, 13 Jul 2025 19:31:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 56DJVDMI070898; Sun, 13 Jul 2025 19:31:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 56DJVCVl070895; Sun, 13 Jul 2025 19:31:12 GMT (envelope-from git) Date: Sun, 13 Jul 2025 19:31:12 GMT Message-Id: <202507131931.56DJVCVl070895@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: 6cdcf08c9c5e - stable/14 - Bump __FreeBSD_verion for LinuxKPI changes to dma-mapping.h and acpi. List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-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/14 X-Git-Reftype: branch X-Git-Commit: 6cdcf08c9c5eda6dc3b8395cefd9d30a4f5e2f1a Auto-Submitted: auto-generated The branch stable/14 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=6cdcf08c9c5eda6dc3b8395cefd9d30a4f5e2f1a commit 6cdcf08c9c5eda6dc3b8395cefd9d30a4f5e2f1a Author: Bjoern A. Zeeb AuthorDate: 2025-07-04 03:19:23 +0000 Commit: Bjoern A. Zeeb CommitDate: 2025-07-13 19:26:25 +0000 Bump __FreeBSD_verion for LinuxKPI changes to dma-mapping.h and acpi. Sponsored by: The FreeBSD Foundation (cherry picked from commit 842da154a0ce8f866d65f495537a13ffa8fb9cc0) --- UPDATING | 3 ++- sys/sys/param.h | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/UPDATING b/UPDATING index 4d06a05650bf..be2d8be0ff49 100644 --- a/UPDATING +++ b/UPDATING @@ -14,7 +14,8 @@ and/or ports. 20250713: LinuxKPI dma-mapping.h were pulled into the tree from drm-kmod. - Bump _FreeBSD_version to 1403503 to be able to detect this change. + LinuxKPI acpi changes effecting drivers and drm-kmod. + Bump __FreeBSD_version to 1403503 to be able to detect these changes. 20250707: Commit f5195b1a63df removed in6_maxmtu and its setter in6_setmaxmtu(). diff --git a/sys/sys/param.h b/sys/sys/param.h index 4d26484e3bb2..68cbc92b5791 100644 --- a/sys/sys/param.h +++ b/sys/sys/param.h @@ -75,7 +75,7 @@ * cannot include sys/param.h and should only be updated here. */ #undef __FreeBSD_version -#define __FreeBSD_version 1403502 +#define __FreeBSD_version 1403503 /* * __FreeBSD_kernel__ indicates that this system uses the kernel of FreeBSD, From nobody Sun Jul 13 19:31: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 4bgFtV3J1Lz61N7h; Sun, 13 Jul 2025 19:31: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bgFtV1wG4z3kC7; Sun, 13 Jul 2025 19:31:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1752435074; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ov3zO46JvaYNJQSkjUuKdvEwV2r3WqHux4tgVVrQJUc=; b=vi7Qub0a2uezOn6+BLUGzFQwDD1YdN5UWW+IuD1vDpo48XKlouCKQ25w11Eg5WAelEc/P9 wzAx7TSYh+ZVaHRxnLLT3doGXljZKW2Jk3Lzfqm3WPqJwzrJnNpB9tN0YTrvciudON2wHr ZRtfUWGORhVvp5Fw6oO59w0Vkuv6oq7hW6fMOT6qCUvjot1lnfRYYmh/C8AqmHcwqp5vR8 Ft3H4K48arJmZUeX4niSmfMJPGW/cVYfiSluDpzWZJtX7ktvoGeYevAA2ZGu9cBar19esU QBEwGvB+URnsVLj/5leFl49Oy0PEje2DLIqNsNXl8xUvYeByxXQz4uYEUXYUGw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1752435074; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ov3zO46JvaYNJQSkjUuKdvEwV2r3WqHux4tgVVrQJUc=; b=VFtJCs0jeeA7zt/G7jQ59H+PcZ8BvjajYaq6JBfGHCfS0iI5bk/kdcTu9gyiBqEf/1aqDq kI2YNiLEJi4+gUxUfZvDTP4cdc9kuuDIc1yBIgLS7dgrBA5GHR9wH9WGMJiBb4gdHQG+Rw pfNRwSdjPnVL4hoknRDduyVejy96mRbA4VV6u4swCEOxxT0je3oXEIWeekUbry/u+8TR22 aMYo76tQ1fxRzkl2yI9nc+as+M9DkHLMidDH2ausYII7+k+vmavS0hJxr8rCboNrqGdTb/ 7yRqB5GFZ3EeB7Fqxz6hItCws9tQpcbSJPFCWpYe1KBCpLWoMT7t6JodF2VAfQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1752435074; a=rsa-sha256; cv=none; b=K6E/yZUghLhw0Ql53kF8wgZubWrE996sJSzIkg08dCDf/KF+QJ4qktDFAFFmuJjw1vt1wg 49dwuvb5XRkB8OY82tRDWF64UPPk4T47GRaMt0YSR8hnucSdRZepkyyWMmPfrC02kd6fTd YZIDA0aKWHn47A8YClEqheTIFuPylHPYr4hMGD6KH2iEXH3rSrMzBc22g7TCETKL1RA3RI zek+sivaBl0yijDbknPlqjr8xQq8L6V5/jtEbtsnmoRVkLZMRqqu5BJYyCK4g9lwXdDxQT 5wqz5Yfe0IrCKRWYv7UbHh2NagghnG8svK20CrpU+15mUI1RZSdQJsHdx2HL3w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4bgFtV1W3kz6gq; Sun, 13 Jul 2025 19:31: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 56DJVEKY071615; Sun, 13 Jul 2025 19:31:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 56DJVEJH071600; Sun, 13 Jul 2025 19:31:14 GMT (envelope-from git) Date: Sun, 13 Jul 2025 19:31:14 GMT Message-Id: <202507131931.56DJVEJH071600@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: f39c377274bd - stable/14 - rtw89: enable ACPI support on FreeBSD List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-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/14 X-Git-Reftype: branch X-Git-Commit: f39c377274bd02fa0f8e7c4d1a05d3d617de895a Auto-Submitted: auto-generated The branch stable/14 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=f39c377274bd02fa0f8e7c4d1a05d3d617de895a commit f39c377274bd02fa0f8e7c4d1a05d3d617de895a Author: Bjoern A. Zeeb AuthorDate: 2025-06-15 10:44:55 +0000 Commit: Bjoern A. Zeeb CommitDate: 2025-07-13 19:26:25 +0000 rtw89: enable ACPI support on FreeBSD Now that LinuxKPI supports the lower case Linux ACPI spellings under LINUXKPI_WANT_LINUX_ACPI remove the #ifdef around the code and compile in ACPI support. Sponsored by: The FreeBSD Foundation (cherry picked from commit 8c97c46418f9767a9984df259116da08d9659076) --- sys/contrib/dev/rtw89/acpi.c | 26 -------------------------- sys/modules/rtw89/Makefile | 1 + 2 files changed, 1 insertion(+), 26 deletions(-) diff --git a/sys/contrib/dev/rtw89/acpi.c b/sys/contrib/dev/rtw89/acpi.c index 02d4526c1538..f5dedb12c129 100644 --- a/sys/contrib/dev/rtw89/acpi.c +++ b/sys/contrib/dev/rtw89/acpi.c @@ -8,7 +8,6 @@ #include "acpi.h" #include "debug.h" -#if defined(__linux__) static const guid_t rtw89_guid = GUID_INIT(0xD2A8C3E8, 0x4B69, 0x4F00, 0x82, 0xBD, 0xFE, 0x86, 0x07, 0x80, 0x3A, 0xA7); @@ -149,14 +148,6 @@ int rtw89_acpi_evaluate_dsm(struct rtw89_dev *rtwdev, ACPI_FREE(obj); return ret; } -#elif defined(__FreeBSD__) -int rtw89_acpi_evaluate_dsm(struct rtw89_dev *rtwdev, - enum rtw89_acpi_dsm_func func, - struct rtw89_acpi_dsm_result *res) -{ - return -ENOENT; -} -#endif int rtw89_acpi_evaluate_rtag(struct rtw89_dev *rtwdev, struct rtw89_acpi_rtag_result *res) @@ -180,28 +171,15 @@ int rtw89_acpi_evaluate_rtag(struct rtw89_dev *rtwdev, if (ACPI_FAILURE(status)) return -EIO; -#if defined(__linux__) obj = buf.pointer; if (obj->type != ACPI_TYPE_BUFFER) { -#elif defined(__FreeBSD__) - obj = buf.Pointer; - if (obj->Type != ACPI_TYPE_BUFFER) { -#endif rtw89_debug(rtwdev, RTW89_DBG_ACPI, -#if defined(__linux__) "acpi: expect buffer but type: %d\n", obj->type); -#elif defined(__FreeBSD__) - "acpi: expect buffer but type: %d\n", obj->Type); -#endif ret = -EINVAL; goto out; } -#if defined(__linux__) buf_len = obj->buffer.length; -#elif defined(__FreeBSD__) - buf_len = obj->Buffer.Length; -#endif if (buf_len != sizeof(*res)) { rtw89_debug(rtwdev, RTW89_DBG_ACPI, "%s: invalid buffer length: %u\n", __func__, buf_len); @@ -209,11 +187,7 @@ int rtw89_acpi_evaluate_rtag(struct rtw89_dev *rtwdev, goto out; } -#if defined(__linux__) *res = *(struct rtw89_acpi_rtag_result *)obj->buffer.pointer; -#elif defined(__FreeBSD__) - *res = *(struct rtw89_acpi_rtag_result *)obj->Buffer.Pointer; -#endif rtw89_hex_dump(rtwdev, RTW89_DBG_ACPI, "antenna_gain: ", res, sizeof(*res)); diff --git a/sys/modules/rtw89/Makefile b/sys/modules/rtw89/Makefile index bed007f9aa51..ae31b7dbd1b6 100644 --- a/sys/modules/rtw89/Makefile +++ b/sys/modules/rtw89/Makefile @@ -40,6 +40,7 @@ SRCS+= ${LINUXKPI_GENSRCS} SRCS+= opt_wlan.h opt_inet6.h opt_inet.h opt_acpi.h CFLAGS+= -DKBUILD_MODNAME='"rtw89"' +CFLAGS+= -DLINUXKPI_WANT_LINUX_ACPI CFLAGS+= -I${DEVRTW89DIR} CFLAGS+= ${LINUXKPI_INCLUDES} From nobody Sun Jul 13 19:31: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 4bgFtX1vT8z61NDT; Sun, 13 Jul 2025 19:31: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bgFtW4CjWz3kFb; Sun, 13 Jul 2025 19:31:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1752435075; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=FKVjsgYwyrwlag79XXVebkIO1ntYJI2S4FvCljdOocM=; b=KoQJEyi1m0yVHIPsvs3SAbGE3tzxzsLzVP8fJZUa/8INb8UgeltMofRRRkpgwogn6D9M1n 1GSXT3nQR3L4lL6lrfNYORdjU2XANw7diBQP3A0aeYwRSUpjL/rDGKZPpgorz+vVRvj4hi EAYEHr200UOMQBUU5Y6qnXUoeWPg5khxRMuSmEMXMebJP9xUvDmbqIteFGKMk25k3R8ITs Bjw+TP/XO1lHH8L4gybvO5+g1fTzby1h/9vsLKOMM85XKTxggiUA430eZ7l9vFTWkGvOpp IARs7vGWCCWQ6QQOLAYUvJ9BOz6rA3Rh3H6PDanAxmCXzb4N4qrTo79YxzaX6w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1752435075; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=FKVjsgYwyrwlag79XXVebkIO1ntYJI2S4FvCljdOocM=; b=kvgpP0WX/fYx4sh0Fur38bFQ33hff4kaybrDZjtyjmUKlI2F5D70P1AEzHQu+Qrmndf2AC Vk/aJCioMloNduNI4b6PTq5jvqCSy3U0tjQVRbFeXL71t0D2RZVKO4H4EAReZDUfF1yXW1 1x7Y3K+2NM+gKU2mFz5/IXdAhKUPO0QIEfGn0R6aCjHm6ZOXjnzgl3/lSPAuEx7W/hAP0x 367HOWxUzRrXyXXrj9paqgOMjo1bB02DZO5Snkz+lFMcJFwUkvAP+MxMjE7eT1isv2BkQ/ ehMH8CGAPDRo88TrsVM6Saa9W7mAr3vWrxFkvTkUiYAAwtxayimK/vbAxRPhOw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1752435075; a=rsa-sha256; cv=none; b=MnZPfu8+Z0iGUKAI+fHN/MArz8R9DamINxcL3pdSusmIfq3sDkNb3/PQg4siCIxrdE6HcG NVKldglLrm1fc4yPXSWa9d884ObviqWFtgCoH4l12SHYZmE0/LqmZNMnAir4bNsEE8HaQ8 w9r81ljMXQdxNkN1OInC1VbDAiUFiiLyCziZ3UdtL73qmJ1ZvCn0KMlhUhShGa+lwSS1Jx EoLUA8OnG0SkaYhpWiws7ErA/eoMewsGTZXQWnbMnXujubgQssPT4aOJCzAVphEMulrQ3e RH3Mj7UtWzBwdHUh5HX1WHKJDnl7I/Qnei1NUPMb4aDeZ4XnVisAyRanVZIU9Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4bgFtW2CYWz6B4; Sun, 13 Jul 2025 19:31: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 56DJVFxR071848; Sun, 13 Jul 2025 19:31:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 56DJVFJl071845; Sun, 13 Jul 2025 19:31:15 GMT (envelope-from git) Date: Sun, 13 Jul 2025 19:31:15 GMT Message-Id: <202507131931.56DJVFJl071845@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: c4496f82680c - stable/14 - iwlwifi: compile in ACPI support List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-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/14 X-Git-Reftype: branch X-Git-Commit: c4496f82680c5edb0820598817ea22e322250317 Auto-Submitted: auto-generated The branch stable/14 has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=c4496f82680c5edb0820598817ea22e322250317 commit c4496f82680c5edb0820598817ea22e322250317 Author: Bjoern A. Zeeb AuthorDate: 2025-06-15 10:46:22 +0000 Commit: Bjoern A. Zeeb CommitDate: 2025-07-13 19:26:25 +0000 iwlwifi: compile in ACPI support Now that LinuxKPI supports the lower case Linux ACPI spellings under LINUXKPI_WANT_LINUX_ACPI we only need to provide the debug macro to allow us to compile in ACPI support. This ties into regulatory and will be used, e.g., for 11ax, 11be, and Per Platform Antenna Gain (PPAG) settings. Sponsored by: The FreeBSD Foundation (cherry picked from commit 228b43c258d24c293b135ae94c120e7ccf0a7aea) --- sys/contrib/dev/iwlwifi/iwl-debug.h | 4 +++- sys/modules/iwlwifi/Makefile | 8 +++++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/sys/contrib/dev/iwlwifi/iwl-debug.h b/sys/contrib/dev/iwlwifi/iwl-debug.h index 43288a5a8d74..7b3b402766b4 100644 --- a/sys/contrib/dev/iwlwifi/iwl-debug.h +++ b/sys/contrib/dev/iwlwifi/iwl-debug.h @@ -47,7 +47,7 @@ enum iwl_dl { IWL_DL_DROP = 0x00000010, IWL_DL_EEPROM = 0x00000020, IWL_DL_FW = 0x00000040, - /* = 0x00000080, */ + IWL_DL_DEV_RADIO = 0x00000080, IWL_DL_HC = 0x00000100, IWL_DL_HT = 0x00000200, IWL_DL_INFO = 0x00000400, @@ -195,6 +195,8 @@ void __iwl_dbg(struct device *, u32, bool, const char *, const char *fmt, ...); IWL_DPRINTF(_subsys, IWL_DL_WEP, _fmt, ##__VA_ARGS__) #define IWL_DEBUG_WOWLAN(_subsys, _fmt, ...) \ IWL_DPRINTF(_subsys, IWL_DL_WOWLAN, _fmt, ##__VA_ARGS__) +#define IWL_DEBUG_DEV_RADIO(_dev, _fmt, ...) \ + IWL_DPRINTF_DEV((_dev), IWL_DL_DEV_RADIO, _fmt, ##__VA_ARGS__) #define IWL_DEBUG_PCI_RW(_subsys, _fmt, ...) \ IWL_DPRINTF(_subsys, IWL_DL_PCI_RW, _fmt, ##__VA_ARGS__) diff --git a/sys/modules/iwlwifi/Makefile b/sys/modules/iwlwifi/Makefile index fd11e670b540..7f4ef7d8d32d 100644 --- a/sys/modules/iwlwifi/Makefile +++ b/sys/modules/iwlwifi/Makefile @@ -5,6 +5,7 @@ DEVIWLWIFIDIR= ${SRCTOP}/sys/contrib/dev/iwlwifi WITH_CONFIG_PM= 0 WITH_DEBUGFS= 1 +WITH_CONFIG_ACPI= 1 KMOD= if_iwlwifi @@ -41,6 +42,12 @@ CFLAGS+= -DCONFIG_PM CFLAGS+= -DCONFIG_PM_SLEEP .endif +.if defined(WITH_CONFIG_ACPI) && ${WITH_CONFIG_ACPI} > 0 +SRCS+= fw/acpi.c +CFLAGS+= -DCONFIG_ACPI +CFLAGS+= -DLINUXKPI_WANT_LINUX_ACPI +.endif + SRCS+= iwl-devtrace.c # Other @@ -57,7 +64,6 @@ CFLAGS+= -DCONFIG_IWLMVM=1 # Helpful after fresh imports. #CFLAGS+= -ferror-limit=0 -#CFLAGS+= -DCONFIG_ACPI=1 #CFLAGS+= -DCONFIG_INET=1 # Need LKPI TSO implementation. #CFLAGS+= -DCONFIG_IPV6=1 CFLAGS+= -DCONFIG_IWLWIFI_DEBUG=1