From nobody Mon Dec 9 12:39:41 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Y6LzK4QGgz5gFvT; Mon, 09 Dec 2024 12:39:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Y6LzK3yjKz44FB; Mon, 9 Dec 2024 12:39:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733747981; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=KA16uSGFvc5UWadDhwIN7OTzpkLjrejJAbgLwU836Fc=; b=uY7kjQimowp63ZXUCXb8hQkB/fbgjW9UphpdLQGnjiBiD9Qd6SSN8hbICE+NhCqCmxhGND szoQ/4r6VSbPxycWJvS/9uNZ7c78ptDtp2DCfTV69uyUFCiWx0tay3na8ilc+ZHedk/tF0 orcb+Nc6ZX7kWTMB9083OW3Nsw49SKg2YlaIuZkLy5QY9o0y+GohOHOzuVKiR7+fceCziD 4rdNSGj+XGSuefIGnCgPcaXCO7pZtBk0Un84/MgW8xUDN+r9o3T6A+KWaJ0/X0TF8Egvq5 aQZy+trGxdLlinStIb/g8QaudAjmOr/46befKaZXjN03v1VUrv7CLjMTv4kb8g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733747981; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=KA16uSGFvc5UWadDhwIN7OTzpkLjrejJAbgLwU836Fc=; b=x2hWxPPHPy5Fd594dpXfnumkxsFKjVx4MJd3KgWrxa3hRn5Ydpqcn6dlMPs4gRqZ3pYFGM 8YZQ6uyXLra08ZCD97xOgfoZvbvFxn/MzQukgEyFm25FVCal4Q3bwLfHu03a2c1Z9Qk/90 PVdxKvEZX8LPxsoXOejBrIY0RWB9lUEuV/j/ik9e+4N34KVSZXbHeYtB4zfLKnXuLBNP/y p/IUsUGUSXC5YtKJ1Q3SGgtlwIiS4uF9Hw1XlgDD510NP/2G6oU0y9Yg5k2mIyBYZ30YPY ymMtwliXQPvGjxMrNhWeLnZz/UAcXoXehIy66iQGLNayX2b+2can5XwWtyEopg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1733747981; a=rsa-sha256; cv=none; b=lbUUcnq6o59yUX+XLJehbOJekqB0hESE+d/epMpqGcFv0oD7FQ/cO4MCLiJrAUDhdqkH7w 33ji/2dP1lHH9apNqfn/Qry+U500Qp6Hq6vVK2KalYMfjOS7TKWhCFGnmV8e7jOzu3QlFY FX2T9HII5nLDS47eDgfXuma5R6GkxMEOl3CfbYfAa/pCNhP524Wx17WAiggRg0rfVWHcd1 4C3DNUX9NHO8RSxc7dgHvK923yxWhzpT6u7RZziLrP9u6XCyWK+FiFirW9fCI5tKkf31XZ FHeOJmiSGfe846CNREntIefdTPjfgw3GUxvyzPG/9c2s6aBPL+VLacf7OtLJyA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Y6LzK3Z3KzdYJ; Mon, 9 Dec 2024 12:39:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4B9CdfJj008369; Mon, 9 Dec 2024 12:39:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4B9CdfY6008366; Mon, 9 Dec 2024 12:39:41 GMT (envelope-from git) Date: Mon, 9 Dec 2024 12:39:41 GMT Message-Id: <202412091239.4B9CdfY6008366@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= Subject: git: 0ff2b4a85b66 - stable/14 - Improve reliability of stdout 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: des X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 0ff2b4a85b66d5fb8cf526a47c6367671bc2bc42 Auto-Submitted: auto-generated The branch stable/14 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=0ff2b4a85b66d5fb8cf526a47c6367671bc2bc42 commit 0ff2b4a85b66d5fb8cf526a47c6367671bc2bc42 Author: Dag-Erling Smørgrav AuthorDate: 2024-11-14 19:41:35 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2024-12-09 12:39:21 +0000 Improve reliability of stdout tests. If the test runner is under heavy load, the command we are testing may succeed in printing to stdout before the dummy receiver has terminated. Add a short delay to reduce the likelihood of this happening. MFC after: 1 week Sponsored by: Klara, Inc. Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D47572 (cherry picked from commit b697835ce614de2fa30ba066983d7e71c48f34ce) --- usr.bin/asa/tests/asa_test.sh | 1 + usr.bin/cmp/tests/cmp_test2.sh | 1 + usr.bin/env/tests/env_test.sh | 1 + 3 files changed, 3 insertions(+) diff --git a/usr.bin/asa/tests/asa_test.sh b/usr.bin/asa/tests/asa_test.sh index 91515bb55d95..2b8fecb12d98 100644 --- a/usr.bin/asa/tests/asa_test.sh +++ b/usr.bin/asa/tests/asa_test.sh @@ -70,6 +70,7 @@ stdout_head() { stdout_body() { ( trap "" PIPE + sleep 1 echo " $a $b" | asa 2>stderr echo $? >result ) | true diff --git a/usr.bin/cmp/tests/cmp_test2.sh b/usr.bin/cmp/tests/cmp_test2.sh index 2ec6071851d3..bca8fc18a6b8 100755 --- a/usr.bin/cmp/tests/cmp_test2.sh +++ b/usr.bin/cmp/tests/cmp_test2.sh @@ -138,6 +138,7 @@ atf_check_stdout() { ( trap "" PIPE + sleep 1 cmp "$@" 2>stderr echo $? >result ) | true diff --git a/usr.bin/env/tests/env_test.sh b/usr.bin/env/tests/env_test.sh index 2dc8f1a4c911..3210361eb223 100644 --- a/usr.bin/env/tests/env_test.sh +++ b/usr.bin/env/tests/env_test.sh @@ -139,6 +139,7 @@ stdout_body() { ( trap "" PIPE + sleep 1 env 2>stderr echo $? >result ) | true From nobody Mon Dec 9 14:06:16 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Y6NvF0x5cz5gLNM; Mon, 09 Dec 2024 14:06: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 4Y6NvF0GxWz4D83; Mon, 9 Dec 2024 14:06:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733753177; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=QdJBY1EQOkw4dlZThDxW+xHNxfMGdcuEe3jNMHNvgx0=; b=wt4OGn2uXzDPFGQPMlXcTzTUSLZNrJFrml3UAHayZt3zkC/hta4FItp1UgWVgzVlIvnXun Fp23YHsAmnT3kLRM44/3vWeh5yDrRZp7PAmA3Kl9F3CAk1QN68RPNHFOOIuf3Ga+Ph9NOw mR+nH0sD48y30+OSN0bUMXYmiSq69QEET7T/5edAjG3ciajHAtVgdgtn5mTMT2O1AW0h8Q uqrjJ4ybZDPnTTA21vJdQThe/eQ8S1Evi1B0KGkvdmDelp687UX3DSNhFgPqdKmgKu4Pwl o/DwkJLnDOr3a7EaBCuofCZlUSUu/CDukN+cENqinRGw14JomkHQ8BfXkkKBug== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733753177; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=QdJBY1EQOkw4dlZThDxW+xHNxfMGdcuEe3jNMHNvgx0=; b=kPpVAjD0XH8i6zTcJnRU2i/MYj4nxwijs6zD8SeBiY+PJqUHRaxkrI68D+sCLZeHmx1pw8 tn2Gx0NK7/phiiUekKjfUcttRA8gy0cef6M4DaKwZlH/9I+sMQ00c1SVNSeFmNw/JtD2to KizyoXm3tRs6apkwJhItYPMR06f+UAQEgHgb/J69QjF9OPSHiOqpwwGNPPvkX78uAj1CPq WfaVlF2C7l8pt4uacejEuA0mB2NW80PR3lGq1HEoGr3AL6zOu951vpPKEWk3rqvvYs3jso mtEQb4HXqnIEebTprC3rweQxXBCl8vJwOEe/EtrdtkbqQgI0o56J9E2744NcXQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1733753177; a=rsa-sha256; cv=none; b=XdlUAMJtzeAsuC0bSHBXItr9FzRW3BVtq4smOiOswlAm1u2QX3vulblqSinOcjHjl8DAzS V2xBpH5RPtVaH4mTFqEXFZwnHsWuk0QRCwuFbpw+n9So05ce0MW4vGiARqYclLS/JvmIas Y3EhkqZnrEUmegH86al0foPSRJpJ4WQvmNeFNPhl5x9j7SvHJU0dwtYJ+4lTC++mLaJGeD 8T4tHMC2mvhh6qmAvJBp6YZsy9PPmbCkCebXqXeW2I0V2k0VGaQkEV+pggabCkPpB1ERvz XNVZF3lYfZo5xE3pK2ZH+hfNHhL3hmXjdDHYSDXSRwzhUByyWgPvTGHhdSNF7w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Y6NvD6sgqzhFw; Mon, 9 Dec 2024 14:06: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 4B9E6GjZ076285; Mon, 9 Dec 2024 14:06:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4B9E6GRJ076282; Mon, 9 Dec 2024 14:06:16 GMT (envelope-from git) Date: Mon, 9 Dec 2024 14:06:16 GMT Message-Id: <202412091406.4B9E6GRJ076282@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dimitry Andric Subject: git: 210ff8644846 - stable/13 - depend-cleanup: fix after 99b2ab71c5b6 List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dim X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 210ff86448461dd00dce6f826ae58deb5ae44822 Auto-Submitted: auto-generated The branch stable/13 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=210ff86448461dd00dce6f826ae58deb5ae44822 commit 210ff86448461dd00dce6f826ae58deb5ae44822 Author: Dimitry Andric AuthorDate: 2024-12-09 14:05:07 +0000 Commit: Dimitry Andric CommitDate: 2024-12-09 14:05:07 +0000 depend-cleanup: fix after 99b2ab71c5b6 After commit 99b2ab71c5b6 was merged, the stable/13 version of depend-cleanup gives an error "run: not found". This is because the "dry run" functionality from commit 1ec7cb1b5d18 was never merged. Remove the "run" invocation to make the script correctly again, as merging commit 1ec7cb1b5d18 results in many conflicts. Direct commit to stable/13, since this does not apply to other branches. Reported by: des Fixes: 99b2ab71c5b6 --- tools/build/depend-cleanup.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/build/depend-cleanup.sh b/tools/build/depend-cleanup.sh index effb6376d225..fd0d7eb01fe7 100755 --- a/tools/build/depend-cleanup.sh +++ b/tools/build/depend-cleanup.sh @@ -102,6 +102,6 @@ f="$p"/arm_mve_builtin_sema.inc if [ -e "$f" ]; then if grep -q SemaBuiltinConstantArgRange "$f"; then echo "Removing pre-llvm19 clang-tblgen output" - run rm -f "$p"/*.inc + rm -f "$p"/*.inc fi fi From nobody Mon Dec 9 16:25:00 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Y6RzK1jQWz5gVJV; Mon, 09 Dec 2024 16:25:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Y6RzK0tKVz4VpQ; Mon, 9 Dec 2024 16:25:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733761501; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=nwLJGnw500U/7pshiupsdv02j9FSB2HPyNH5yoDL5dE=; b=HkuAgP6AHulC+ZsuodKrOlOYYLnLZGIAnNILfib+AghyKoQ/jFrjyDhngxlHIT8hT3Puhv DbYeQRavOGeYYnzUkB1osPImflnpng0LOl4o1ONfNrONo/0aFUgQIowCXEMbMQKwCp5v/m RfYqq1xiJCCuDTWQQc5z8zza8WUuXT3GhUYXQIh+aAVW3SKaPg6uAKX6LrZ8TZTko8WFiB PGW4KJQxWEumGUoVD2xDPe4oNVCKUepuFMWvtzfj9eW4O+wFe0V7VCQItcylUot1rqoKKQ /aM+ZhGAVc+mFCX1/UNU+8rSiUtmCljN3JurZHCWRfhvMMDdwbNxo0c+h5jZMg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733761501; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=nwLJGnw500U/7pshiupsdv02j9FSB2HPyNH5yoDL5dE=; b=LwVB3uhOUTzIPiW0voKeA1wW3Qb6vhCX6iQEe/ttQjAcZRKJJRbk7J/42y+9VMoJHbWSsT yD3GEk7hXph23KA1v453pxLu0SuYVNyzFuJ8u6oh8MXW7BC8D0uzcSQ5toSQwPU9do+dnU +4Vyb6IsK2Fw43rH9lmFgIZd/+9VZ/kEVeLC+5zJ6iO12i9mig9jqcuhciFq/DEn2KuNhj quMGBi6C3O2itG77Nnh2mQJrkqmrjZir+rFY7gYwt3FkFyLkHUnh9bkQ9m2sw2SoIAmNh+ d+A3/LyysXsgLJmYirkbVc3cpY5Uko+aRDPLB5ap2tWrd0WgV1X84ZutjmIdKw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1733761501; a=rsa-sha256; cv=none; b=KdDz/fnnMFHTfvmfuUuXXYzxrFBkSW4muNF/xMZJRud5Nr8bk4IeYLofdzdSUjLcqvqu49 6dJbUtAjLdolzxuaKLD4tv9RPqIEp1Tqa1s9LamQwpgG0yDoSKEjFR4j8Ckmvoj82p/CZb 4h/JWmGOJu/ALq61P5lvTR7cJMDZAb2rv8A6rMsPL4Jm6LLRDStyPaXwSpSwapJwrn4J1A tOY4FiJZP/8gXuco76EG6WTE3O+u2E2pWnnC0lEZTaMm4y0blr7kHEJLeNJiokH/gCnWKf KSClf/UkwflwXl8CiCl5hbOMoEUc4N23TnvDJ1Nazu1GKIW82PQPrPSWsyDPiQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Y6RzK0Ls5zlbr; Mon, 9 Dec 2024 16:25: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 4B9GP04J037157; Mon, 9 Dec 2024 16:25:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4B9GP02K037154; Mon, 9 Dec 2024 16:25:00 GMT (envelope-from git) Date: Mon, 9 Dec 2024 16:25:00 GMT Message-Id: <202412091625.4B9GP02K037154@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Jessica Clarke Subject: git: 9266d812eaf4 - stable/14 - depend-cleanup.sh: Fix pretend (-n) 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: jrtc27 X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 9266d812eaf4d810eeb482b07fbe320d405e7361 Auto-Submitted: auto-generated The branch stable/14 has been updated by jrtc27: URL: https://cgit.FreeBSD.org/src/commit/?id=9266d812eaf4d810eeb482b07fbe320d405e7361 commit 9266d812eaf4d810eeb482b07fbe320d405e7361 Author: Jessica Clarke AuthorDate: 2024-09-10 16:14:37 +0000 Commit: Jessica Clarke CommitDate: 2024-12-09 16:24:25 +0000 depend-cleanup.sh: Fix pretend (-n) mode Fixes: 26a09db3add3 ("Fix incremental build with WITH_NVME newly enabled") MFC after: 1 week (cherry picked from commit 7ce171bd4220b2e8946556bb806c787b51324993) --- tools/build/depend-cleanup.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/build/depend-cleanup.sh b/tools/build/depend-cleanup.sh index 6da37606300c..aad4f6b9218f 100755 --- a/tools/build/depend-cleanup.sh +++ b/tools/build/depend-cleanup.sh @@ -164,7 +164,7 @@ fi if [ -f "$OBJTOP"/rescue/rescue/rescue.mk ] && \ grep -q -v 'nvme_util.o' "$OBJTOP"/rescue/rescue/rescue.mk; then echo "removing rescue.mk without nvme_util.o" - rm -f "$OBJTOP"/rescue/rescue/rescue.mk + run rm -f "$OBJTOP"/rescue/rescue/rescue.mk fi # 20241018 5deeebd8c6ca Merge llvm-project release/19.x llvmorg-19.1.2-0-g7ba7d8e2f7b6 From nobody Mon Dec 9 16:25:02 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Y6RzL1dByz5gV1w; Mon, 09 Dec 2024 16:25: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 4Y6RzL10Brz4VtZ; Mon, 9 Dec 2024 16:25:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733761502; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vOktDMzuAXZO5ELoTq6HrSPoLMBZ7hDDgtAvWJ8BmPI=; b=W0ADkNKl9dfmsuv9I75jwOusTkKfkTkufAOWwK9mFai/MyhlzT3hnf5U/5jg77+PwCozl6 kzY0ttssUGVw7Ihk8gD0kNYRUJLWhU7Qon3DlF7McYDwUxSJr+rqdpGbuWm8tfraJBAcgN HM0PrXPQZh/4ltoUQQSMk2OoO+N25r4Oy34+pEL2kIw5yZmYnkRAM/GG2UwMAcDMYoEhfu Rtztuhm6kizJMBI0YQyi4A74t/zP9CMZnNwx5k+nUSK7/i9EKSOH+RbgK0R4YSVcn98ACt N5Ruyl5JS5se31zKiY7wcvoFoEDDNqpVG6dLjn+UAdXTM87l0jsyni8cDfpr+Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733761502; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vOktDMzuAXZO5ELoTq6HrSPoLMBZ7hDDgtAvWJ8BmPI=; b=VOUpm2CvVN7jjWEEydNjZGnW2U/i9e71TNVet+rzKPu0SoaGXUVFk+TIbLORfdOjnaozwx SAlHDST4g0CX2V2qfybXc/ZuS9gSTasq2S7LuwGEe96zZ4hmDenbwIAYhnYDTUaQKSUwx0 1EHiQjdVSk4K1UhBh6ecghCU0F398RbVnFJ0B7/vmiUeJdxAdLJ+3TrVmkNVSVp75ZU5T6 X+2avXDJ2aDgOTnNNaDDg2sZ3O7oTJVfH/QC2nUIpM2NXGXFf/x00cARto2N8ABF6QxAAw rufkSG+Py5LLtVJlOny8Q6ZI3xhUIcQxcI08cqtsVmwOcUPG8VFmYCarKo+1wQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1733761502; a=rsa-sha256; cv=none; b=pHPkgW9P4PB+dh09jVYzpKjEVVPb4xuJFyx3I/J1+b7rgxawYAY/6AJjh8QaNzp7Klrj6t TtbLnRr0oswGQzsTaaKYgMOUbJSVw4KvWzVPLIljktKs7gVQOQv4cCBOqslVScMzea+KRM T1VNF08rP1HGduudOC6q79fL8kYwR88gLGKcSakMy9v5HZ9xf1awtYCcG+NCrclvBSq25c 48Fsftm8SM0d8fBerg7PjbtyeonKbaKS1tYFKYgZDHxW+O71RbCPJ4+M4daBjM4PxF1IYK 3OPwvyAITf9KjifiXgB/5u+8tSOU2nwID6n/RkbiWC/SORv6hRaQM1XPDP25lg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Y6RzL0cBNzlnV; Mon, 9 Dec 2024 16:25: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 4B9GP2vR037216; Mon, 9 Dec 2024 16:25:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4B9GP2wF037211; Mon, 9 Dec 2024 16:25:02 GMT (envelope-from git) Date: Mon, 9 Dec 2024 16:25:02 GMT Message-Id: <202412091625.4B9GP2wF037211@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Jessica Clarke Subject: git: be778581eb31 - stable/14 - depend-cleanup.sh: Fix overzealous rescue.mk 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: jrtc27 X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: be778581eb3168bcd8f9d8034e5175873efba416 Auto-Submitted: auto-generated The branch stable/14 has been updated by jrtc27: URL: https://cgit.FreeBSD.org/src/commit/?id=be778581eb3168bcd8f9d8034e5175873efba416 commit be778581eb3168bcd8f9d8034e5175873efba416 Author: Jessica Clarke AuthorDate: 2024-09-10 16:33:06 +0000 Commit: Jessica Clarke CommitDate: 2024-12-09 16:24:25 +0000 depend-cleanup.sh: Fix overzealous rescue.mk cleanup grep -q -v means "are there any lines that don't match", not "are there no lines that match", and since the file has lines other than ones with nvme_util.o when up-to-date this triggers on every build. Fixes: 26a09db3add3 ("Fix incremental build with WITH_NVME newly enabled") MFC after: 1 week (cherry picked from commit e546c3950a2c98b298b8ddfb68b50cb496fe7fac) --- tools/build/depend-cleanup.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/build/depend-cleanup.sh b/tools/build/depend-cleanup.sh index aad4f6b9218f..7441cd1d7d81 100755 --- a/tools/build/depend-cleanup.sh +++ b/tools/build/depend-cleanup.sh @@ -162,7 +162,7 @@ fi # 20240416 2fda3ab0ac19 WITH_NVME: Remove from broken if [ -f "$OBJTOP"/rescue/rescue/rescue.mk ] && \ - grep -q -v 'nvme_util.o' "$OBJTOP"/rescue/rescue/rescue.mk; then + ! grep -q 'nvme_util.o' "$OBJTOP"/rescue/rescue/rescue.mk; then echo "removing rescue.mk without nvme_util.o" run rm -f "$OBJTOP"/rescue/rescue/rescue.mk fi From nobody Mon Dec 9 16:33:18 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Y6S8v5MhFz5gW5L; Mon, 09 Dec 2024 16:33: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 4Y6S8v0nw2z4X40; Mon, 9 Dec 2024 16:33:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733761999; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4lilf1iBxrXg/YuCZ/AmxpjGPpwLKhmdJaQLtOvAb/8=; b=lUUWXDV6Qrq0IF/+ByAr2bsSPqzp0uOnFuaJX5t/4nLYOYlzGKGXaeLN7SPVqro/4NZOK2 esGFItvcNV0nGwkXnDOM7CPGFtecawEi5vaYE561ysD0mDnPkiRkeM6TyqCOwCSRznoxdF UFmVon4E4LjSRj+XUF/IxqodmbJLHA85cTjJtE+MmhmyNbD+dT9m1VFG3isxIXEysaXUpp kCDjaykv1j2ygSiK49R8mfjXsdrkIJQqqqqPmEPT/z+Kt6PJ0vNQaYydoiieoucIj4d4on Q04Jyqm7XvIulQPENR857jzEGXqyHkkMqXuBYYlU7MTGVth1g9plE6T9t9rK9w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733761999; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4lilf1iBxrXg/YuCZ/AmxpjGPpwLKhmdJaQLtOvAb/8=; b=gGgrbFxm5+Ak7pPzFqsKd1xq8Pl8hC7qNrhXe0tdCyBg1K32drJwfA2oI7f9uxzHziPzyW Aqxbz2sM74NzgyUOBBnoctpE3d4x4FdocX9JQcgDRwLNVl9qbjhfwTRg9LeH7PfFVkJCWM ZyynWmvueq70P6f2iH3PWPs/a7o2rkWfFTdSilxdmDHjO/Zu97vIT7i+Lsa+jDLO1TTW/7 psHMZIlWYcG0aFH1aY9zdT2P6kGC72Pcxo7F+9/FtyUqkJi5V7W3FUZrm/3YU2LwGvdf1t vNyFtJnwk1KDW6RXMNd321ZukCQb0aD9hL6aGH8SeEZG7bEuBU7goWPChWVDLg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1733761999; a=rsa-sha256; cv=none; b=hcuaGUZS6ABY+Qj078uRp0Jrbs9K8ohmBdW9amLQHUIZu3QhqSduH6toVDjsNjpxKDeIRE iBUcObnC++o+9eQUqWEtLoOLZIosdX1ODhCfXC4hYnLOwiK+ks2Cr/izt0Hl6tKytqIo1K pyM/SVuDPVoKg3z2lTfjdROyzOZL64UxbZNMHVgAQqjrXm224ybmv/WMsyCBgzI6EgF3mO W3uMFnLJPcNAF5yvJVUeFEAuxUagsQTmoms1G6Ht9az5g3F5jPprR5/jya4FHTvJ0+Dq0J Ck6729EWanhodXDWxw1JtCTuFTCb2YlhJQZWSOXRuaFPcf4ORISvAmSSY4jUZw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Y6S8v0PnCzln8; Mon, 9 Dec 2024 16:33: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 4B9GXIm5055167; Mon, 9 Dec 2024 16:33:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4B9GXIUS055164; Mon, 9 Dec 2024 16:33:18 GMT (envelope-from git) Date: Mon, 9 Dec 2024 16:33:18 GMT Message-Id: <202412091633.4B9GXIUS055164@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: 3f879ed6eee9 - stable/14 - 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: 3f879ed6eee9618ff7611f5de7a73868ef0cebb9 Auto-Submitted: auto-generated The branch stable/14 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=3f879ed6eee9618ff7611f5de7a73868ef0cebb9 commit 3f879ed6eee9618ff7611f5de7a73868ef0cebb9 Author: Zhenlei Huang AuthorDate: 2024-12-06 11:39:18 +0000 Commit: Zhenlei Huang CommitDate: 2024-12-09 16:32:43 +0000 sys/sys/kernel.h: Various whitespace fixes MFC after: 3 days (cherry picked from commit 5c623697d6011de63bc762560a648c09379e06d2) --- sys/sys/kernel.h | 100 +++++++++++++++++++++++++++---------------------------- 1 file changed, 50 insertions(+), 50 deletions(-) diff --git a/sys/sys/kernel.h b/sys/sys/kernel.h index 62b9e6a02b3c..f547ff4690de 100644 --- a/sys/sys/kernel.h +++ b/sys/sys/kernel.h @@ -86,16 +86,16 @@ extern volatile int ticks; * The SI_SUB_LAST value must have the highest lexical value. */ enum sysinit_sub_id { - SI_SUB_DUMMY = 0x0000000, /* not executed; for linker*/ - SI_SUB_DONE = 0x0000001, /* processed*/ + SI_SUB_DUMMY = 0x0000000, /* not executed; for linker */ + SI_SUB_DONE = 0x0000001, /* processed */ SI_SUB_TUNABLES = 0x0700000, /* establish tunable values */ - SI_SUB_COPYRIGHT = 0x0800001, /* first use of console*/ + SI_SUB_COPYRIGHT = 0x0800001, /* first use of console */ SI_SUB_VM = 0x1000000, /* virtual memory system init */ SI_SUB_COUNTER = 0x1100000, /* counter(9) is initialized */ - SI_SUB_KMEM = 0x1800000, /* kernel memory*/ + SI_SUB_KMEM = 0x1800000, /* kernel memory */ SI_SUB_HYPERVISOR = 0x1A40000, /* * Hypervisor detection and - * virtualization support + * virtualization support * setup. */ SI_SUB_WITNESS = 0x1A80000, /* witness initialization */ @@ -105,7 +105,7 @@ enum sysinit_sub_id { SI_SUB_VNET_PRELINK = 0x1E00000, /* vnet init before modules */ SI_SUB_KLD = 0x2000000, /* KLD and module setup */ SI_SUB_KHELP = 0x2080000, /* khelp modules */ - SI_SUB_CPU = 0x2100000, /* CPU resource(s)*/ + SI_SUB_CPU = 0x2100000, /* CPU resource(s) */ SI_SUB_RACCT = 0x2110000, /* resource accounting */ SI_SUB_KDTRACE = 0x2140000, /* Kernel dtrace hooks */ SI_SUB_RANDOM = 0x2160000, /* random number generator */ @@ -113,21 +113,21 @@ enum sysinit_sub_id { SI_SUB_MAC_POLICY = 0x21C0000, /* TrustedBSD MAC policies */ SI_SUB_MAC_LATE = 0x21D0000, /* TrustedBSD MAC subsystem */ SI_SUB_VNET = 0x21E0000, /* vnet 0 */ - SI_SUB_INTRINSIC = 0x2200000, /* proc 0*/ - SI_SUB_VM_CONF = 0x2300000, /* config VM, set limits*/ + SI_SUB_INTRINSIC = 0x2200000, /* proc 0 */ + SI_SUB_VM_CONF = 0x2300000, /* config VM, set limits */ SI_SUB_DDB_SERVICES = 0x2380000, /* capture, scripting, etc. */ - SI_SUB_RUN_QUEUE = 0x2400000, /* set up run queue*/ + SI_SUB_RUN_QUEUE = 0x2400000, /* set up run queue */ SI_SUB_KTRACE = 0x2480000, /* ktrace */ SI_SUB_OPENSOLARIS = 0x2490000, /* OpenSolaris compatibility */ SI_SUB_AUDIT = 0x24C0000, /* audit */ - SI_SUB_CREATE_INIT = 0x2500000, /* create init process*/ + SI_SUB_CREATE_INIT = 0x2500000, /* create init process */ SI_SUB_SCHED_IDLE = 0x2600000, /* required idle procs */ SI_SUB_MBUF = 0x2700000, /* mbuf subsystem */ SI_SUB_INTR = 0x2800000, /* interrupt threads */ SI_SUB_TASKQ = 0x2880000, /* task queues */ SI_SUB_EPOCH = 0x2888000, /* epoch subsystem */ #ifdef EARLY_AP_STARTUP - SI_SUB_SMP = 0x2900000, /* start the APs*/ + SI_SUB_SMP = 0x2900000, /* start the APs */ #endif SI_SUB_SOFTINTR = 0x2A00000, /* start soft interrupt thread */ SI_SUB_DEVFS = 0x2F00000, /* devfs ready for devices */ @@ -138,40 +138,40 @@ enum sysinit_sub_id { SI_SUB_DTRACE_ANON = 0x308C000, /* DTrace anon enabling */ SI_SUB_DRIVERS = 0x3100000, /* Let Drivers initialize */ SI_SUB_CONFIGURE = 0x3800000, /* Configure devices */ - SI_SUB_VFS = 0x4000000, /* virtual filesystem*/ - SI_SUB_CLOCKS = 0x4800000, /* real time and stat clocks*/ - SI_SUB_SYSV_SHM = 0x6400000, /* System V shared memory*/ - SI_SUB_SYSV_SEM = 0x6800000, /* System V semaphores*/ - SI_SUB_SYSV_MSG = 0x6C00000, /* System V message queues*/ + SI_SUB_VFS = 0x4000000, /* virtual filesystem */ + SI_SUB_CLOCKS = 0x4800000, /* real time and stat clocks */ + SI_SUB_SYSV_SHM = 0x6400000, /* System V shared memory */ + SI_SUB_SYSV_SEM = 0x6800000, /* System V semaphores */ + SI_SUB_SYSV_MSG = 0x6C00000, /* System V message queues */ SI_SUB_P1003_1B = 0x6E00000, /* P1003.1B realtime */ - SI_SUB_PSEUDO = 0x7000000, /* pseudo devices*/ + SI_SUB_PSEUDO = 0x7000000, /* pseudo devices */ SI_SUB_EXEC = 0x7400000, /* execve() handlers */ SI_SUB_PROTO_BEGIN = 0x8000000, /* VNET initialization */ SI_SUB_PROTO_PFIL = 0x8100000, /* Initialize pfil before FWs */ - SI_SUB_PROTO_IF = 0x8400000, /* interfaces*/ + SI_SUB_PROTO_IF = 0x8400000, /* interfaces */ SI_SUB_PROTO_DOMAININIT = 0x8600000, /* domain registration system */ SI_SUB_PROTO_MC = 0x8700000, /* Multicast */ - SI_SUB_PROTO_DOMAIN = 0x8800000, /* domains (address families?)*/ + SI_SUB_PROTO_DOMAIN = 0x8800000, /* domains (address families?) */ SI_SUB_PROTO_FIREWALL = 0x8806000, /* Firewalls */ SI_SUB_PROTO_IFATTACHDOMAIN = 0x8808000,/* domain dependent data init */ SI_SUB_PROTO_END = 0x8ffffff, /* VNET helper functions */ - SI_SUB_KPROF = 0x9000000, /* kernel profiling*/ - SI_SUB_KICK_SCHEDULER = 0xa000000, /* start the timeout events*/ + SI_SUB_KPROF = 0x9000000, /* kernel profiling */ + SI_SUB_KICK_SCHEDULER = 0xa000000, /* start the timeout events */ SI_SUB_INT_CONFIG_HOOKS = 0xa800000, /* Interrupts enabled config */ SI_SUB_ROOT_CONF = 0xb000000, /* Find root devices */ - SI_SUB_INTRINSIC_POST = 0xd000000, /* proc 0 cleanup*/ + SI_SUB_INTRINSIC_POST = 0xd000000, /* proc 0 cleanup */ SI_SUB_SYSCALLS = 0xd800000, /* register system calls */ SI_SUB_VNET_DONE = 0xdc00000, /* vnet registration complete */ - SI_SUB_KTHREAD_INIT = 0xe000000, /* init process*/ - SI_SUB_KTHREAD_PAGE = 0xe400000, /* pageout daemon*/ - SI_SUB_KTHREAD_VM = 0xe800000, /* vm daemon*/ - SI_SUB_KTHREAD_BUF = 0xea00000, /* buffer daemon*/ - SI_SUB_KTHREAD_UPDATE = 0xec00000, /* update daemon*/ - SI_SUB_KTHREAD_IDLE = 0xee00000, /* idle procs*/ + SI_SUB_KTHREAD_INIT = 0xe000000, /* init process */ + SI_SUB_KTHREAD_PAGE = 0xe400000, /* pageout daemon */ + SI_SUB_KTHREAD_VM = 0xe800000, /* vm daemon */ + SI_SUB_KTHREAD_BUF = 0xea00000, /* buffer daemon */ + SI_SUB_KTHREAD_UPDATE = 0xec00000, /* update daemon */ + SI_SUB_KTHREAD_IDLE = 0xee00000, /* idle procs */ #ifndef EARLY_AP_STARTUP - SI_SUB_SMP = 0xf000000, /* start the APs*/ -#endif - SI_SUB_RACCTD = 0xf100000, /* start racctd*/ + SI_SUB_SMP = 0xf000000, /* start the APs */ +#endif + SI_SUB_RACCTD = 0xf100000, /* start racctd */ SI_SUB_LAST = 0xfffffff /* final initialization */ }; @@ -179,16 +179,16 @@ enum sysinit_sub_id { * Some enumerated orders; "ANY" sorts last. */ enum sysinit_elem_order { - SI_ORDER_FIRST = 0x0000000, /* first*/ - SI_ORDER_SECOND = 0x0000001, /* second*/ - SI_ORDER_THIRD = 0x0000002, /* third*/ - SI_ORDER_FOURTH = 0x0000003, /* fourth*/ - SI_ORDER_FIFTH = 0x0000004, /* fifth*/ - SI_ORDER_SIXTH = 0x0000005, /* sixth*/ - SI_ORDER_SEVENTH = 0x0000006, /* seventh*/ - SI_ORDER_EIGHTH = 0x0000007, /* eighth*/ + SI_ORDER_FIRST = 0x0000000, /* first */ + SI_ORDER_SECOND = 0x0000001, /* second */ + SI_ORDER_THIRD = 0x0000002, /* third */ + SI_ORDER_FOURTH = 0x0000003, /* fourth */ + SI_ORDER_FIFTH = 0x0000004, /* fifth */ + SI_ORDER_SIXTH = 0x0000005, /* sixth */ + SI_ORDER_SEVENTH = 0x0000006, /* seventh */ + SI_ORDER_EIGHTH = 0x0000007, /* eighth */ SI_ORDER_MIDDLE = 0x1000000, /* somewhere in the middle */ - SI_ORDER_ANY = 0xfffffff /* last*/ + SI_ORDER_ANY = 0xfffffff /* last */ }; /* @@ -218,10 +218,10 @@ typedef void (*sysinit_nfunc_t)(void *); typedef void (*sysinit_cfunc_t)(const void *); struct sysinit { - enum sysinit_sub_id subsystem; /* subsystem identifier*/ - enum sysinit_elem_order order; /* init order within subsystem*/ + enum sysinit_sub_id subsystem; /* subsystem identifier */ + enum sysinit_elem_order order; /* init order within subsystem */ STAILQ_ENTRY(sysinit) next; /* singly-linked list */ - sysinit_cfunc_t func; /* function */ + sysinit_cfunc_t func; /* function */ const void *udata; /* multiplexer/argument */ }; @@ -240,13 +240,13 @@ struct sysinit { #ifdef TSLOG struct sysinit_tslog { sysinit_cfunc_t func; - const void * data; - const char * name; + const void *data; + const char *name; }; static inline void -sysinit_tslog_shim(const void * data) +sysinit_tslog_shim(const void *data) { - const struct sysinit_tslog * x = data; + const struct sysinit_tslog *x = data; TSRAW(curthread, TS_ENTER, "SYSINIT", x->name); (x->func)(x->data); @@ -265,7 +265,7 @@ sysinit_tslog_shim(const void * data) sysinit_tslog_shim, \ &uniquifier ## _sys_init_tslog \ }; \ - DATA_WSET(sysinit_set,uniquifier ## _sys_init) + DATA_WSET(sysinit_set, uniquifier ## _sys_init) #else #define C_SYSINIT(uniquifier, subsystem, order, func, ident) \ static struct sysinit uniquifier ## _sys_init = { \ @@ -275,7 +275,7 @@ sysinit_tslog_shim(const void * data) func, \ (ident) \ }; \ - DATA_WSET(sysinit_set,uniquifier ## _sys_init) + DATA_WSET(sysinit_set, uniquifier ## _sys_init) #endif #define SYSINIT(uniquifier, subsystem, order, func, ident) \ @@ -293,7 +293,7 @@ sysinit_tslog_shim(const void * data) func, \ (ident) \ }; \ - DATA_WSET(sysuninit_set,uniquifier ## _sys_uninit) + DATA_WSET(sysuninit_set, uniquifier ## _sys_uninit) #define SYSUNINIT(uniquifier, subsystem, order, func, ident) \ C_SYSUNINIT(uniquifier, subsystem, order, \ From nobody Mon Dec 9 16:37:27 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Y6SFg5wg2z5gWDM; Mon, 09 Dec 2024 16:37: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 4Y6SFg5RTQz4Yjv; Mon, 9 Dec 2024 16:37:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733762247; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=mmV/YuOnVx1JdtL6rS5G+8+HA+jUMucCDQzMBKf7uA0=; b=YF31bw96I5ndYE7mQQQ3EyW4QQXYMKYByeOXT2iWOKLrWvoU7CvJJhf327fM/O7w8H69gk R04JxytvsYhHgOyAk9lKuQ9nIngXMWW//ZIVF2GyE+3tXb1MYBjLXfyke4q6b1wk/BpeYX rHtc6ldhn02ScWl29yJtF3PyqaBJeuqUCd9h7s40P9rMhw3mj5+pLRqpjd7sowPwYHjRx7 FFm6okgu9Wt1SRNeFcwOZyM2NC49mVovhX5MiiFOV8juSR+iNhJxm25aiVO+Rbpf1GZ2RY dimGC/PwmCAXJnoW+jkEPvapPMrZC3I3MI015yS3ph99wSs8CuKilmhhpx2Oag== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733762247; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=mmV/YuOnVx1JdtL6rS5G+8+HA+jUMucCDQzMBKf7uA0=; b=q0qa/NiK1u0bSKsw0LVpdKpSqpj8RrZ/VkUSS/7zUwuDgi0lW6F6nc5lSEJNfBqeCyOgqg n/uUDq6CJupzBarHS1Orm/XHe3ODXMCD4Ou3MvX/zmI1gwp4tligM1DUdQ9+399DFy+fPl T9cuEPkKH2qUkzP8yw11zIM1Nh+jsdv6gZT3FzcvMwRye54G+uTsiaLJ0F1hBJiFp9pAsK 43mcfIZT1xGM/HZ581ApxMsEwXGM6gTkitX0aY2DjNtQ66wmaxfmlZAe7xiiF7zxqTsy1o RoOEp/rOkohzLPwo3hdp0DXnZa7fiN+boA9elMIzCKi2OxVaKuAXbF5foTkdqw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1733762247; a=rsa-sha256; cv=none; b=hCNJ32u2SW+EchlfgfVgytzBDGBGiH13z4l4Zp1h98aFUtXRMSYuw3RqnJwri25kGIrCmp by3vcFA3Bfrw6IaZCUNyiLhTtbSGmptD3SghUxwnMZuhL2FKnG7Cyylr8HMJfLaWcLDRCY ISSGEAwQoe2PcdYPpHh66kn8zESpN3wtVCgNLCSZBBEllTVnxgz4Fw8Q3sNoFCjCT0QtY/ xHmefdp27wOh5JSqXcUMmF4FzLgwht7q5mNn4QzQD4PdON9J2jEpzp1mMtBuFLCheNzE1A R7OpnIzw68NiEi0MGHfTA9Mc83AYyADNHKEptUOZLkRNqyiCjEg9ql4CT2QG6w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Y6SFg51JGzlTK; Mon, 9 Dec 2024 16:37:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4B9GbREM056472; Mon, 9 Dec 2024 16:37:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4B9GbRig056469; Mon, 9 Dec 2024 16:37:27 GMT (envelope-from git) Date: Mon, 9 Dec 2024 16:37:27 GMT Message-Id: <202412091637.4B9GbRig056469@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: f507e664dc9d - stable/13 - 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/13 X-Git-Reftype: branch X-Git-Commit: f507e664dc9d6acccd9b969e5ac808d7eb7bdc9f Auto-Submitted: auto-generated The branch stable/13 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=f507e664dc9d6acccd9b969e5ac808d7eb7bdc9f commit f507e664dc9d6acccd9b969e5ac808d7eb7bdc9f Author: Zhenlei Huang AuthorDate: 2024-12-06 11:39:18 +0000 Commit: Zhenlei Huang CommitDate: 2024-12-09 16:36:49 +0000 sys/sys/kernel.h: Various whitespace fixes MFC after: 3 days (cherry picked from commit 5c623697d6011de63bc762560a648c09379e06d2) (cherry picked from commit 3f879ed6eee9618ff7611f5de7a73868ef0cebb9) --- sys/sys/kernel.h | 100 +++++++++++++++++++++++++++---------------------------- 1 file changed, 50 insertions(+), 50 deletions(-) diff --git a/sys/sys/kernel.h b/sys/sys/kernel.h index fccf96f3febf..e1ef7ff10dfa 100644 --- a/sys/sys/kernel.h +++ b/sys/sys/kernel.h @@ -86,16 +86,16 @@ extern volatile int ticks; * The SI_SUB_LAST value must have the highest lexical value. */ enum sysinit_sub_id { - SI_SUB_DUMMY = 0x0000000, /* not executed; for linker*/ - SI_SUB_DONE = 0x0000001, /* processed*/ + SI_SUB_DUMMY = 0x0000000, /* not executed; for linker */ + SI_SUB_DONE = 0x0000001, /* processed */ SI_SUB_TUNABLES = 0x0700000, /* establish tunable values */ - SI_SUB_COPYRIGHT = 0x0800001, /* first use of console*/ + SI_SUB_COPYRIGHT = 0x0800001, /* first use of console */ SI_SUB_VM = 0x1000000, /* virtual memory system init */ SI_SUB_COUNTER = 0x1100000, /* counter(9) is initialized */ - SI_SUB_KMEM = 0x1800000, /* kernel memory*/ + SI_SUB_KMEM = 0x1800000, /* kernel memory */ SI_SUB_HYPERVISOR = 0x1A40000, /* * Hypervisor detection and - * virtualization support + * virtualization support * setup. */ SI_SUB_WITNESS = 0x1A80000, /* witness initialization */ @@ -105,7 +105,7 @@ enum sysinit_sub_id { SI_SUB_VNET_PRELINK = 0x1E00000, /* vnet init before modules */ SI_SUB_KLD = 0x2000000, /* KLD and module setup */ SI_SUB_KHELP = 0x2080000, /* khelp modules */ - SI_SUB_CPU = 0x2100000, /* CPU resource(s)*/ + SI_SUB_CPU = 0x2100000, /* CPU resource(s) */ SI_SUB_RACCT = 0x2110000, /* resource accounting */ SI_SUB_KDTRACE = 0x2140000, /* Kernel dtrace hooks */ SI_SUB_RANDOM = 0x2160000, /* random number generator */ @@ -113,21 +113,21 @@ enum sysinit_sub_id { SI_SUB_MAC_POLICY = 0x21C0000, /* TrustedBSD MAC policies */ SI_SUB_MAC_LATE = 0x21D0000, /* TrustedBSD MAC subsystem */ SI_SUB_VNET = 0x21E0000, /* vnet 0 */ - SI_SUB_INTRINSIC = 0x2200000, /* proc 0*/ - SI_SUB_VM_CONF = 0x2300000, /* config VM, set limits*/ + SI_SUB_INTRINSIC = 0x2200000, /* proc 0 */ + SI_SUB_VM_CONF = 0x2300000, /* config VM, set limits */ SI_SUB_DDB_SERVICES = 0x2380000, /* capture, scripting, etc. */ - SI_SUB_RUN_QUEUE = 0x2400000, /* set up run queue*/ + SI_SUB_RUN_QUEUE = 0x2400000, /* set up run queue */ SI_SUB_KTRACE = 0x2480000, /* ktrace */ SI_SUB_OPENSOLARIS = 0x2490000, /* OpenSolaris compatibility */ SI_SUB_AUDIT = 0x24C0000, /* audit */ - SI_SUB_CREATE_INIT = 0x2500000, /* create init process*/ + SI_SUB_CREATE_INIT = 0x2500000, /* create init process */ SI_SUB_SCHED_IDLE = 0x2600000, /* required idle procs */ SI_SUB_MBUF = 0x2700000, /* mbuf subsystem */ SI_SUB_INTR = 0x2800000, /* interrupt threads */ SI_SUB_TASKQ = 0x2880000, /* task queues */ SI_SUB_EPOCH = 0x2888000, /* epoch subsystem */ #ifdef EARLY_AP_STARTUP - SI_SUB_SMP = 0x2900000, /* start the APs*/ + SI_SUB_SMP = 0x2900000, /* start the APs */ #endif SI_SUB_SOFTINTR = 0x2A00000, /* start soft interrupt thread */ SI_SUB_DEVFS = 0x2F00000, /* devfs ready for devices */ @@ -138,40 +138,40 @@ enum sysinit_sub_id { SI_SUB_DTRACE_ANON = 0x308C000, /* DTrace anon enabling */ SI_SUB_DRIVERS = 0x3100000, /* Let Drivers initialize */ SI_SUB_CONFIGURE = 0x3800000, /* Configure devices */ - SI_SUB_VFS = 0x4000000, /* virtual filesystem*/ - SI_SUB_CLOCKS = 0x4800000, /* real time and stat clocks*/ - SI_SUB_SYSV_SHM = 0x6400000, /* System V shared memory*/ - SI_SUB_SYSV_SEM = 0x6800000, /* System V semaphores*/ - SI_SUB_SYSV_MSG = 0x6C00000, /* System V message queues*/ + SI_SUB_VFS = 0x4000000, /* virtual filesystem */ + SI_SUB_CLOCKS = 0x4800000, /* real time and stat clocks */ + SI_SUB_SYSV_SHM = 0x6400000, /* System V shared memory */ + SI_SUB_SYSV_SEM = 0x6800000, /* System V semaphores */ + SI_SUB_SYSV_MSG = 0x6C00000, /* System V message queues */ SI_SUB_P1003_1B = 0x6E00000, /* P1003.1B realtime */ - SI_SUB_PSEUDO = 0x7000000, /* pseudo devices*/ + SI_SUB_PSEUDO = 0x7000000, /* pseudo devices */ SI_SUB_EXEC = 0x7400000, /* execve() handlers */ SI_SUB_PROTO_BEGIN = 0x8000000, /* VNET initialization */ SI_SUB_PROTO_PFIL = 0x8100000, /* Initialize pfil before FWs */ - SI_SUB_PROTO_IF = 0x8400000, /* interfaces*/ + SI_SUB_PROTO_IF = 0x8400000, /* interfaces */ SI_SUB_PROTO_DOMAININIT = 0x8600000, /* domain registration system */ SI_SUB_PROTO_MC = 0x8700000, /* Multicast */ - SI_SUB_PROTO_DOMAIN = 0x8800000, /* domains (address families?)*/ + SI_SUB_PROTO_DOMAIN = 0x8800000, /* domains (address families?) */ SI_SUB_PROTO_FIREWALL = 0x8806000, /* Firewalls */ SI_SUB_PROTO_IFATTACHDOMAIN = 0x8808000,/* domain dependent data init */ SI_SUB_PROTO_END = 0x8ffffff, /* VNET helper functions */ - SI_SUB_KPROF = 0x9000000, /* kernel profiling*/ - SI_SUB_KICK_SCHEDULER = 0xa000000, /* start the timeout events*/ + SI_SUB_KPROF = 0x9000000, /* kernel profiling */ + SI_SUB_KICK_SCHEDULER = 0xa000000, /* start the timeout events */ SI_SUB_INT_CONFIG_HOOKS = 0xa800000, /* Interrupts enabled config */ SI_SUB_ROOT_CONF = 0xb000000, /* Find root devices */ - SI_SUB_INTRINSIC_POST = 0xd000000, /* proc 0 cleanup*/ + SI_SUB_INTRINSIC_POST = 0xd000000, /* proc 0 cleanup */ SI_SUB_SYSCALLS = 0xd800000, /* register system calls */ SI_SUB_VNET_DONE = 0xdc00000, /* vnet registration complete */ - SI_SUB_KTHREAD_INIT = 0xe000000, /* init process*/ - SI_SUB_KTHREAD_PAGE = 0xe400000, /* pageout daemon*/ - SI_SUB_KTHREAD_VM = 0xe800000, /* vm daemon*/ - SI_SUB_KTHREAD_BUF = 0xea00000, /* buffer daemon*/ - SI_SUB_KTHREAD_UPDATE = 0xec00000, /* update daemon*/ - SI_SUB_KTHREAD_IDLE = 0xee00000, /* idle procs*/ + SI_SUB_KTHREAD_INIT = 0xe000000, /* init process */ + SI_SUB_KTHREAD_PAGE = 0xe400000, /* pageout daemon */ + SI_SUB_KTHREAD_VM = 0xe800000, /* vm daemon */ + SI_SUB_KTHREAD_BUF = 0xea00000, /* buffer daemon */ + SI_SUB_KTHREAD_UPDATE = 0xec00000, /* update daemon */ + SI_SUB_KTHREAD_IDLE = 0xee00000, /* idle procs */ #ifndef EARLY_AP_STARTUP - SI_SUB_SMP = 0xf000000, /* start the APs*/ -#endif - SI_SUB_RACCTD = 0xf100000, /* start racctd*/ + SI_SUB_SMP = 0xf000000, /* start the APs */ +#endif + SI_SUB_RACCTD = 0xf100000, /* start racctd */ SI_SUB_LAST = 0xfffffff /* final initialization */ }; @@ -179,16 +179,16 @@ enum sysinit_sub_id { * Some enumerated orders; "ANY" sorts last. */ enum sysinit_elem_order { - SI_ORDER_FIRST = 0x0000000, /* first*/ - SI_ORDER_SECOND = 0x0000001, /* second*/ - SI_ORDER_THIRD = 0x0000002, /* third*/ - SI_ORDER_FOURTH = 0x0000003, /* fourth*/ - SI_ORDER_FIFTH = 0x0000004, /* fifth*/ - SI_ORDER_SIXTH = 0x0000005, /* sixth*/ - SI_ORDER_SEVENTH = 0x0000006, /* seventh*/ - SI_ORDER_EIGHTH = 0x0000007, /* eighth*/ + SI_ORDER_FIRST = 0x0000000, /* first */ + SI_ORDER_SECOND = 0x0000001, /* second */ + SI_ORDER_THIRD = 0x0000002, /* third */ + SI_ORDER_FOURTH = 0x0000003, /* fourth */ + SI_ORDER_FIFTH = 0x0000004, /* fifth */ + SI_ORDER_SIXTH = 0x0000005, /* sixth */ + SI_ORDER_SEVENTH = 0x0000006, /* seventh */ + SI_ORDER_EIGHTH = 0x0000007, /* eighth */ SI_ORDER_MIDDLE = 0x1000000, /* somewhere in the middle */ - SI_ORDER_ANY = 0xfffffff /* last*/ + SI_ORDER_ANY = 0xfffffff /* last */ }; /* @@ -218,9 +218,9 @@ typedef void (*sysinit_nfunc_t)(void *); typedef void (*sysinit_cfunc_t)(const void *); struct sysinit { - enum sysinit_sub_id subsystem; /* subsystem identifier*/ - enum sysinit_elem_order order; /* init order within subsystem*/ - sysinit_cfunc_t func; /* function */ + enum sysinit_sub_id subsystem; /* subsystem identifier */ + enum sysinit_elem_order order; /* init order within subsystem */ + sysinit_cfunc_t func; /* function */ const void *udata; /* multiplexer/argument */ }; @@ -239,13 +239,13 @@ struct sysinit { #ifdef TSLOG struct sysinit_tslog { sysinit_cfunc_t func; - const void * data; - const char * name; + const void *data; + const char *name; }; static inline void -sysinit_tslog_shim(const void * data) +sysinit_tslog_shim(const void *data) { - const struct sysinit_tslog * x = data; + const struct sysinit_tslog *x = data; TSRAW(curthread, TS_ENTER, "SYSINIT", x->name); (x->func)(x->data); @@ -263,7 +263,7 @@ sysinit_tslog_shim(const void * data) sysinit_tslog_shim, \ &uniquifier ## _sys_init_tslog \ }; \ - DATA_WSET(sysinit_set,uniquifier ## _sys_init) + DATA_WSET(sysinit_set, uniquifier ## _sys_init) #else #define C_SYSINIT(uniquifier, subsystem, order, func, ident) \ static struct sysinit uniquifier ## _sys_init = { \ @@ -272,7 +272,7 @@ sysinit_tslog_shim(const void * data) func, \ (ident) \ }; \ - DATA_WSET(sysinit_set,uniquifier ## _sys_init) + DATA_WSET(sysinit_set, uniquifier ## _sys_init) #endif #define SYSINIT(uniquifier, subsystem, order, func, ident) \ @@ -289,7 +289,7 @@ sysinit_tslog_shim(const void * data) func, \ (ident) \ }; \ - DATA_WSET(sysuninit_set,uniquifier ## _sys_uninit) + DATA_WSET(sysuninit_set, uniquifier ## _sys_uninit) #define SYSUNINIT(uniquifier, subsystem, order, func, ident) \ C_SYSUNINIT(uniquifier, subsystem, order, \ From nobody Mon Dec 9 21:48:55 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Y6b934f4Lz5gqPw; Mon, 09 Dec 2024 21:48: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 4Y6b933vKXz4H8n; Mon, 9 Dec 2024 21:48:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733780935; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vrmXUvt9xsfJNP3mkEVBGPyX2W/sM+oPYqBevRGdZLc=; b=wstz44XxuSBlKDX1heqcvQvnJLbFcMdozO3ctNtIxyr2SLdYPzrysRhgXOAMcLj88SC5b/ BX4kNtIF7h1lKUT6UXRCD4TxWOlaSsbW6zdbib+tiLtI5zDqBgtbF1sLMtWPnqPSEk3NjQ muaiPH9bGnwK5ge91SKV10ejweaha+5m8evuD3PNgKZhG0SkVCrxhaDGLGnd3J84rCMZYP 8y3a8XMpqbOWRhaED7qN+5RRyDXJxFDqc2G6ivPJrIRrrnk9sJVtWU0qmxQoMmgD3TNrYV Zdqv0h02vVwNwVmPFLheAbTxVaVAjsaOzT5XLM2FHe9mTkx5feBSesz96iAMtQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733780935; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vrmXUvt9xsfJNP3mkEVBGPyX2W/sM+oPYqBevRGdZLc=; b=WO0L+z/BeNY1pCO9G7bE1/igDRStuIBSkNaOYiS6BSyPggdYL1dfRVC1kjI83lW8Mkd+Gs TQuohdmZOVqcSjHarJGs+pbbqUkPfCxP9PydiHwZjzY1bXdCDvVldb/5pqbi7VMHAF69Ea 1/g3lGwufOY+2GHXjtKyr9kzzypQbW7nTTqHt20BxVoCV7OASwOYCkt7d8lFPvrjguK2Jx mp+6IVYijN8LAIaOzk2PmlsardoR1tzNhaPTCzfK+D05AUPjs6YgDzS5hL1xmo9kXuwYHO Q6j0S9M8vkgFe1XLibZopE1TN8nD94wO1lBnqyApgOEkTDkC2bkmF+TYe1BySw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1733780935; a=rsa-sha256; cv=none; b=ZRG8+FXEs/yOVhg+SRPbJdl9eyinA9dYpycUgZRmNa6FNmhbAOH8tVckyKQt5qcdFPEmxo DyuhS0a7bp3wdH0dZ7dHMBos9FO18lCMx6oUyHwVHbBFFL3kZeg36zcG67KAUIkc1DEwYm PgmhTFxNRl341vJ2GXPk2jMZVdSSiGUFFvNIAteLVkiOBdVaZOnV81jH5DcwJB7uUjhpDL HCzrXAXnhrp1HkqFHKFwzkbeimTwK5hAEU87II8LTRmFIPP9yK4E2pK677v9l/2yHTzuLV 877JVIF8houXs2tGi83QaJCY023mbQFgbF7H/vfvksgccjS3smnivcfHx8iy/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 4Y6b9339h5zvG7; Mon, 9 Dec 2024 21:48: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 4B9Lmts0033039; Mon, 9 Dec 2024 21:48:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4B9Lmtlr033036; Mon, 9 Dec 2024 21:48:55 GMT (envelope-from git) Date: Mon, 9 Dec 2024 21:48:55 GMT Message-Id: <202412092148.4B9Lmtlr033036@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Brooks Davis Subject: git: 82fcae46051c - stable/13 - depend-cleanup.sh: Simplify the logic, and clean bootstrap tools. List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: brooks X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 82fcae46051c3e395585d07e9bbfb8ef5f92a391 Auto-Submitted: auto-generated The branch stable/13 has been updated by brooks: URL: https://cgit.FreeBSD.org/src/commit/?id=82fcae46051c3e395585d07e9bbfb8ef5f92a391 commit 82fcae46051c3e395585d07e9bbfb8ef5f92a391 Author: Dag-Erling Smørgrav AuthorDate: 2023-02-08 22:58:51 +0000 Commit: Brooks Davis CommitDate: 2024-12-09 21:46:29 +0000 depend-cleanup.sh: Simplify the logic, and clean bootstrap tools. * There's no need to check if the file exists before grepping it; if it does not exist, grep will fail, which is what we want. Just redirect the error message to /dev/null. * There's no need to split the .o and .pico cases; the bodies are identical, so combine the conditions. Use a glob to avoid a false negative if one exists but not the other. * Also run depend-cleanup.sh on the bootstrap build tree. This unbreaks the build after 29c5f8bf9a01. Sponsored by: Klara, Inc. Sponsored by: NetApp, Inc. Differential Revision: https://reviews.freebsd.org/D38447 (cherry picked from commit 0dfaefa975477cee2ec3155c3e0689ba1fcdde9a) Pull Request: https://github.com/freebsd/freebsd-src/pull/1543 --- Makefile.inc1 | 3 +++ tools/build/depend-cleanup.sh | 11 ++--------- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/Makefile.inc1 b/Makefile.inc1 index fc5e82d39eca..48cd0f1c772c 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -1084,6 +1084,9 @@ _bootstrap-tools: @echo "--------------------------------------------------------------" @echo ">>> stage 1.2: bootstrap tools" @echo "--------------------------------------------------------------" +.if ${MK_CLEAN} != "yes" + ${_+_}cd ${.CURDIR}; ${BMAKE} _NO_INCLUDE_COMPILERMK=t _cleanobj_fast_depend_hack +.endif ${_+_}cd ${.CURDIR}; ${BMAKE} bootstrap-tools mkdir -p ${WORLDTMP}/usr ${WORLDTMP}/lib/casper ${WORLDTMP}/lib/geom \ ${WORLDTMP}/bin diff --git a/tools/build/depend-cleanup.sh b/tools/build/depend-cleanup.sh index fd0d7eb01fe7..fd29c50593a5 100755 --- a/tools/build/depend-cleanup.sh +++ b/tools/build/depend-cleanup.sh @@ -27,15 +27,8 @@ fi # $3 source extension clean_dep() { - if [ -e "$OBJTOP"/$1/.depend.$2.pico ] && \ - egrep -qw "$2\.$3" "$OBJTOP"/$1/.depend.$2.pico; then \ - echo "Removing stale dependencies and objects for $2.$3"; \ - rm -f \ - "$OBJTOP"/$1/.depend.$2.* \ - "$OBJTOP"/$1/$2.*o - fi - if egrep -qw "$2\.$3" "$OBJTOP"/obj-lib32/$1/.depend.$2.*o 2>/dev/null; then - echo "Removing 32-bit stale dependencies and objects for $2.$3" + if egrep -qw "$2\.$3" "$OBJTOP"/$1/.depend.$2.*o 2>/dev/null; then + echo "Removing stale dependencies and objects for $2.$3" rm -f \ "$OBJTOP"/obj-lib32/$1/.depend.$2.* \ "$OBJTOP"/obj-lib32/$1/$2.*o From nobody Mon Dec 9 21:48:56 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Y6b945JqFz5gqQ1; Mon, 09 Dec 2024 21:48: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 4Y6b94404Nz4HKj; Mon, 9 Dec 2024 21:48:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733780936; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=d0LSBNyf5ughbVSlQBPSHYp0rakjVnbR+nr99wrHUI8=; b=OiAJ8JGE9wrWUmtJliYuVlRhq4wshEliZBJnqfneaHaS39snJkK0isTlQ3N413Ge+SMlIu /P1XDJaG1q7CWiWnmYQyIoOyfR9nRoX5uP8Wd2B+l/ykjZJ9EpzLvXYMoVrDHHbyl7XlEw uuLzS4fcV9BImKJEyvgWIMZRkeAChv0y5QVowwpcexATTFRA7qmOKQnDFgGB2Vcjm30xw5 SDkZ9EQp8sq8G6HRKBcEMXs/CJbyrvJXFM3kMtZHXaNt2qvxkWulc1CNW+Bw99sJPrHq5z RI5dxqm6daUXgh6JXFBfhGoh1A77K7u0rbqUgy+m++ABt4rSSVJLY2INXS3nLA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733780936; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=d0LSBNyf5ughbVSlQBPSHYp0rakjVnbR+nr99wrHUI8=; b=tfWsq1hbuAritOiGWJjQMZ71+zUBseX3xHomJSnUI3oDpm+MEXveZExV9r6yxEtssWZDN+ ScwFaSHx7N1xY83yb8meE6miXP7N2SWO8de5DqsixAsEPcJMDK9tyLGLMpczI5Fuwj2ezM mX/oKiaZekHvwbZ22MLTKYgMhyoF84IPc2A2SZDssWzc9aUeMP1Jeux9fu1EVlMnw1uxUh gfj3ht6x39PGJy1zXIRkG8egDFZeqjtEt4ZQUe3KxcrlnxHak7nNrkg/45ZbZv73ZDj7tn UiD6K/oqlctoy1XM7Uhojd7300BYvN2xEBkfV/awEu6FGLKGuFHoniUm78OUbQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1733780936; a=rsa-sha256; cv=none; b=G50mKZtbNBeEd99U8UJdR3nDRfoir/pViIDUsIseQ6Db2KFnmtMXapl5S0GNQHd99QRdEo w7FeQg2rNGBPzsibFcLv4t3oTwxCh9cpagIRmGB/Q91vQey9r2RvZzOdNE5tOF/e1gDiHR ROEMEGKhlYIXPqp996t/epE+YamZQxVq4rUSC0bUz2ZN3laJe7wClTHU5P79dM+2NAGevy m3S0OQR9W0hyusxZV24Hatasv1BjzSrqpwqDdEsqXbPzO+EpQOwXmEsszECB5C3e+TiEeN 9aMqQcFhgEmVCOYnXjA2fI2D09hw7zhU9nL4m1OdvqxTHmW/DvhTfEELt1e/jw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Y6b943bmvzvVJ; Mon, 9 Dec 2024 21:48:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4B9LmumA033113; Mon, 9 Dec 2024 21:48:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4B9Lmuoj033110; Mon, 9 Dec 2024 21:48:56 GMT (envelope-from git) Date: Mon, 9 Dec 2024 21:48:56 GMT Message-Id: <202412092148.4B9Lmuoj033110@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Brooks Davis Subject: git: 37d2e25a2dc7 - stable/13 - Make sure MACHINE(_ARCH) are exported for depend-cleanup.sh List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: brooks X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 37d2e25a2dc7c9a12148b71dc6cf4a0c4bffdcd2 Auto-Submitted: auto-generated The branch stable/13 has been updated by brooks: URL: https://cgit.FreeBSD.org/src/commit/?id=37d2e25a2dc7c9a12148b71dc6cf4a0c4bffdcd2 commit 37d2e25a2dc7c9a12148b71dc6cf4a0c4bffdcd2 Author: Jessica Clarke AuthorDate: 2023-07-11 00:53:04 +0000 Commit: Brooks Davis CommitDate: 2024-12-09 21:46:43 +0000 Make sure MACHINE(_ARCH) are exported for depend-cleanup.sh We run depend-cleanup.sh twice during the build. The second time is the normal run, where we run it under WMAKEENV and thus have CROSSENV's MACHINE(_ARCH)=${TARGET(_ARCH)} in the environment. However, the first time is for bootstrap-tools, where it's run under BMAKEENV and we don't have any assignments to MACHINE(_ARCH) in the environment, meaning the script sees them as unset. In practice this doesn't matter since the only use doesn't apply to bootstrap-tools, but it could be a future issue. Thus, explicitly export them for depend-cleanup.sh and have the script verify they're set. Differential Revision: https://reviews.freebsd.org/D40968 (cherry picked from commit c70dd03a7ff649f832f1d29179b9094720392bce) Pull Request: https://github.com/freebsd/freebsd-src/pull/1543 --- Makefile.inc1 | 3 ++- tools/build/depend-cleanup.sh | 10 ++++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/Makefile.inc1 b/Makefile.inc1 index 48cd0f1c772c..c8b5fc856dd5 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -1029,7 +1029,8 @@ _sanity_check: .PHONY .MAKE # replacing generated files. Handle these cases here in an ad-hoc fashion. _cleanobj_fast_depend_hack: .PHONY @echo ">>> Deleting stale dependencies..."; - sh ${.CURDIR}/tools/build/depend-cleanup.sh ${OBJTOP} + MACHINE=${MACHINE} MACHINE_ARCH=${MACHINE_ARCH} \ + sh ${.CURDIR}/tools/build/depend-cleanup.sh ${OBJTOP} _worldtmp: .PHONY @echo diff --git a/tools/build/depend-cleanup.sh b/tools/build/depend-cleanup.sh index fd29c50593a5..385df785b426 100755 --- a/tools/build/depend-cleanup.sh +++ b/tools/build/depend-cleanup.sh @@ -22,6 +22,16 @@ if [ ! -d "$OBJTOP" ]; then exit 1 fi +if [ -z "${MACHINE+set}" ]; then + echo "$(basename "$0"): MACHINE not set" >&2 + exit 1 +fi + +if [ -z "${MACHINE_ARCH+set}" ]; then + echo "$(basename "$0"): MACHINE_ARCH not set" >&2 + exit 1 +fi + # $1 directory # $2 source filename w/o extension # $3 source extension From nobody Mon Dec 9 21:48:58 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Y6b970m56z5gqgX; Mon, 09 Dec 2024 21:48: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 4Y6b966G3Fz4HBy; Mon, 9 Dec 2024 21:48:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733780938; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=iBwlukL00HrCJJkKRki7eI7yw2pwQXsTJucmuaouTjE=; b=FYaUQQZHnz3y7LKq0c3iBVXCf2nUkKB1wiGMwu4co+NzQUhRIp4D5R3N+/KpfPfHxMeimI 3iAO0Y+lgow6JMNbUt+w+1LaGpVakMCs+9MNHoPznA4FQZzH0Gh9BEnamTFp8fh/2bUY5e IqNOxHZ9La/k/KXT7Z6akBCJWY79h4+HtnJH6cvyB1f8iuYyyDiDsbdI4x57XUa6+waGru iNrIdMFCUkBhIxAn6brS6LMNN12ZEhsZYCT1g3fl1DezVwMf8Z4oW6zZdRdsfF1fNz0YFP 02D0TUjJyStP7M72Zz3AFswVAQwmfcZplP6S1vmcpG4yYlDsKGvI3rWrVEOB0A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733780938; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=iBwlukL00HrCJJkKRki7eI7yw2pwQXsTJucmuaouTjE=; b=R05arJUTkShwbOAV3gQP6GQPnsV42qwmAnPWEUyN1agh6DNXWuulZMn16VmhMPNLLnlH+J /mUuaM+GO9wBawY01DsIHv58pERLMxt+j3QTVYuesdtU+TaVwie6frP5Fw62t1IM04PGzH EU1fjDTgDaKxIvdDcufsgCpEry4iVSav6Zqu+2ZjI06PLaU5LNnOsjLqNFo8jsPvouPhIL +qnok8/HsNCrUCy8XDaNwCBHsFrZOCyhTMKEa9sB8bcymETuvDGgYHfP0eq/MA3hsd3pGl Qv9iqaQAPB8RF/pyQtqF7O7IUkQwpXeQbRCYSN4V0Xpy0SD+p1o1K+o1d+H6Tg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1733780938; a=rsa-sha256; cv=none; b=C2RompANLJOLxCAaKvfI3vdYI1Gb5x63Y7p/IH9LEH5F6GKQ61sOShYIhesFHdElu54i+Q h4n7PzS0wFIFLN72tQErFXU9k8bIEx9MIL6gEvlhjY5NuISAtXK+a3FwinA2Vm3HNrvPdf Vrr9RT/bWKRotb05OAndG8ZWwwhg/lO8HOB7ap4J2s9nAr6/+cOFtESgb6acq3SrP5NjvH 9jeP2CUbIzhsN3Tm/pZpxlu0T37sV7HWTWmzVqkyyR1y9rgJ/QA1bQS5nqKmLK5Sc/Gvuh 8qySyvlkpGrIgU6nbyXH1UFLCm315CP5Gi8YUNky82n9uJNAlTKXxMrrpygK6g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Y6b965RNrzvG9; Mon, 9 Dec 2024 21:48: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 4B9LmwRI033224; Mon, 9 Dec 2024 21:48:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4B9Lmwp8033219; Mon, 9 Dec 2024 21:48:58 GMT (envelope-from git) Date: Mon, 9 Dec 2024 21:48:58 GMT Message-Id: <202412092148.4B9Lmwp8033219@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Brooks Davis Subject: git: 50291c77306b - stable/13 - depend-cleanup.sh: Generalise lib32 code and avoid duplication List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: brooks X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 50291c77306be87ee9f85fe557d47b65c8af50ed Auto-Submitted: auto-generated The branch stable/13 has been updated by brooks: URL: https://cgit.FreeBSD.org/src/commit/?id=50291c77306be87ee9f85fe557d47b65c8af50ed commit 50291c77306be87ee9f85fe557d47b65c8af50ed Author: Jessica Clarke AuthorDate: 2023-07-27 04:10:47 +0000 Commit: Brooks Davis CommitDate: 2024-12-09 21:46:55 +0000 depend-cleanup.sh: Generalise lib32 code and avoid duplication By passing through _ALL_libcompats we can avoid hard-coding the list of libcompats in depend-cleanup.sh. This cleanup also makes clean_dep shorter by using a loop instead of handling each case explicitly (at the expense of slightly tweaked logging). Reviewed by: brooks, jhb Differential Revision: https://reviews.freebsd.org/D41187 (cherry picked from commit 81805ec30074363e5d7d7add37b3ccf4f1eb396b) Pull Request: https://github.com/freebsd/freebsd-src/pull/1543 --- tools/build/depend-cleanup.sh | 28 ++++++++++++++++++++-------- 1 file changed, 20 insertions(+), 8 deletions(-) diff --git a/tools/build/depend-cleanup.sh b/tools/build/depend-cleanup.sh index e88a765357a5..7299ee0ccf6b 100755 --- a/tools/build/depend-cleanup.sh +++ b/tools/build/depend-cleanup.sh @@ -72,6 +72,9 @@ if [ -z "${MACHINE_ARCH+set}" ]; then err "MACHINE_ARCH not set" fi +# XXX: _ALL_libcompats not MFC'd in Makefile.inc1 +ALL_libcompats=32 + run() { if [ "$VERBOSE" ]; then @@ -87,12 +90,15 @@ run() # $3 source extension clean_dep() { - if egrep -qw "$2\.$3" "$OBJTOP"/$1/.depend.$2.*o 2>/dev/null; then - echo "Removing stale dependencies and objects for $2.$3" - run rm -f \ - "$OBJTOP"/obj-lib32/$1/.depend.$2.* \ - "$OBJTOP"/obj-lib32/$1/$2.*o - fi + for libcompat in "" $ALL_libcompats; do + dirprfx=${libcompat:+obj-lib${libcompat}/} + if egrep -qw "$2\.$3" "$OBJTOP"/$dirprfx$1/.depend.$2.*o 2>/dev/null; then + echo "Removing stale ${libcompat:+lib${libcompat} }dependencies and objects for $2.$3" + run rm -f \ + "$OBJTOP"/$dirprfx$1/.depend.$2.* \ + "$OBJTOP"/$dirprfx$1/$2.*o + fi + done } # Date Rev Description @@ -106,7 +112,10 @@ if [ -e "$OBJTOP"/cddl/lib/libzfs/.depend.libzfs_changelist.o ] && \ egrep -qw "cddl/contrib/opensolaris/lib/libzfs/common/libzfs_changelist.c" \ "$OBJTOP"/cddl/lib/libzfs/.depend.libzfs_changelist.o; then echo "Removing old ZFS tree" - run rm -rf "$OBJTOP"/cddl "$OBJTOP"/obj-lib32/cddl + for libcompat in "" $ALL_libcompats; do + dirprfx=${libcompat:+obj-lib${libcompat}/} + run rm -rf "$OBJTOP"/${dirprfx}cddl + done fi # 20200916 WARNS bumped, need bootstrapped crunchgen stubs @@ -127,7 +136,10 @@ fi # 20210108 821aa63a0940 non-widechar version of ncurses removed if [ -e "$OBJTOP"/lib/ncurses/ncursesw ]; then echo "Removing stale ncurses objects" - run rm -rf "$OBJTOP"/lib/ncurses "$OBJTOP"/obj-lib32/lib/ncurses + for libcompat in "" $ALL_libcompats; do + dirprfx=${libcompat:+obj-lib${libcompat}/} + run rm -rf "$OBJTOP"/${dirprfx}lib/ncurses + done fi # 20210608 f20893853e8e move from atomic.S to atomic.c From nobody Mon Dec 9 21:48:57 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Y6b960jmcz5gqrm; Mon, 09 Dec 2024 21:48: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 4Y6b9550k9z4HN5; Mon, 9 Dec 2024 21:48:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733780937; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=neVJL3gttiLjc7OZdHVocLqyGVV9T99YXA9WmXyYy9s=; b=HO3LvX1ksJ3UgOEhIVSOJz2Pr86tNEfj0/jc+IWTpJT4qrIpsVc5B+jYf1I1ly7b7s8/D6 VedBu6Liohk63toxtBIuRd/uDy0MR3RAqSWrRpmY81wH4/9/h4BDB0ZFpBF1rUvlKPPFbr BQJz7joW/I2ke0VTncrLkHUQs3HFoMKzUhKTyE4muL909gazeMP9MNajIaG4ZtEsgjifgn 8knuUD8UNYZOKV0br2/kPsmVAPmxGadgaUzsYQyzRXuCwVwOi1FzqwxAsc/JIupnEdrMmW xCa10DkoqH9qWlPvQ/jXn5zm4nYX0ll8rWjxeg6VJC5jsuHtJjcFh9AcMg4B7Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733780937; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=neVJL3gttiLjc7OZdHVocLqyGVV9T99YXA9WmXyYy9s=; b=KnJ3tSGJeyI3Ytak+wQZAd8MNjy8Yc3LxqHJfRaBxIhzmbVz5Jn+stxwV8Oo+yTY8OtaUg sgR6NdQ+4xgffNaoRIdg3pw3JNsH3m7TdgzAsVeYRTH3jOERdWHli6QpyBcCnGFMhzKrlo jyGDm8rseVgK6SozxQXpA9tnNJ6mFsslfGfSBIHzc+9fw6rrwGAWYWgsKNndxws0lIl20s cc1JXonCBLGyorTfVeHDAtapKHo9RVq7QNngDYr0YBiiUwEZ2mR1+Btehkrx7GADNyNMCK FFk7rIf7HZGeHc3X4L/prOaGyrFqauM7yGd3AWXuBv+jtNDREYDiVNEFL0XxGQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1733780937; a=rsa-sha256; cv=none; b=rfTNb8ur3ngntDjSBDLu9rjLtmijIvKMXVknnrXB87mclAOKafdVbaxMqSv5gmDLnqeraG 1ULE9LAyoLn6nmT8hFn0ch1ogmORgaSwIofTMyZVOOpgCJUx+QIKeLwe3EZDM0uYrGtB8t RBNyJ7vwt7tpQV4ZzdLuRX5mxS9G+A3QixlyvApV1/mz+YVeZxdtMDDYMF6fcaWL2+8lgw JOUtsX4196m7CpMp4+KiLRTNVbcIKHrUbY5b1PAtEW6iPYU3enDUAEHIsepzMpgrM0WQAr M5UtBYFGCxdOw+tCBkdXu+x8I2WGAvGEE4qOSoB9VfOGpR/WwlyV0XqsymziJA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Y6b954cDJzvG8; Mon, 9 Dec 2024 21:48: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 4B9LmvSn033165; Mon, 9 Dec 2024 21:48:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4B9Lmvcj033162; Mon, 9 Dec 2024 21:48:57 GMT (envelope-from git) Date: Mon, 9 Dec 2024 21:48:57 GMT Message-Id: <202412092148.4B9Lmvcj033162@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Brooks Davis Subject: git: 0f00a4c39b65 - stable/13 - depend-cleanup: Add verbose (-v) and pretend/dry-run (-n) flags List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: brooks X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 0f00a4c39b65172f3e12bf7e12d31c1b4bc40e34 Auto-Submitted: auto-generated The branch stable/13 has been updated by brooks: URL: https://cgit.FreeBSD.org/src/commit/?id=0f00a4c39b65172f3e12bf7e12d31c1b4bc40e34 commit 0f00a4c39b65172f3e12bf7e12d31c1b4bc40e34 Author: Jessica Clarke AuthorDate: 2023-07-11 00:53:04 +0000 Commit: Brooks Davis CommitDate: 2024-12-09 21:46:48 +0000 depend-cleanup: Add verbose (-v) and pretend/dry-run (-n) flags These are useful for testing new additions to the script. Whilst here, harden the script a little and improve error messages. Reviewed by: imp Differential Revision: https://reviews.freebsd.org/D31007 (cherry picked from commit 1ec7cb1b5d1800b05c0682e0b673be0dece98779) Pull Request: https://github.com/freebsd/freebsd-src/pull/1543 --- tools/build/depend-cleanup.sh | 76 +++++++++++++++++++++++++++++++++++-------- 1 file changed, 63 insertions(+), 13 deletions(-) diff --git a/tools/build/depend-cleanup.sh b/tools/build/depend-cleanup.sh index 385df785b426..e88a765357a5 100755 --- a/tools/build/depend-cleanup.sh +++ b/tools/build/depend-cleanup.sh @@ -16,22 +16,72 @@ # anyone would try a NO_CLEAN build against an object tree from before the # related change. One year should be sufficient. +set -e +set -u + +warn() +{ + echo "$(basename "$0"):" "$@" >&2 +} + +err() +{ + warn "$@" + exit 1 +} + +usage() +{ + echo "usage: $(basename $0) [-v] [-n] objtop" >&2 +} + +VERBOSE= +PRETEND= +while getopts vn o; do + case "$o" in + v) + VERBOSE=1 + ;; + n) + PRETEND=1 + ;; + *) + usage + exit 1 + ;; + esac +done +shift $((OPTIND-1)) + +if [ $# -ne 1 ]; then + usage + exit 1 +fi + OBJTOP=$1 +shift if [ ! -d "$OBJTOP" ]; then - echo "usage: $(basename $0) objtop" >&2 - exit 1 + err "$OBJTOP: Not a directory" fi if [ -z "${MACHINE+set}" ]; then - echo "$(basename "$0"): MACHINE not set" >&2 - exit 1 + err "MACHINE not set" fi if [ -z "${MACHINE_ARCH+set}" ]; then - echo "$(basename "$0"): MACHINE_ARCH not set" >&2 - exit 1 + err "MACHINE_ARCH not set" fi +run() +{ + if [ "$VERBOSE" ]; then + echo "$@" + fi + if ! [ "$PRETEND" ]; then + "$@" + fi +} + # $1 directory # $2 source filename w/o extension # $3 source extension @@ -39,7 +89,7 @@ clean_dep() { if egrep -qw "$2\.$3" "$OBJTOP"/$1/.depend.$2.*o 2>/dev/null; then echo "Removing stale dependencies and objects for $2.$3" - rm -f \ + run rm -f \ "$OBJTOP"/obj-lib32/$1/.depend.$2.* \ "$OBJTOP"/obj-lib32/$1/$2.*o fi @@ -56,14 +106,14 @@ if [ -e "$OBJTOP"/cddl/lib/libzfs/.depend.libzfs_changelist.o ] && \ egrep -qw "cddl/contrib/opensolaris/lib/libzfs/common/libzfs_changelist.c" \ "$OBJTOP"/cddl/lib/libzfs/.depend.libzfs_changelist.o; then echo "Removing old ZFS tree" - rm -rf "$OBJTOP"/cddl "$OBJTOP"/obj-lib32/cddl + run rm -rf "$OBJTOP"/cddl "$OBJTOP"/obj-lib32/cddl fi # 20200916 WARNS bumped, need bootstrapped crunchgen stubs if [ -e "$OBJTOP"/rescue/rescue/rescue.c ] && \ ! grep -q 'crunched_stub_t' "$OBJTOP"/rescue/rescue/rescue.c; then echo "Removing old rescue(8) tree" - rm -rf "$OBJTOP"/rescue/rescue + run rm -rf "$OBJTOP"/rescue/rescue fi # 20210105 fda7daf06301 pfctl gained its own version of pf_ruleset.c @@ -71,13 +121,13 @@ if [ -e "$OBJTOP"/sbin/pfctl/.depend.pf_ruleset.o ] && \ egrep -qw "sys/netpfil/pf/pf_ruleset.c" \ "$OBJTOP"/sbin/pfctl/.depend.pf_ruleset.o; then echo "Removing old pf_ruleset dependecy file" - rm -rf "$OBJTOP"/sbin/pfctl/.depend.pf_ruleset.o + run rm -rf "$OBJTOP"/sbin/pfctl/.depend.pf_ruleset.o fi # 20210108 821aa63a0940 non-widechar version of ncurses removed if [ -e "$OBJTOP"/lib/ncurses/ncursesw ]; then echo "Removing stale ncurses objects" - rm -rf "$OBJTOP"/lib/ncurses "$OBJTOP"/obj-lib32/lib/ncurses + run rm -rf "$OBJTOP"/lib/ncurses "$OBJTOP"/obj-lib32/lib/ncurses fi # 20210608 f20893853e8e move from atomic.S to atomic.c @@ -89,14 +139,14 @@ clean_dep lib/libc pdfork S if stat "$OBJTOP"/tests/sys/kqueue/libkqueue/*kqtest* \ "$OBJTOP"/tests/sys/kqueue/libkqueue/.depend.kqtest* >/dev/null 2>&1; then echo "Removing old kqtest" - rm -f "$OBJTOP"/tests/sys/kqueue/libkqueue/.depend.* \ + run rm -f "$OBJTOP"/tests/sys/kqueue/libkqueue/.depend.* \ "$OBJTOP"/tests/sys/kqueue/libkqueue/* fi # 20230110 bc42155199b5 usr.sbin/zic/zic -> usr.sbin/zic if [ -d "$OBJTOP"/usr.sbin/zic/zic ] ; then echo "Removing old zic directory" - rm -rf "$OBJTOP"/usr.sbin/zic/zic + run rm -rf "$OBJTOP"/usr.sbin/zic/zic fi # 20241018 5deeebd8c6ca Merge llvm-project release/19.x llvmorg-19.1.2-0-g7ba7d8e2f7b6 From nobody Mon Dec 9 21:48:59 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Y6b981LWLz5gqdC; Mon, 09 Dec 2024 21:49: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 4Y6b976nrkz4H6k; Mon, 9 Dec 2024 21:48:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733780940; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Tfkg1rcZmxqTIaFQeXtCFY9HVzjkWoP8ub/K++Jh30c=; b=nYYrdwaPo0eodl7pxTxqsOzZXlUZ/X1IR7vcv4K6309OyeLrWNQCba4wONQ7JuNo7aSXde 2n2uLrI4aoRt+4rhYJxPLlLbaQKtVUC4JvSvWEvzn98CmcL03d5b2uzGOd/v+kMrZ38lLy 0NI+wlTLMA6OqbmvRBzM/d5EJT6IZYTpfuVktPalaCsfRkOZaeNE1c2u/1niB/aXhbhcQo ti5XJYVjoBVSxBa7voi/NFex0Ju5K86NvqOWIs4+e7rQa3tfcyWCYG0Xkxswa2cMAua6j+ nFmQGVG81sfjAnhoH4NNps1heCkFg1+MgpgUqTyQhSGx6mE87kqGvrjpM7WyaA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733780939; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Tfkg1rcZmxqTIaFQeXtCFY9HVzjkWoP8ub/K++Jh30c=; b=HK3DuOzW6vuGHDXqLBhecdKtXWsWCv3ES2e9OgbZUwZVthtbazNxsWnrgc9GQFWCeo3cym 6QWDA1MoRaBBEbet5faTvHEVTivBBtLogoEfQaVIxj6F2UXslzOP///ImxmpRRHdsNbdom rfdsCmCMC+8V1fixlW3TjJkc8GtqHZymBTkmfNe4AhzD4ntRe1DBB5afQN7RawVG5olTyH l+DJSgVT1S9RcBGvfvpbzhaEHgsuCoChV/KmZL90jg4zX4e3RTisycIrO9GgM9CbDxKNVB rolvdYzwiToDqM1prSYjmzUY8qIZTsp1E8sO1fj205qkrFGmPom908n0CwYjTA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1733780940; a=rsa-sha256; cv=none; b=OFmukC6G67dQR7PZJNj5a1YaboYMHbawRGHREGgVkn2lgisvTpBT+riC8BJVUWYKxx/EP9 GVjFevq3TUc5R8hPQmUERR2O2sE8k6dZXQZfZW9XFudRjKgdRnT6PyPwCYMwZXct7bo2+N 2KsZj0UrlzZaaaws2VwznJYJVLF2b32wRbMVsFSFmw9M8mrrslsRxtRpRj1J6fXE0heqQN R3fGJ+3YUDTsPfVZKNinqB8nwZ8VW+Dt7g4r0kY4wE+BY8R+9E266dlisOq73xQl7pc8xI LTBN4skqTIxLx6XDszingg7WVBoiUphjV46JIFTCRSLmjg2AIfzrZj4T9Pw78A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Y6b976QPJzvVK; Mon, 9 Dec 2024 21:48: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 4B9LmxGR033277; Mon, 9 Dec 2024 21:48:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4B9LmxuA033274; Mon, 9 Dec 2024 21:48:59 GMT (envelope-from git) Date: Mon, 9 Dec 2024 21:48:59 GMT Message-Id: <202412092148.4B9LmxuA033274@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Brooks Davis Subject: git: 91549cf666db - stable/13 - Revert "depend-cleanup: fix after 99b2ab71c5b6" List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: brooks X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 91549cf666db4e6064f43dfa6062904db3385a8f Auto-Submitted: auto-generated The branch stable/13 has been updated by brooks: URL: https://cgit.FreeBSD.org/src/commit/?id=91549cf666db4e6064f43dfa6062904db3385a8f commit 91549cf666db4e6064f43dfa6062904db3385a8f Author: Brooks Davis AuthorDate: 2024-12-09 19:29:10 +0000 Commit: Brooks Davis CommitDate: 2024-12-09 21:47:00 +0000 Revert "depend-cleanup: fix after 99b2ab71c5b6" Dry run support has been merged. This reverts commit 210ff86448461dd00dce6f826ae58deb5ae44822. Pull Request: https://github.com/freebsd/freebsd-src/pull/1543 --- tools/build/depend-cleanup.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/build/depend-cleanup.sh b/tools/build/depend-cleanup.sh index 7299ee0ccf6b..22baf65517fe 100755 --- a/tools/build/depend-cleanup.sh +++ b/tools/build/depend-cleanup.sh @@ -167,6 +167,6 @@ f="$p"/arm_mve_builtin_sema.inc if [ -e "$f" ]; then if grep -q SemaBuiltinConstantArgRange "$f"; then echo "Removing pre-llvm19 clang-tblgen output" - rm -f "$p"/*.inc + run rm -f "$p"/*.inc fi fi From nobody Mon Dec 9 21:49:00 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Y6b992nTRz5gqbm; Mon, 09 Dec 2024 21:49:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Y6b990Pqdz4HLl; Mon, 9 Dec 2024 21:49:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733780941; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=IFVMyUHc1vQu1f29WShEPI1QukYsbyi4R7KVFVioWOQ=; b=yGm7Tq0kZD+3N6X7H1LESTTt7DGfweTfjFlsjZcxnnLtxgbFMXnyUkyMxGJmd4nNuEk2cJ C86xIRbSraZzlC2GYjDDn/iL3sNXkzkWjfjQn0CB6yzyS53vAnWeaRsObhc5eJmzcULx0/ QOUDIuRcpW1VcRYGJOnAgTxcrl0I1hHbNQwkchDordyyzSY+b3g5SDEvTEnxnlN2TCrJ/C 1tZ1fWdg6swwxEecyDhVTxbFwepdIfzumtIgIcHV1LszI/LJVjwHxqXFNHWlHQzFvdAJB4 wm/TKgDpA3O4UlhWgMm8kGILvvZVXvffPTDd7q9rZrQF5ZqdG/X/63D+h8MJog== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733780941; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=IFVMyUHc1vQu1f29WShEPI1QukYsbyi4R7KVFVioWOQ=; b=XcGVCCDpCoM46FwdlFT8MHJhZaajxVRzssDgZabwh3lC8h74KLHN8xtNl7UbQkjzelqNIS DbrPPIrY0at1mn7eXijLc3+kMi108Nz/GXgr+k4JJlxjsWOU96PXeY5Qp1wUQ/uzRVK879 voDuOnX/nV7df5pKfIha4VdXsFZ/FDdbMJUeotfz9QOE9Z6/oDydYzNVTiDuLa37P7O3+M RpysCxJI0bBcMbLRukZDoMRCCJS0P3s+kl0/GB24IrIRgHLa4UdH2thJMKlwuExKwJHapf lGzsbPhTJMKahZAZ3VSVAKHRlmTXbJ+F/puZa/kcw0MV/IoPqE+j4BKNeAN1ww== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1733780941; a=rsa-sha256; cv=none; b=hbC3zMZz9afJsYTLxbrbosUl9djFPaMT8o4Mh71VPgFsam5vprXA0FThM0BZMkUesA0Pkt 6gejtzyCiVaQUXUnaIKM87A15AxQsr9sV+IePm2XBa282JEP1fRNvVgDmECkGWoq/SNnOQ aZWlh1XI1rJu0Ewnmr55aOTuh9ruUGqrdoD4bXIy8KE24OQWv/5u85V1kd5icHUcDdttDy 7YHFBCLI8wmPRU3geYjyw/3snY7c6KmjgHzSojLc6k04baG9zW6SGfsPSegWiBhis2HXoU OPCYoeRo3I9jVGpoLYMgBgY0Wkn+bawXXKaQdzNCJDxBYOE8lIE4rufjJklv7A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Y6b9902J8zvv5; Mon, 9 Dec 2024 21:49: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 4B9Ln0Hb033334; Mon, 9 Dec 2024 21:49:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4B9Ln0Cw033331; Mon, 9 Dec 2024 21:49:00 GMT (envelope-from git) Date: Mon, 9 Dec 2024 21:49:00 GMT Message-Id: <202412092149.4B9Ln0Cw033331@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Brooks Davis Subject: git: 6608a478cddb - stable/13 - depend-cleanup.sh: Extend clean_dep to support a custom regex List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: brooks X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 6608a478cddb98c1ad52ec0abae5240915fb2c57 Auto-Submitted: auto-generated The branch stable/13 has been updated by brooks: URL: https://cgit.FreeBSD.org/src/commit/?id=6608a478cddb98c1ad52ec0abae5240915fb2c57 commit 6608a478cddb98c1ad52ec0abae5240915fb2c57 Author: Jessica Clarke AuthorDate: 2024-09-10 17:54:44 +0000 Commit: Brooks Davis CommitDate: 2024-12-09 21:47:08 +0000 depend-cleanup.sh: Extend clean_dep to support a custom regex This will avoid having to duplicate the loop every time the default regex isn't good enough, and will be used by upcoming commits. (cherry picked from commit cc30f4ae6790cf4f19bc4787d7528dfea79ef27a) Pull Request: https://github.com/freebsd/freebsd-src/pull/1543 --- tools/build/depend-cleanup.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tools/build/depend-cleanup.sh b/tools/build/depend-cleanup.sh index 22baf65517fe..c12c8e203324 100755 --- a/tools/build/depend-cleanup.sh +++ b/tools/build/depend-cleanup.sh @@ -88,11 +88,12 @@ run() # $1 directory # $2 source filename w/o extension # $3 source extension +# $4 optional regex for egrep -w clean_dep() { for libcompat in "" $ALL_libcompats; do dirprfx=${libcompat:+obj-lib${libcompat}/} - if egrep -qw "$2\.$3" "$OBJTOP"/$dirprfx$1/.depend.$2.*o 2>/dev/null; then + if egrep -qw "${4:-$2\.$3}" "$OBJTOP"/$dirprfx$1/.depend.$2.*o 2>/dev/null; then echo "Removing stale ${libcompat:+lib${libcompat} }dependencies and objects for $2.$3" run rm -f \ "$OBJTOP"/$dirprfx$1/.depend.$2.* \ From nobody Tue Dec 10 02:40:41 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Y6jdk2647z5h82f; Tue, 10 Dec 2024 02:40:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Y6jdj6lP3z4mpk; Tue, 10 Dec 2024 02:40:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733798441; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=mjSFIptpj7OQZawgeZ8J5Vr8+D/G7Z4GvKJa2otwEnQ=; b=os63BxvdRF9pl1OnehXc2MnBnvFFQ2LA2YiOodQNNOE5bXPy8TJSepERDPf4J6KmQYOBaK a2L6DYTKIH89C+Oz0gJb29KfMx8xw2VuPHTqORld4mXYnXTzBXYLscxd4WSUnPvc9T3h17 Lw5vw9ZzZ8xC7tGowurSZ+86tw4isERrbyYyBYrdTXrewcH11S7Xs+adfpww/NkJa4WzvU 2VPuVlzsF+PmmzINmMjsZI6qO0WSwhCNXYvWqciFKkaCWw6Y48vcdK/ONioiSLzrvrc1Yf dwc5sJcnEESYUM4nDrGBx7jqqogJ+bNkhuPObqoEl6c+PfKmbxmbS9e/7arBLQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733798441; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=mjSFIptpj7OQZawgeZ8J5Vr8+D/G7Z4GvKJa2otwEnQ=; b=jZ6xOPVNi0YQ02TUEbpNKNV29dwL6a4VJNKagvviqcNLXuoRgLBuyiAUSRLUJO1ZVVdkiG MmrsRUtuGt14btMWgXSS5SwJVPPe6g3gn+Y6wBDriRQyPhXGsxlNxarMpS4004cwy8Akum O9yDZVG02IllA8vzAReTF+IpUNCZeQ2Wrekoy7ERbfSs/dFGyt/oDqobr+rUmH7FkeWf6G QUZ5N1bVJiLPuRFvLR4KlGWDOssVKNSgnUdmiKw89jgJPlGhqtMkxMtA6aY0rI3LrtBZv+ hiTDd8BUCWAWmhIecE2NNqTmmzo5lfSGEEaxErQeNYtKbFZElo7GPtbWTX7BzQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1733798441; a=rsa-sha256; cv=none; b=W6dhDOb5uJX/TMHrAW4sPtbHveNcMYffRsuPkuoKiX3QGpMvKZYaF6FdhuKjkEaCtoxAl8 s3bSYAGx6Lqt1jBiiy+xhJK/A8b9mGhKJ54WYJXyAkWAtL7KOTNWUuobLg8OBLOXoo0EM3 OSAEiHJ9PegClNYUshMiNIvqD9AZMPtayExFfu0apikur10pzQEzhcs/DqhwtXYzHGFPxK HYY2rXslIyp6IrRC9hI/rNxWuaOZ6O61KQpvyho5Q/bkCEfzS5pCx4pe/zAjKJqU2QBjDu jEOjrvkazQYhAxs9RUb/QIRy7vLMF627yNN/Jvy5rxhu7sRiCf98MsSMDl+wRw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Y6jdj6Mp3z14G3; Tue, 10 Dec 2024 02:40:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4BA2efIX083450; Tue, 10 Dec 2024 02:40:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BA2efVp083447; Tue, 10 Dec 2024 02:40:41 GMT (envelope-from git) Date: Tue, 10 Dec 2024 02:40:41 GMT Message-Id: <202412100240.4BA2efVp083447@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: b50851e8ebfa - stable/14 - prison_proc_iterate(): make it work for prison0 List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-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: b50851e8ebfa8acc77607a4ff1095ed6e4a56881 Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=b50851e8ebfa8acc77607a4ff1095ed6e4a56881 commit b50851e8ebfa8acc77607a4ff1095ed6e4a56881 Author: Konstantin Belousov AuthorDate: 2024-12-06 17:01:00 +0000 Commit: Konstantin Belousov CommitDate: 2024-12-10 02:40:24 +0000 prison_proc_iterate(): make it work for prison0 PR: 283163 (cherry picked from commit 831531a82e0f1d1d7b97e50c0587639322ed8d2e) --- sys/kern/kern_jail.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/sys/kern/kern_jail.c b/sys/kern/kern_jail.c index a4bd27734e8e..c4e89774f18b 100644 --- a/sys/kern/kern_jail.c +++ b/sys/kern/kern_jail.c @@ -3051,8 +3051,7 @@ prison_proc_iterate(struct prison *pr, void (*cb)(struct proc *, void *), FOREACH_PROC_IN_SYSTEM(p) { PROC_LOCK(p); if (p->p_state != PRS_NEW && p->p_ucred != NULL) { - for (ppr = p->p_ucred->cr_prison; - ppr != &prison0; + for (ppr = p->p_ucred->cr_prison; ppr != NULL; ppr = ppr->pr_parent) { if (ppr == pr) { cb(p, cbarg); From nobody Tue Dec 10 02:40:42 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Y6jdl2kXBz5h7yV; Tue, 10 Dec 2024 02:40:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Y6jdl0wNRz4mQ5; Tue, 10 Dec 2024 02:40:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733798443; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2RiIXiAgO8NDjkGF4KGrsLyfvtlLvQbbo4TViwkNLTs=; b=ATkyPtwzOVEP9VVQlkm6PFSJkkdC8zO6AmVmgPF0jgDCevBxcSg5xg7huPXowYTXsw/7PC Q/AaFBr60ZpbdcdGm8zRgK24lq0kaA/WJGto20rMl5/9GgTUmrt+PNvuzHF021PCWtXqK6 tqH/iUpNZIauaZXJ0gjKMpn3d5AVnLRLFv7a9KkUU6E/GG9Ud1QUpRiQ6Eb82N90t+12DE tR+HciMxjTsama0xQTKmvMzb9UX9r14FWRFtStvn45LgPk0EzhZu3zwf/bjJp0VjHIECno l8J8Px6ZVeoep9Z7D8criLh+q3/tD7KgVcIeqIYdhP3FMBTMYGdUX/KA/OQIgQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733798443; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2RiIXiAgO8NDjkGF4KGrsLyfvtlLvQbbo4TViwkNLTs=; b=Sr1UUEXjw+45mkkao2iiQaUfNybnneG0aElHuxWQGezFmL1Y27lsxplSdGTjK2Rk8w/Dtj lADIqXEhWXvS3nTV9lfWyeHUSIKmTtvDeWcvwHpM5fHwPLan6sarzUu4Si5JhjcOOMxNJD uecH2dqiE/4k9fZOqiXAImiXREfnyB6dzN0NzeJpDQl9sPBsIrfnCLdt5LrBeFBLiPtUqp M8bfuOoaam9nl1Utq3UOFR/3G3mBMoFpzhUXeScDzr25+znAgYJjA3sogQgSk1AB+7Tjnd 71zzgJ76S5LRoLsvoYThOqzzbgIc+16m/dX0CG2XKFkoltCyfzk++EGxcSKclA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1733798443; a=rsa-sha256; cv=none; b=rsmyInxU1trpteDeem+gqmWWZ1rPRt5hNpzSVxwqeDNEoAAogzZjfrB+zEe8oyBBMsfkMn D61L0E75D4KkuovxiQ+qx+aFq0Wz2wZu9+HXJy+R6bXDen4v6U+w1OCNQJ1Lp8GXH00lk0 wNfz53bWXkE7rZJLpFLEHp4ANxwzoQSWWtWVaj1Y68fE0PG4j+XHrmKWnStFDouHYHRPGg O2n2HkuiGSFYCSNYc//6k2HMGV4L4/Q/EvP5D1KNmuV/QZjhqb6ptgpnvHCrh+urvXCUmA zgrmtxwjV+Hw3zSSepl+cTS6Kw88GfwYOk7y5izpaFDyUN6r+6luhVGV1f95lA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Y6jdl0X8vz14b7; Tue, 10 Dec 2024 02:40:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4BA2egl5083492; Tue, 10 Dec 2024 02:40:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BA2egt4083489; Tue, 10 Dec 2024 02:40:42 GMT (envelope-from git) Date: Tue, 10 Dec 2024 02:40:42 GMT Message-Id: <202412100240.4BA2egt4083489@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: fff3323694f7 - stable/14 - amdiommu: correctly initialize iommu.unit List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-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: fff3323694f79e020ea139a020ed047bfeb578e3 Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=fff3323694f79e020ea139a020ed047bfeb578e3 commit fff3323694f79e020ea139a020ed047bfeb578e3 Author: Konstantin Belousov AuthorDate: 2024-12-06 08:06:42 +0000 Commit: Konstantin Belousov CommitDate: 2024-12-10 02:40:24 +0000 amdiommu: correctly initialize iommu.unit (cherry picked from commit 53adc0b898a4d263cad0bdfb687d9f008e5768f3) --- sys/x86/iommu/amd_drv.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/sys/x86/iommu/amd_drv.c b/sys/x86/iommu/amd_drv.c index 2ab0213925eb..72aae58334f2 100644 --- a/sys/x86/iommu/amd_drv.c +++ b/sys/x86/iommu/amd_drv.c @@ -176,7 +176,6 @@ ivrs_lookup_ivhd_0x40(ACPI_IVRS_HARDWARE2 *h2, void *arg) return (false); ildp->sc->unit_dom = h2->PciSegmentGroup; - ildp->sc->iommu.unit = ivrs_info_to_unit_id(h2->Info); ildp->sc->efr = h2->EfrRegisterImage; return (true); } @@ -194,7 +193,6 @@ ivrs_lookup_ivhd_0x10(ACPI_IVRS_HARDWARE1 *h1, void *arg) return (false); ildp->sc->unit_dom = h1->PciSegmentGroup; - ildp->sc->iommu.unit = ivrs_info_to_unit_id(h1->Info); return (true); } @@ -456,6 +454,7 @@ amdiommu_attach(device_t dev) bool res; sc = device_get_softc(dev); + sc->iommu.unit = device_get_unit(dev); sc->iommu.dev = dev; error = pci_find_cap(dev, PCIY_SECDEV, &sc->seccap_reg); From nobody Tue Dec 10 20:03:18 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Y78mk5KFFz5gYks; Tue, 10 Dec 2024 20:03: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 4Y78mk4HJyz4Nr1; Tue, 10 Dec 2024 20:03:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733860998; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=AmERC/ROs/cXMyLlNp4Q2uRho8WZUx1rm4A2n+Rn2x0=; b=eCEQ+SBNFwnJVB/YUV2mKrfnV2PReu+fFMOzTC91A/KUncqnJtqpWGHUIkTzfmTLkx9Weg 35RWGPoqXQuiBYmcrgmJWox6MRyZJZY0jfb3Z5zoCaWWfW3aXFxM9D4DyDENI2aSUk+OmW bD4KGKXoRyz0TXTLo3XTabEvl8QEXoZyRjvUYoRO3FxJM34tOmosoxVJXBSPtS89SGRPPk 4HkzqV/DBS/owR3E62K+/cTIp5qPGDZIOWHkM5xuISb0a3ts1YlHDgIqJ6h3FPMjCbUWib WYU2n3HBB6PUj+f8UjlkTXNPP5SpG/ZOFFhEXDVTFK9LrDsiw2VmVEg/obfIKw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733860998; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=AmERC/ROs/cXMyLlNp4Q2uRho8WZUx1rm4A2n+Rn2x0=; b=YscHf7GQUmd/dZtoJwgK09uVBrVTNrKBJTyVvF+L9MMP3fNu8Tt0Yr0j0Ia+LDHiprOS7I UTIXe9zirQB7E82a5R7kii1rskBDCoDRHzBKAfCM8sk9h5AfWlxgsGqrDRMzmAnBj30mb5 FOVrhYwTlSle+u4z7Elqbpapi/zCAMwJXcUFE54FbuGSuenFop/FJ0YKt7LpZwjYcYMnEw zO51BNZmirmh403dIJzGCO+pAQalQvVSi4jiMhcA2ENeic+kYViE01cM1iEDSsNkBPcdkN RuOUQZsFFnUVMhHsOSQHwaCOkJOzS1VMdNKlubQsqJ3I8mgzRsEXpEYqfWasTw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1733860998; a=rsa-sha256; cv=none; b=R80paqqstYfVe6vOH5bh4aO0qcemAy7tNocyhiZbnn9qXa8W5n0/Iu7umr5n0VyKjEf1DK nlhG1jLx8XvZVrgxSGixibqu6ty4GS1vpd4tSnvalZlsx9P0cZIGlo7Ei6Qiqf/an54AAG a73P+Ae9L7N2iKtydWBhr75x97I7OXOUomttTjwXqFAfN4rFh75qwP97CjxRuT5Rh0Ko+Y iGrnzLuF00/PTv4QspkGmsuHEakFKeV9PDod8ch+UtRlMMbnCeAGdcsnGqgGzhnrkeXXHG 2CDMdPdVZIRfb9nhNa/lAicHtXo9HBLpsBLoPm03GFHu+usm+xjJBk7Mc/EiZg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Y78mk3ts0zd9M; Tue, 10 Dec 2024 20:03: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 4BAK3IBP028334; Tue, 10 Dec 2024 20:03:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BAK3IB7028331; Tue, 10 Dec 2024 20:03:18 GMT (envelope-from git) Date: Tue, 10 Dec 2024 20:03:18 GMT Message-Id: <202412102003.4BAK3IB7028331@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kyle Evans Subject: git: c4290f346662 - stable/14 - kern: restore signal mask before ast() for pselect/ppoll List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kevans X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: c4290f3466624f8e26af83f3090c3b0f62512ca1 Auto-Submitted: auto-generated The branch stable/14 has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=c4290f3466624f8e26af83f3090c3b0f62512ca1 commit c4290f3466624f8e26af83f3090c3b0f62512ca1 Author: Kyle Evans AuthorDate: 2024-11-26 04:04:48 +0000 Commit: Kyle Evans CommitDate: 2024-12-10 20:02:52 +0000 kern: restore signal mask before ast() for pselect/ppoll It's possible to take a signal after pselect/ppoll have set their return value, but before we actually return to userland. This results in taking a signal without reflecting it in the return value, which weakens the guarantees provided by these functions. Switch both to restore the signal mask before we would deliver signals on return to userland. If a signal was received after the wait was over, then we'll just have the signal queued up for the next time it comes unblocked. The modified signal mask is retained if we were interrupted so that ast() actually handles the signal, at which point the signal mask is restored. des@ has a test case demonstrating the issue in D47738 which will follow. Reported by: des Reviewed by: des (earlier version), kib Sponsored by: Klara, Inc. Sponsored by: NetApp, Inc. (cherry picked from commit ccb973da1f1b65879eade8e65cdd2885e125f90e) --- sys/kern/sys_generic.c | 53 +++++++++++++++++++++++++++++++++++++++----------- 1 file changed, 42 insertions(+), 11 deletions(-) diff --git a/sys/kern/sys_generic.c b/sys/kern/sys_generic.c index 77e4c13d4390..6a80ddbe86ed 100644 --- a/sys/kern/sys_generic.c +++ b/sys/kern/sys_generic.c @@ -1050,15 +1050,31 @@ kern_pselect(struct thread *td, int nd, fd_set *in, fd_set *ou, fd_set *ex, &td->td_oldsigmask, 0); if (error != 0) return (error); - td->td_pflags |= TDP_OLDMASK; + } + error = kern_select(td, nd, in, ou, ex, tvp, abi_nfdbits); + if (uset != NULL) { /* * Make sure that ast() is called on return to * usermode and TDP_OLDMASK is cleared, restoring old - * sigmask. + * sigmask. If we didn't get interrupted, then the caller is + * likely not expecting a signal to hit that should normally be + * blocked by its signal mask, so we restore the mask before + * any signals could be delivered. */ - ast_sched(td, TDA_SIGSUSPEND); + if (error == EINTR) { + td->td_pflags |= TDP_OLDMASK; + ast_sched(td, TDA_SIGSUSPEND); + } else { + int serror __diagused; + + /* *select(2) should never restart. */ + MPASS(error != ERESTART); + serror = kern_sigprocmask(td, SIG_SETMASK, + &td->td_oldsigmask, NULL, 0); + MPASS(serror == 0); + } } - error = kern_select(td, nd, in, ou, ex, tvp, abi_nfdbits); + return (error); } @@ -1529,13 +1545,6 @@ kern_poll_kfds(struct thread *td, struct pollfd *kfds, u_int nfds, &td->td_oldsigmask, 0); if (error) return (error); - td->td_pflags |= TDP_OLDMASK; - /* - * Make sure that ast() is called on return to - * usermode and TDP_OLDMASK is cleared, restoring old - * sigmask. - */ - ast_sched(td, TDA_SIGSUSPEND); } seltdinit(td); @@ -1558,6 +1567,28 @@ kern_poll_kfds(struct thread *td, struct pollfd *kfds, u_int nfds, error = EINTR; if (error == EWOULDBLOCK) error = 0; + + if (uset != NULL) { + /* + * Make sure that ast() is called on return to + * usermode and TDP_OLDMASK is cleared, restoring old + * sigmask. If we didn't get interrupted, then the caller is + * likely not expecting a signal to hit that should normally be + * blocked by its signal mask, so we restore the mask before + * any signals could be delivered. + */ + if (error == EINTR) { + td->td_pflags |= TDP_OLDMASK; + ast_sched(td, TDA_SIGSUSPEND); + } else { + int serror __diagused; + + serror = kern_sigprocmask(td, SIG_SETMASK, + &td->td_oldsigmask, NULL, 0); + MPASS(serror == 0); + } + } + return (error); } From nobody Tue Dec 10 20:03:23 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Y78mq2qccz5gYWR; Tue, 10 Dec 2024 20:03: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 4Y78mq25Lvz4P7c; Tue, 10 Dec 2024 20:03:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733861003; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=IWtf46lo6/oLuGbqgo5ba+aYdhHU9f9ZH5anuVwHsDs=; b=DsaXRDxiJINBrDM0sInh//G3Hou/nhdqZ0jDho1vQ86uRrd9qoF+IMUEyEWvn50IXm6dsF XMnwhShxH6HC5vNlX2BQBx9qqVDmXAD6QYzkI5CuUOdY1HN6kS0m4idOQcvL8lPqySPKlq lW+ZnQ6DO+nvANv4suTupDzt6lyFaScsxQGc8QRmtd6xKAYvclrjtZg0xwjtLQBzfJfw++ HSP/U6RiJEnGxZu5gb77JKHFGvcvyUMLOBGr8U8b9IMkp5OSrfHuUAx2pFYDwLY5TvjdB0 gAWN0V5e9A87CekFLp9j5mfYvEqjZeVrDLCVu3v99RoWh5g8LHMGXOhTRrtiog== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733861003; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=IWtf46lo6/oLuGbqgo5ba+aYdhHU9f9ZH5anuVwHsDs=; b=wfsPvUDuVczQvpJ2vtFKh5THCs0Ml7XcuSlmIv4v44l+ZwgTIujPYqW9zDPHybjzpCtNyV zqn9SpUK3jgdC+pjtIYKVV2HDUbG4ruOGJkJTQ8pBB4ikK/TN0wjWLYSWvSIL5q9J8FqFo RqFtEZLEWgMT3SLw0biYJSBN0wwic6d14HSHkDLLMNvxuTZ/pKU3DW1uLnCW2WoWn2UWYb o2U0lB2LzJhtKdr1h7lEW/Ru/0YhuqP+fsKh85ezOTGDMqfnTs0bhb65K0IAfnqr+yYCYQ zYNA4FAeNpLcaYdl4SEHry4yPHyWUWO3E5gPqogo04LLVI7nabWJUY7G2vvi6w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1733861003; a=rsa-sha256; cv=none; b=UHs5Vpn6mEx9f2dn6uEr5RmsjzkSDg3dzxDv2c4vO73nfNYX3p7ESVAJLjf0lfuIrpd5lm eNMZmVial/Q778rR7iMiIytK4rD6LfLzr92tx5/+1fVgD4HFJKO1nWtg/xR9kbgPmvxLbJ CFr0ClzjWlFizMooqi/IUlgmVsjbkJd+JORZBZrvK1hdtevQCYiTj4REp6EarTzWwNLd14 nnlbkPd3bFxxebvQlWl7LW+tgPaaztmTMC0Njk33yoQha9jerAzLzvuY1TLJZiPJmJVp57 YqCA6kh5P3+lLKKA7gA8/y1XzoL7Vo9Sl7nGpowsbWNzLQ4cSM9+aw8bqvB+Dw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Y78mq1c4DzdCV; Tue, 10 Dec 2024 20:03: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 4BAK3NZ3028504; Tue, 10 Dec 2024 20:03:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BAK3NFm028499; Tue, 10 Dec 2024 20:03:23 GMT (envelope-from git) Date: Tue, 10 Dec 2024 20:03:23 GMT Message-Id: <202412102003.4BAK3NFm028499@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kyle Evans Subject: git: e5e44726d5af - stable/13 - kern: restore signal mask before ast() for pselect/ppoll List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kevans X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: e5e44726d5afdb260893a3b4e0be025f6dd74bd4 Auto-Submitted: auto-generated The branch stable/13 has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=e5e44726d5afdb260893a3b4e0be025f6dd74bd4 commit e5e44726d5afdb260893a3b4e0be025f6dd74bd4 Author: Kyle Evans AuthorDate: 2024-11-26 04:04:48 +0000 Commit: Kyle Evans CommitDate: 2024-12-10 20:03:14 +0000 kern: restore signal mask before ast() for pselect/ppoll It's possible to take a signal after pselect/ppoll have set their return value, but before we actually return to userland. This results in taking a signal without reflecting it in the return value, which weakens the guarantees provided by these functions. Switch both to restore the signal mask before we would deliver signals on return to userland. If a signal was received after the wait was over, then we'll just have the signal queued up for the next time it comes unblocked. The modified signal mask is retained if we were interrupted so that ast() actually handles the signal, at which point the signal mask is restored. des@ has a test case demonstrating the issue in D47738 which will follow. Reported by: des Reviewed by: des (earlier version), kib Sponsored by: Klara, Inc. Sponsored by: NetApp, Inc. Differential Revision: https://reviews.freebsd.org/D47741 (cherry picked from commit ccb973da1f1b65879eade8e65cdd2885e125f90e) --- sys/kern/sys_generic.c | 61 +++++++++++++++++++++++++++++++++++++------------- 1 file changed, 46 insertions(+), 15 deletions(-) diff --git a/sys/kern/sys_generic.c b/sys/kern/sys_generic.c index a0a13e77131b..c605e3f00fdd 100644 --- a/sys/kern/sys_generic.c +++ b/sys/kern/sys_generic.c @@ -975,17 +975,33 @@ kern_pselect(struct thread *td, int nd, fd_set *in, fd_set *ou, fd_set *ex, &td->td_oldsigmask, 0); if (error != 0) return (error); - td->td_pflags |= TDP_OLDMASK; + } + error = kern_select(td, nd, in, ou, ex, tvp, abi_nfdbits); + if (uset != NULL) { /* * Make sure that ast() is called on return to * usermode and TDP_OLDMASK is cleared, restoring old - * sigmask. + * sigmask. If we didn't get interrupted, then the caller is + * likely not expecting a signal to hit that should normally be + * blocked by its signal mask, so we restore the mask before + * any signals could be delivered. */ - thread_lock(td); - td->td_flags |= TDF_ASTPENDING; - thread_unlock(td); + if (error == EINTR) { + td->td_pflags |= TDP_OLDMASK; + thread_lock(td); + td->td_flags |= TDF_ASTPENDING; + thread_unlock(td); + } else { + int serror __diagused; + + /* *select(2) should never restart. */ + MPASS(error != ERESTART); + serror = kern_sigprocmask(td, SIG_SETMASK, + &td->td_oldsigmask, NULL, 0); + MPASS(serror == 0); + } } - error = kern_select(td, nd, in, ou, ex, tvp, abi_nfdbits); + return (error); } @@ -1456,15 +1472,6 @@ kern_poll_kfds(struct thread *td, struct pollfd *kfds, u_int nfds, &td->td_oldsigmask, 0); if (error) return (error); - td->td_pflags |= TDP_OLDMASK; - /* - * Make sure that ast() is called on return to - * usermode and TDP_OLDMASK is cleared, restoring old - * sigmask. - */ - thread_lock(td); - td->td_flags |= TDF_ASTPENDING; - thread_unlock(td); } seltdinit(td); @@ -1487,6 +1494,30 @@ kern_poll_kfds(struct thread *td, struct pollfd *kfds, u_int nfds, error = EINTR; if (error == EWOULDBLOCK) error = 0; + + if (uset != NULL) { + /* + * Make sure that ast() is called on return to + * usermode and TDP_OLDMASK is cleared, restoring old + * sigmask. If we didn't get interrupted, then the caller is + * likely not expecting a signal to hit that should normally be + * blocked by its signal mask, so we restore the mask before + * any signals could be delivered. + */ + if (error == EINTR) { + td->td_pflags |= TDP_OLDMASK; + thread_lock(td); + td->td_flags |= TDF_ASTPENDING; + thread_unlock(td); + } else { + int serror __diagused; + + serror = kern_sigprocmask(td, SIG_SETMASK, + &td->td_oldsigmask, NULL, 0); + MPASS(serror == 0); + } + } + return (error); } From nobody Tue Dec 10 23:37:58 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Y7FXR18mFz5g34C; Tue, 10 Dec 2024 23:37: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 4Y7FXR0KFqz4l2g; Tue, 10 Dec 2024 23:37:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733873879; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=W8Nh0LRK7owKcgIL6Kq4LS0tPNv0FOHNMJe8cKBT7V8=; b=t9HFHkB8zt1dTX8wTT9Lr4teexUxC2bxPX0mhoDDxyWC6vo6E76OtYBCc+NzWdnrrYpvh2 DFqWKvMsCcQeZyhMLuq4w8Patwh0rkLyNQ37vjxTJ34vVFH3Ywys/zjE02TI4ElcRuWjaO u9TMylkgF/1BgP7d///PeEMSwsPFVSO5k42shrMlSCzu/Uv9mdIGElQWKmiUujT0E62qWb gC/+QKBsr/E7bZIsyBH5tbWSEdEkKvBXl1eRh9QobfPP7RbZp4dP7r5KksZ4ctGIcbTuJX gW1fGcHjDG2+1es5JgcPPqKSKb9VtiFGkuIES6KVLgMFXMCUDp3AtGlBIhFWpg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733873879; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=W8Nh0LRK7owKcgIL6Kq4LS0tPNv0FOHNMJe8cKBT7V8=; b=SJjsq1qW4t8nANP9V71CxWsUQi9ec8AeQtSqSjP/fB0RaFcDynAs6HZnc3eW8tcilCzcmm Jn8XlzJZus5Fyd3lsgaA5RfWPheCG5oNNChBszHxoO6uguZuBnPG5i+BxUkYePccv2JPZF kSn8WJoYYCz0aJQzOIRGCSmdHYvpeinVLh+73a8jGnWzwpcQ8OaylgxPznmHmJjGZ+6p/u n+3kaOQLxV+bbigxlFB2l8C9nKZR0VW3OTXuIZaPcCWbNoT0cMaRj9O0wCCuLG4MWGOPiU v5gvor+jLOoPnQaOdT+3OCyrLWbFa32oBAvgAOl5cJU1LFCd0tDJ9XayMmtyNg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1733873879; a=rsa-sha256; cv=none; b=ITv00ls2PmMsqNn2mI5nNVOgSyZ8aH7U2TnKjdYaOxuYGB9eaDSF9yV6M4f1LozQdajJ/X Jv5QTqhE++91NVgEbdoyfETXtjPC+Q7cSohR8oA/Vp2hEbNJAcjVq3DILP9wpYnHvOE68V PnfWeYFIYAwcd7bmUUszTJy31e2dCmFyW5mtvMHgcviqKbVtgRFj56VvkoP+MWBvwejE8K S1jI7tV5c/tOuGzY79qWdR/nPpdmmNaXGC99EJY81x0SwT/bSWiMjMczfs5+A6Wy/bmrIk Pvk9H2GoOMl43t9eb6h2i660gY++OLxvTv4j2RASPTGUFn7pYE+zGelpBCVohg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Y7FXQ6hr9zkk7; Tue, 10 Dec 2024 23:37: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 4BANbwX2019711; Tue, 10 Dec 2024 23:37:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BANbwJ5019708; Tue, 10 Dec 2024 23:37:58 GMT (envelope-from git) Date: Tue, 10 Dec 2024 23:37:58 GMT Message-Id: <202412102337.4BANbwJ5019708@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kyle Evans Subject: git: aee794942130 - stable/14 - daemon: truncate the pidfile when we're waiting to restart child List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kevans X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: aee794942130e684dd6cfe9c989e8a43c95a3ff3 Auto-Submitted: auto-generated The branch stable/14 has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=aee794942130e684dd6cfe9c989e8a43c95a3ff3 commit aee794942130e684dd6cfe9c989e8a43c95a3ff3 Author: Kyle Evans AuthorDate: 2024-11-19 19:51:26 +0000 Commit: Kyle Evans CommitDate: 2024-12-10 22:59:58 +0000 daemon: truncate the pidfile when we're waiting to restart child We need to be able to test some more restart behavior that depends on knowing specifically where we're at (inside the event loop or outside of the event loop). Truncate the pidfile until the process is restarted to give the test a clean marker rather than having to add arbitrary delays and hoping for the best. Reviewed by: des, markj (cherry picked from commit aa8722cc18e4620ea5e7b0a4917207ed1508393d) --- usr.sbin/daemon/daemon.c | 30 ++++++++++++++++++++++++++++++ usr.sbin/daemon/tests/daemon_test.sh | 7 +++++-- 2 files changed, 35 insertions(+), 2 deletions(-) diff --git a/usr.sbin/daemon/daemon.c b/usr.sbin/daemon/daemon.c index 52fbfca1dcd2..6d0ce2cc10e6 100644 --- a/usr.sbin/daemon/daemon.c +++ b/usr.sbin/daemon/daemon.c @@ -105,6 +105,8 @@ static void daemon_exec(struct daemon_state *); static bool daemon_is_child_dead(struct daemon_state *); static void daemon_set_child_pipe(struct daemon_state *); +static int pidfile_truncate(struct pidfh *); + static const char shortopts[] = "+cfHSp:P:ru:o:s:l:t:m:R:T:h"; static const struct option longopts[] = { @@ -497,6 +499,15 @@ daemon_eventloop(struct daemon_state *state) close(kq); close(state->pipe_fd[0]); state->pipe_fd[0] = -1; + + /* + * We don't have to truncate the pidfile, but it's easier to test + * daemon(8) behavior in some respects if we do. We won't bother if + * the child won't be restarted. + */ + if (state->child_pidfh != NULL && state->restart_enabled) { + pidfile_truncate(state->child_pidfh); + } } static void @@ -788,3 +799,22 @@ daemon_set_child_pipe(struct daemon_state *state) /* The child gets dup'd pipes. */ close(state->pipe_fd[0]); } + +static int +pidfile_truncate(struct pidfh *pfh) +{ + int pfd = pidfile_fileno(pfh); + + assert(pfd >= 0); + + if (ftruncate(pfd, 0) == -1) + return (-1); + + /* + * pidfile_write(3) will always pwrite(..., 0) today, but let's assume + * it may not always and do a best-effort reset of the position just to + * set a good example. + */ + (void)lseek(pfd, 0, SEEK_SET); + return (0); +} diff --git a/usr.sbin/daemon/tests/daemon_test.sh b/usr.sbin/daemon/tests/daemon_test.sh index 948a9f6a8a57..2ad0803842b7 100644 --- a/usr.sbin/daemon/tests/daemon_test.sh +++ b/usr.sbin/daemon/tests/daemon_test.sh @@ -139,8 +139,11 @@ restart_child_body() { kill $orig_sleep_pid # Wait up to 10s for the daemon to restart the child. for t in `seq 0 0.1 10`; do - new_sleep_pid=`cat sleep.pid` - [ "$orig_sleep_pid" -ne "$new_sleep_pid" ] && break + if [ -s "sleep.pid" ]; then + new_sleep_pid=`cat sleep.pid` + [ "$orig_sleep_pid" -ne "$new_sleep_pid" ] && break + fi + sleep 0.1 done [ "$orig_sleep_pid" -ne "$new_sleep_pid" ] || \ From nobody Tue Dec 10 23:37:59 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Y7FXS4HWqz5g2W0; Tue, 10 Dec 2024 23:38: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 4Y7FXS1qnDz4l7K; Tue, 10 Dec 2024 23:38:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733873880; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xtTUh3U4MO0KJ/LFR3GTIcSEvpqX0V3PHFwNUrhJonQ=; b=nfLny+VqO3/0NPkrGCitRzHMN+iEWZuQDwtDFyP33VXS7JNHs+69v1Kg0ycwH3zKQyMplY 4fLHkebpB2tyP+H9LlmfpN8Wq9q5T/2WT/HmqNJE8Ir+fLKgHjZF2iIvw7Ay42iv+nqrkf hmI4XGittBB1P1PwBijzFJyFd2idSJfBexNOlmVqUiw/VeIqiL7rXiGejCELG+ikABVwMr 9UUmvHLQfi458f7irvQyCx1BV/z1H2HEexIX6e5bkvaej53Z9IhcjxQQQMf+jWW/8b5KAJ uCMBwmGddaV7zL1zCAaRBVtvEW4XYHR4IIh01Nj2ZtdgMWSpmapFVi3Ij0ORfA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733873880; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xtTUh3U4MO0KJ/LFR3GTIcSEvpqX0V3PHFwNUrhJonQ=; b=Eba8EQnyT05VUHBfm0kRgYpubfTIFQbmK3Gcjr5WsgDNdb/GOTRyCdyIv9FjZ9aKA+t9cU kd9dup1dm4Hiqd/dBizDvRZju7RpENSfq547RJCvwoMu0j6TVvwGqZb7iz/q/+i97E9TTP u7usj3GIvUC7WdRb78SmNHz6c1c0JLmwsn4+p01XSyZW0DUxzVyoAFeThyJcBDMkLwQqxU 5baq9yGNxzr+fIPTbgul89NSJ1gMAB+nHVmsc1pDagLY/GWHuBNZV85YBHSpkLsBvtYolp iEvVW8SCBBNTbqFPrkQXthLT8WZ38HZ7pCulNPIEw0GK/P+vEhqfDOlW5U2NqQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1733873880; a=rsa-sha256; cv=none; b=dmN2SUKSGUuHUn87EehrHGQB0HD0WAMbsykqzk3ZBQJrh0CZ3YJgY0KXim6ZywuIV8KwIw HT3GNA5Q6tVofhzUPD+dy8AhF3D/yLvljCVcx12A/M1GSvPGjdKV2niXXz/UALq+BL5HSx z+Tx5cSrLBPPz5IDgr/AxZe15jKcCj+x6OS3uC7Ltl0aLlg1So/FfGVDuimLyd07mOQyN2 m5vyLw4qGts5+TCo62kJuytoQHNr8Zo4uTYRvRkvWRWG4Ncc9jWI/1MtzoWiWajlRoi0oe /FbI3He5gpcFjcQYELFCq/aAp3PN4qza2BHK2xHwmx21xwYJwjxCySGIJJLylw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Y7FXS12L2zkWX; Tue, 10 Dec 2024 23:38: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 4BANbxK5019763; Tue, 10 Dec 2024 23:37:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BANbxeX019760; Tue, 10 Dec 2024 23:37:59 GMT (envelope-from git) Date: Tue, 10 Dec 2024 23:37:59 GMT Message-Id: <202412102337.4BANbxeX019760@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kyle Evans Subject: git: e310a825c933 - stable/14 - daemon: tests: add a test for missed SIGTERM List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kevans X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: e310a825c933182a5b29261b741467f649951ff1 Auto-Submitted: auto-generated The branch stable/14 has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=e310a825c933182a5b29261b741467f649951ff1 commit e310a825c933182a5b29261b741467f649951ff1 Author: Kyle Evans AuthorDate: 2024-11-19 19:51:27 +0000 Commit: Kyle Evans CommitDate: 2024-12-10 23:00:03 +0000 daemon: tests: add a test for missed SIGTERM This is somewhaht hard to test reliably, but we'll give it a shot. Startup a sleep(1) daemon with a hefty restart delay. In refactoring of daemon(8), we inadvertently started dropping SIGTERMs that came in while we were waiting to restart the child, so we employ the strategy: - Pop the child sleep(1) first - Wait for sleep(1) to exit (pid file truncated) - Pop the daemon(8) with a SIGTERM - Wait for daemon(8) to exit The pidfile is specifically truncated outside of the event loop so that we don't have a kqueue to catch it in the current model. PR: 277959 Reviewed by: des, markj (cherry picked from commit 9ab59e900c1dd693b4d14285389a035e81341789) --- usr.sbin/daemon/tests/daemon_test.sh | 38 ++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) diff --git a/usr.sbin/daemon/tests/daemon_test.sh b/usr.sbin/daemon/tests/daemon_test.sh index 2ad0803842b7..ec94d30bc1c3 100644 --- a/usr.sbin/daemon/tests/daemon_test.sh +++ b/usr.sbin/daemon/tests/daemon_test.sh @@ -154,6 +154,43 @@ restart_child_cleanup() { [ -f daemon.pid ] && kill `cat daemon.pid` } +atf_test_case restart_hang cleanup +restart_hang_head() { + atf_set "descr" "daemon should terminate with SIGTERM even pending child restart" +} +restart_hang_body() { + daemon -rP daemon.pid -R 10 -p sleep.pid sleep 300 + atf_check -s exit:0 test -f daemon.pid + atf_check -s exit:0 test -f sleep.pid + read sleep_pid < sleep.pid + 1>&2 echo "$sleep_pid" + kill "$sleep_pid" + + # Wait up to 5s for the child to exit + for t in `seq 0 0.1 5`; do + [ ! -s "sleep.pid" ] && break + sleep 0.1 + done + + atf_check test ! -s "sleep.pid" + + read daemon_pid < daemon.pid + kill -TERM "$daemon_pid" + + # Wait up to 10s for the daemon to terminate + for t in `seq 0 0.1 10`; do + [ ! -f "daemon.pid" ] && break + sleep 0.1 + done + + atf_check test ! -f "daemon.pid" + atf_check test ! -f "sleep.pid" +} +restart_hang_cleanup() { + [ -s daemon.pid ] && kill -9 `cat daemon.pid` + true +} + atf_test_case supervisor_pidfile cleanup supervisor_pidfile_head() { atf_set "descr" "daemon should write its own pid to a pidfile" @@ -218,6 +255,7 @@ atf_init_test_cases() { atf_add_test_case newsyslog atf_add_test_case output_file atf_add_test_case restart_child + atf_add_test_case restart_hang atf_add_test_case supervisor_pidfile atf_add_test_case supervisor_pidfile_lock atf_add_test_case title From nobody Tue Dec 10 23:38:01 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Y7FXT3hzXz5g2yN; Tue, 10 Dec 2024 23:38:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Y7FXT2KwFz4lZc; Tue, 10 Dec 2024 23:38:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733873881; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=BMa7bon8cqtsItyGlVVuUaw0Ggje2t+nuwNRdrOpHVI=; b=M4UXULhkDhM2szE67Rn7sJiq0b+J6LqM+ja6ZVEzjoP00hV8xwT0ncql21Cztf0XvfPz83 B9zdfxrFyufxjNOZTZ1bz9WZJL48fNoiM2SxETTIqgONy4R6dusVLVAYvskGJ1NRBc6wir u0vmLY7cgk/43CYsIlOd/FHsRNLrMwVoj+qi6CT8BS1I20oYuMzEDU/kvcssF0raq8G+BL IMRekUiMo/N8wjZJj1MwKszeEXjM5MyRzSDo1iN+APmkehynZM19PKu1F1yNl7c9uT6ZcW 4q4C3slp85ud+UK/3kVGKgR7lGUB5DZMos17tnR4AVfom6T8ZyymoGH8nPTlzQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733873881; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=BMa7bon8cqtsItyGlVVuUaw0Ggje2t+nuwNRdrOpHVI=; b=CU/Dx3tBfvZmY7gkU6maLaGijEjIdPrI9bQxbAIsb3XnYI8f0GOnxeOeeI2xKKwvE+q7UL tgq6x5XRehIddUKvQV7VccJOuVKh4ECs0uXs+zIHMhnVVgcZFmvAO2qYh7mvrHZjw2vSQb zLQEsfKlrhJa5vGh5pyIkf/5FOurPjMaRIj+/41yiiz3uuqypngtdAQzv3bsjzwWLZoXNC /n9DNwgGHE/rPhorSyJY5EVrodzLtjB446ITdy4UwQTW50/zAz/zvFvI8XzBzHO0QMoee7 jtZwNZeeW3H4wdZM6XK84F0L55m+xLQpxm6USfaQ8NUCSvF5JEX3+sUwUVKoCQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1733873881; a=rsa-sha256; cv=none; b=U+Twbw2ssvp06Wu1CsuH+hMXxIkHt0Iqrc0799JwUnuqe3ZcfuI92BHVIpt4u+UKacQSr9 cLrf0K1EL+/WR5UBgw7RL+wLFXX9FjW3BD0KgERrEsZv9Mh6NsyYhBbUZEISUPxf987VUy QaMVKCrGeRy8MKxlOUzW80ZfNnu9uzXzQDsNtUSiMFuItZlNPG5Bn/uu+tCNbfzeu67V+1 mP24Vc/QyNci5pr84LG2uz101WON9TIpJyArN45AV+xYsV/7zcVRr3LQwSZoRB2kgl9IMn qKcqI1x2zrU+hla912/u2pBF3odckhhZM9VtmHDy3dAEAaJL3CwaBKFoK2bvPA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Y7FXT1ddLzkQk; Tue, 10 Dec 2024 23:38: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 4BANc1db019833; Tue, 10 Dec 2024 23:38:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BANc19s019830; Tue, 10 Dec 2024 23:38:01 GMT (envelope-from git) Date: Tue, 10 Dec 2024 23:38:01 GMT Message-Id: <202412102338.4BANc19s019830@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kyle Evans Subject: git: 7ea2874eadf9 - stable/14 - daemon: stop rebuilding the kqueue every restart of the child List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kevans X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 7ea2874eadf901b1187772670169b6fc3a44d917 Auto-Submitted: auto-generated The branch stable/14 has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=7ea2874eadf901b1187772670169b6fc3a44d917 commit 7ea2874eadf901b1187772670169b6fc3a44d917 Author: Kyle Evans AuthorDate: 2024-11-19 19:51:27 +0000 Commit: Kyle Evans CommitDate: 2024-12-10 23:05:46 +0000 daemon: stop rebuilding the kqueue every restart of the child We populate the kqueue with all of four kevents: three signal handlers and one for read of the child pipe. Every time we start the child, we rebuild this kqueue from scratch for the child and tear it down before we exit and check if we need to restart the child. As a consequence, we effectively drop any of the signals we're interested in between restarts. Push the kqueue out into the daemon state to avoid losing any signal events in the process, and reimplement the restart timer in terms of kqueue timers. The pipe read event will be automatically deleted upon last close, which leaves us with only the signal events that really get retained between restarts of the child. PR: 277959 Reviewed by: des, markj (cherry picked from commit bc1dfc316a2bba97773a14b96f5e976a52524be4) --- usr.sbin/daemon/daemon.c | 121 +++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 101 insertions(+), 20 deletions(-) diff --git a/usr.sbin/daemon/daemon.c b/usr.sbin/daemon/daemon.c index 6d0ce2cc10e6..73524e3bd286 100644 --- a/usr.sbin/daemon/daemon.c +++ b/usr.sbin/daemon/daemon.c @@ -79,6 +79,7 @@ struct daemon_state { enum daemon_mode mode; int pid; int keep_cur_workdir; + int kqueue_fd; int restart_delay; int stdmask; int syslog_priority; @@ -104,6 +105,7 @@ static void daemon_terminate(struct daemon_state *); static void daemon_exec(struct daemon_state *); static bool daemon_is_child_dead(struct daemon_state *); static void daemon_set_child_pipe(struct daemon_state *); +static int daemon_setup_kqueue(void); static int pidfile_truncate(struct pidfh *); @@ -324,6 +326,8 @@ main(int argc, char *argv[]) /* Write out parent pidfile if needed. */ pidfile_write(state.parent_pidfh); + state.kqueue_fd = daemon_setup_kqueue(); + do { state.mode = MODE_SUPERVISE; daemon_eventloop(&state); @@ -379,27 +383,13 @@ daemon_eventloop(struct daemon_state *state) err(1, "pipe"); } - kq = kqueuex(KQUEUE_CLOEXEC); + kq = state->kqueue_fd; EV_SET(&event, state->pipe_fd[0], EVFILT_READ, EV_ADD|EV_CLEAR, 0, 0, NULL); if (kevent(kq, &event, 1, NULL, 0, NULL) == -1) { err(EXIT_FAILURE, "failed to register kevent"); } - EV_SET(&event, SIGHUP, EVFILT_SIGNAL, EV_ADD, 0, 0, NULL); - if (kevent(kq, &event, 1, NULL, 0, NULL) == -1) { - err(EXIT_FAILURE, "failed to register kevent"); - } - - EV_SET(&event, SIGTERM, EVFILT_SIGNAL, EV_ADD, 0, 0, NULL); - if (kevent(kq, &event, 1, NULL, 0, NULL) == -1) { - err(EXIT_FAILURE, "failed to register kevent"); - } - - EV_SET(&event, SIGCHLD, EVFILT_SIGNAL, EV_ADD, 0, 0, NULL); - if (kevent(kq, &event, 1, NULL, 0, NULL) == -1) { - err(EXIT_FAILURE, "failed to register kevent"); - } memset(&event, 0, sizeof(struct kevent)); /* Spawn a child to exec the command. */ @@ -492,11 +482,12 @@ daemon_eventloop(struct daemon_state *state) } continue; default: + assert(0 && "Unexpected kevent filter type"); continue; } } - close(kq); + /* EVFILT_READ kqueue filter goes away here. */ close(state->pipe_fd[0]); state->pipe_fd[0] = -1; @@ -510,19 +501,76 @@ daemon_eventloop(struct daemon_state *state) } } +/* + * Note that daemon_sleep() should not be called with anything but the signal + * events in the kqueue without further consideration. + */ static void daemon_sleep(struct daemon_state *state) { - struct timespec ts = { state->restart_delay, 0 }; + struct kevent event = { 0 }; + int ret; + + assert(state->pipe_fd[0] == -1); + assert(state->pipe_fd[1] == -1); if (!state->restart_enabled) { return; } - while (nanosleep(&ts, &ts) == -1) { - if (errno != EINTR) { - err(1, "nanosleep"); + + EV_SET(&event, 0, EVFILT_TIMER, EV_ADD|EV_ONESHOT, NOTE_SECONDS, + state->restart_delay, NULL); + if (kevent(state->kqueue_fd, &event, 1, NULL, 0, NULL) == -1) { + err(1, "failed to register timer"); + } + + for (;;) { + ret = kevent(state->kqueue_fd, NULL, 0, &event, 1, NULL); + if (ret == -1) { + if (errno != EINTR) { + err(1, "kevent"); + } + + continue; + } + + /* + * Any other events being raised are indicative of a problem + * that we need to investigate. Most likely being that + * something was not cleaned up from the eventloop. + */ + assert(event.filter == EVFILT_TIMER || + event.filter == EVFILT_SIGNAL); + + if (event.filter == EVFILT_TIMER) { + /* Break's over, back to work. */ + break; + } + + /* Process any pending signals. */ + switch (event.ident) { + case SIGTERM: + /* + * We could disarm the timer, but we'll be terminating + * promptly anyways. + */ + state->restart_enabled = false; + return; + case SIGHUP: + if (state->log_reopen && state->output_fd >= 0) { + reopen_log(state); + } + + break; + case SIGCHLD: + default: + /* Discard */ + break; } } + + /* SIGTERM should've returned immediately. */ + assert(state->restart_enabled); } static void @@ -712,6 +760,7 @@ daemon_state_init(struct daemon_state *state) .restart_enabled = false, .pid = 0, .keep_cur_workdir = 1, + .kqueue_fd = -1, .restart_delay = 1, .stdmask = STDOUT_FILENO | STDERR_FILENO, .syslog_enabled = false, @@ -730,6 +779,9 @@ daemon_terminate(struct daemon_state *state) { assert(state != NULL); + if (state->kqueue_fd >= 0) { + close(state->kqueue_fd); + } if (state->output_fd >= 0) { close(state->output_fd); } @@ -800,6 +852,35 @@ daemon_set_child_pipe(struct daemon_state *state) close(state->pipe_fd[0]); } +static int +daemon_setup_kqueue(void) +{ + int kq; + struct kevent event = { 0 }; + + kq = kqueuex(KQUEUE_CLOEXEC); + if (kq == -1) { + err(EXIT_FAILURE, "kqueue"); + } + + EV_SET(&event, SIGHUP, EVFILT_SIGNAL, EV_ADD, 0, 0, NULL); + if (kevent(kq, &event, 1, NULL, 0, NULL) == -1) { + err(EXIT_FAILURE, "failed to register kevent"); + } + + EV_SET(&event, SIGTERM, EVFILT_SIGNAL, EV_ADD, 0, 0, NULL); + if (kevent(kq, &event, 1, NULL, 0, NULL) == -1) { + err(EXIT_FAILURE, "failed to register kevent"); + } + + EV_SET(&event, SIGCHLD, EVFILT_SIGNAL, EV_ADD, 0, 0, NULL); + if (kevent(kq, &event, 1, NULL, 0, NULL) == -1) { + err(EXIT_FAILURE, "failed to register kevent"); + } + + return (kq); +} + static int pidfile_truncate(struct pidfh *pfh) { From nobody Tue Dec 10 23:38:02 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Y7FXW0Tdwz5g2bf; Tue, 10 Dec 2024 23:38: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 4Y7FXV31mWz4lRm; Tue, 10 Dec 2024 23:38:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733873882; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kBaZWhKZox0QwYQ2Mogf7deny8PZR5BgTlLzpdEGJtY=; b=Jo+25cKQs9ixaG72/rD4dixzXhiZSrsxzQHJW5OlkAqxyjUjCbH3KoF563gkLIENr9om6g 5rAgX1ZHDB482fliy3p/druo7kr7qgxt+LS7Q/Zi9Ppv8zPHaspWE5TRVJV3cztzkuQtkz 5cS1NdPuxm0DzQdzuygYKUtNkmvk/j926+hGoj+eZYJmORkPZRugcMLVi1jMemhoVARSUP floisji7IhWQ/fsJjRcicmX04H8xBhevGDPlDQXHjMZM/H+aQeJwtDo8LhXx7R3Y2cIMV5 XSmlAXqLkRViU+IRKy/QD3RmIIKaptSobIKQpfWsv0tZ19OPQXEe4kaGTFyP5Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733873882; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kBaZWhKZox0QwYQ2Mogf7deny8PZR5BgTlLzpdEGJtY=; b=vxMZuCUZWJBXyU6tM4m/4V4dOOKMq7H/PyqmGLPt/ng8UbPy2dLKmNDhzXLx9YDgAJdJz/ VKLmsBwp66WlluHbdRwU1Vrt8MaIG2dpn0KNaFM3xVKi68z6uqarSs+ntQZeCWTu+Mgz81 5ibwu/VxsZZQ/KUgaCo8teN1R1rdoV8sWLaHCciQ4s6kAVSyNwaKKdQ8znJev02gJDNPoD SlPkLPbM0UedmibvMSoUfT62ApnrVszLs4ScFDUwzwpHUere/Tvv1QJfcPpS7YlemL8FWH BhqRok5bZxOgn4ZsAukzmVG5o+M4CeMKqW8Zg7cnlRvPdz83KyFQU3YMF8oKgw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1733873882; a=rsa-sha256; cv=none; b=vtbhNqhXMjVcOtwSB0I2YBIH529GU94+4i7SXji/v3gAzu/FxR8x5R388DVxgGVlJnFsg+ 7VH5Uy4YhTKL5l7OLWjVwn0TJqZXmDHVP+x0GzK/oSEzaC8MHNpswmR4LF3VsNOvILUlMH N0qa2reIT3TLFLUzFEAH5QmK70DgYMvSokbjDVyf6ryGhhTWvIl6SX0vSlLYxNhlg1vXH9 e+6aA0kEHXPlgI/q6/68fgeJOMijHjzKwMIPlWf8CZ66ApgfdO2idhcFNl17w35ZFIqNMp rVC/grvgAewXNIiKPRaOCayMnx5sdXB8b4KjeHjXibkNt7nIatZRw795QRx60Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Y7FXV2bV1zkWY; Tue, 10 Dec 2024 23:38:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4BANc2If019890; Tue, 10 Dec 2024 23:38:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BANc2dB019887; Tue, 10 Dec 2024 23:38:02 GMT (envelope-from git) Date: Tue, 10 Dec 2024 23:38:02 GMT Message-Id: <202412102338.4BANc2dB019887@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kyle Evans Subject: git: b50d2127d971 - stable/14 - pw: set the user's home directory mode if it existed List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kevans X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: b50d2127d9718e54b68ffead90e9de8b5cee72f5 Auto-Submitted: auto-generated The branch stable/14 has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=b50d2127d9718e54b68ffead90e9de8b5cee72f5 commit b50d2127d9718e54b68ffead90e9de8b5cee72f5 Author: Kyle Evans AuthorDate: 2024-12-01 19:05:57 +0000 Commit: Kyle Evans CommitDate: 2024-12-10 23:05:51 +0000 pw: set the user's home directory mode if it existed The adduser(8) prompt allows one to set the mode of a new home directory, but pw(8) doesn't honor the -M mode if the home directory already exists at creation time. It doesn't seem to make sense to ignore the mode (which may lead to a security issue on the system being configured) when we'll happily chown an existing directory, so fix the inconsistency. PR: 280099 Reviewed by: des, jlduran (previous version) (cherry picked from commit 6a7238fd7c60f35191eadaa026d3d395c6140c47) --- usr.sbin/adduser/adduser.8 | 6 ++++-- usr.sbin/pw/cpdir.c | 27 +++++++++++++++++++++------ 2 files changed, 25 insertions(+), 8 deletions(-) diff --git a/usr.sbin/adduser/adduser.8 b/usr.sbin/adduser/adduser.8 index 8ba623fedd9d..e21a7653f250 100644 --- a/usr.sbin/adduser/adduser.8 +++ b/usr.sbin/adduser/adduser.8 @@ -27,7 +27,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd April 11, 2024 +.Dd December 1, 2024 .Dt ADDUSER 8 .Os .Sh NAME @@ -246,7 +246,9 @@ file can reference the internal variables of the script. .It Fl M Ar mode Create the home directory with permissions set to -.Ar mode . +.Ar mode , +modified by the current +.Xr umask 2 . .It Fl N Do not read the default configuration file. .It Fl q diff --git a/usr.sbin/pw/cpdir.c b/usr.sbin/pw/cpdir.c index 504933ab88af..3dee8f7c43ac 100644 --- a/usr.sbin/pw/cpdir.c +++ b/usr.sbin/pw/cpdir.c @@ -49,13 +49,28 @@ copymkdir(int rootfd, char const * dir, int skelfd, mode_t mode, uid_t uid, if (*dir == '/') dir++; - if (mkdirat(rootfd, dir, mode) != 0 && errno != EEXIST) { - warn("mkdir(%s)", dir); - return; + if (mkdirat(rootfd, dir, mode) != 0) { + mode_t pumask; + + if (errno != EEXIST) { + warn("mkdir(%s)", dir); + return; + } + + pumask = umask(0); + umask(pumask); + + if (fchmodat(rootfd, dir, mode & ~pumask, + AT_SYMLINK_NOFOLLOW) == -1) + warn("chmod(%s)", dir); } - fchownat(rootfd, dir, uid, gid, AT_SYMLINK_NOFOLLOW); - if (flags > 0) - chflagsat(rootfd, dir, flags, AT_SYMLINK_NOFOLLOW); + + if (fchownat(rootfd, dir, uid, gid, AT_SYMLINK_NOFOLLOW) == -1) + warn("chown(%s)", dir); + + if (flags > 0 && chflagsat(rootfd, dir, flags, + AT_SYMLINK_NOFOLLOW) == -1) + warn("chflags(%s)", dir); if (skelfd == -1) return; From nobody Tue Dec 10 23:38:03 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Y7FXX4cXtz5g2yS; Tue, 10 Dec 2024 23:38: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 4Y7FXW5wspz4lb7; Tue, 10 Dec 2024 23:38:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733873883; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gCdlSbiWwtV4C8Wa9/305CixJ+08RN6sqZIkwtwDFvI=; b=UEa9IX5e6jJFvPQoKJ8uIMX8v7I16mTSlvVx/fpPvoz6Pl+XSBa8xber9lP1it3Yser6TN Q6VC6Mus9tRdYp2aa8igKyldcu1uKS09OoOIOVe/tsL+o7mSfHH1yWNOK1kP0eRGfADEKa d1c5U/VQx7gK+qgk3CzC7B7aEo3FWb8StSvdxlDi2APVlF1jpr2ZfQygCNaxSs6LX4kUug Dc1lpSq8SI5Iv7M/bFf8rpp5cHK9+Re52rxtIV+ngBsRwaaP30Mqw+jYnc7ogKgWenuZwL lMzJqog3CVGYvMqYfxDGaMmTDEmnbJYC/emhrMwlSfoLxFsW9vKpIRm8A5arcw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733873883; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gCdlSbiWwtV4C8Wa9/305CixJ+08RN6sqZIkwtwDFvI=; b=LAnTGAwwS18jG2XQDMlo4JvCjqOs3U7JdFNkWIJAZ72yk42daVHQc7d1zWMpMZiQoUZZA5 TsGo7ri6KPG1dTDToPj5FNmqmgDpq9ZqfIgILFFZZmZzXdnWynlLzUjgUzaDi9MiH+ZfLC V8flwbmKH3OQ7hPAJtd4EhYde6heJr8iz547YsWldGRlcXyKYIJU9MGr8oD0S96+/Y5bXo Qe27HQojyHWFvhsrxxpG8R/fd7OwF99A5UoiH9OSC3teMejYy20L1xAFwFtwtaVk1Ftv1m WmAYG0OSS4kE10Onb45dOa6RfuURW+fw/RWnDPxDRRNlLNBQ/YzLAP0hH7hJLA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1733873883; a=rsa-sha256; cv=none; b=hrthf2rYJZk1UHkAA3O3jSLlvdpW12uovbdnLwHtacoP+HiCx8hFCo4rWt4E4nE7V5Qhza R/5me70HIdm3mccBD77MAW9O7o81G7T5INNw3a5cO/2QbDED8OI2LKMgQlC+bI5JzF06EQ l788l/KyXunBEgvJx4vLcja4W2tmbE5PF8RMYIgoo3K4h7bfnRL6BIqx75NemkiCaLhsiq aISyNMR47TcV7ZtgXI1G/h8IgOmJ5U78bu9fJJcUJ7BMEFWf/ygkRFMA+pXSe4DTcOkdI2 Tmo5FAaZq/wdTQYWArKUGvDf+q6aMPO6O6fU0MmwYdIzgFHf+Y79dV3kh+sM1w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Y7FXW4b7TzkT9; Tue, 10 Dec 2024 23:38: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 4BANc3X8019962; Tue, 10 Dec 2024 23:38:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BANc336019957; Tue, 10 Dec 2024 23:38:03 GMT (envelope-from git) Date: Tue, 10 Dec 2024 23:38:03 GMT Message-Id: <202412102338.4BANc336019957@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kyle Evans Subject: git: 9aac1584c846 - stable/14 - pw: tests: add a test for -M with a pre-existing home 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: kevans X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 9aac1584c846cbb1dce638222ffc239ed712eb9b Auto-Submitted: auto-generated The branch stable/14 has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=9aac1584c846cbb1dce638222ffc239ed712eb9b commit 9aac1584c846cbb1dce638222ffc239ed712eb9b Author: Jose Luis Duran AuthorDate: 2024-12-01 19:05:58 +0000 Commit: Kyle Evans CommitDate: 2024-12-10 23:05:51 +0000 pw: tests: add a test for -M with a pre-existing home directory Previous versions of pw(8) wouldn't chmod the home directory if it already existed prior to user creation, rendering adduser(8) -M ineffective in some cases. Add a test to cover that situation. PR: 280099 Reviewed by: kevans (cherry picked from commit f7cf62cf728a942e494a5b58438600998606617a) --- usr.sbin/pw/tests/pw_useradd_test.sh | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/usr.sbin/pw/tests/pw_useradd_test.sh b/usr.sbin/pw/tests/pw_useradd_test.sh index b4efa42bada7..6413c063d482 100755 --- a/usr.sbin/pw/tests/pw_useradd_test.sh +++ b/usr.sbin/pw/tests/pw_useradd_test.sh @@ -329,6 +329,21 @@ user_add_dir_body() { stat -f '%p' ${HOME}/home/foo } +atf_test_case user_add_existing_dir +user_add_existing_dir_body() { + populate_root_etc_skel + + mkdir -p -m 0777 ${HOME}/home/foo + atf_check -o inline:"40777\n" \ + stat -f '%p' ${HOME}/home/foo + + atf_check -s exit:0 ${RPW} useradd foo -M 0705 -m + atf_check grep -q '^foo:' $HOME/etc/master.passwd + atf_check test -d ${HOME}/home/foo + atf_check -o inline:"40705\n" \ + stat -f '%p' ${HOME}/home/foo +} + atf_test_case user_add_skel user_add_skel_body() { populate_root_etc_skel @@ -528,6 +543,7 @@ atf_init_test_cases() { atf_add_test_case user_add_R_no_symlink atf_add_test_case user_add_R_intermed atf_add_test_case user_add_dir + atf_add_test_case user_add_existing_dir atf_add_test_case user_add_skel atf_add_test_case user_add_uid0 atf_add_test_case user_add_uid_too_large From nobody Tue Dec 10 23:38:06 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Y7FXZ64sMz5g2bn; Tue, 10 Dec 2024 23:38: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 4Y7FXZ45jSz4lk6; Tue, 10 Dec 2024 23:38:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733873886; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=X3/tOjJZUXYE5u4wRa4iSuU+XgsSrnV2w2y+BjzXROo=; b=ZY21EITw9Tctnc5ScfWy5h+GDq5/TcDyFXoAxA79B7O2UzhAn/72xch0Xr5r8cYo6KciQM W89Wyi4+eXjCcoVJRvBCu8P0Wa3314EzcCzJOxb4olRV23Mkng1idu/j2Mj6lR4Hm6/j3F SZSkAe2YBKzSe3tNe/LdiMWeXva/u7UjPlYG58DC0WWabfc4n42yRDkF1RuSWdCeUpIEEx mPJzjufv23irLjKaaIKTYidfKC+EAOeLSgPZ9XQg7s6jGEZ+FJzjkjv7GMvjpfZxvYzJ/H ehIIRFWfZ68iPizhEePvSLWqsoyC6XCX5MTp7Lnr6CaX6eTHpmylkLuZEJILBw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733873886; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=X3/tOjJZUXYE5u4wRa4iSuU+XgsSrnV2w2y+BjzXROo=; b=bkeRejs/SQzu3MehSoyxKRrCpEghCmhxGJLAwTn9V4Kzz9+O/dDpL9P0YgKc6AGncXQY7P no18KbW2Zk7UoB7KX283/oIap3Ifni67tTNEyrf+nqiHRiAzgTTCVPy9YHHxicTmWohAyG GDM24Ag2ZZVj6FCSmLfhhNpS6ABOgXe6fVOOsh3hHZOliPI6O2u9s16dvLlt/N7/G0gi2e kvwaCu0gOlKUeEy7v2hkrkwesRClQFpMvodGnAAJw7a1jWO79HDQSIFuvywye7A4P8Brlt nkWOpzQgyeckiicRM+8nRyVED3AB6SlcJDhegTlJdlERy3f2mYQZ11Cy1x8K5Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1733873886; a=rsa-sha256; cv=none; b=Atrl/dCXWSlIljTKxje3YN7TgPpMiToYZlfyNiqSOu1yaodpyExAt5p6QiLmsy0LFQajLF mauoW+aNGYvIY7kRBtUlW06kJDwbKws1PYgV1+9YRW8OqvAiviIeEw72LE54vy8g8YR59g V5+lM5oQcd+idErlbYrIrYQDtQq8l8W/0q+HQoIhUYZcuIlski+wMGhJPcRH0QZUDG3cSH FNyrQL/TMdREvKuV7OrNPUpid9H0/hJX4zfM952HNmWAVmdl/1MQ40Vztd9PAFBTtAuv98 D7JH1ewd7czL9mOlbaOS32bvP7Oqskqb5njUEt9nTJ55jSskhDcaOzjOSnbXKA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Y7FXZ27gszkTC; Tue, 10 Dec 2024 23:38: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 4BANc6HP020184; Tue, 10 Dec 2024 23:38:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BANc6qL020181; Tue, 10 Dec 2024 23:38:06 GMT (envelope-from git) Date: Tue, 10 Dec 2024 23:38:06 GMT Message-Id: <202412102338.4BANc6qL020181@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kyle Evans Subject: git: 067e3791d615 - stable/13 - daemon: truncate the pidfile when we're waiting to restart child List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kevans X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 067e3791d6151973eaae70ab767ce5f53fbef3f6 Auto-Submitted: auto-generated The branch stable/13 has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=067e3791d6151973eaae70ab767ce5f53fbef3f6 commit 067e3791d6151973eaae70ab767ce5f53fbef3f6 Author: Kyle Evans AuthorDate: 2024-11-19 19:51:26 +0000 Commit: Kyle Evans CommitDate: 2024-12-10 23:02:36 +0000 daemon: truncate the pidfile when we're waiting to restart child We need to be able to test some more restart behavior that depends on knowing specifically where we're at (inside the event loop or outside of the event loop). Truncate the pidfile until the process is restarted to give the test a clean marker rather than having to add arbitrary delays and hoping for the best. Reviewed by: des, markj (cherry picked from commit aa8722cc18e4620ea5e7b0a4917207ed1508393d) --- usr.sbin/daemon/daemon.c | 30 ++++++++++++++++++++++++++++++ usr.sbin/daemon/tests/daemon_test.sh | 7 +++++-- 2 files changed, 35 insertions(+), 2 deletions(-) diff --git a/usr.sbin/daemon/daemon.c b/usr.sbin/daemon/daemon.c index 52fbfca1dcd2..6d0ce2cc10e6 100644 --- a/usr.sbin/daemon/daemon.c +++ b/usr.sbin/daemon/daemon.c @@ -105,6 +105,8 @@ static void daemon_exec(struct daemon_state *); static bool daemon_is_child_dead(struct daemon_state *); static void daemon_set_child_pipe(struct daemon_state *); +static int pidfile_truncate(struct pidfh *); + static const char shortopts[] = "+cfHSp:P:ru:o:s:l:t:m:R:T:h"; static const struct option longopts[] = { @@ -497,6 +499,15 @@ daemon_eventloop(struct daemon_state *state) close(kq); close(state->pipe_fd[0]); state->pipe_fd[0] = -1; + + /* + * We don't have to truncate the pidfile, but it's easier to test + * daemon(8) behavior in some respects if we do. We won't bother if + * the child won't be restarted. + */ + if (state->child_pidfh != NULL && state->restart_enabled) { + pidfile_truncate(state->child_pidfh); + } } static void @@ -788,3 +799,22 @@ daemon_set_child_pipe(struct daemon_state *state) /* The child gets dup'd pipes. */ close(state->pipe_fd[0]); } + +static int +pidfile_truncate(struct pidfh *pfh) +{ + int pfd = pidfile_fileno(pfh); + + assert(pfd >= 0); + + if (ftruncate(pfd, 0) == -1) + return (-1); + + /* + * pidfile_write(3) will always pwrite(..., 0) today, but let's assume + * it may not always and do a best-effort reset of the position just to + * set a good example. + */ + (void)lseek(pfd, 0, SEEK_SET); + return (0); +} diff --git a/usr.sbin/daemon/tests/daemon_test.sh b/usr.sbin/daemon/tests/daemon_test.sh index 948a9f6a8a57..2ad0803842b7 100644 --- a/usr.sbin/daemon/tests/daemon_test.sh +++ b/usr.sbin/daemon/tests/daemon_test.sh @@ -139,8 +139,11 @@ restart_child_body() { kill $orig_sleep_pid # Wait up to 10s for the daemon to restart the child. for t in `seq 0 0.1 10`; do - new_sleep_pid=`cat sleep.pid` - [ "$orig_sleep_pid" -ne "$new_sleep_pid" ] && break + if [ -s "sleep.pid" ]; then + new_sleep_pid=`cat sleep.pid` + [ "$orig_sleep_pid" -ne "$new_sleep_pid" ] && break + fi + sleep 0.1 done [ "$orig_sleep_pid" -ne "$new_sleep_pid" ] || \ From nobody Tue Dec 10 23:38:07 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Y7FXb6kg7z5g2W9; Tue, 10 Dec 2024 23:38: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 4Y7FXb3Q2Gz4lkD; Tue, 10 Dec 2024 23:38:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733873887; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6wMJkaphPjXhBtiiK8eFw612icE2HNg7GTFy3cVzfpg=; b=qRaQWftd8rV0vQXcFIXcaQW5V+nn9n3SPBg8bOyx6p0iuaWH6KmtxeV1Gtfp+kZdCZE2d9 DXqfZSLYD9a8dpf3nalU3JWXhMOZhaxov1NhsRJ9GvWV0XC1dR0+K8tsD/e02fVNr9XSYp azK4oczxHlIEG+wr2eJ6bl3AssbBz0OSdnuETho+58+zB9dLIZAb/UAQ9Dwca1/6bj3ivH okqSdDOxCSLPBmf3WVAnu/O4MGVQVax4aHdZ3F7Nn+iUIuIlJnyxsnkRXvbtx/KFSFV8dl rNYPgDoeKZOHqTrT0CinpQl6QrIo4XCE6zaQKbAkv2Yin4JykXwhGQ0Hb4Z5eA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733873887; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6wMJkaphPjXhBtiiK8eFw612icE2HNg7GTFy3cVzfpg=; b=KFdmcmsbvKJRgWg8ZN19y7C/weWxrxVB97MZ4+Wj/Q+gTh6gdgVZDX7vOtlCprDb/fK9o0 giv06zKM8ouph6iprshNpKJZIdK+RQesRJb6dneEHZV/xd7h9M+hBWmsk+EEDVdE4QlXpk jjocxvOln7+Y2UghLyA5WWVS8nxS+azRUHGCN8ae2yrtRUc9Uj3oO7NyoPmyLyXic/5fHg ICVwIGHwBvZAeTI+hzKoeKKIn+LyRd3mLdUsnO2xhXUSXBQmzUIUyw1kRV0ISFUeED/GOO /uX1XZCtEFXfVQk9S1lS+dzE8kTZZru1pFXvRsnoXMR78eyWwmNFonRtAmVlGA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1733873887; a=rsa-sha256; cv=none; b=MwObqqNKJS+NPiWOS2yOgQloOcNi0o3bGviL1vesKzIzCFehkB3ONPFTsxKQU/K/ajWmqF Cn1HVK4Di+oxqkEr3dLa8t7fSfhqIJmQ7wsU6Z+pLV4Scwczyd+RTF/wbfYvBNmf80OIGL Rtrl2dXIM2ESWCZRro3mtHnA0Sl2N2mzujhP/JzD6YvBxSE00MSH4bkM99GXSIdpn53D3V j+YlBQGTzpt9OFK/5DGfecstFgYhSzfM7WrgwrsPQhtCBLoEW/GErNCYpWqrPJTx9Pl49o bEFog3dEILXBetkjKDf70Rg+2Q9s1p/W5EORtHDRyZ+PZm4uOKVqZFfMVLs+eQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Y7FXb2szBzkm0; Tue, 10 Dec 2024 23:38: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 4BANc7kn020239; Tue, 10 Dec 2024 23:38:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BANc7gB020236; Tue, 10 Dec 2024 23:38:07 GMT (envelope-from git) Date: Tue, 10 Dec 2024 23:38:07 GMT Message-Id: <202412102338.4BANc7gB020236@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kyle Evans Subject: git: 57c60ec86246 - stable/13 - daemon: tests: add a test for missed SIGTERM List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kevans X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 57c60ec86246804a3df5c50ecfd921b39febcfd2 Auto-Submitted: auto-generated The branch stable/13 has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=57c60ec86246804a3df5c50ecfd921b39febcfd2 commit 57c60ec86246804a3df5c50ecfd921b39febcfd2 Author: Kyle Evans AuthorDate: 2024-11-19 19:51:27 +0000 Commit: Kyle Evans CommitDate: 2024-12-10 23:02:40 +0000 daemon: tests: add a test for missed SIGTERM This is somewhaht hard to test reliably, but we'll give it a shot. Startup a sleep(1) daemon with a hefty restart delay. In refactoring of daemon(8), we inadvertently started dropping SIGTERMs that came in while we were waiting to restart the child, so we employ the strategy: - Pop the child sleep(1) first - Wait for sleep(1) to exit (pid file truncated) - Pop the daemon(8) with a SIGTERM - Wait for daemon(8) to exit The pidfile is specifically truncated outside of the event loop so that we don't have a kqueue to catch it in the current model. PR: 277959 Reviewed by: des, markj (cherry picked from commit 9ab59e900c1dd693b4d14285389a035e81341789) --- usr.sbin/daemon/tests/daemon_test.sh | 38 ++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) diff --git a/usr.sbin/daemon/tests/daemon_test.sh b/usr.sbin/daemon/tests/daemon_test.sh index 2ad0803842b7..ec94d30bc1c3 100644 --- a/usr.sbin/daemon/tests/daemon_test.sh +++ b/usr.sbin/daemon/tests/daemon_test.sh @@ -154,6 +154,43 @@ restart_child_cleanup() { [ -f daemon.pid ] && kill `cat daemon.pid` } +atf_test_case restart_hang cleanup +restart_hang_head() { + atf_set "descr" "daemon should terminate with SIGTERM even pending child restart" +} +restart_hang_body() { + daemon -rP daemon.pid -R 10 -p sleep.pid sleep 300 + atf_check -s exit:0 test -f daemon.pid + atf_check -s exit:0 test -f sleep.pid + read sleep_pid < sleep.pid + 1>&2 echo "$sleep_pid" + kill "$sleep_pid" + + # Wait up to 5s for the child to exit + for t in `seq 0 0.1 5`; do + [ ! -s "sleep.pid" ] && break + sleep 0.1 + done + + atf_check test ! -s "sleep.pid" + + read daemon_pid < daemon.pid + kill -TERM "$daemon_pid" + + # Wait up to 10s for the daemon to terminate + for t in `seq 0 0.1 10`; do + [ ! -f "daemon.pid" ] && break + sleep 0.1 + done + + atf_check test ! -f "daemon.pid" + atf_check test ! -f "sleep.pid" +} +restart_hang_cleanup() { + [ -s daemon.pid ] && kill -9 `cat daemon.pid` + true +} + atf_test_case supervisor_pidfile cleanup supervisor_pidfile_head() { atf_set "descr" "daemon should write its own pid to a pidfile" @@ -218,6 +255,7 @@ atf_init_test_cases() { atf_add_test_case newsyslog atf_add_test_case output_file atf_add_test_case restart_child + atf_add_test_case restart_hang atf_add_test_case supervisor_pidfile atf_add_test_case supervisor_pidfile_lock atf_add_test_case title From nobody Tue Dec 10 23:38:08 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Y7FXd1rCbz5g34G; Tue, 10 Dec 2024 23:38: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 4Y7FXc5SNSz4lYD; Tue, 10 Dec 2024 23:38:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733873888; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=EPu2Akwdaf+meavOfgF5HapupG4Pqs90nwA0DoI7qzs=; b=Txw0ezXSci5baynKZAhXyCgeYHIUdvz9mQqaH+eMg7lGFjZxJXEfRMErzAO2fPqMFi1mZh 1OcZOo7Gi71NCRcnnsnG6ADg1bJYSM4aMfmbo8SEmKJfMJrJwTfRuOD+XrTmj92T+q+44C MbYuR5FGCqo0QJLP6t5D2GzggdbPF1qlWIqbgcuykoZibzdXWmbGqvDmk5hCPX7RdIOwEd t7S207S+EtVGyGStmUxbU1KTV5Ryg0xd1Rgg95aVHcncV9cnGx5aGdlQL2WSUmtGxp4oTl vQNbB22opr+4G2qkpPs0LcCg+YNe6gMVTV45NX3qS5nHpWKsmnqRa+NpJPt6/g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733873888; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=EPu2Akwdaf+meavOfgF5HapupG4Pqs90nwA0DoI7qzs=; b=to8nhM8TwKq8gI6knQfMxddHFwEhp8hzSwlYr3Wuum7rBklKgvSZMP+rU+xuNaxiveFHGB 9HmR+JNfGdIwARlrxddnN8U2Mlm7ahc44DHrQ83pJbvMx/dFQDpjhuhSBxUDOksn94yOVV FzDivNm3Xb/2uhheFSu8S2CwS9qXnpCUCDcLI1Yw9N9++K1Tt/ajR8K9rjjJ6XLZMPZ6ZL Pj0MkTyJ+6B51Q2+sjbTLxlToP10kfvOVWc241B93zDwSBMpMb50JuNf6BXBNnG3ESuqcv s3fvT8B92EhmOLfa2C0wMtWUQmFIA4/6f0tMlg9Ufh3RQtnvrFCH+tBzAWm1Jw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1733873888; a=rsa-sha256; cv=none; b=DRBknWKOJK9rvNgctcIgCH7ufOAuQryx4SMekW0fDqlgjYHkWcEkTqhrKZyPIp/+2MZoHG eXjnUBJjHVxWCMA7e8pIqZREhpBS7KVLhs6HUGWqM1M/Nf2rcfAHKzJmKhbyKjkarrKFBE oGdauNefjg2tAVEtexB6cCheJ57jFhUgK8QngwvLy+MLJv4pnyMW0fH23TgAFHs48etyAa GsVLisb2PQ1kba+HGDmCP1zE6iZ0eWJSt0yKhRnspYTvpH2gnLMIFUhi5mHvlxPgmsEwJd acwwIUhln8nKQ1TZ7uNmk7YYGjdhn+slODSGOD2zYPuAaeKfjSYzk4ZIVeTR9Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Y7FXc4HN0zkKl; Tue, 10 Dec 2024 23:38: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 4BANc89k020305; Tue, 10 Dec 2024 23:38:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BANc8RH020302; Tue, 10 Dec 2024 23:38:08 GMT (envelope-from git) Date: Tue, 10 Dec 2024 23:38:08 GMT Message-Id: <202412102338.4BANc8RH020302@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kyle Evans Subject: git: 4bb1a558a281 - stable/13 - daemon: stop rebuilding the kqueue every restart of the child List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kevans X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 4bb1a558a2811a27b1211579cb257a11df49c0e1 Auto-Submitted: auto-generated The branch stable/13 has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=4bb1a558a2811a27b1211579cb257a11df49c0e1 commit 4bb1a558a2811a27b1211579cb257a11df49c0e1 Author: Kyle Evans AuthorDate: 2024-11-19 19:51:27 +0000 Commit: Kyle Evans CommitDate: 2024-12-10 23:06:11 +0000 daemon: stop rebuilding the kqueue every restart of the child We populate the kqueue with all of four kevents: three signal handlers and one for read of the child pipe. Every time we start the child, we rebuild this kqueue from scratch for the child and tear it down before we exit and check if we need to restart the child. As a consequence, we effectively drop any of the signals we're interested in between restarts. Push the kqueue out into the daemon state to avoid losing any signal events in the process, and reimplement the restart timer in terms of kqueue timers. The pipe read event will be automatically deleted upon last close, which leaves us with only the signal events that really get retained between restarts of the child. PR: 277959 Reviewed by: des, markj (cherry picked from commit bc1dfc316a2bba97773a14b96f5e976a52524be4) --- usr.sbin/daemon/daemon.c | 121 +++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 101 insertions(+), 20 deletions(-) diff --git a/usr.sbin/daemon/daemon.c b/usr.sbin/daemon/daemon.c index 6d0ce2cc10e6..73524e3bd286 100644 --- a/usr.sbin/daemon/daemon.c +++ b/usr.sbin/daemon/daemon.c @@ -79,6 +79,7 @@ struct daemon_state { enum daemon_mode mode; int pid; int keep_cur_workdir; + int kqueue_fd; int restart_delay; int stdmask; int syslog_priority; @@ -104,6 +105,7 @@ static void daemon_terminate(struct daemon_state *); static void daemon_exec(struct daemon_state *); static bool daemon_is_child_dead(struct daemon_state *); static void daemon_set_child_pipe(struct daemon_state *); +static int daemon_setup_kqueue(void); static int pidfile_truncate(struct pidfh *); @@ -324,6 +326,8 @@ main(int argc, char *argv[]) /* Write out parent pidfile if needed. */ pidfile_write(state.parent_pidfh); + state.kqueue_fd = daemon_setup_kqueue(); + do { state.mode = MODE_SUPERVISE; daemon_eventloop(&state); @@ -379,27 +383,13 @@ daemon_eventloop(struct daemon_state *state) err(1, "pipe"); } - kq = kqueuex(KQUEUE_CLOEXEC); + kq = state->kqueue_fd; EV_SET(&event, state->pipe_fd[0], EVFILT_READ, EV_ADD|EV_CLEAR, 0, 0, NULL); if (kevent(kq, &event, 1, NULL, 0, NULL) == -1) { err(EXIT_FAILURE, "failed to register kevent"); } - EV_SET(&event, SIGHUP, EVFILT_SIGNAL, EV_ADD, 0, 0, NULL); - if (kevent(kq, &event, 1, NULL, 0, NULL) == -1) { - err(EXIT_FAILURE, "failed to register kevent"); - } - - EV_SET(&event, SIGTERM, EVFILT_SIGNAL, EV_ADD, 0, 0, NULL); - if (kevent(kq, &event, 1, NULL, 0, NULL) == -1) { - err(EXIT_FAILURE, "failed to register kevent"); - } - - EV_SET(&event, SIGCHLD, EVFILT_SIGNAL, EV_ADD, 0, 0, NULL); - if (kevent(kq, &event, 1, NULL, 0, NULL) == -1) { - err(EXIT_FAILURE, "failed to register kevent"); - } memset(&event, 0, sizeof(struct kevent)); /* Spawn a child to exec the command. */ @@ -492,11 +482,12 @@ daemon_eventloop(struct daemon_state *state) } continue; default: + assert(0 && "Unexpected kevent filter type"); continue; } } - close(kq); + /* EVFILT_READ kqueue filter goes away here. */ close(state->pipe_fd[0]); state->pipe_fd[0] = -1; @@ -510,19 +501,76 @@ daemon_eventloop(struct daemon_state *state) } } +/* + * Note that daemon_sleep() should not be called with anything but the signal + * events in the kqueue without further consideration. + */ static void daemon_sleep(struct daemon_state *state) { - struct timespec ts = { state->restart_delay, 0 }; + struct kevent event = { 0 }; + int ret; + + assert(state->pipe_fd[0] == -1); + assert(state->pipe_fd[1] == -1); if (!state->restart_enabled) { return; } - while (nanosleep(&ts, &ts) == -1) { - if (errno != EINTR) { - err(1, "nanosleep"); + + EV_SET(&event, 0, EVFILT_TIMER, EV_ADD|EV_ONESHOT, NOTE_SECONDS, + state->restart_delay, NULL); + if (kevent(state->kqueue_fd, &event, 1, NULL, 0, NULL) == -1) { + err(1, "failed to register timer"); + } + + for (;;) { + ret = kevent(state->kqueue_fd, NULL, 0, &event, 1, NULL); + if (ret == -1) { + if (errno != EINTR) { + err(1, "kevent"); + } + + continue; + } + + /* + * Any other events being raised are indicative of a problem + * that we need to investigate. Most likely being that + * something was not cleaned up from the eventloop. + */ + assert(event.filter == EVFILT_TIMER || + event.filter == EVFILT_SIGNAL); + + if (event.filter == EVFILT_TIMER) { + /* Break's over, back to work. */ + break; + } + + /* Process any pending signals. */ + switch (event.ident) { + case SIGTERM: + /* + * We could disarm the timer, but we'll be terminating + * promptly anyways. + */ + state->restart_enabled = false; + return; + case SIGHUP: + if (state->log_reopen && state->output_fd >= 0) { + reopen_log(state); + } + + break; + case SIGCHLD: + default: + /* Discard */ + break; } } + + /* SIGTERM should've returned immediately. */ + assert(state->restart_enabled); } static void @@ -712,6 +760,7 @@ daemon_state_init(struct daemon_state *state) .restart_enabled = false, .pid = 0, .keep_cur_workdir = 1, + .kqueue_fd = -1, .restart_delay = 1, .stdmask = STDOUT_FILENO | STDERR_FILENO, .syslog_enabled = false, @@ -730,6 +779,9 @@ daemon_terminate(struct daemon_state *state) { assert(state != NULL); + if (state->kqueue_fd >= 0) { + close(state->kqueue_fd); + } if (state->output_fd >= 0) { close(state->output_fd); } @@ -800,6 +852,35 @@ daemon_set_child_pipe(struct daemon_state *state) close(state->pipe_fd[0]); } +static int +daemon_setup_kqueue(void) +{ + int kq; + struct kevent event = { 0 }; + + kq = kqueuex(KQUEUE_CLOEXEC); + if (kq == -1) { + err(EXIT_FAILURE, "kqueue"); + } + + EV_SET(&event, SIGHUP, EVFILT_SIGNAL, EV_ADD, 0, 0, NULL); + if (kevent(kq, &event, 1, NULL, 0, NULL) == -1) { + err(EXIT_FAILURE, "failed to register kevent"); + } + + EV_SET(&event, SIGTERM, EVFILT_SIGNAL, EV_ADD, 0, 0, NULL); + if (kevent(kq, &event, 1, NULL, 0, NULL) == -1) { + err(EXIT_FAILURE, "failed to register kevent"); + } + + EV_SET(&event, SIGCHLD, EVFILT_SIGNAL, EV_ADD, 0, 0, NULL); + if (kevent(kq, &event, 1, NULL, 0, NULL) == -1) { + err(EXIT_FAILURE, "failed to register kevent"); + } + + return (kq); +} + static int pidfile_truncate(struct pidfh *pfh) { From nobody Tue Dec 10 23:38:09 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Y7FXf0JSrz5g2xn; Tue, 10 Dec 2024 23:38: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 4Y7FXd5hQSz4lfP; Tue, 10 Dec 2024 23:38:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733873889; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=nCNtepRdnIR/Ss7Ll99OEfhxVOVjUfyomtSkEdjBS1E=; b=jEJkvo1oLn9oBxRtOMjyM5691Z7NDk7mSrgJrZpppxA69gFAl6zQPGbHtmMrXhGwz4pNdD a4RDtYSDx6mMLin7vVqJ1ULVUxtvKfB1qrXrgJD+Sv7s5fVzpRU85Gwk9SnpsUFFw4PimW TS2FkzTN2XLpJxJ1tQXUb3CR9/T+OCjyFvNi+jNiGsPhsHY3O7v9HPwBWBY8pvdWKkpZvx kHMKiEHxZP5BxN6f/YTQTVLx1sa2aF7YyU2+NSb/LQIMksYkTCIATT1EzQBeqAjs+B34Nm /mNaeVx9+A+I710ECUlfC5l2U5x3vSfvSngEDlv3WGsVd53AE7wTnQGUaFtxFw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733873889; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=nCNtepRdnIR/Ss7Ll99OEfhxVOVjUfyomtSkEdjBS1E=; b=MLZhmbAxeTvrGOhnJ7F+ACveeaRJlLq+zfg9VtV4suNkXtQC3MSa1fT3am8kjfBeedBOxI KbxFVGzkGAKaLYhlyWaGhvlnnOCW07fXJIuAnGspLIMi/JUuwK1OkrS4tRCqUwwY4XY7vI zM7bEexKMurCH4+GGvcA9fAywp3/+tAYlYZIrpCjKMWUBpix/rF7KW/6IFOQ6t71D1VpDr KG99MVPZae9e8WEW8oto6WVjtgeTfexs/EiiXvIPSoffAA4sMHLJJJEnK82+6eqaCEAmVi 97uLr1+5UMx9aH8m4KfNFEM5uk7EMWOTLPu8MjNxHmda7YYWvhPeXSid4Z/OTw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1733873889; a=rsa-sha256; cv=none; b=CXTDDMjTnTvsIAeaRm9Xqh15VZJB1M7jm6dsLOlKF97JXydAgPcaYqORzr7t+hO7jwulsy zLowNQO4UcKxxHk/o3wV8GGqZ6GzxEAKzSpAybN8dEenGp+T8Sht043GB9yLJKs9UHB4t0 9uVdItB0WxoirOio12XdBk7fZRWafOtky2kuqyhew2wMD7cbi46dRMOI0UKlKGNy5Ot1S5 5gvYeHY1Ghqr83PKQbQSGbqrhAfSM50/eC6nxttfIx/lRz/KaO+8dTMErZNBn5/fTofQZL WRWq5Rr3XSfvqdGs9KWdRjUlMsWAUPVgWIHg2oD8B9YPWYUvXYkGlmdUyea4mw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Y7FXd52r5zkm1; Tue, 10 Dec 2024 23:38: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 4BANc9JF020362; Tue, 10 Dec 2024 23:38:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BANc9jS020359; Tue, 10 Dec 2024 23:38:09 GMT (envelope-from git) Date: Tue, 10 Dec 2024 23:38:09 GMT Message-Id: <202412102338.4BANc9jS020359@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kyle Evans Subject: git: 1eaaa55f2ba9 - stable/13 - pw: set the user's home directory mode if it existed List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kevans X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 1eaaa55f2ba9b45dfd955743a9bc5cbe7a6437f3 Auto-Submitted: auto-generated The branch stable/13 has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=1eaaa55f2ba9b45dfd955743a9bc5cbe7a6437f3 commit 1eaaa55f2ba9b45dfd955743a9bc5cbe7a6437f3 Author: Kyle Evans AuthorDate: 2024-12-01 19:05:57 +0000 Commit: Kyle Evans CommitDate: 2024-12-10 23:06:15 +0000 pw: set the user's home directory mode if it existed The adduser(8) prompt allows one to set the mode of a new home directory, but pw(8) doesn't honor the -M mode if the home directory already exists at creation time. It doesn't seem to make sense to ignore the mode (which may lead to a security issue on the system being configured) when we'll happily chown an existing directory, so fix the inconsistency. PR: 280099 Reviewed by: des, jlduran (previous version) (cherry picked from commit 6a7238fd7c60f35191eadaa026d3d395c6140c47) --- usr.sbin/adduser/adduser.8 | 6 ++++-- usr.sbin/pw/cpdir.c | 27 +++++++++++++++++++++------ 2 files changed, 25 insertions(+), 8 deletions(-) diff --git a/usr.sbin/adduser/adduser.8 b/usr.sbin/adduser/adduser.8 index ed67e21f9430..1c4785cd56a6 100644 --- a/usr.sbin/adduser/adduser.8 +++ b/usr.sbin/adduser/adduser.8 @@ -24,7 +24,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd April 11, 2024 +.Dd December 1, 2024 .Dt ADDUSER 8 .Os .Sh NAME @@ -243,7 +243,9 @@ file can reference the internal variables of the script. .It Fl M Ar mode Create the home directory with permissions set to -.Ar mode . +.Ar mode , +modified by the current +.Xr umask 2 . .It Fl N Do not read the default configuration file. .It Fl q diff --git a/usr.sbin/pw/cpdir.c b/usr.sbin/pw/cpdir.c index 504933ab88af..3dee8f7c43ac 100644 --- a/usr.sbin/pw/cpdir.c +++ b/usr.sbin/pw/cpdir.c @@ -49,13 +49,28 @@ copymkdir(int rootfd, char const * dir, int skelfd, mode_t mode, uid_t uid, if (*dir == '/') dir++; - if (mkdirat(rootfd, dir, mode) != 0 && errno != EEXIST) { - warn("mkdir(%s)", dir); - return; + if (mkdirat(rootfd, dir, mode) != 0) { + mode_t pumask; + + if (errno != EEXIST) { + warn("mkdir(%s)", dir); + return; + } + + pumask = umask(0); + umask(pumask); + + if (fchmodat(rootfd, dir, mode & ~pumask, + AT_SYMLINK_NOFOLLOW) == -1) + warn("chmod(%s)", dir); } - fchownat(rootfd, dir, uid, gid, AT_SYMLINK_NOFOLLOW); - if (flags > 0) - chflagsat(rootfd, dir, flags, AT_SYMLINK_NOFOLLOW); + + if (fchownat(rootfd, dir, uid, gid, AT_SYMLINK_NOFOLLOW) == -1) + warn("chown(%s)", dir); + + if (flags > 0 && chflagsat(rootfd, dir, flags, + AT_SYMLINK_NOFOLLOW) == -1) + warn("chflags(%s)", dir); if (skelfd == -1) return; From nobody Tue Dec 10 23:38:10 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Y7FXg18wWz5g2yZ; Tue, 10 Dec 2024 23:38: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 4Y7FXf6Cwcz4lH4; Tue, 10 Dec 2024 23:38:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733873890; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qtGQU/49NTs1Um3QWjhF2AH6I9qgGAMncLlmqrRE6eo=; b=bgghvrlFAfsJWAY37bvs1/qHPuVAfucNAS8KoN7Fkwm57ZoTniVlJoCEBlGR8lEXyxQ14B ZEdTLybDOXRu4B/iWwKRWVPRaZjK31aR+QlSsR+yfn771EyDFlehF+HgtYXqva7T5qYk0V nGNwvrUGbroGAekFZDQ0BLfWJpY2uU4GIwiMI1wE9bVxOMRTMqygtVAys2pfF2P71icj0V TvdCB4HSBh4PXpZdUatbVsmddyQAQ2e3L/tkpStAedVfx9C9dtRKljQ0vClI/p+44FBwRN +281kYVlEgovONAo39J2MVspWlP6WGN9gCt32Ge04IGr7UbtK1M3X/JOb13+nw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733873890; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qtGQU/49NTs1Um3QWjhF2AH6I9qgGAMncLlmqrRE6eo=; b=NF3CHfg31cTdXGsmceZIPKEfhAnykuPk85xbzfIaFqRD+a0EOBhPj4qa26ZFRNFw5HEwJ5 +aNjsAsSGspBqhulTsgeIpt+TM/ZTLqDBw/u9DGEWAYdfX6IU2IWcEzhsUXGWI1EGaYMga etkFNTLxN5g+o7Yf2Z9AwxZ6XJUkCPi+IMoN8GAAsAE6lj60TLACIUT2oSAQ8x9LlIgzj1 Y7Vp77TYY7jW0Np4KVwO5jsC+nu4v35RWPulMQQiLSDPUW2g+xFCyeMn1b3kIZCmmFAjLh ypIT88rqVYpakYuJ/3C7Dn1Wh7/BbKGeSgOb/J/mYKI9h6IZDQLs0rmqqfl6Bg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1733873890; a=rsa-sha256; cv=none; b=ebKZaaPVukAprSmAZ1vu4zSdJKtnNPzDcqbxwIKooBZ4qBXVGw79Th5qXDi0diQxkSNH0B jy+rsBoKAeYUfrK3zc6RhCGtOc47u9QSLl4SjZEQr0K8mL4h+XnC/kJJxmwbfe0uPcVRd+ V3tRbclZCidy3SsQmqcbO1zspAFXbbAwLADYQ2h0tiEqUOlfZ1/WBIOfXAkEzXGPPP2RiQ AlhKpy3DrYVpWpLEiF4a5pzVQB2M6VUPgA9OsY3Can1+HAnSK89SSj59BibjLu+f8b7I0R INgKWnjQcybyBrmuXunOLRpWZIIJVl5hQ8v7WLVnX/Mm8beUJIGY9XpPnija5A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Y7FXf5r9hzkQm; Tue, 10 Dec 2024 23:38: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 4BANcAUH020429; Tue, 10 Dec 2024 23:38:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BANcAEw020424; Tue, 10 Dec 2024 23:38:10 GMT (envelope-from git) Date: Tue, 10 Dec 2024 23:38:10 GMT Message-Id: <202412102338.4BANcAEw020424@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kyle Evans Subject: git: 9d8a178b38ed - stable/13 - pw: tests: add a test for -M with a pre-existing home 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: kevans X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 9d8a178b38ed0953f2beaa49c0dd3981cce56179 Auto-Submitted: auto-generated The branch stable/13 has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=9d8a178b38ed0953f2beaa49c0dd3981cce56179 commit 9d8a178b38ed0953f2beaa49c0dd3981cce56179 Author: Jose Luis Duran AuthorDate: 2024-12-01 19:05:58 +0000 Commit: Kyle Evans CommitDate: 2024-12-10 23:06:16 +0000 pw: tests: add a test for -M with a pre-existing home directory Previous versions of pw(8) wouldn't chmod the home directory if it already existed prior to user creation, rendering adduser(8) -M ineffective in some cases. Add a test to cover that situation. PR: 280099 Reviewed by: kevans (cherry picked from commit f7cf62cf728a942e494a5b58438600998606617a) --- usr.sbin/pw/tests/pw_useradd_test.sh | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/usr.sbin/pw/tests/pw_useradd_test.sh b/usr.sbin/pw/tests/pw_useradd_test.sh index 93a192c59409..0da1877c3283 100755 --- a/usr.sbin/pw/tests/pw_useradd_test.sh +++ b/usr.sbin/pw/tests/pw_useradd_test.sh @@ -321,6 +321,21 @@ user_add_dir_body() { stat -f '%p' ${HOME}/home/foo } +atf_test_case user_add_existing_dir +user_add_existing_dir_body() { + populate_root_etc_skel + + mkdir -p -m 0777 ${HOME}/home/foo + atf_check -o inline:"40777\n" \ + stat -f '%p' ${HOME}/home/foo + + atf_check -s exit:0 ${RPW} useradd foo -M 0705 -m + atf_check grep -q '^foo:' $HOME/etc/master.passwd + atf_check test -d ${HOME}/home/foo + atf_check -o inline:"40705\n" \ + stat -f '%p' ${HOME}/home/foo +} + atf_test_case user_add_skel user_add_skel_body() { populate_root_etc_skel @@ -496,6 +511,7 @@ atf_init_test_cases() { atf_add_test_case user_add_R atf_add_test_case user_add_R_symlink atf_add_test_case user_add_dir + atf_add_test_case user_add_existing_dir atf_add_test_case user_add_skel atf_add_test_case user_add_uid0 atf_add_test_case user_add_uid_too_large From nobody Wed Dec 11 08:17:28 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Y7T3r38srz5gbtx; Wed, 11 Dec 2024 08:17: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 4Y7T3r2kzlz4c4g; Wed, 11 Dec 2024 08:17:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733905048; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/boujf6lk4ggu8hfwCtxADZSqsNh1i+3G7DM36XI9Zs=; b=Rir/RXvrFqALHlkb2eFL5G5mzF9CicpWHwhUeNOPfSXrF46StQNLvOwNJ+jKh1Vf/DYH7w Vh89drHc7+vWgUaEz2p4ksvwtAWwVOHh0Uj0TID/LvZk9VxSOdgPCNRdnNDKN3NodnHUM5 bt+PDvbeJ9D9zjBsth+ZwNxEUN8V1Sn2Wl2SiGO2//V+kpRfUZGDbK2DA5r7IayRlWIGWC Rcv+8wbR64wLOXVmJgIlOJx8ePDlbBGjXS29Dcdp0yi2l3kvYn0JB3OKgTmtWA2WN/M+q+ 5bY7Tm3nL18YTrJdKI0WX/ub9jOrTnPoR1q54NZ/VRDDCz/MCqvQ8/BbU434hA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733905048; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/boujf6lk4ggu8hfwCtxADZSqsNh1i+3G7DM36XI9Zs=; b=omh9oohhK2UbyTokyIseKc3OmCDhLTYUtCKfFVmTc7/HJTFtwa3QU9PSr6Rrd79zsaqOUH t1nd6t4XoxcfRuIwiIGAzBh2WBSVokzbZUyQbRP31om9AIv5IxPQYg/F2AblxEnS7ioGJb GXnuPqvqwWIziveI7xzVVbML0P3cbRxf7F+ou5M0ACA71JfJKS1ok0F4afkDkEZPiFfOr3 R7/lnWMNSv2ebZsRHp5GljCYtg9NA8sZuR4txD6rx9u+ry7g62uwuogWPceGvDOMIxc+qf ixaGVgsRGcPx1T+7sg5YezSxSXYv/ZiaRuTYwv+B6ZcgnTonskSDVrLKQCqjyw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1733905048; a=rsa-sha256; cv=none; b=kQhHAFWQKDRdbdKJtz5bM/kd7WMszMLPXA/fzRfylynvzhwvHElWYqpJxn8L6tbm50sX57 6/2YzMrOMQq19AU/wtZ45pLv4p098fbBVm+lRmawhVGzBzsehfTbu6lQ5164ms289R+X+W tEeUgqE3397EoFfc4vBO1VZbax0faxgYwOeOjUGOdOsw/oxZVYs8EcViftddfqeNxS5tI8 AGEi9NlrXIFWk2SEXwbzVsvgwXlLOVYYqElAWoyPsk7yxp/Xj/srhjWCMJjb0hI7nckeP8 P8TyGIAnahQMEco0bv/fY76od8IQKzDkXvLQPB+Sro4fZrz7HKNuQqFb2HUstg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Y7T3r2CgGz10d3; Wed, 11 Dec 2024 08:17: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 4BB8HSTn087433; Wed, 11 Dec 2024 08:17:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BB8HS3i087430; Wed, 11 Dec 2024 08:17:28 GMT (envelope-from git) Date: Wed, 11 Dec 2024 08:17:28 GMT Message-Id: <202412110817.4BB8HS3i087430@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dimitry Andric Subject: git: 4db4ed368037 - stable/14 - Merge llvm-project release/19.x llvmorg-19.1.5-0-gab4b5a2db582 List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dim X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 4db4ed368037a5faa6cd51c5aca9784ecb619042 Auto-Submitted: auto-generated The branch stable/14 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=4db4ed368037a5faa6cd51c5aca9784ecb619042 commit 4db4ed368037a5faa6cd51c5aca9784ecb619042 Author: Dimitry Andric AuthorDate: 2024-12-06 17:26:41 +0000 Commit: Dimitry Andric CommitDate: 2024-12-11 08:16:53 +0000 Merge llvm-project release/19.x llvmorg-19.1.5-0-gab4b5a2db582 This updates llvm, clang, compiler-rt, libc++, libunwind, lld, lldb and openmp to llvm-project release/19.x llvmorg-19.1.5-0-gab4b5a2db582, a.k.a. 19.1.5 release. PR: 280562 MFC after: 3 days (cherry picked from commit 71ac745d76c3ba442e753daff1870893f272b29d) --- .../clang/lib/Driver/ToolChains/Hexagon.cpp | 7 ++- .../clang/lib/Interpreter/IncrementalExecutor.h | 2 +- .../clang/lib/Interpreter/Interpreter.cpp | 2 +- .../llvm-project/clang/lib/Interpreter/Wasm.cpp | 65 +++++++++++++++++----- contrib/llvm-project/clang/lib/Interpreter/Wasm.h | 1 + contrib/llvm-project/libcxx/include/__config | 2 +- contrib/llvm-project/lld/ELF/Arch/Hexagon.cpp | 2 +- .../llvm/include/llvm/Analysis/MemorySSAUpdater.h | 5 ++ .../llvm/lib/Analysis/MemorySSAUpdater.cpp | 13 ++++- .../llvm/lib/Analysis/ScalarEvolution.cpp | 4 +- .../llvm-project/llvm/lib/CodeGen/MachineLICM.cpp | 2 +- .../lib/Target/AArch64/AArch64FrameLowering.cpp | 34 ++++++----- .../lib/Target/AArch64/AArch64ISelLowering.cpp | 19 ++++--- .../LoongArch/LoongArchExpandPseudoInsts.cpp | 2 +- .../lib/Target/LoongArch/LoongArchLSXInstrInfo.td | 6 +- .../MCTargetDesc/LoongArchMCTargetDesc.cpp | 2 +- .../llvm/lib/Target/Mips/MipsISelDAGToDAG.cpp | 4 ++ .../llvm/lib/Target/Mips/MipsISelDAGToDAG.h | 3 + .../llvm/lib/Target/Mips/MipsMSAInstrInfo.td | 59 +++++++------------- .../llvm/lib/Target/Mips/MipsSEISelDAGToDAG.cpp | 12 ++++ .../llvm/lib/Target/Mips/MipsSEISelDAGToDAG.h | 3 + .../llvm/lib/Target/NVPTX/NVPTXISelLowering.cpp | 4 ++ .../Transforms/InstCombine/InstCombineCalls.cpp | 4 +- .../InstCombine/InstCombineSimplifyDemanded.cpp | 2 +- .../Transforms/Scalar/ConstraintElimination.cpp | 13 +++-- .../llvm/lib/Transforms/Scalar/LICM.cpp | 5 +- .../llvm/lib/Transforms/Utils/Local.cpp | 10 +++- .../lib/Transforms/Vectorize/SLPVectorizer.cpp | 16 ++++++ .../utils/TableGen/Common/CodeGenDAGPatterns.cpp | 8 +++ lib/clang/include/VCSVersion.inc | 6 +- lib/clang/include/clang/Basic/Version.inc | 6 +- lib/clang/include/lld/Common/Version.inc | 2 +- lib/clang/include/lldb/Version/Version.inc | 6 +- lib/clang/include/llvm/Config/config.h | 4 +- lib/clang/include/llvm/Config/llvm-config.h | 4 +- lib/clang/include/llvm/Support/VCSRevision.h | 2 +- 36 files changed, 225 insertions(+), 116 deletions(-) diff --git a/contrib/llvm-project/clang/lib/Driver/ToolChains/Hexagon.cpp b/contrib/llvm-project/clang/lib/Driver/ToolChains/Hexagon.cpp index 29781399cbab..be7851adecea 100644 --- a/contrib/llvm-project/clang/lib/Driver/ToolChains/Hexagon.cpp +++ b/contrib/llvm-project/clang/lib/Driver/ToolChains/Hexagon.cpp @@ -294,9 +294,10 @@ constructHexagonLinkArgs(Compilation &C, const JobAction &JA, bool IncStartFiles = !Args.hasArg(options::OPT_nostartfiles); bool IncDefLibs = !Args.hasArg(options::OPT_nodefaultlibs); bool UseG0 = false; - const char *Exec = Args.MakeArgString(HTC.GetLinkerPath()); - bool UseLLD = (llvm::sys::path::filename(Exec).equals_insensitive("ld.lld") || - llvm::sys::path::stem(Exec).equals_insensitive("ld.lld")); + bool UseLLD = false; + const char *Exec = Args.MakeArgString(HTC.GetLinkerPath(&UseLLD)); + UseLLD = UseLLD || llvm::sys::path::filename(Exec).ends_with("ld.lld") || + llvm::sys::path::stem(Exec).ends_with("ld.lld"); bool UseShared = IsShared && !IsStatic; StringRef CpuVer = toolchains::HexagonToolChain::GetTargetCPUVersion(Args); diff --git a/contrib/llvm-project/clang/lib/Interpreter/IncrementalExecutor.h b/contrib/llvm-project/clang/lib/Interpreter/IncrementalExecutor.h index 7954cde36588..dbd61f0b8b1e 100644 --- a/contrib/llvm-project/clang/lib/Interpreter/IncrementalExecutor.h +++ b/contrib/llvm-project/clang/lib/Interpreter/IncrementalExecutor.h @@ -56,7 +56,7 @@ public: virtual llvm::Error addModule(PartialTranslationUnit &PTU); virtual llvm::Error removeModule(PartialTranslationUnit &PTU); virtual llvm::Error runCtors() const; - llvm::Error cleanUp(); + virtual llvm::Error cleanUp(); llvm::Expected getSymbolAddress(llvm::StringRef Name, SymbolNameKind NameKind) const; diff --git a/contrib/llvm-project/clang/lib/Interpreter/Interpreter.cpp b/contrib/llvm-project/clang/lib/Interpreter/Interpreter.cpp index b4882ab5d223..985d0b7c0ef3 100644 --- a/contrib/llvm-project/clang/lib/Interpreter/Interpreter.cpp +++ b/contrib/llvm-project/clang/lib/Interpreter/Interpreter.cpp @@ -192,8 +192,8 @@ IncrementalCompilerBuilder::CreateCpp() { #ifdef __EMSCRIPTEN__ Argv.push_back("-target"); Argv.push_back("wasm32-unknown-emscripten"); - Argv.push_back("-pie"); Argv.push_back("-shared"); + Argv.push_back("-fvisibility=default"); #endif Argv.insert(Argv.end(), UserArgs.begin(), UserArgs.end()); diff --git a/contrib/llvm-project/clang/lib/Interpreter/Wasm.cpp b/contrib/llvm-project/clang/lib/Interpreter/Wasm.cpp index 1001410aa0f2..aa10b160ccf8 100644 --- a/contrib/llvm-project/clang/lib/Interpreter/Wasm.cpp +++ b/contrib/llvm-project/clang/lib/Interpreter/Wasm.cpp @@ -23,6 +23,31 @@ #include namespace lld { +enum Flavor { + Invalid, + Gnu, // -flavor gnu + MinGW, // -flavor gnu MinGW + WinLink, // -flavor link + Darwin, // -flavor darwin + Wasm, // -flavor wasm +}; + +using Driver = bool (*)(llvm::ArrayRef, llvm::raw_ostream &, + llvm::raw_ostream &, bool, bool); + +struct DriverDef { + Flavor f; + Driver d; +}; + +struct Result { + int retCode; + bool canRunAgain; +}; + +Result lldMain(llvm::ArrayRef args, llvm::raw_ostream &stdoutOS, + llvm::raw_ostream &stderrOS, llvm::ArrayRef drivers); + namespace wasm { bool link(llvm::ArrayRef args, llvm::raw_ostream &stdoutOS, llvm::raw_ostream &stderrOS, bool exitEarly, bool disableOutput); @@ -51,13 +76,14 @@ llvm::Error WasmIncrementalExecutor::addModule(PartialTranslationUnit &PTU) { llvm::TargetMachine *TargetMachine = Target->createTargetMachine( PTU.TheModule->getTargetTriple(), "", "", TO, llvm::Reloc::Model::PIC_); PTU.TheModule->setDataLayout(TargetMachine->createDataLayout()); - std::string OutputFileName = PTU.TheModule->getName().str() + ".wasm"; + std::string ObjectFileName = PTU.TheModule->getName().str() + ".o"; + std::string BinaryFileName = PTU.TheModule->getName().str() + ".wasm"; std::error_code Error; - llvm::raw_fd_ostream OutputFile(llvm::StringRef(OutputFileName), Error); + llvm::raw_fd_ostream ObjectFileOutput(llvm::StringRef(ObjectFileName), Error); llvm::legacy::PassManager PM; - if (TargetMachine->addPassesToEmitFile(PM, OutputFile, nullptr, + if (TargetMachine->addPassesToEmitFile(PM, ObjectFileOutput, nullptr, llvm::CodeGenFileType::ObjectFile)) { return llvm::make_error( "Wasm backend cannot produce object.", llvm::inconvertibleErrorCode()); @@ -69,27 +95,30 @@ llvm::Error WasmIncrementalExecutor::addModule(PartialTranslationUnit &PTU) { llvm::inconvertibleErrorCode()); } - OutputFile.close(); + ObjectFileOutput.close(); std::vector LinkerArgs = {"wasm-ld", - "-pie", + "-shared", "--import-memory", - "--no-entry", - "--export-all", "--experimental-pic", - "--no-export-dynamic", "--stack-first", - OutputFileName.c_str(), + "--allow-undefined", + ObjectFileName.c_str(), "-o", - OutputFileName.c_str()}; - int Result = - lld::wasm::link(LinkerArgs, llvm::outs(), llvm::errs(), false, false); - if (!Result) + BinaryFileName.c_str()}; + + const lld::DriverDef WasmDriver = {lld::Flavor::Wasm, &lld::wasm::link}; + std::vector WasmDriverArgs; + WasmDriverArgs.push_back(WasmDriver); + lld::Result Result = + lld::lldMain(LinkerArgs, llvm::outs(), llvm::errs(), WasmDriverArgs); + + if (Result.retCode) return llvm::make_error( "Failed to link incremental module", llvm::inconvertibleErrorCode()); void *LoadedLibModule = - dlopen(OutputFileName.c_str(), RTLD_NOW | RTLD_GLOBAL); + dlopen(BinaryFileName.c_str(), RTLD_NOW | RTLD_GLOBAL); if (LoadedLibModule == nullptr) { llvm::errs() << dlerror() << '\n'; return llvm::make_error( @@ -109,6 +138,12 @@ llvm::Error WasmIncrementalExecutor::runCtors() const { return llvm::Error::success(); } +llvm::Error WasmIncrementalExecutor::cleanUp() { + // Can't call cleanUp through IncrementalExecutor as it + // tries to deinitialize JIT which hasn't been initialized + return llvm::Error::success(); +} + WasmIncrementalExecutor::~WasmIncrementalExecutor() = default; -} // namespace clang +} // namespace clang \ No newline at end of file diff --git a/contrib/llvm-project/clang/lib/Interpreter/Wasm.h b/contrib/llvm-project/clang/lib/Interpreter/Wasm.h index b1fd88024f14..4632613326d3 100644 --- a/contrib/llvm-project/clang/lib/Interpreter/Wasm.h +++ b/contrib/llvm-project/clang/lib/Interpreter/Wasm.h @@ -28,6 +28,7 @@ public: llvm::Error addModule(PartialTranslationUnit &PTU) override; llvm::Error removeModule(PartialTranslationUnit &PTU) override; llvm::Error runCtors() const override; + llvm::Error cleanUp() override; ~WasmIncrementalExecutor() override; }; diff --git a/contrib/llvm-project/libcxx/include/__config b/contrib/llvm-project/libcxx/include/__config index 8b49c6b309a6..458910d6139e 100644 --- a/contrib/llvm-project/libcxx/include/__config +++ b/contrib/llvm-project/libcxx/include/__config @@ -27,7 +27,7 @@ // _LIBCPP_VERSION represents the version of libc++, which matches the version of LLVM. // Given a LLVM release LLVM XX.YY.ZZ (e.g. LLVM 17.0.1 == 17.00.01), _LIBCPP_VERSION is // defined to XXYYZZ. -# define _LIBCPP_VERSION 190104 +# define _LIBCPP_VERSION 190105 # define _LIBCPP_CONCAT_IMPL(_X, _Y) _X##_Y # define _LIBCPP_CONCAT(_X, _Y) _LIBCPP_CONCAT_IMPL(_X, _Y) diff --git a/contrib/llvm-project/lld/ELF/Arch/Hexagon.cpp b/contrib/llvm-project/lld/ELF/Arch/Hexagon.cpp index 56cf96fd1770..8bcd28309f8b 100644 --- a/contrib/llvm-project/lld/ELF/Arch/Hexagon.cpp +++ b/contrib/llvm-project/lld/ELF/Arch/Hexagon.cpp @@ -329,7 +329,7 @@ void Hexagon::relocate(uint8_t *loc, const Relocation &rel, case R_HEX_B22_PCREL: case R_HEX_GD_PLT_B22_PCREL: case R_HEX_PLT_B22_PCREL: - checkInt(loc, val, 22, rel); + checkInt(loc, val, 24, rel); or32le(loc, applyMask(0x1ff3ffe, val >> 2)); break; case R_HEX_B22_PCREL_X: diff --git a/contrib/llvm-project/llvm/include/llvm/Analysis/MemorySSAUpdater.h b/contrib/llvm-project/llvm/include/llvm/Analysis/MemorySSAUpdater.h index d4da3ef1146d..f598dedea75f 100644 --- a/contrib/llvm-project/llvm/include/llvm/Analysis/MemorySSAUpdater.h +++ b/contrib/llvm-project/llvm/include/llvm/Analysis/MemorySSAUpdater.h @@ -192,6 +192,11 @@ public: const BasicBlock *BB, MemorySSA::InsertionPlace Point); + MemoryAccess *createMemoryAccessInBB(Instruction *I, MemoryAccess *Definition, + const BasicBlock *BB, + MemorySSA::InsertionPlace Point, + bool CreationMustSucceed); + /// Create a MemoryAccess in MemorySSA before an existing MemoryAccess. /// /// See createMemoryAccessInBB() for usage details. diff --git a/contrib/llvm-project/llvm/lib/Analysis/MemorySSAUpdater.cpp b/contrib/llvm-project/llvm/lib/Analysis/MemorySSAUpdater.cpp index aa550f0b6a7b..94061c949b7f 100644 --- a/contrib/llvm-project/llvm/lib/Analysis/MemorySSAUpdater.cpp +++ b/contrib/llvm-project/llvm/lib/Analysis/MemorySSAUpdater.cpp @@ -1404,8 +1404,17 @@ void MemorySSAUpdater::changeToUnreachable(const Instruction *I) { MemoryAccess *MemorySSAUpdater::createMemoryAccessInBB( Instruction *I, MemoryAccess *Definition, const BasicBlock *BB, MemorySSA::InsertionPlace Point) { - MemoryUseOrDef *NewAccess = MSSA->createDefinedAccess(I, Definition); - MSSA->insertIntoListsForBlock(NewAccess, BB, Point); + return createMemoryAccessInBB(I, Definition, BB, Point, + /*CreationMustSucceed=*/true); +} + +MemoryAccess *MemorySSAUpdater::createMemoryAccessInBB( + Instruction *I, MemoryAccess *Definition, const BasicBlock *BB, + MemorySSA::InsertionPlace Point, bool CreationMustSucceed) { + MemoryUseOrDef *NewAccess = MSSA->createDefinedAccess( + I, Definition, /*Template=*/nullptr, CreationMustSucceed); + if (NewAccess) + MSSA->insertIntoListsForBlock(NewAccess, BB, Point); return NewAccess; } diff --git a/contrib/llvm-project/llvm/lib/Analysis/ScalarEvolution.cpp b/contrib/llvm-project/llvm/lib/Analysis/ScalarEvolution.cpp index 51cffac80876..412cfe73d3e5 100644 --- a/contrib/llvm-project/llvm/lib/Analysis/ScalarEvolution.cpp +++ b/contrib/llvm-project/llvm/lib/Analysis/ScalarEvolution.cpp @@ -6313,8 +6313,10 @@ APInt ScalarEvolution::getConstantMultipleImpl(const SCEV *S) { return getConstantMultiple(Z->getOperand()).zext(BitWidth); } case scSignExtend: { + // Only multiples that are a power of 2 will hold after sext. const SCEVSignExtendExpr *E = cast(S); - return getConstantMultiple(E->getOperand()).sext(BitWidth); + uint32_t TZ = getMinTrailingZeros(E->getOperand()); + return GetShiftedByZeros(TZ); } case scMulExpr: { const SCEVMulExpr *M = cast(S); diff --git a/contrib/llvm-project/llvm/lib/CodeGen/MachineLICM.cpp b/contrib/llvm-project/llvm/lib/CodeGen/MachineLICM.cpp index f24ab187ef40..21a02a6f0947 100644 --- a/contrib/llvm-project/llvm/lib/CodeGen/MachineLICM.cpp +++ b/contrib/llvm-project/llvm/lib/CodeGen/MachineLICM.cpp @@ -1474,7 +1474,7 @@ void MachineLICMBase::InitializeLoadsHoistableLoops() { if (!AllowedToHoistLoads[Loop]) continue; for (auto &MI : *MBB) { - if (!MI.mayStore() && !MI.isCall() && + if (!MI.isLoadFoldBarrier() && !MI.mayStore() && !MI.isCall() && !(MI.mayLoad() && MI.hasOrderedMemoryRef())) continue; for (MachineLoop *L = Loop; L != nullptr; L = L->getParentLoop()) diff --git a/contrib/llvm-project/llvm/lib/Target/AArch64/AArch64FrameLowering.cpp b/contrib/llvm-project/llvm/lib/Target/AArch64/AArch64FrameLowering.cpp index 87e057a468af..c183ffd384c2 100644 --- a/contrib/llvm-project/llvm/lib/Target/AArch64/AArch64FrameLowering.cpp +++ b/contrib/llvm-project/llvm/lib/Target/AArch64/AArch64FrameLowering.cpp @@ -1394,6 +1394,18 @@ bool requiresGetVGCall(MachineFunction &MF) { !MF.getSubtarget().hasSVE(); } +static bool requiresSaveVG(MachineFunction &MF) { + AArch64FunctionInfo *AFI = MF.getInfo(); + // For Darwin platforms we don't save VG for non-SVE functions, even if SME + // is enabled with streaming mode changes. + if (!AFI->hasStreamingModeChanges()) + return false; + auto &ST = MF.getSubtarget(); + if (ST.isTargetDarwin()) + return ST.hasSVE(); + return true; +} + bool isVGInstruction(MachineBasicBlock::iterator MBBI) { unsigned Opc = MBBI->getOpcode(); if (Opc == AArch64::CNTD_XPiI || Opc == AArch64::RDSVLI_XI || @@ -1430,8 +1442,7 @@ static MachineBasicBlock::iterator convertCalleeSaveRestoreToSPPrePostIncDec( // functions, we need to do this for both the streaming and non-streaming // vector length. Move past these instructions if necessary. MachineFunction &MF = *MBB.getParent(); - AArch64FunctionInfo *AFI = MF.getInfo(); - if (AFI->hasStreamingModeChanges()) + if (requiresSaveVG(MF)) while (isVGInstruction(MBBI)) ++MBBI; @@ -1936,12 +1947,9 @@ void AArch64FrameLowering::emitPrologue(MachineFunction &MF, // pointer bump above. while (MBBI != End && MBBI->getFlag(MachineInstr::FrameSetup) && !IsSVECalleeSave(MBBI)) { - // Move past instructions generated to calculate VG - if (AFI->hasStreamingModeChanges()) - while (isVGInstruction(MBBI)) - ++MBBI; - - if (CombineSPBump) + if (CombineSPBump && + // Only fix-up frame-setup load/store instructions. + (!requiresSaveVG(MF) || !isVGInstruction(MBBI))) fixupCalleeSaveRestoreStackOffset(*MBBI, AFI->getLocalStackSize(), NeedsWinCFI, &HasWinCFI); ++MBBI; @@ -2848,7 +2856,8 @@ static bool produceCompactUnwindFrame(MachineFunction &MF) { return Subtarget.isTargetMachO() && !(Subtarget.getTargetLowering()->supportSwiftError() && Attrs.hasAttrSomewhere(Attribute::SwiftError)) && - MF.getFunction().getCallingConv() != CallingConv::SwiftTail; + MF.getFunction().getCallingConv() != CallingConv::SwiftTail && + !requiresSaveVG(MF); } static bool invalidateWindowsRegisterPairing(unsigned Reg1, unsigned Reg2, @@ -3720,7 +3729,7 @@ void AArch64FrameLowering::determineCalleeSaves(MachineFunction &MF, // non-streaming VG value. const Function &F = MF.getFunction(); SMEAttrs Attrs(F); - if (AFI->hasStreamingModeChanges()) { + if (requiresSaveVG(MF)) { if (Attrs.hasStreamingBody() && !Attrs.hasStreamingInterface()) CSStackSize += 16; else @@ -3873,7 +3882,7 @@ bool AArch64FrameLowering::assignCalleeSavedSpillSlots( } // Insert VG into the list of CSRs, immediately before LR if saved. - if (AFI->hasStreamingModeChanges()) { + if (requiresSaveVG(MF)) { std::vector VGSaves; SMEAttrs Attrs(MF.getFunction()); @@ -4602,10 +4611,9 @@ MachineBasicBlock::iterator emitVGSaveRestore(MachineBasicBlock::iterator II, void AArch64FrameLowering::processFunctionBeforeFrameIndicesReplaced( MachineFunction &MF, RegScavenger *RS = nullptr) const { - AArch64FunctionInfo *AFI = MF.getInfo(); for (auto &BB : MF) for (MachineBasicBlock::iterator II = BB.begin(); II != BB.end();) { - if (AFI->hasStreamingModeChanges()) + if (requiresSaveVG(MF)) II = emitVGSaveRestore(II, this); if (StackTaggingMergeSetTag) II = tryMergeAdjacentSTG(II, this, RS); diff --git a/contrib/llvm-project/llvm/lib/Target/AArch64/AArch64ISelLowering.cpp b/contrib/llvm-project/llvm/lib/Target/AArch64/AArch64ISelLowering.cpp index 62078822c89b..ef2789e96213 100644 --- a/contrib/llvm-project/llvm/lib/Target/AArch64/AArch64ISelLowering.cpp +++ b/contrib/llvm-project/llvm/lib/Target/AArch64/AArch64ISelLowering.cpp @@ -8732,10 +8732,11 @@ AArch64TargetLowering::LowerCall(CallLoweringInfo &CLI, SDValue InGlue; if (RequiresSMChange) { - - Chain = DAG.getNode(AArch64ISD::VG_SAVE, DL, - DAG.getVTList(MVT::Other, MVT::Glue), Chain); - InGlue = Chain.getValue(1); + if (!Subtarget->isTargetDarwin() || Subtarget->hasSVE()) { + Chain = DAG.getNode(AArch64ISD::VG_SAVE, DL, + DAG.getVTList(MVT::Other, MVT::Glue), Chain); + InGlue = Chain.getValue(1); + } SDValue NewChain = changeStreamingMode( DAG, DL, CalleeAttrs.hasStreamingInterface(), Chain, InGlue, @@ -8914,11 +8915,13 @@ AArch64TargetLowering::LowerCall(CallLoweringInfo &CLI, Result = changeStreamingMode( DAG, DL, !CalleeAttrs.hasStreamingInterface(), Result, InGlue, getSMCondition(CallerAttrs, CalleeAttrs), PStateSM); - InGlue = Result.getValue(1); - Result = - DAG.getNode(AArch64ISD::VG_RESTORE, DL, - DAG.getVTList(MVT::Other, MVT::Glue), {Result, InGlue}); + if (!Subtarget->isTargetDarwin() || Subtarget->hasSVE()) { + InGlue = Result.getValue(1); + Result = + DAG.getNode(AArch64ISD::VG_RESTORE, DL, + DAG.getVTList(MVT::Other, MVT::Glue), {Result, InGlue}); + } } if (CallerAttrs.requiresEnablingZAAfterCall(CalleeAttrs)) diff --git a/contrib/llvm-project/llvm/lib/Target/LoongArch/LoongArchExpandPseudoInsts.cpp b/contrib/llvm-project/llvm/lib/Target/LoongArch/LoongArchExpandPseudoInsts.cpp index c136f5b3e515..e680dda7374d 100644 --- a/contrib/llvm-project/llvm/lib/Target/LoongArch/LoongArchExpandPseudoInsts.cpp +++ b/contrib/llvm-project/llvm/lib/Target/LoongArch/LoongArchExpandPseudoInsts.cpp @@ -721,7 +721,7 @@ bool LoongArchExpandPseudo::expandFunctionCALL( IsTailCall ? LoongArch::PseudoJIRL_TAIL : LoongArch::PseudoJIRL_CALL; Register AddrReg = IsTailCall ? LoongArch::R19 : LoongArch::R1; - bool UseGOT = Func.isGlobal() && !Func.getGlobal()->isDSOLocal(); + bool UseGOT = Func.getTargetFlags() == LoongArchII::MO_CALL_PLT; unsigned MO = UseGOT ? LoongArchII::MO_GOT_PC_HI : LoongArchII::MO_PCREL_LO; unsigned LAOpcode = UseGOT ? LoongArch::LDX_D : LoongArch::ADD_D; expandLargeAddressLoad(MBB, MBBI, NextMBBI, LAOpcode, MO, Func, AddrReg, diff --git a/contrib/llvm-project/llvm/lib/Target/LoongArch/LoongArchLSXInstrInfo.td b/contrib/llvm-project/llvm/lib/Target/LoongArch/LoongArchLSXInstrInfo.td index 0580683c3ce3..0233baecf6dd 100644 --- a/contrib/llvm-project/llvm/lib/Target/LoongArch/LoongArchLSXInstrInfo.td +++ b/contrib/llvm-project/llvm/lib/Target/LoongArch/LoongArchLSXInstrInfo.td @@ -67,8 +67,7 @@ class VecCondgetValueType(0).getVectorElementType(); @@ -109,8 +108,7 @@ def vsplati32_imm_eq_31 : PatFrags<(ops), [(build_vector)], [{ return selectVSplat(N, Imm, EltTy.getSizeInBits()) && Imm.getBitWidth() == EltTy.getSizeInBits() && Imm == 31; }]>; -def vsplati64_imm_eq_63 : PatFrags<(ops), [(build_vector), - (bitconvert (v4i32 (build_vector)))], [{ +def vsplati64_imm_eq_63 : PatFrags<(ops), [(build_vector)], [{ APInt Imm; EVT EltTy = N->getValueType(0).getVectorElementType(); diff --git a/contrib/llvm-project/llvm/lib/Target/LoongArch/MCTargetDesc/LoongArchMCTargetDesc.cpp b/contrib/llvm-project/llvm/lib/Target/LoongArch/MCTargetDesc/LoongArchMCTargetDesc.cpp index e40981f5b5cd..0712cc01ea03 100644 --- a/contrib/llvm-project/llvm/lib/Target/LoongArch/MCTargetDesc/LoongArchMCTargetDesc.cpp +++ b/contrib/llvm-project/llvm/lib/Target/LoongArch/MCTargetDesc/LoongArchMCTargetDesc.cpp @@ -55,7 +55,7 @@ static MCInstrInfo *createLoongArchMCInstrInfo() { static MCSubtargetInfo * createLoongArchMCSubtargetInfo(const Triple &TT, StringRef CPU, StringRef FS) { if (CPU.empty() || CPU == "generic") - CPU = TT.isArch64Bit() ? "la464" : "generic-la32"; + CPU = TT.isArch64Bit() ? "generic-la64" : "generic-la32"; return createLoongArchMCSubtargetInfoImpl(TT, CPU, /*TuneCPU*/ CPU, FS); } diff --git a/contrib/llvm-project/llvm/lib/Target/Mips/MipsISelDAGToDAG.cpp b/contrib/llvm-project/llvm/lib/Target/Mips/MipsISelDAGToDAG.cpp index f6f32fde3b77..a9ffd2bedf21 100644 --- a/contrib/llvm-project/llvm/lib/Target/Mips/MipsISelDAGToDAG.cpp +++ b/contrib/llvm-project/llvm/lib/Target/Mips/MipsISelDAGToDAG.cpp @@ -220,6 +220,10 @@ bool MipsDAGToDAGISel::selectVSplatMaskR(SDValue N, SDValue &Imm) const { return false; } +bool MipsDAGToDAGISel::selectVSplatImmEq1(SDValue N) const { + llvm_unreachable("Unimplemented function."); +} + /// Convert vector addition with vector subtraction if that allows to encode /// constant as an immediate and thus avoid extra 'ldi' instruction. /// add X, <-1, -1...> --> sub X, <1, 1...> diff --git a/contrib/llvm-project/llvm/lib/Target/Mips/MipsISelDAGToDAG.h b/contrib/llvm-project/llvm/lib/Target/Mips/MipsISelDAGToDAG.h index 6135f9680785..3485300a782c 100644 --- a/contrib/llvm-project/llvm/lib/Target/Mips/MipsISelDAGToDAG.h +++ b/contrib/llvm-project/llvm/lib/Target/Mips/MipsISelDAGToDAG.h @@ -120,6 +120,9 @@ private: /// starting at bit zero. virtual bool selectVSplatMaskR(SDValue N, SDValue &Imm) const; + /// Select constant vector splats whose value is 1. + virtual bool selectVSplatImmEq1(SDValue N) const; + /// Convert vector addition with vector subtraction if that allows to encode /// constant as an immediate and thus avoid extra 'ldi' instruction. /// add X, <-1, -1...> --> sub X, <1, 1...> diff --git a/contrib/llvm-project/llvm/lib/Target/Mips/MipsMSAInstrInfo.td b/contrib/llvm-project/llvm/lib/Target/Mips/MipsMSAInstrInfo.td index c4abccb24c6f..f4c32c9dcd42 100644 --- a/contrib/llvm-project/llvm/lib/Target/Mips/MipsMSAInstrInfo.td +++ b/contrib/llvm-project/llvm/lib/Target/Mips/MipsMSAInstrInfo.td @@ -198,14 +198,8 @@ def vsplati32 : PatFrag<(ops node:$e0), (v4i32 (build_vector node:$e0, node:$e0, node:$e0, node:$e0))>; -def vsplati64_imm_eq_1 : PatLeaf<(bitconvert (v4i32 (build_vector))), [{ - APInt Imm; - SDNode *BV = N->getOperand(0).getNode(); - EVT EltTy = N->getValueType(0).getVectorElementType(); - - return selectVSplat(BV, Imm, EltTy.getSizeInBits()) && - Imm.getBitWidth() == EltTy.getSizeInBits() && Imm == 1; -}]>; +// Any build_vector that is a constant splat with a value that equals 1 +def vsplat_imm_eq_1 : ComplexPattern; def vsplati64 : PatFrag<(ops node:$e0), (v2i64 (build_vector node:$e0, node:$e0))>; @@ -217,7 +211,7 @@ def vsplati64_splat_d : PatFrag<(ops node:$e0), node:$e0, node:$e0, node:$e0)), - vsplati64_imm_eq_1))))>; + (vsplat_imm_eq_1)))))>; def vsplatf32 : PatFrag<(ops node:$e0), (v4f32 (build_vector node:$e0, node:$e0, @@ -352,46 +346,35 @@ def vsplat_maskr_bits_uimm6 : SplatComplexPattern; -// Any build_vector that is a constant splat with a value that equals 1 -// FIXME: These should be a ComplexPattern but we can't use them because the -// ISel generator requires the uses to have a name, but providing a name -// causes other errors ("used in pattern but not operand list") -def vsplat_imm_eq_1 : PatLeaf<(build_vector), [{ - APInt Imm; - EVT EltTy = N->getValueType(0).getVectorElementType(); - - return selectVSplat(N, Imm, EltTy.getSizeInBits()) && - Imm.getBitWidth() == EltTy.getSizeInBits() && Imm == 1; -}]>; def vbclr_b : PatFrag<(ops node:$ws, node:$wt), - (and node:$ws, (vnot (shl vsplat_imm_eq_1, node:$wt)))>; + (and node:$ws, (vnot (shl (vsplat_imm_eq_1), node:$wt)))>; def vbclr_h : PatFrag<(ops node:$ws, node:$wt), - (and node:$ws, (vnot (shl vsplat_imm_eq_1, node:$wt)))>; + (and node:$ws, (vnot (shl (vsplat_imm_eq_1), node:$wt)))>; def vbclr_w : PatFrag<(ops node:$ws, node:$wt), - (and node:$ws, (vnot (shl vsplat_imm_eq_1, node:$wt)))>; + (and node:$ws, (vnot (shl (vsplat_imm_eq_1), node:$wt)))>; def vbclr_d : PatFrag<(ops node:$ws, node:$wt), - (and node:$ws, (vnot (shl (v2i64 vsplati64_imm_eq_1), + (and node:$ws, (vnot (shl (v2i64 (vsplat_imm_eq_1)), node:$wt)))>; def vbneg_b : PatFrag<(ops node:$ws, node:$wt), - (xor node:$ws, (shl vsplat_imm_eq_1, node:$wt))>; + (xor node:$ws, (shl (vsplat_imm_eq_1), node:$wt))>; def vbneg_h : PatFrag<(ops node:$ws, node:$wt), - (xor node:$ws, (shl vsplat_imm_eq_1, node:$wt))>; + (xor node:$ws, (shl (vsplat_imm_eq_1), node:$wt))>; def vbneg_w : PatFrag<(ops node:$ws, node:$wt), - (xor node:$ws, (shl vsplat_imm_eq_1, node:$wt))>; + (xor node:$ws, (shl (vsplat_imm_eq_1), node:$wt))>; def vbneg_d : PatFrag<(ops node:$ws, node:$wt), - (xor node:$ws, (shl (v2i64 vsplati64_imm_eq_1), + (xor node:$ws, (shl (v2i64 (vsplat_imm_eq_1)), node:$wt))>; def vbset_b : PatFrag<(ops node:$ws, node:$wt), - (or node:$ws, (shl vsplat_imm_eq_1, node:$wt))>; + (or node:$ws, (shl (vsplat_imm_eq_1), node:$wt))>; def vbset_h : PatFrag<(ops node:$ws, node:$wt), - (or node:$ws, (shl vsplat_imm_eq_1, node:$wt))>; + (or node:$ws, (shl (vsplat_imm_eq_1), node:$wt))>; def vbset_w : PatFrag<(ops node:$ws, node:$wt), - (or node:$ws, (shl vsplat_imm_eq_1, node:$wt))>; + (or node:$ws, (shl (vsplat_imm_eq_1), node:$wt))>; def vbset_d : PatFrag<(ops node:$ws, node:$wt), - (or node:$ws, (shl (v2i64 vsplati64_imm_eq_1), + (or node:$ws, (shl (v2i64 (vsplat_imm_eq_1)), node:$wt))>; def muladd : PatFrag<(ops node:$wd, node:$ws, node:$wt), @@ -3842,7 +3825,7 @@ class MSAShiftPat : (VT (Insn VT:$ws, VT:$wt))>; class MSABitPat : - MSAPat<(VT (Node VT:$ws, (shl vsplat_imm_eq_1, (Frag VT:$wt)))), + MSAPat<(VT (Node VT:$ws, (shl (vsplat_imm_eq_1), (Frag VT:$wt)))), (VT (Insn VT:$ws, VT:$wt))>; multiclass MSAShiftPats { @@ -3861,7 +3844,7 @@ multiclass MSABitPats { def : MSABitPat(Insn#_B), vsplati8imm7>; def : MSABitPat(Insn#_H), vsplati16imm15>; def : MSABitPat(Insn#_W), vsplati32imm31>; - def : MSAPat<(Node v2i64:$ws, (shl (v2i64 vsplati64_imm_eq_1), + def : MSAPat<(Node v2i64:$ws, (shl (v2i64 (vsplat_imm_eq_1)), (vsplati64imm63 v2i64:$wt))), (v2i64 (!cast(Insn#_D) v2i64:$ws, v2i64:$wt))>; } @@ -3872,16 +3855,16 @@ defm : MSAShiftPats; defm : MSABitPats; defm : MSABitPats; -def : MSAPat<(and v16i8:$ws, (vnot (shl vsplat_imm_eq_1, +def : MSAPat<(and v16i8:$ws, (vnot (shl (vsplat_imm_eq_1), (vsplati8imm7 v16i8:$wt)))), (v16i8 (BCLR_B v16i8:$ws, v16i8:$wt))>; -def : MSAPat<(and v8i16:$ws, (vnot (shl vsplat_imm_eq_1, +def : MSAPat<(and v8i16:$ws, (vnot (shl (vsplat_imm_eq_1), (vsplati16imm15 v8i16:$wt)))), (v8i16 (BCLR_H v8i16:$ws, v8i16:$wt))>; -def : MSAPat<(and v4i32:$ws, (vnot (shl vsplat_imm_eq_1, +def : MSAPat<(and v4i32:$ws, (vnot (shl (vsplat_imm_eq_1), (vsplati32imm31 v4i32:$wt)))), (v4i32 (BCLR_W v4i32:$ws, v4i32:$wt))>; -def : MSAPat<(and v2i64:$ws, (vnot (shl (v2i64 vsplati64_imm_eq_1), +def : MSAPat<(and v2i64:$ws, (vnot (shl (v2i64 (vsplat_imm_eq_1)), (vsplati64imm63 v2i64:$wt)))), (v2i64 (BCLR_D v2i64:$ws, v2i64:$wt))>; diff --git a/contrib/llvm-project/llvm/lib/Target/Mips/MipsSEISelDAGToDAG.cpp b/contrib/llvm-project/llvm/lib/Target/Mips/MipsSEISelDAGToDAG.cpp index 7ad300c6cccd..66c034a889c6 100644 --- a/contrib/llvm-project/llvm/lib/Target/Mips/MipsSEISelDAGToDAG.cpp +++ b/contrib/llvm-project/llvm/lib/Target/Mips/MipsSEISelDAGToDAG.cpp @@ -730,6 +730,18 @@ bool MipsSEDAGToDAGISel::selectVSplatUimmInvPow2(SDValue N, return false; } +// Select const vector splat of 1. +bool MipsSEDAGToDAGISel::selectVSplatImmEq1(SDValue N) const { + APInt ImmValue; + EVT EltTy = N->getValueType(0).getVectorElementType(); + + if (N->getOpcode() == ISD::BITCAST) + N = N->getOperand(0); + + return selectVSplat(N.getNode(), ImmValue, EltTy.getSizeInBits()) && + ImmValue.getBitWidth() == EltTy.getSizeInBits() && ImmValue == 1; +} + bool MipsSEDAGToDAGISel::trySelect(SDNode *Node) { unsigned Opcode = Node->getOpcode(); SDLoc DL(Node); diff --git a/contrib/llvm-project/llvm/lib/Target/Mips/MipsSEISelDAGToDAG.h b/contrib/llvm-project/llvm/lib/Target/Mips/MipsSEISelDAGToDAG.h index 7b843b0e0b25..22d8e924ac53 100644 --- a/contrib/llvm-project/llvm/lib/Target/Mips/MipsSEISelDAGToDAG.h +++ b/contrib/llvm-project/llvm/lib/Target/Mips/MipsSEISelDAGToDAG.h @@ -124,6 +124,9 @@ private: /// starting at bit zero. bool selectVSplatMaskR(SDValue N, SDValue &Imm) const override; + /// Select constant vector splats whose value is 1. + bool selectVSplatImmEq1(SDValue N) const override; + bool trySelect(SDNode *Node) override; // Emits proper ABI for _mcount profiling calls. diff --git a/contrib/llvm-project/llvm/lib/Target/NVPTX/NVPTXISelLowering.cpp b/contrib/llvm-project/llvm/lib/Target/NVPTX/NVPTXISelLowering.cpp index 6975412ce5d3..b2153a7afe73 100644 --- a/contrib/llvm-project/llvm/lib/Target/NVPTX/NVPTXISelLowering.cpp +++ b/contrib/llvm-project/llvm/lib/Target/NVPTX/NVPTXISelLowering.cpp @@ -229,6 +229,10 @@ static void ComputePTXValueVTs(const TargetLowering &TLI, const DataLayout &DL, // v*i8 are formally lowered as v4i8 EltVT = MVT::v4i8; NumElts = (NumElts + 3) / 4; + } else if (EltVT.getSimpleVT() == MVT::i8 && NumElts == 2) { + // v2i8 is promoted to v2i16 + NumElts = 1; + EltVT = MVT::v2i16; } for (unsigned j = 0; j != NumElts; ++j) { ValueVTs.push_back(EltVT); diff --git a/contrib/llvm-project/llvm/lib/Transforms/InstCombine/InstCombineCalls.cpp b/contrib/llvm-project/llvm/lib/Transforms/InstCombine/InstCombineCalls.cpp index 9d2990c98ce2..3223fccbcf49 100644 --- a/contrib/llvm-project/llvm/lib/Transforms/InstCombine/InstCombineCalls.cpp +++ b/contrib/llvm-project/llvm/lib/Transforms/InstCombine/InstCombineCalls.cpp @@ -506,8 +506,10 @@ static Instruction *foldCttzCtlz(IntrinsicInst &II, InstCombinerImpl &IC) { // If ctlz/cttz is only used as a shift amount, set is_zero_poison to true. if (II.hasOneUse() && match(Op1, m_Zero()) && - match(II.user_back(), m_Shift(m_Value(), m_Specific(&II)))) + match(II.user_back(), m_Shift(m_Value(), m_Specific(&II)))) { + II.dropUBImplyingAttrsAndMetadata(); return IC.replaceOperand(II, 1, IC.Builder.getTrue()); + } Constant *C; diff --git a/contrib/llvm-project/llvm/lib/Transforms/InstCombine/InstCombineSimplifyDemanded.cpp b/contrib/llvm-project/llvm/lib/Transforms/InstCombine/InstCombineSimplifyDemanded.cpp index 8a6ec3076ac6..b9d06b593685 100644 --- a/contrib/llvm-project/llvm/lib/Transforms/InstCombine/InstCombineSimplifyDemanded.cpp +++ b/contrib/llvm-project/llvm/lib/Transforms/InstCombine/InstCombineSimplifyDemanded.cpp @@ -1004,7 +1004,7 @@ Value *InstCombinerImpl::SimplifyDemandedUseBits(Instruction *I, uint64_t MaskedGEPIndex = HighBitsGEPIndex | MaskedLowBitsGEPIndex; if (MaskedGEPIndex != GEPIndex) { - auto *GEP = cast(II->getArgOperand(0)); + auto *GEP = cast(II->getArgOperand(0)); Builder.SetInsertPoint(I); Type *GEPIndexType = DL.getIndexType(GEP->getPointerOperand()->getType()); diff --git a/contrib/llvm-project/llvm/lib/Transforms/Scalar/ConstraintElimination.cpp b/contrib/llvm-project/llvm/lib/Transforms/Scalar/ConstraintElimination.cpp index 37022104d0a9..d1c80aa67124 100644 --- a/contrib/llvm-project/llvm/lib/Transforms/Scalar/ConstraintElimination.cpp +++ b/contrib/llvm-project/llvm/lib/Transforms/Scalar/ConstraintElimination.cpp @@ -1033,9 +1033,9 @@ void State::addInfoForInductions(BasicBlock &BB) { DTN, CmpInst::ICMP_SLT, PN, B, ConditionTy(CmpInst::ICMP_SLE, StartValue, B))); - // Try to add condition from header to the exit blocks. When exiting either - // with EQ or NE in the header, we know that the induction value must be u<= - // B, as other exits may only exit earlier. + // Try to add condition from header to the dedicated exit blocks. When exiting + // either with EQ or NE in the header, we know that the induction value must + // be u<= B, as other exits may only exit earlier. assert(!StepOffset.isNegative() && "induction must be increasing"); assert((Pred == CmpInst::ICMP_EQ || Pred == CmpInst::ICMP_NE) && "unsupported predicate"); @@ -1043,8 +1043,11 @@ void State::addInfoForInductions(BasicBlock &BB) { SmallVector ExitBBs; L->getExitBlocks(ExitBBs); for (BasicBlock *EB : ExitBBs) { - WorkList.emplace_back(FactOrCheck::getConditionFact( - DT.getNode(EB), CmpInst::ICMP_ULE, A, B, Precond)); + // Bail out on non-dedicated exits. + if (DT.dominates(&BB, EB)) { + WorkList.emplace_back(FactOrCheck::getConditionFact( + DT.getNode(EB), CmpInst::ICMP_ULE, A, B, Precond)); + } } } diff --git a/contrib/llvm-project/llvm/lib/Transforms/Scalar/LICM.cpp b/contrib/llvm-project/llvm/lib/Transforms/Scalar/LICM.cpp index 91ef2b4b7c18..ca03eff7a4e2 100644 --- a/contrib/llvm-project/llvm/lib/Transforms/Scalar/LICM.cpp +++ b/contrib/llvm-project/llvm/lib/Transforms/Scalar/LICM.cpp @@ -1464,8 +1464,11 @@ static Instruction *cloneInstructionInExitBlock( if (MSSAU.getMemorySSA()->getMemoryAccess(&I)) { // Create a new MemoryAccess and let MemorySSA set its defining access. + // After running some passes, MemorySSA might be outdated, and the + // instruction `I` may have become a non-memory touching instruction. MemoryAccess *NewMemAcc = MSSAU.createMemoryAccessInBB( - New, nullptr, New->getParent(), MemorySSA::Beginning); + New, nullptr, New->getParent(), MemorySSA::Beginning, + /*CreationMustSucceed=*/false); if (NewMemAcc) { if (auto *MemDef = dyn_cast(NewMemAcc)) MSSAU.insertDef(MemDef, /*RenameUses=*/true); diff --git a/contrib/llvm-project/llvm/lib/Transforms/Utils/Local.cpp b/contrib/llvm-project/llvm/lib/Transforms/Utils/Local.cpp index 7192efe3f16b..f68cbf62b982 100644 --- a/contrib/llvm-project/llvm/lib/Transforms/Utils/Local.cpp +++ b/contrib/llvm-project/llvm/lib/Transforms/Utils/Local.cpp @@ -1028,7 +1028,13 @@ CanRedirectPredsOfEmptyBBToSucc(BasicBlock *BB, BasicBlock *Succ, if (!BB->hasNPredecessorsOrMore(2)) return false; - // Get single common predecessors of both BB and Succ + if (any_of(BBPreds, [](const BasicBlock *Pred) { + return isa(Pred->getTerminator()); + })) + return false; + + // Get the single common predecessor of both BB and Succ. Return false + // when there are more than one common predecessors. for (BasicBlock *SuccPred : SuccPreds) { if (BBPreds.count(SuccPred)) { if (CommonPred) @@ -1133,7 +1139,7 @@ bool llvm::TryToSimplifyUncondBranchFromEmptyBlock(BasicBlock *BB, bool BBKillable = CanPropagatePredecessorsForPHIs(BB, Succ, BBPreds); - // Even if we can not fold bB into Succ, we may be able to redirect the + // Even if we can not fold BB into Succ, we may be able to redirect the // predecessors of BB to Succ. bool BBPhisMergeable = BBKillable || diff --git a/contrib/llvm-project/llvm/lib/Transforms/Vectorize/SLPVectorizer.cpp b/contrib/llvm-project/llvm/lib/Transforms/Vectorize/SLPVectorizer.cpp index ab2b96cdc42d..746ba51a981f 100644 --- a/contrib/llvm-project/llvm/lib/Transforms/Vectorize/SLPVectorizer.cpp +++ b/contrib/llvm-project/llvm/lib/Transforms/Vectorize/SLPVectorizer.cpp @@ -15440,9 +15440,25 @@ bool BoUpSLP::collectValuesToDemote( MaskedValueIsZero(I->getOperand(1), Mask, SimplifyQuery(*DL))); }); }; + auto AbsChecker = [&](unsigned BitWidth, unsigned OrigBitWidth) { + assert(BitWidth <= OrigBitWidth && "Unexpected bitwidths!"); + return all_of(E.Scalars, [&](Value *V) { + auto *I = cast(V); + unsigned SignBits = OrigBitWidth - BitWidth; + APInt Mask = APInt::getBitsSetFrom(OrigBitWidth, BitWidth - 1); + unsigned Op0SignBits = + ComputeNumSignBits(I->getOperand(0), *DL, 0, AC, nullptr, DT); + return SignBits <= Op0SignBits && + ((SignBits != Op0SignBits && + !isKnownNonNegative(I->getOperand(0), SimplifyQuery(*DL))) || + MaskedValueIsZero(I->getOperand(0), Mask, SimplifyQuery(*DL))); + }); + }; if (ID != Intrinsic::abs) { Operands.push_back(getOperandEntry(&E, 1)); CallChecker = CompChecker; + } else { + CallChecker = AbsChecker; } InstructionCost BestCost = std::numeric_limits::max(); diff --git a/contrib/llvm-project/llvm/utils/TableGen/Common/CodeGenDAGPatterns.cpp b/contrib/llvm-project/llvm/utils/TableGen/Common/CodeGenDAGPatterns.cpp index a8cecca0d4a5..ca71569008d5 100644 --- a/contrib/llvm-project/llvm/utils/TableGen/Common/CodeGenDAGPatterns.cpp +++ b/contrib/llvm-project/llvm/utils/TableGen/Common/CodeGenDAGPatterns.cpp @@ -3042,6 +3042,14 @@ static bool SimplifyTree(TreePatternNodePtr &N) { !N->getExtType(0).empty() && N->getExtType(0) == N->getChild(0).getExtType(0) && N->getName().empty()) { + if (!N->getPredicateCalls().empty()) { + std::string Str; + raw_string_ostream OS(Str); + OS << *N + << "\n trivial bitconvert node should not have predicate calls\n"; + PrintFatalError(Str); + return false; + } N = N->getChildShared(0); SimplifyTree(N); return true; diff --git a/lib/clang/include/VCSVersion.inc b/lib/clang/include/VCSVersion.inc index 2197c8ca2947..7624a2e4b17a 100644 --- a/lib/clang/include/VCSVersion.inc +++ b/lib/clang/include/VCSVersion.inc @@ -1,8 +1,8 @@ -#define LLVM_REVISION "llvmorg-19.1.4-0-gaadaa00de76e" +#define LLVM_REVISION "llvmorg-19.1.5-0-gab4b5a2db582" #define LLVM_REPOSITORY "https://github.com/llvm/llvm-project.git" -#define CLANG_REVISION "llvmorg-19.1.4-0-gaadaa00de76e" +#define CLANG_REVISION "llvmorg-19.1.5-0-gab4b5a2db582" #define CLANG_REPOSITORY "https://github.com/llvm/llvm-project.git" -#define LLDB_REVISION "llvmorg-19.1.4-0-gaadaa00de76e" +#define LLDB_REVISION "llvmorg-19.1.5-0-gab4b5a2db582" #define LLDB_REPOSITORY "https://github.com/llvm/llvm-project.git" diff --git a/lib/clang/include/clang/Basic/Version.inc b/lib/clang/include/clang/Basic/Version.inc index d7a4777e7cec..5104f9d7ad7a 100644 --- a/lib/clang/include/clang/Basic/Version.inc +++ b/lib/clang/include/clang/Basic/Version.inc @@ -1,8 +1,8 @@ -#define CLANG_VERSION 19.1.4 -#define CLANG_VERSION_STRING "19.1.4" +#define CLANG_VERSION 19.1.5 +#define CLANG_VERSION_STRING "19.1.5" #define CLANG_VERSION_MAJOR 19 #define CLANG_VERSION_MAJOR_STRING "19" #define CLANG_VERSION_MINOR 1 -#define CLANG_VERSION_PATCHLEVEL 4 +#define CLANG_VERSION_PATCHLEVEL 5 #define CLANG_VENDOR "FreeBSD " diff --git a/lib/clang/include/lld/Common/Version.inc b/lib/clang/include/lld/Common/Version.inc index b041a27576fb..6cf430b53591 100644 --- a/lib/clang/include/lld/Common/Version.inc +++ b/lib/clang/include/lld/Common/Version.inc @@ -1,4 +1,4 @@ // Local identifier in __FreeBSD_version style #define LLD_FREEBSD_VERSION 1400007 -#define LLD_VERSION_STRING "19.1.4 (FreeBSD llvmorg-19.1.4-0-gaadaa00de76e-" __XSTRING(LLD_FREEBSD_VERSION) ")" +#define LLD_VERSION_STRING "19.1.5 (FreeBSD llvmorg-19.1.5-0-gab4b5a2db582-" __XSTRING(LLD_FREEBSD_VERSION) ")" diff --git a/lib/clang/include/lldb/Version/Version.inc b/lib/clang/include/lldb/Version/Version.inc index d69a702815ff..5aa1f29215b4 100644 --- a/lib/clang/include/lldb/Version/Version.inc +++ b/lib/clang/include/lldb/Version/Version.inc @@ -1,6 +1,6 @@ -#define LLDB_VERSION 19.1.4 -#define LLDB_VERSION_STRING "19.1.4" +#define LLDB_VERSION 19.1.5 +#define LLDB_VERSION_STRING "19.1.5" #define LLDB_VERSION_MAJOR 19 #define LLDB_VERSION_MINOR 1 -#define LLDB_VERSION_PATCH 4 +#define LLDB_VERSION_PATCH 5 /* #undef LLDB_FULL_VERSION_STRING */ diff --git a/lib/clang/include/llvm/Config/config.h b/lib/clang/include/llvm/Config/config.h index a775cc7e9bbf..f86e4b6b5946 100644 --- a/lib/clang/include/llvm/Config/config.h +++ b/lib/clang/include/llvm/Config/config.h @@ -338,10 +338,10 @@ #define PACKAGE_NAME "LLVM" /* Define to the full name and version of this package. */ -#define PACKAGE_STRING "LLVM 19.1.4" +#define PACKAGE_STRING "LLVM 19.1.5" /* Define to the version of this package. */ -#define PACKAGE_VERSION "19.1.4" +#define PACKAGE_VERSION "19.1.5" /* Define to the vendor of this package. */ /* #undef PACKAGE_VENDOR */ diff --git a/lib/clang/include/llvm/Config/llvm-config.h b/lib/clang/include/llvm/Config/llvm-config.h index 16af33f177e6..966249436723 100644 --- a/lib/clang/include/llvm/Config/llvm-config.h +++ b/lib/clang/include/llvm/Config/llvm-config.h @@ -176,10 +176,10 @@ #define LLVM_VERSION_MINOR 1 /* Patch version of the LLVM API */ -#define LLVM_VERSION_PATCH 4 +#define LLVM_VERSION_PATCH 5 /* LLVM version string */ -#define LLVM_VERSION_STRING "19.1.4" +#define LLVM_VERSION_STRING "19.1.5" /* Whether LLVM records statistics for use with GetStatistics(), * PrintStatistics() or PrintStatisticsJSON() diff --git a/lib/clang/include/llvm/Support/VCSRevision.h b/lib/clang/include/llvm/Support/VCSRevision.h index 68785cd03f5d..db3347a0e5a5 100644 --- a/lib/clang/include/llvm/Support/VCSRevision.h +++ b/lib/clang/include/llvm/Support/VCSRevision.h @@ -1,2 +1,2 @@ -#define LLVM_REVISION "llvmorg-19.1.4-0-gaadaa00de76e" +#define LLVM_REVISION "llvmorg-19.1.5-0-gab4b5a2db582" #define LLVM_REPOSITORY "https://github.com/llvm/llvm-project.git" From nobody Wed Dec 11 08:17:42 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Y7T470VDQz5gbv1; Wed, 11 Dec 2024 08:17:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Y7T466vGNz4cM0; Wed, 11 Dec 2024 08:17:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733905062; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=LcagUBmKJqbeyz5hc8FPOACybAQuyfX8XfYNNnGn0OI=; b=tWEktZEgD+mKR7paGOCdhe6iYe+whDNvt7EyyKilbBwCx0XneSawbO0Avk0FK6R+kHvC7S xEFISyv01pKoGXV0x+0TedQ71RHbYM8w6svoQqWPjUDp6LcVWhQZHeMF/83iZsXDZWF5pU PY97wwXyBmhd9syk3lW4KX7zt2/CQ+V+wbrsUhWkGtzl3IfM8boKKWL4N/uaado6OGLSxM Nfw6qVByK8DpNFgkpeiYizOCtLSbn69x6oiLkeJ7ujVeJ9QibUOO0KzLjMMmZujsct8paX QdvjrDpSMlqb1zo63LE/df2oyjn6uvJIvRQHtRTVuf0tTBMcMWnXzw8t0WzEiw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1733905062; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=LcagUBmKJqbeyz5hc8FPOACybAQuyfX8XfYNNnGn0OI=; b=w1d/m9ULz1D1xioAdI909Iabf2PmbqENL9e/pkKWdHhlm/XaORSNJqelVTS07yHHPrt5K2 9ay66SYptNXVPY92VzzfUig3EJ7QYuyN6wFPR35KorwfQYODNwc+6d9x+OZtjlTZpAO8ik LaEqlwf7r1I2GW/Me9Xyi/EnBRSfRK+6d5Ajg7WigETQZlWxo4AFIks7SVlVfXZlveuU99 B/70AZKAQI11KchEEs/Jsy6lllRZ4Es+IQ1SVB7UvDTXE8MApUH0tbtZpwV9mhwSvkw04p osVxl3aZ2koxYLvamAWl/+nyCLORSQlhPvHOVYfgNhZhjjc67NKpemH5WrgtaA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1733905062; a=rsa-sha256; cv=none; b=XCAa3OnFPJsVxahuE9QfFY54kAmrKh1jbI2eVnOB5RFsjWgquH/QkOkuurYoajnmBQRRkR eE6IWIzNsGOno/N2Jqc3JsCuatyPooI+HDm8tK59ed4QA3NDlzHcB7WqutP3FnHv7k/WBo cTYj+smPdu2XrDlo3hDLroqgJxvWs5UsAl+mI5Yk4CXTO1cse/i3B41Wq5c9LATXswidNs DTfQ5uOk3KqQALkHkeUHlC4A0pjx1hJ4dIz1cVwkiBEcXZJpQyDF9G4uMHp5qR2JeEv/L2 rF8QvKiVD0VzNy5WJREzuxHZdTrz5Y4SO5N+RfrRtM10joAfhyC4T3qjAVlDIg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Y7T466VWsz10d4; Wed, 11 Dec 2024 08:17:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4BB8Hgkk087619; Wed, 11 Dec 2024 08:17:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BB8HgBo087616; Wed, 11 Dec 2024 08:17:42 GMT (envelope-from git) Date: Wed, 11 Dec 2024 08:17:42 GMT Message-Id: <202412110817.4BB8HgBo087616@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dimitry Andric Subject: git: a8e22567d3fa - stable/13 - Merge llvm-project release/19.x llvmorg-19.1.5-0-gab4b5a2db582 List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dim X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: a8e22567d3fa660c9f61daa3c9c8f0f587df6fb0 Auto-Submitted: auto-generated The branch stable/13 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=a8e22567d3fa660c9f61daa3c9c8f0f587df6fb0 commit a8e22567d3fa660c9f61daa3c9c8f0f587df6fb0 Author: Dimitry Andric AuthorDate: 2024-12-06 17:26:41 +0000 Commit: Dimitry Andric CommitDate: 2024-12-11 08:17:06 +0000 Merge llvm-project release/19.x llvmorg-19.1.5-0-gab4b5a2db582 This updates llvm, clang, compiler-rt, libc++, libunwind, lld, lldb and openmp to llvm-project release/19.x llvmorg-19.1.5-0-gab4b5a2db582, a.k.a. 19.1.5 release. PR: 280562 MFC after: 3 days (cherry picked from commit 71ac745d76c3ba442e753daff1870893f272b29d) --- .../clang/lib/Driver/ToolChains/Hexagon.cpp | 7 ++- .../clang/lib/Interpreter/IncrementalExecutor.h | 2 +- .../clang/lib/Interpreter/Interpreter.cpp | 2 +- .../llvm-project/clang/lib/Interpreter/Wasm.cpp | 65 +++++++++++++++++----- contrib/llvm-project/clang/lib/Interpreter/Wasm.h | 1 + contrib/llvm-project/libcxx/include/__config | 2 +- contrib/llvm-project/lld/ELF/Arch/Hexagon.cpp | 2 +- .../llvm/include/llvm/Analysis/MemorySSAUpdater.h | 5 ++ .../llvm/lib/Analysis/MemorySSAUpdater.cpp | 13 ++++- .../llvm/lib/Analysis/ScalarEvolution.cpp | 4 +- .../llvm-project/llvm/lib/CodeGen/MachineLICM.cpp | 2 +- .../lib/Target/AArch64/AArch64FrameLowering.cpp | 34 ++++++----- .../lib/Target/AArch64/AArch64ISelLowering.cpp | 19 ++++--- .../LoongArch/LoongArchExpandPseudoInsts.cpp | 2 +- .../lib/Target/LoongArch/LoongArchLSXInstrInfo.td | 6 +- .../MCTargetDesc/LoongArchMCTargetDesc.cpp | 2 +- .../llvm/lib/Target/Mips/MipsISelDAGToDAG.cpp | 4 ++ .../llvm/lib/Target/Mips/MipsISelDAGToDAG.h | 3 + .../llvm/lib/Target/Mips/MipsMSAInstrInfo.td | 59 +++++++------------- .../llvm/lib/Target/Mips/MipsSEISelDAGToDAG.cpp | 12 ++++ .../llvm/lib/Target/Mips/MipsSEISelDAGToDAG.h | 3 + .../llvm/lib/Target/NVPTX/NVPTXISelLowering.cpp | 4 ++ .../Transforms/InstCombine/InstCombineCalls.cpp | 4 +- .../InstCombine/InstCombineSimplifyDemanded.cpp | 2 +- .../Transforms/Scalar/ConstraintElimination.cpp | 13 +++-- .../llvm/lib/Transforms/Scalar/LICM.cpp | 5 +- .../llvm/lib/Transforms/Utils/Local.cpp | 10 +++- .../lib/Transforms/Vectorize/SLPVectorizer.cpp | 16 ++++++ .../utils/TableGen/Common/CodeGenDAGPatterns.cpp | 8 +++ lib/clang/include/VCSVersion.inc | 6 +- lib/clang/include/clang/Basic/Version.inc | 6 +- lib/clang/include/lld/Common/Version.inc | 2 +- lib/clang/include/lldb/Version/Version.inc | 6 +- lib/clang/include/llvm/Config/config.h | 4 +- lib/clang/include/llvm/Config/llvm-config.h | 4 +- lib/clang/include/llvm/Support/VCSRevision.h | 2 +- 36 files changed, 225 insertions(+), 116 deletions(-) diff --git a/contrib/llvm-project/clang/lib/Driver/ToolChains/Hexagon.cpp b/contrib/llvm-project/clang/lib/Driver/ToolChains/Hexagon.cpp index 29781399cbab..be7851adecea 100644 --- a/contrib/llvm-project/clang/lib/Driver/ToolChains/Hexagon.cpp +++ b/contrib/llvm-project/clang/lib/Driver/ToolChains/Hexagon.cpp @@ -294,9 +294,10 @@ constructHexagonLinkArgs(Compilation &C, const JobAction &JA, bool IncStartFiles = !Args.hasArg(options::OPT_nostartfiles); bool IncDefLibs = !Args.hasArg(options::OPT_nodefaultlibs); bool UseG0 = false; - const char *Exec = Args.MakeArgString(HTC.GetLinkerPath()); - bool UseLLD = (llvm::sys::path::filename(Exec).equals_insensitive("ld.lld") || - llvm::sys::path::stem(Exec).equals_insensitive("ld.lld")); + bool UseLLD = false; + const char *Exec = Args.MakeArgString(HTC.GetLinkerPath(&UseLLD)); + UseLLD = UseLLD || llvm::sys::path::filename(Exec).ends_with("ld.lld") || + llvm::sys::path::stem(Exec).ends_with("ld.lld"); bool UseShared = IsShared && !IsStatic; StringRef CpuVer = toolchains::HexagonToolChain::GetTargetCPUVersion(Args); diff --git a/contrib/llvm-project/clang/lib/Interpreter/IncrementalExecutor.h b/contrib/llvm-project/clang/lib/Interpreter/IncrementalExecutor.h index 7954cde36588..dbd61f0b8b1e 100644 --- a/contrib/llvm-project/clang/lib/Interpreter/IncrementalExecutor.h +++ b/contrib/llvm-project/clang/lib/Interpreter/IncrementalExecutor.h @@ -56,7 +56,7 @@ public: virtual llvm::Error addModule(PartialTranslationUnit &PTU); virtual llvm::Error removeModule(PartialTranslationUnit &PTU); virtual llvm::Error runCtors() const; - llvm::Error cleanUp(); + virtual llvm::Error cleanUp(); llvm::Expected getSymbolAddress(llvm::StringRef Name, SymbolNameKind NameKind) const; diff --git a/contrib/llvm-project/clang/lib/Interpreter/Interpreter.cpp b/contrib/llvm-project/clang/lib/Interpreter/Interpreter.cpp index b4882ab5d223..985d0b7c0ef3 100644 --- a/contrib/llvm-project/clang/lib/Interpreter/Interpreter.cpp +++ b/contrib/llvm-project/clang/lib/Interpreter/Interpreter.cpp @@ -192,8 +192,8 @@ IncrementalCompilerBuilder::CreateCpp() { #ifdef __EMSCRIPTEN__ Argv.push_back("-target"); Argv.push_back("wasm32-unknown-emscripten"); - Argv.push_back("-pie"); Argv.push_back("-shared"); + Argv.push_back("-fvisibility=default"); #endif Argv.insert(Argv.end(), UserArgs.begin(), UserArgs.end()); diff --git a/contrib/llvm-project/clang/lib/Interpreter/Wasm.cpp b/contrib/llvm-project/clang/lib/Interpreter/Wasm.cpp index 1001410aa0f2..aa10b160ccf8 100644 --- a/contrib/llvm-project/clang/lib/Interpreter/Wasm.cpp +++ b/contrib/llvm-project/clang/lib/Interpreter/Wasm.cpp @@ -23,6 +23,31 @@ #include namespace lld { +enum Flavor { + Invalid, + Gnu, // -flavor gnu + MinGW, // -flavor gnu MinGW + WinLink, // -flavor link + Darwin, // -flavor darwin + Wasm, // -flavor wasm +}; + +using Driver = bool (*)(llvm::ArrayRef, llvm::raw_ostream &, + llvm::raw_ostream &, bool, bool); + +struct DriverDef { + Flavor f; + Driver d; +}; + +struct Result { + int retCode; + bool canRunAgain; +}; + +Result lldMain(llvm::ArrayRef args, llvm::raw_ostream &stdoutOS, + llvm::raw_ostream &stderrOS, llvm::ArrayRef drivers); + namespace wasm { bool link(llvm::ArrayRef args, llvm::raw_ostream &stdoutOS, llvm::raw_ostream &stderrOS, bool exitEarly, bool disableOutput); @@ -51,13 +76,14 @@ llvm::Error WasmIncrementalExecutor::addModule(PartialTranslationUnit &PTU) { llvm::TargetMachine *TargetMachine = Target->createTargetMachine( PTU.TheModule->getTargetTriple(), "", "", TO, llvm::Reloc::Model::PIC_); PTU.TheModule->setDataLayout(TargetMachine->createDataLayout()); - std::string OutputFileName = PTU.TheModule->getName().str() + ".wasm"; + std::string ObjectFileName = PTU.TheModule->getName().str() + ".o"; + std::string BinaryFileName = PTU.TheModule->getName().str() + ".wasm"; std::error_code Error; - llvm::raw_fd_ostream OutputFile(llvm::StringRef(OutputFileName), Error); + llvm::raw_fd_ostream ObjectFileOutput(llvm::StringRef(ObjectFileName), Error); llvm::legacy::PassManager PM; - if (TargetMachine->addPassesToEmitFile(PM, OutputFile, nullptr, + if (TargetMachine->addPassesToEmitFile(PM, ObjectFileOutput, nullptr, llvm::CodeGenFileType::ObjectFile)) { return llvm::make_error( "Wasm backend cannot produce object.", llvm::inconvertibleErrorCode()); @@ -69,27 +95,30 @@ llvm::Error WasmIncrementalExecutor::addModule(PartialTranslationUnit &PTU) { llvm::inconvertibleErrorCode()); } - OutputFile.close(); + ObjectFileOutput.close(); std::vector LinkerArgs = {"wasm-ld", - "-pie", + "-shared", "--import-memory", - "--no-entry", - "--export-all", "--experimental-pic", - "--no-export-dynamic", "--stack-first", - OutputFileName.c_str(), + "--allow-undefined", + ObjectFileName.c_str(), "-o", - OutputFileName.c_str()}; - int Result = - lld::wasm::link(LinkerArgs, llvm::outs(), llvm::errs(), false, false); - if (!Result) + BinaryFileName.c_str()}; + + const lld::DriverDef WasmDriver = {lld::Flavor::Wasm, &lld::wasm::link}; + std::vector WasmDriverArgs; + WasmDriverArgs.push_back(WasmDriver); + lld::Result Result = + lld::lldMain(LinkerArgs, llvm::outs(), llvm::errs(), WasmDriverArgs); + + if (Result.retCode) return llvm::make_error( "Failed to link incremental module", llvm::inconvertibleErrorCode()); void *LoadedLibModule = - dlopen(OutputFileName.c_str(), RTLD_NOW | RTLD_GLOBAL); + dlopen(BinaryFileName.c_str(), RTLD_NOW | RTLD_GLOBAL); if (LoadedLibModule == nullptr) { llvm::errs() << dlerror() << '\n'; return llvm::make_error( @@ -109,6 +138,12 @@ llvm::Error WasmIncrementalExecutor::runCtors() const { return llvm::Error::success(); } +llvm::Error WasmIncrementalExecutor::cleanUp() { + // Can't call cleanUp through IncrementalExecutor as it + // tries to deinitialize JIT which hasn't been initialized + return llvm::Error::success(); +} + WasmIncrementalExecutor::~WasmIncrementalExecutor() = default; -} // namespace clang +} // namespace clang \ No newline at end of file diff --git a/contrib/llvm-project/clang/lib/Interpreter/Wasm.h b/contrib/llvm-project/clang/lib/Interpreter/Wasm.h index b1fd88024f14..4632613326d3 100644 --- a/contrib/llvm-project/clang/lib/Interpreter/Wasm.h +++ b/contrib/llvm-project/clang/lib/Interpreter/Wasm.h @@ -28,6 +28,7 @@ public: llvm::Error addModule(PartialTranslationUnit &PTU) override; llvm::Error removeModule(PartialTranslationUnit &PTU) override; llvm::Error runCtors() const override; + llvm::Error cleanUp() override; ~WasmIncrementalExecutor() override; }; diff --git a/contrib/llvm-project/libcxx/include/__config b/contrib/llvm-project/libcxx/include/__config index 8b49c6b309a6..458910d6139e 100644 --- a/contrib/llvm-project/libcxx/include/__config +++ b/contrib/llvm-project/libcxx/include/__config @@ -27,7 +27,7 @@ // _LIBCPP_VERSION represents the version of libc++, which matches the version of LLVM. // Given a LLVM release LLVM XX.YY.ZZ (e.g. LLVM 17.0.1 == 17.00.01), _LIBCPP_VERSION is // defined to XXYYZZ. -# define _LIBCPP_VERSION 190104 +# define _LIBCPP_VERSION 190105 # define _LIBCPP_CONCAT_IMPL(_X, _Y) _X##_Y # define _LIBCPP_CONCAT(_X, _Y) _LIBCPP_CONCAT_IMPL(_X, _Y) diff --git a/contrib/llvm-project/lld/ELF/Arch/Hexagon.cpp b/contrib/llvm-project/lld/ELF/Arch/Hexagon.cpp index 56cf96fd1770..8bcd28309f8b 100644 --- a/contrib/llvm-project/lld/ELF/Arch/Hexagon.cpp +++ b/contrib/llvm-project/lld/ELF/Arch/Hexagon.cpp @@ -329,7 +329,7 @@ void Hexagon::relocate(uint8_t *loc, const Relocation &rel, case R_HEX_B22_PCREL: case R_HEX_GD_PLT_B22_PCREL: case R_HEX_PLT_B22_PCREL: - checkInt(loc, val, 22, rel); + checkInt(loc, val, 24, rel); or32le(loc, applyMask(0x1ff3ffe, val >> 2)); break; case R_HEX_B22_PCREL_X: diff --git a/contrib/llvm-project/llvm/include/llvm/Analysis/MemorySSAUpdater.h b/contrib/llvm-project/llvm/include/llvm/Analysis/MemorySSAUpdater.h index d4da3ef1146d..f598dedea75f 100644 --- a/contrib/llvm-project/llvm/include/llvm/Analysis/MemorySSAUpdater.h +++ b/contrib/llvm-project/llvm/include/llvm/Analysis/MemorySSAUpdater.h @@ -192,6 +192,11 @@ public: const BasicBlock *BB, MemorySSA::InsertionPlace Point); + MemoryAccess *createMemoryAccessInBB(Instruction *I, MemoryAccess *Definition, + const BasicBlock *BB, + MemorySSA::InsertionPlace Point, + bool CreationMustSucceed); + /// Create a MemoryAccess in MemorySSA before an existing MemoryAccess. /// /// See createMemoryAccessInBB() for usage details. diff --git a/contrib/llvm-project/llvm/lib/Analysis/MemorySSAUpdater.cpp b/contrib/llvm-project/llvm/lib/Analysis/MemorySSAUpdater.cpp index aa550f0b6a7b..94061c949b7f 100644 --- a/contrib/llvm-project/llvm/lib/Analysis/MemorySSAUpdater.cpp +++ b/contrib/llvm-project/llvm/lib/Analysis/MemorySSAUpdater.cpp @@ -1404,8 +1404,17 @@ void MemorySSAUpdater::changeToUnreachable(const Instruction *I) { MemoryAccess *MemorySSAUpdater::createMemoryAccessInBB( Instruction *I, MemoryAccess *Definition, const BasicBlock *BB, MemorySSA::InsertionPlace Point) { - MemoryUseOrDef *NewAccess = MSSA->createDefinedAccess(I, Definition); - MSSA->insertIntoListsForBlock(NewAccess, BB, Point); + return createMemoryAccessInBB(I, Definition, BB, Point, + /*CreationMustSucceed=*/true); +} + +MemoryAccess *MemorySSAUpdater::createMemoryAccessInBB( + Instruction *I, MemoryAccess *Definition, const BasicBlock *BB, + MemorySSA::InsertionPlace Point, bool CreationMustSucceed) { + MemoryUseOrDef *NewAccess = MSSA->createDefinedAccess( + I, Definition, /*Template=*/nullptr, CreationMustSucceed); + if (NewAccess) + MSSA->insertIntoListsForBlock(NewAccess, BB, Point); return NewAccess; } diff --git a/contrib/llvm-project/llvm/lib/Analysis/ScalarEvolution.cpp b/contrib/llvm-project/llvm/lib/Analysis/ScalarEvolution.cpp index 51cffac80876..412cfe73d3e5 100644 --- a/contrib/llvm-project/llvm/lib/Analysis/ScalarEvolution.cpp +++ b/contrib/llvm-project/llvm/lib/Analysis/ScalarEvolution.cpp @@ -6313,8 +6313,10 @@ APInt ScalarEvolution::getConstantMultipleImpl(const SCEV *S) { return getConstantMultiple(Z->getOperand()).zext(BitWidth); } case scSignExtend: { + // Only multiples that are a power of 2 will hold after sext. const SCEVSignExtendExpr *E = cast(S); - return getConstantMultiple(E->getOperand()).sext(BitWidth); + uint32_t TZ = getMinTrailingZeros(E->getOperand()); + return GetShiftedByZeros(TZ); } case scMulExpr: { const SCEVMulExpr *M = cast(S); diff --git a/contrib/llvm-project/llvm/lib/CodeGen/MachineLICM.cpp b/contrib/llvm-project/llvm/lib/CodeGen/MachineLICM.cpp index f24ab187ef40..21a02a6f0947 100644 --- a/contrib/llvm-project/llvm/lib/CodeGen/MachineLICM.cpp +++ b/contrib/llvm-project/llvm/lib/CodeGen/MachineLICM.cpp @@ -1474,7 +1474,7 @@ void MachineLICMBase::InitializeLoadsHoistableLoops() { if (!AllowedToHoistLoads[Loop]) continue; for (auto &MI : *MBB) { - if (!MI.mayStore() && !MI.isCall() && + if (!MI.isLoadFoldBarrier() && !MI.mayStore() && !MI.isCall() && !(MI.mayLoad() && MI.hasOrderedMemoryRef())) continue; for (MachineLoop *L = Loop; L != nullptr; L = L->getParentLoop()) diff --git a/contrib/llvm-project/llvm/lib/Target/AArch64/AArch64FrameLowering.cpp b/contrib/llvm-project/llvm/lib/Target/AArch64/AArch64FrameLowering.cpp index 87e057a468af..c183ffd384c2 100644 --- a/contrib/llvm-project/llvm/lib/Target/AArch64/AArch64FrameLowering.cpp +++ b/contrib/llvm-project/llvm/lib/Target/AArch64/AArch64FrameLowering.cpp @@ -1394,6 +1394,18 @@ bool requiresGetVGCall(MachineFunction &MF) { !MF.getSubtarget().hasSVE(); } +static bool requiresSaveVG(MachineFunction &MF) { + AArch64FunctionInfo *AFI = MF.getInfo(); + // For Darwin platforms we don't save VG for non-SVE functions, even if SME + // is enabled with streaming mode changes. + if (!AFI->hasStreamingModeChanges()) + return false; + auto &ST = MF.getSubtarget(); + if (ST.isTargetDarwin()) + return ST.hasSVE(); + return true; +} + bool isVGInstruction(MachineBasicBlock::iterator MBBI) { unsigned Opc = MBBI->getOpcode(); if (Opc == AArch64::CNTD_XPiI || Opc == AArch64::RDSVLI_XI || @@ -1430,8 +1442,7 @@ static MachineBasicBlock::iterator convertCalleeSaveRestoreToSPPrePostIncDec( // functions, we need to do this for both the streaming and non-streaming // vector length. Move past these instructions if necessary. MachineFunction &MF = *MBB.getParent(); - AArch64FunctionInfo *AFI = MF.getInfo(); - if (AFI->hasStreamingModeChanges()) + if (requiresSaveVG(MF)) while (isVGInstruction(MBBI)) ++MBBI; @@ -1936,12 +1947,9 @@ void AArch64FrameLowering::emitPrologue(MachineFunction &MF, // pointer bump above. while (MBBI != End && MBBI->getFlag(MachineInstr::FrameSetup) && !IsSVECalleeSave(MBBI)) { - // Move past instructions generated to calculate VG - if (AFI->hasStreamingModeChanges()) - while (isVGInstruction(MBBI)) - ++MBBI; - - if (CombineSPBump) + if (CombineSPBump && + // Only fix-up frame-setup load/store instructions. + (!requiresSaveVG(MF) || !isVGInstruction(MBBI))) fixupCalleeSaveRestoreStackOffset(*MBBI, AFI->getLocalStackSize(), NeedsWinCFI, &HasWinCFI); ++MBBI; @@ -2848,7 +2856,8 @@ static bool produceCompactUnwindFrame(MachineFunction &MF) { return Subtarget.isTargetMachO() && !(Subtarget.getTargetLowering()->supportSwiftError() && Attrs.hasAttrSomewhere(Attribute::SwiftError)) && - MF.getFunction().getCallingConv() != CallingConv::SwiftTail; + MF.getFunction().getCallingConv() != CallingConv::SwiftTail && + !requiresSaveVG(MF); } static bool invalidateWindowsRegisterPairing(unsigned Reg1, unsigned Reg2, @@ -3720,7 +3729,7 @@ void AArch64FrameLowering::determineCalleeSaves(MachineFunction &MF, // non-streaming VG value. const Function &F = MF.getFunction(); SMEAttrs Attrs(F); - if (AFI->hasStreamingModeChanges()) { + if (requiresSaveVG(MF)) { if (Attrs.hasStreamingBody() && !Attrs.hasStreamingInterface()) CSStackSize += 16; else @@ -3873,7 +3882,7 @@ bool AArch64FrameLowering::assignCalleeSavedSpillSlots( } // Insert VG into the list of CSRs, immediately before LR if saved. - if (AFI->hasStreamingModeChanges()) { + if (requiresSaveVG(MF)) { std::vector VGSaves; SMEAttrs Attrs(MF.getFunction()); @@ -4602,10 +4611,9 @@ MachineBasicBlock::iterator emitVGSaveRestore(MachineBasicBlock::iterator II, void AArch64FrameLowering::processFunctionBeforeFrameIndicesReplaced( MachineFunction &MF, RegScavenger *RS = nullptr) const { - AArch64FunctionInfo *AFI = MF.getInfo(); for (auto &BB : MF) for (MachineBasicBlock::iterator II = BB.begin(); II != BB.end();) { - if (AFI->hasStreamingModeChanges()) + if (requiresSaveVG(MF)) II = emitVGSaveRestore(II, this); if (StackTaggingMergeSetTag) II = tryMergeAdjacentSTG(II, this, RS); diff --git a/contrib/llvm-project/llvm/lib/Target/AArch64/AArch64ISelLowering.cpp b/contrib/llvm-project/llvm/lib/Target/AArch64/AArch64ISelLowering.cpp index 62078822c89b..ef2789e96213 100644 --- a/contrib/llvm-project/llvm/lib/Target/AArch64/AArch64ISelLowering.cpp +++ b/contrib/llvm-project/llvm/lib/Target/AArch64/AArch64ISelLowering.cpp @@ -8732,10 +8732,11 @@ AArch64TargetLowering::LowerCall(CallLoweringInfo &CLI, SDValue InGlue; if (RequiresSMChange) { - - Chain = DAG.getNode(AArch64ISD::VG_SAVE, DL, - DAG.getVTList(MVT::Other, MVT::Glue), Chain); - InGlue = Chain.getValue(1); + if (!Subtarget->isTargetDarwin() || Subtarget->hasSVE()) { + Chain = DAG.getNode(AArch64ISD::VG_SAVE, DL, + DAG.getVTList(MVT::Other, MVT::Glue), Chain); + InGlue = Chain.getValue(1); + } SDValue NewChain = changeStreamingMode( DAG, DL, CalleeAttrs.hasStreamingInterface(), Chain, InGlue, @@ -8914,11 +8915,13 @@ AArch64TargetLowering::LowerCall(CallLoweringInfo &CLI, Result = changeStreamingMode( DAG, DL, !CalleeAttrs.hasStreamingInterface(), Result, InGlue, getSMCondition(CallerAttrs, CalleeAttrs), PStateSM); - InGlue = Result.getValue(1); - Result = - DAG.getNode(AArch64ISD::VG_RESTORE, DL, - DAG.getVTList(MVT::Other, MVT::Glue), {Result, InGlue}); + if (!Subtarget->isTargetDarwin() || Subtarget->hasSVE()) { + InGlue = Result.getValue(1); + Result = + DAG.getNode(AArch64ISD::VG_RESTORE, DL, + DAG.getVTList(MVT::Other, MVT::Glue), {Result, InGlue}); + } } if (CallerAttrs.requiresEnablingZAAfterCall(CalleeAttrs)) diff --git a/contrib/llvm-project/llvm/lib/Target/LoongArch/LoongArchExpandPseudoInsts.cpp b/contrib/llvm-project/llvm/lib/Target/LoongArch/LoongArchExpandPseudoInsts.cpp index c136f5b3e515..e680dda7374d 100644 --- a/contrib/llvm-project/llvm/lib/Target/LoongArch/LoongArchExpandPseudoInsts.cpp +++ b/contrib/llvm-project/llvm/lib/Target/LoongArch/LoongArchExpandPseudoInsts.cpp @@ -721,7 +721,7 @@ bool LoongArchExpandPseudo::expandFunctionCALL( IsTailCall ? LoongArch::PseudoJIRL_TAIL : LoongArch::PseudoJIRL_CALL; Register AddrReg = IsTailCall ? LoongArch::R19 : LoongArch::R1; - bool UseGOT = Func.isGlobal() && !Func.getGlobal()->isDSOLocal(); + bool UseGOT = Func.getTargetFlags() == LoongArchII::MO_CALL_PLT; unsigned MO = UseGOT ? LoongArchII::MO_GOT_PC_HI : LoongArchII::MO_PCREL_LO; unsigned LAOpcode = UseGOT ? LoongArch::LDX_D : LoongArch::ADD_D; expandLargeAddressLoad(MBB, MBBI, NextMBBI, LAOpcode, MO, Func, AddrReg, diff --git a/contrib/llvm-project/llvm/lib/Target/LoongArch/LoongArchLSXInstrInfo.td b/contrib/llvm-project/llvm/lib/Target/LoongArch/LoongArchLSXInstrInfo.td index 0580683c3ce3..0233baecf6dd 100644 --- a/contrib/llvm-project/llvm/lib/Target/LoongArch/LoongArchLSXInstrInfo.td +++ b/contrib/llvm-project/llvm/lib/Target/LoongArch/LoongArchLSXInstrInfo.td @@ -67,8 +67,7 @@ class VecCondgetValueType(0).getVectorElementType(); @@ -109,8 +108,7 @@ def vsplati32_imm_eq_31 : PatFrags<(ops), [(build_vector)], [{ return selectVSplat(N, Imm, EltTy.getSizeInBits()) && Imm.getBitWidth() == EltTy.getSizeInBits() && Imm == 31; }]>; -def vsplati64_imm_eq_63 : PatFrags<(ops), [(build_vector), - (bitconvert (v4i32 (build_vector)))], [{ +def vsplati64_imm_eq_63 : PatFrags<(ops), [(build_vector)], [{ APInt Imm; EVT EltTy = N->getValueType(0).getVectorElementType(); diff --git a/contrib/llvm-project/llvm/lib/Target/LoongArch/MCTargetDesc/LoongArchMCTargetDesc.cpp b/contrib/llvm-project/llvm/lib/Target/LoongArch/MCTargetDesc/LoongArchMCTargetDesc.cpp index e40981f5b5cd..0712cc01ea03 100644 --- a/contrib/llvm-project/llvm/lib/Target/LoongArch/MCTargetDesc/LoongArchMCTargetDesc.cpp +++ b/contrib/llvm-project/llvm/lib/Target/LoongArch/MCTargetDesc/LoongArchMCTargetDesc.cpp @@ -55,7 +55,7 @@ static MCInstrInfo *createLoongArchMCInstrInfo() { static MCSubtargetInfo * createLoongArchMCSubtargetInfo(const Triple &TT, StringRef CPU, StringRef FS) { if (CPU.empty() || CPU == "generic") - CPU = TT.isArch64Bit() ? "la464" : "generic-la32"; + CPU = TT.isArch64Bit() ? "generic-la64" : "generic-la32"; return createLoongArchMCSubtargetInfoImpl(TT, CPU, /*TuneCPU*/ CPU, FS); } diff --git a/contrib/llvm-project/llvm/lib/Target/Mips/MipsISelDAGToDAG.cpp b/contrib/llvm-project/llvm/lib/Target/Mips/MipsISelDAGToDAG.cpp index f6f32fde3b77..a9ffd2bedf21 100644 --- a/contrib/llvm-project/llvm/lib/Target/Mips/MipsISelDAGToDAG.cpp +++ b/contrib/llvm-project/llvm/lib/Target/Mips/MipsISelDAGToDAG.cpp @@ -220,6 +220,10 @@ bool MipsDAGToDAGISel::selectVSplatMaskR(SDValue N, SDValue &Imm) const { return false; } +bool MipsDAGToDAGISel::selectVSplatImmEq1(SDValue N) const { + llvm_unreachable("Unimplemented function."); +} + /// Convert vector addition with vector subtraction if that allows to encode /// constant as an immediate and thus avoid extra 'ldi' instruction. /// add X, <-1, -1...> --> sub X, <1, 1...> diff --git a/contrib/llvm-project/llvm/lib/Target/Mips/MipsISelDAGToDAG.h b/contrib/llvm-project/llvm/lib/Target/Mips/MipsISelDAGToDAG.h index 6135f9680785..3485300a782c 100644 --- a/contrib/llvm-project/llvm/lib/Target/Mips/MipsISelDAGToDAG.h +++ b/contrib/llvm-project/llvm/lib/Target/Mips/MipsISelDAGToDAG.h @@ -120,6 +120,9 @@ private: /// starting at bit zero. virtual bool selectVSplatMaskR(SDValue N, SDValue &Imm) const; + /// Select constant vector splats whose value is 1. + virtual bool selectVSplatImmEq1(SDValue N) const; + /// Convert vector addition with vector subtraction if that allows to encode /// constant as an immediate and thus avoid extra 'ldi' instruction. /// add X, <-1, -1...> --> sub X, <1, 1...> diff --git a/contrib/llvm-project/llvm/lib/Target/Mips/MipsMSAInstrInfo.td b/contrib/llvm-project/llvm/lib/Target/Mips/MipsMSAInstrInfo.td index c4abccb24c6f..f4c32c9dcd42 100644 --- a/contrib/llvm-project/llvm/lib/Target/Mips/MipsMSAInstrInfo.td +++ b/contrib/llvm-project/llvm/lib/Target/Mips/MipsMSAInstrInfo.td @@ -198,14 +198,8 @@ def vsplati32 : PatFrag<(ops node:$e0), (v4i32 (build_vector node:$e0, node:$e0, node:$e0, node:$e0))>; -def vsplati64_imm_eq_1 : PatLeaf<(bitconvert (v4i32 (build_vector))), [{ - APInt Imm; - SDNode *BV = N->getOperand(0).getNode(); - EVT EltTy = N->getValueType(0).getVectorElementType(); - - return selectVSplat(BV, Imm, EltTy.getSizeInBits()) && - Imm.getBitWidth() == EltTy.getSizeInBits() && Imm == 1; -}]>; +// Any build_vector that is a constant splat with a value that equals 1 +def vsplat_imm_eq_1 : ComplexPattern; def vsplati64 : PatFrag<(ops node:$e0), (v2i64 (build_vector node:$e0, node:$e0))>; @@ -217,7 +211,7 @@ def vsplati64_splat_d : PatFrag<(ops node:$e0), node:$e0, node:$e0, node:$e0)), - vsplati64_imm_eq_1))))>; + (vsplat_imm_eq_1)))))>; def vsplatf32 : PatFrag<(ops node:$e0), (v4f32 (build_vector node:$e0, node:$e0, @@ -352,46 +346,35 @@ def vsplat_maskr_bits_uimm6 : SplatComplexPattern; -// Any build_vector that is a constant splat with a value that equals 1 -// FIXME: These should be a ComplexPattern but we can't use them because the -// ISel generator requires the uses to have a name, but providing a name -// causes other errors ("used in pattern but not operand list") -def vsplat_imm_eq_1 : PatLeaf<(build_vector), [{ - APInt Imm; - EVT EltTy = N->getValueType(0).getVectorElementType(); - - return selectVSplat(N, Imm, EltTy.getSizeInBits()) && - Imm.getBitWidth() == EltTy.getSizeInBits() && Imm == 1; -}]>; def vbclr_b : PatFrag<(ops node:$ws, node:$wt), - (and node:$ws, (vnot (shl vsplat_imm_eq_1, node:$wt)))>; + (and node:$ws, (vnot (shl (vsplat_imm_eq_1), node:$wt)))>; def vbclr_h : PatFrag<(ops node:$ws, node:$wt), - (and node:$ws, (vnot (shl vsplat_imm_eq_1, node:$wt)))>; + (and node:$ws, (vnot (shl (vsplat_imm_eq_1), node:$wt)))>; def vbclr_w : PatFrag<(ops node:$ws, node:$wt), - (and node:$ws, (vnot (shl vsplat_imm_eq_1, node:$wt)))>; + (and node:$ws, (vnot (shl (vsplat_imm_eq_1), node:$wt)))>; def vbclr_d : PatFrag<(ops node:$ws, node:$wt), - (and node:$ws, (vnot (shl (v2i64 vsplati64_imm_eq_1), + (and node:$ws, (vnot (shl (v2i64 (vsplat_imm_eq_1)), node:$wt)))>; def vbneg_b : PatFrag<(ops node:$ws, node:$wt), - (xor node:$ws, (shl vsplat_imm_eq_1, node:$wt))>; + (xor node:$ws, (shl (vsplat_imm_eq_1), node:$wt))>; def vbneg_h : PatFrag<(ops node:$ws, node:$wt), - (xor node:$ws, (shl vsplat_imm_eq_1, node:$wt))>; + (xor node:$ws, (shl (vsplat_imm_eq_1), node:$wt))>; def vbneg_w : PatFrag<(ops node:$ws, node:$wt), - (xor node:$ws, (shl vsplat_imm_eq_1, node:$wt))>; + (xor node:$ws, (shl (vsplat_imm_eq_1), node:$wt))>; def vbneg_d : PatFrag<(ops node:$ws, node:$wt), - (xor node:$ws, (shl (v2i64 vsplati64_imm_eq_1), + (xor node:$ws, (shl (v2i64 (vsplat_imm_eq_1)), node:$wt))>; def vbset_b : PatFrag<(ops node:$ws, node:$wt), - (or node:$ws, (shl vsplat_imm_eq_1, node:$wt))>; + (or node:$ws, (shl (vsplat_imm_eq_1), node:$wt))>; def vbset_h : PatFrag<(ops node:$ws, node:$wt), - (or node:$ws, (shl vsplat_imm_eq_1, node:$wt))>; + (or node:$ws, (shl (vsplat_imm_eq_1), node:$wt))>; def vbset_w : PatFrag<(ops node:$ws, node:$wt), - (or node:$ws, (shl vsplat_imm_eq_1, node:$wt))>; + (or node:$ws, (shl (vsplat_imm_eq_1), node:$wt))>; def vbset_d : PatFrag<(ops node:$ws, node:$wt), - (or node:$ws, (shl (v2i64 vsplati64_imm_eq_1), + (or node:$ws, (shl (v2i64 (vsplat_imm_eq_1)), node:$wt))>; def muladd : PatFrag<(ops node:$wd, node:$ws, node:$wt), @@ -3842,7 +3825,7 @@ class MSAShiftPat : (VT (Insn VT:$ws, VT:$wt))>; class MSABitPat : - MSAPat<(VT (Node VT:$ws, (shl vsplat_imm_eq_1, (Frag VT:$wt)))), + MSAPat<(VT (Node VT:$ws, (shl (vsplat_imm_eq_1), (Frag VT:$wt)))), (VT (Insn VT:$ws, VT:$wt))>; multiclass MSAShiftPats { @@ -3861,7 +3844,7 @@ multiclass MSABitPats { def : MSABitPat(Insn#_B), vsplati8imm7>; def : MSABitPat(Insn#_H), vsplati16imm15>; def : MSABitPat(Insn#_W), vsplati32imm31>; - def : MSAPat<(Node v2i64:$ws, (shl (v2i64 vsplati64_imm_eq_1), + def : MSAPat<(Node v2i64:$ws, (shl (v2i64 (vsplat_imm_eq_1)), (vsplati64imm63 v2i64:$wt))), (v2i64 (!cast(Insn#_D) v2i64:$ws, v2i64:$wt))>; } @@ -3872,16 +3855,16 @@ defm : MSAShiftPats; defm : MSABitPats; defm : MSABitPats; -def : MSAPat<(and v16i8:$ws, (vnot (shl vsplat_imm_eq_1, +def : MSAPat<(and v16i8:$ws, (vnot (shl (vsplat_imm_eq_1), (vsplati8imm7 v16i8:$wt)))), (v16i8 (BCLR_B v16i8:$ws, v16i8:$wt))>; -def : MSAPat<(and v8i16:$ws, (vnot (shl vsplat_imm_eq_1, +def : MSAPat<(and v8i16:$ws, (vnot (shl (vsplat_imm_eq_1), (vsplati16imm15 v8i16:$wt)))), (v8i16 (BCLR_H v8i16:$ws, v8i16:$wt))>; -def : MSAPat<(and v4i32:$ws, (vnot (shl vsplat_imm_eq_1, +def : MSAPat<(and v4i32:$ws, (vnot (shl (vsplat_imm_eq_1), (vsplati32imm31 v4i32:$wt)))), (v4i32 (BCLR_W v4i32:$ws, v4i32:$wt))>; -def : MSAPat<(and v2i64:$ws, (vnot (shl (v2i64 vsplati64_imm_eq_1), +def : MSAPat<(and v2i64:$ws, (vnot (shl (v2i64 (vsplat_imm_eq_1)), (vsplati64imm63 v2i64:$wt)))), (v2i64 (BCLR_D v2i64:$ws, v2i64:$wt))>; diff --git a/contrib/llvm-project/llvm/lib/Target/Mips/MipsSEISelDAGToDAG.cpp b/contrib/llvm-project/llvm/lib/Target/Mips/MipsSEISelDAGToDAG.cpp index 7ad300c6cccd..66c034a889c6 100644 --- a/contrib/llvm-project/llvm/lib/Target/Mips/MipsSEISelDAGToDAG.cpp +++ b/contrib/llvm-project/llvm/lib/Target/Mips/MipsSEISelDAGToDAG.cpp @@ -730,6 +730,18 @@ bool MipsSEDAGToDAGISel::selectVSplatUimmInvPow2(SDValue N, return false; } +// Select const vector splat of 1. +bool MipsSEDAGToDAGISel::selectVSplatImmEq1(SDValue N) const { + APInt ImmValue; + EVT EltTy = N->getValueType(0).getVectorElementType(); + + if (N->getOpcode() == ISD::BITCAST) + N = N->getOperand(0); + + return selectVSplat(N.getNode(), ImmValue, EltTy.getSizeInBits()) && + ImmValue.getBitWidth() == EltTy.getSizeInBits() && ImmValue == 1; +} + bool MipsSEDAGToDAGISel::trySelect(SDNode *Node) { unsigned Opcode = Node->getOpcode(); SDLoc DL(Node); diff --git a/contrib/llvm-project/llvm/lib/Target/Mips/MipsSEISelDAGToDAG.h b/contrib/llvm-project/llvm/lib/Target/Mips/MipsSEISelDAGToDAG.h index 7b843b0e0b25..22d8e924ac53 100644 --- a/contrib/llvm-project/llvm/lib/Target/Mips/MipsSEISelDAGToDAG.h +++ b/contrib/llvm-project/llvm/lib/Target/Mips/MipsSEISelDAGToDAG.h @@ -124,6 +124,9 @@ private: /// starting at bit zero. bool selectVSplatMaskR(SDValue N, SDValue &Imm) const override; + /// Select constant vector splats whose value is 1. + bool selectVSplatImmEq1(SDValue N) const override; + bool trySelect(SDNode *Node) override; // Emits proper ABI for _mcount profiling calls. diff --git a/contrib/llvm-project/llvm/lib/Target/NVPTX/NVPTXISelLowering.cpp b/contrib/llvm-project/llvm/lib/Target/NVPTX/NVPTXISelLowering.cpp index 6975412ce5d3..b2153a7afe73 100644 --- a/contrib/llvm-project/llvm/lib/Target/NVPTX/NVPTXISelLowering.cpp +++ b/contrib/llvm-project/llvm/lib/Target/NVPTX/NVPTXISelLowering.cpp @@ -229,6 +229,10 @@ static void ComputePTXValueVTs(const TargetLowering &TLI, const DataLayout &DL, // v*i8 are formally lowered as v4i8 EltVT = MVT::v4i8; NumElts = (NumElts + 3) / 4; + } else if (EltVT.getSimpleVT() == MVT::i8 && NumElts == 2) { + // v2i8 is promoted to v2i16 + NumElts = 1; + EltVT = MVT::v2i16; } for (unsigned j = 0; j != NumElts; ++j) { ValueVTs.push_back(EltVT); diff --git a/contrib/llvm-project/llvm/lib/Transforms/InstCombine/InstCombineCalls.cpp b/contrib/llvm-project/llvm/lib/Transforms/InstCombine/InstCombineCalls.cpp index 9d2990c98ce2..3223fccbcf49 100644 --- a/contrib/llvm-project/llvm/lib/Transforms/InstCombine/InstCombineCalls.cpp +++ b/contrib/llvm-project/llvm/lib/Transforms/InstCombine/InstCombineCalls.cpp @@ -506,8 +506,10 @@ static Instruction *foldCttzCtlz(IntrinsicInst &II, InstCombinerImpl &IC) { // If ctlz/cttz is only used as a shift amount, set is_zero_poison to true. if (II.hasOneUse() && match(Op1, m_Zero()) && - match(II.user_back(), m_Shift(m_Value(), m_Specific(&II)))) + match(II.user_back(), m_Shift(m_Value(), m_Specific(&II)))) { + II.dropUBImplyingAttrsAndMetadata(); return IC.replaceOperand(II, 1, IC.Builder.getTrue()); + } Constant *C; diff --git a/contrib/llvm-project/llvm/lib/Transforms/InstCombine/InstCombineSimplifyDemanded.cpp b/contrib/llvm-project/llvm/lib/Transforms/InstCombine/InstCombineSimplifyDemanded.cpp index 8a6ec3076ac6..b9d06b593685 100644 --- a/contrib/llvm-project/llvm/lib/Transforms/InstCombine/InstCombineSimplifyDemanded.cpp +++ b/contrib/llvm-project/llvm/lib/Transforms/InstCombine/InstCombineSimplifyDemanded.cpp @@ -1004,7 +1004,7 @@ Value *InstCombinerImpl::SimplifyDemandedUseBits(Instruction *I, uint64_t MaskedGEPIndex = HighBitsGEPIndex | MaskedLowBitsGEPIndex; if (MaskedGEPIndex != GEPIndex) { - auto *GEP = cast(II->getArgOperand(0)); + auto *GEP = cast(II->getArgOperand(0)); Builder.SetInsertPoint(I); Type *GEPIndexType = DL.getIndexType(GEP->getPointerOperand()->getType()); diff --git a/contrib/llvm-project/llvm/lib/Transforms/Scalar/ConstraintElimination.cpp b/contrib/llvm-project/llvm/lib/Transforms/Scalar/ConstraintElimination.cpp index 37022104d0a9..d1c80aa67124 100644 --- a/contrib/llvm-project/llvm/lib/Transforms/Scalar/ConstraintElimination.cpp +++ b/contrib/llvm-project/llvm/lib/Transforms/Scalar/ConstraintElimination.cpp @@ -1033,9 +1033,9 @@ void State::addInfoForInductions(BasicBlock &BB) { DTN, CmpInst::ICMP_SLT, PN, B, ConditionTy(CmpInst::ICMP_SLE, StartValue, B))); - // Try to add condition from header to the exit blocks. When exiting either - // with EQ or NE in the header, we know that the induction value must be u<= - // B, as other exits may only exit earlier. + // Try to add condition from header to the dedicated exit blocks. When exiting + // either with EQ or NE in the header, we know that the induction value must + // be u<= B, as other exits may only exit earlier. assert(!StepOffset.isNegative() && "induction must be increasing"); assert((Pred == CmpInst::ICMP_EQ || Pred == CmpInst::ICMP_NE) && "unsupported predicate"); @@ -1043,8 +1043,11 @@ void State::addInfoForInductions(BasicBlock &BB) { SmallVector ExitBBs; L->getExitBlocks(ExitBBs); for (BasicBlock *EB : ExitBBs) { - WorkList.emplace_back(FactOrCheck::getConditionFact( - DT.getNode(EB), CmpInst::ICMP_ULE, A, B, Precond)); + // Bail out on non-dedicated exits. + if (DT.dominates(&BB, EB)) { + WorkList.emplace_back(FactOrCheck::getConditionFact( + DT.getNode(EB), CmpInst::ICMP_ULE, A, B, Precond)); + } } } diff --git a/contrib/llvm-project/llvm/lib/Transforms/Scalar/LICM.cpp b/contrib/llvm-project/llvm/lib/Transforms/Scalar/LICM.cpp index 91ef2b4b7c18..ca03eff7a4e2 100644 --- a/contrib/llvm-project/llvm/lib/Transforms/Scalar/LICM.cpp +++ b/contrib/llvm-project/llvm/lib/Transforms/Scalar/LICM.cpp @@ -1464,8 +1464,11 @@ static Instruction *cloneInstructionInExitBlock( if (MSSAU.getMemorySSA()->getMemoryAccess(&I)) { // Create a new MemoryAccess and let MemorySSA set its defining access. + // After running some passes, MemorySSA might be outdated, and the + // instruction `I` may have become a non-memory touching instruction. MemoryAccess *NewMemAcc = MSSAU.createMemoryAccessInBB( - New, nullptr, New->getParent(), MemorySSA::Beginning); + New, nullptr, New->getParent(), MemorySSA::Beginning, + /*CreationMustSucceed=*/false); if (NewMemAcc) { if (auto *MemDef = dyn_cast(NewMemAcc)) MSSAU.insertDef(MemDef, /*RenameUses=*/true); diff --git a/contrib/llvm-project/llvm/lib/Transforms/Utils/Local.cpp b/contrib/llvm-project/llvm/lib/Transforms/Utils/Local.cpp index 7192efe3f16b..f68cbf62b982 100644 --- a/contrib/llvm-project/llvm/lib/Transforms/Utils/Local.cpp +++ b/contrib/llvm-project/llvm/lib/Transforms/Utils/Local.cpp @@ -1028,7 +1028,13 @@ CanRedirectPredsOfEmptyBBToSucc(BasicBlock *BB, BasicBlock *Succ, if (!BB->hasNPredecessorsOrMore(2)) return false; - // Get single common predecessors of both BB and Succ + if (any_of(BBPreds, [](const BasicBlock *Pred) { + return isa(Pred->getTerminator()); + })) + return false; + + // Get the single common predecessor of both BB and Succ. Return false + // when there are more than one common predecessors. for (BasicBlock *SuccPred : SuccPreds) { if (BBPreds.count(SuccPred)) { if (CommonPred) @@ -1133,7 +1139,7 @@ bool llvm::TryToSimplifyUncondBranchFromEmptyBlock(BasicBlock *BB, bool BBKillable = CanPropagatePredecessorsForPHIs(BB, Succ, BBPreds); - // Even if we can not fold bB into Succ, we may be able to redirect the + // Even if we can not fold BB into Succ, we may be able to redirect the // predecessors of BB to Succ. bool BBPhisMergeable = BBKillable || diff --git a/contrib/llvm-project/llvm/lib/Transforms/Vectorize/SLPVectorizer.cpp b/contrib/llvm-project/llvm/lib/Transforms/Vectorize/SLPVectorizer.cpp index ab2b96cdc42d..746ba51a981f 100644 --- a/contrib/llvm-project/llvm/lib/Transforms/Vectorize/SLPVectorizer.cpp +++ b/contrib/llvm-project/llvm/lib/Transforms/Vectorize/SLPVectorizer.cpp @@ -15440,9 +15440,25 @@ bool BoUpSLP::collectValuesToDemote( MaskedValueIsZero(I->getOperand(1), Mask, SimplifyQuery(*DL))); }); }; + auto AbsChecker = [&](unsigned BitWidth, unsigned OrigBitWidth) { + assert(BitWidth <= OrigBitWidth && "Unexpected bitwidths!"); + return all_of(E.Scalars, [&](Value *V) { + auto *I = cast(V); + unsigned SignBits = OrigBitWidth - BitWidth; + APInt Mask = APInt::getBitsSetFrom(OrigBitWidth, BitWidth - 1); + unsigned Op0SignBits = + ComputeNumSignBits(I->getOperand(0), *DL, 0, AC, nullptr, DT); + return SignBits <= Op0SignBits && + ((SignBits != Op0SignBits && + !isKnownNonNegative(I->getOperand(0), SimplifyQuery(*DL))) || + MaskedValueIsZero(I->getOperand(0), Mask, SimplifyQuery(*DL))); + }); + }; if (ID != Intrinsic::abs) { Operands.push_back(getOperandEntry(&E, 1)); CallChecker = CompChecker; + } else { + CallChecker = AbsChecker; } InstructionCost BestCost = std::numeric_limits::max(); diff --git a/contrib/llvm-project/llvm/utils/TableGen/Common/CodeGenDAGPatterns.cpp b/contrib/llvm-project/llvm/utils/TableGen/Common/CodeGenDAGPatterns.cpp index a8cecca0d4a5..ca71569008d5 100644 --- a/contrib/llvm-project/llvm/utils/TableGen/Common/CodeGenDAGPatterns.cpp +++ b/contrib/llvm-project/llvm/utils/TableGen/Common/CodeGenDAGPatterns.cpp @@ -3042,6 +3042,14 @@ static bool SimplifyTree(TreePatternNodePtr &N) { !N->getExtType(0).empty() && N->getExtType(0) == N->getChild(0).getExtType(0) && N->getName().empty()) { + if (!N->getPredicateCalls().empty()) { + std::string Str; + raw_string_ostream OS(Str); + OS << *N + << "\n trivial bitconvert node should not have predicate calls\n"; + PrintFatalError(Str); + return false; + } N = N->getChildShared(0); SimplifyTree(N); return true; diff --git a/lib/clang/include/VCSVersion.inc b/lib/clang/include/VCSVersion.inc index 2197c8ca2947..7624a2e4b17a 100644 --- a/lib/clang/include/VCSVersion.inc +++ b/lib/clang/include/VCSVersion.inc @@ -1,8 +1,8 @@ -#define LLVM_REVISION "llvmorg-19.1.4-0-gaadaa00de76e" +#define LLVM_REVISION "llvmorg-19.1.5-0-gab4b5a2db582" #define LLVM_REPOSITORY "https://github.com/llvm/llvm-project.git" -#define CLANG_REVISION "llvmorg-19.1.4-0-gaadaa00de76e" +#define CLANG_REVISION "llvmorg-19.1.5-0-gab4b5a2db582" #define CLANG_REPOSITORY "https://github.com/llvm/llvm-project.git" -#define LLDB_REVISION "llvmorg-19.1.4-0-gaadaa00de76e" +#define LLDB_REVISION "llvmorg-19.1.5-0-gab4b5a2db582" #define LLDB_REPOSITORY "https://github.com/llvm/llvm-project.git" diff --git a/lib/clang/include/clang/Basic/Version.inc b/lib/clang/include/clang/Basic/Version.inc index d7a4777e7cec..5104f9d7ad7a 100644 --- a/lib/clang/include/clang/Basic/Version.inc +++ b/lib/clang/include/clang/Basic/Version.inc @@ -1,8 +1,8 @@ -#define CLANG_VERSION 19.1.4 -#define CLANG_VERSION_STRING "19.1.4" +#define CLANG_VERSION 19.1.5 +#define CLANG_VERSION_STRING "19.1.5" #define CLANG_VERSION_MAJOR 19 #define CLANG_VERSION_MAJOR_STRING "19" #define CLANG_VERSION_MINOR 1 -#define CLANG_VERSION_PATCHLEVEL 4 +#define CLANG_VERSION_PATCHLEVEL 5 #define CLANG_VENDOR "FreeBSD " diff --git a/lib/clang/include/lld/Common/Version.inc b/lib/clang/include/lld/Common/Version.inc index b041a27576fb..6cf430b53591 100644 --- a/lib/clang/include/lld/Common/Version.inc +++ b/lib/clang/include/lld/Common/Version.inc @@ -1,4 +1,4 @@ // Local identifier in __FreeBSD_version style #define LLD_FREEBSD_VERSION 1400007 -#define LLD_VERSION_STRING "19.1.4 (FreeBSD llvmorg-19.1.4-0-gaadaa00de76e-" __XSTRING(LLD_FREEBSD_VERSION) ")" +#define LLD_VERSION_STRING "19.1.5 (FreeBSD llvmorg-19.1.5-0-gab4b5a2db582-" __XSTRING(LLD_FREEBSD_VERSION) ")" diff --git a/lib/clang/include/lldb/Version/Version.inc b/lib/clang/include/lldb/Version/Version.inc index d69a702815ff..5aa1f29215b4 100644 --- a/lib/clang/include/lldb/Version/Version.inc +++ b/lib/clang/include/lldb/Version/Version.inc @@ -1,6 +1,6 @@ -#define LLDB_VERSION 19.1.4 -#define LLDB_VERSION_STRING "19.1.4" +#define LLDB_VERSION 19.1.5 +#define LLDB_VERSION_STRING "19.1.5" #define LLDB_VERSION_MAJOR 19 #define LLDB_VERSION_MINOR 1 -#define LLDB_VERSION_PATCH 4 +#define LLDB_VERSION_PATCH 5 /* #undef LLDB_FULL_VERSION_STRING */ diff --git a/lib/clang/include/llvm/Config/config.h b/lib/clang/include/llvm/Config/config.h index a775cc7e9bbf..f86e4b6b5946 100644 --- a/lib/clang/include/llvm/Config/config.h +++ b/lib/clang/include/llvm/Config/config.h @@ -338,10 +338,10 @@ #define PACKAGE_NAME "LLVM" /* Define to the full name and version of this package. */ -#define PACKAGE_STRING "LLVM 19.1.4" +#define PACKAGE_STRING "LLVM 19.1.5" /* Define to the version of this package. */ -#define PACKAGE_VERSION "19.1.4" +#define PACKAGE_VERSION "19.1.5" /* Define to the vendor of this package. */ /* #undef PACKAGE_VENDOR */ diff --git a/lib/clang/include/llvm/Config/llvm-config.h b/lib/clang/include/llvm/Config/llvm-config.h index 16af33f177e6..966249436723 100644 --- a/lib/clang/include/llvm/Config/llvm-config.h +++ b/lib/clang/include/llvm/Config/llvm-config.h @@ -176,10 +176,10 @@ #define LLVM_VERSION_MINOR 1 /* Patch version of the LLVM API */ -#define LLVM_VERSION_PATCH 4 +#define LLVM_VERSION_PATCH 5 /* LLVM version string */ -#define LLVM_VERSION_STRING "19.1.4" +#define LLVM_VERSION_STRING "19.1.5" /* Whether LLVM records statistics for use with GetStatistics(), * PrintStatistics() or PrintStatisticsJSON() diff --git a/lib/clang/include/llvm/Support/VCSRevision.h b/lib/clang/include/llvm/Support/VCSRevision.h index 68785cd03f5d..db3347a0e5a5 100644 --- a/lib/clang/include/llvm/Support/VCSRevision.h +++ b/lib/clang/include/llvm/Support/VCSRevision.h @@ -1,2 +1,2 @@ -#define LLVM_REVISION "llvmorg-19.1.4-0-gaadaa00de76e" +#define LLVM_REVISION "llvmorg-19.1.5-0-gab4b5a2db582" #define LLVM_REPOSITORY "https://github.com/llvm/llvm-project.git" From nobody Thu Dec 12 14:57:20 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Y8Ftm6TbYz5gMxX; Thu, 12 Dec 2024 14:57: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 4Y8Ftm5p5vz4b7W; Thu, 12 Dec 2024 14:57:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734015440; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=B/LqDH7pAJ1eM/0YnuxYHNlToUP/PL7uBilfbL1/lqc=; b=HOyLgFWkeYvybZdZsb5Q+6lUDzJf6IBrO3d/IZ+OxCCr+aRQakDRRL1gAHcZHue5dNWa+X IkIr6DGX6Im2oblzleF1/fY/B6FSg2JCqMPH+7pATBWKtgRtqY2gR4oVu9eMUBNPuOHyzN SEbzzTYfdACMIdc/rlwHstshdaKGGHQuJbDasDipEyzOl0c2e6XUNL7DflH1O4G1SNIhYp nX5tNZ/CfHvCO3R+0XXon1LklkbHAu5NM37qaGFSmXlJzcWY8GeESdcKq2hvVOUKwjByO0 pSFmbWCQ1vT/oMOa1LIVEtUuaEdgqgFfo4fDWGlwMc1yukuPBfcsB5S4MXxODg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734015440; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=B/LqDH7pAJ1eM/0YnuxYHNlToUP/PL7uBilfbL1/lqc=; b=ow6QSlh6gAuuTDbUm9yDCeV62SfR0/N+xYJRaf38Rz0jJJo3NmzAPYoEWnVnsw98d5tC8p aRv2WqNi3f5aj798D7xFsBQ+Gghr7NGMQnxEuqJjuj1o4CC11MJ+5KAB9cXRMWFZ+F38qp qGUnrtokNFSnQwsZNTy4f7rwaih9N0YkhzmH0PcQJG1NluSbWvkZcPrVjiTQZkHekaTg0O JCm0nFia4SrLiM0DR7GPjdnHe3n3Hs2q14QLO5GePHG50RdfQ+3xhIJSnGSGtTzbkdMDfd +kBcW4hB2dWrz94vdaX5z5sWdNFGY//S+X81ehw7PenmhK6FY1yY2AgnHeO1EA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1734015440; a=rsa-sha256; cv=none; b=NRBtSwuNNAp3en/Iqbl9lbW5JZw3rfqa8I7GuSBnKteVgXYjXufJmDuplHCpcZ9pZyIWl4 qqushQA8RBOU23TMm3og0z/m5CP35FV+BlPnJy8nfZRhmniSzJ3MqDjqSKODR8Aqsu+giZ EsByt4RcFG8P42in+jC4K2W62o2amQd65sL/D5RpQiWhgW3zKCZPzGXfqFKfn1MRlj6peB o0Qimt8DqaWEAc2GlhrD3UHzqWoc6uY8kMnFlUu2lYgf7di2Yjwz2NOP+FMxOn3y2vobGK cQOQ1t/y8n4vp3AjQgZ2jnkBNdVtwa7enjzU/bwLdOgH8pegs7WjMaGpwjwSVw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Y8Ftm5PTCzxLk; Thu, 12 Dec 2024 14:57: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 4BCEvKnF022167; Thu, 12 Dec 2024 14:57:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BCEvKmw022164; Thu, 12 Dec 2024 14:57:20 GMT (envelope-from git) Date: Thu, 12 Dec 2024 14:57:20 GMT Message-Id: <202412121457.4BCEvKmw022164@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Martin Matuska Subject: git: a0e2fa50e737 - stable/14 - linux.h: don't redefine lower_32_bits if already defined List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mm X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: a0e2fa50e737aca9b4adda584a99742aa3959295 Auto-Submitted: auto-generated The branch stable/14 has been updated by mm: URL: https://cgit.FreeBSD.org/src/commit/?id=a0e2fa50e737aca9b4adda584a99742aa3959295 commit a0e2fa50e737aca9b4adda584a99742aa3959295 Author: Warner Losh AuthorDate: 2024-10-15 04:53:55 +0000 Commit: Martin Matuska CommitDate: 2024-12-12 12:21:36 +0000 linux.h: don't redefine lower_32_bits if already defined systrace.c fails to build if we're using a common compiler.h for both openzfs and linuxkpi. The issue is easy enough to fix: don't redefined lower_32_bits if it's already defined in linux.h, since it's the least 'standardized'. This will allow systrace.c to build using an equivalent macro. MFC After: 3 days Sponsored by: Netflix (cherry picked from commit 481d5a4891648f0a6979a48689cc16fca80d4ab6) --- sys/compat/linux/linux.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sys/compat/linux/linux.h b/sys/compat/linux/linux.h index 5a0d6e0b68c5..6d276b8a69f4 100644 --- a/sys/compat/linux/linux.h +++ b/sys/compat/linux/linux.h @@ -350,7 +350,9 @@ struct l_statx { #define LINUX_ST_RELATIME 0x1000 /* No native analogue */ #define LINUX_ST_NOSYMFOLLOW 0x2000 +#ifndef lower_32_bits #define lower_32_bits(n) ((uint32_t)((n) & 0xffffffff)) +#endif #ifdef KTRACE #define linux_ktrsigset(s, l) \ From nobody Thu Dec 12 14:57:27 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Y8Fty1Lsjz5gN37; Thu, 12 Dec 2024 14:57: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 4Y8Fty12flz4b92; Thu, 12 Dec 2024 14:57:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734015450; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xoc6l3Y8M+RnuTdxR2xlBu8zZDHUxK8wBUxu3QbyuXY=; b=IzY87vs0A3XoGqfAyqo2vzG5Q7A4sBdARgj88x3hyIRh6x4GF5A3oYJk/XTSHRqeettdNT QrqIRaqJmm6NYwFCsTX8Hi1wXXvC+v4EC34N3zNiuEDGGlARDRrk4h+6kiU7b2e6uma7zF TNwP/R4xGunL7QfkMAb6zk7d2xUylC4mfIiyXlTzYz5kzZD6jc4pNIT1lMeXVGRKRboBmU hvGmB4rthtFMCHihu6r57QM31PLEyrGLKRGJx15oF8r7697JIl9iJ3Kc4M11gzUnu0Jgoc +nyLTPExBm9ticTcYZ+LJqW/IEEBEJrc154SuvUpUXAZVWlbJzB+vf44q8De2Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734015450; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xoc6l3Y8M+RnuTdxR2xlBu8zZDHUxK8wBUxu3QbyuXY=; b=Oq09ybedWjAjSh7XpDNIN228JYXJ66m6Tiap/hCAU+1Qu8RJh4cnqqZpPaXTSsSbA3ywBk TuZb1Z0Qf73FbADK0pSS8mTMqMUoNGVU7Of0L9wTlFVPZ2OqSqNIidEnWZ6JMYxK7iO4b0 3lyUH/Sld8mnR2sPRbF0JRv1eEYmh1oHH9dcAN2S3px49mNVYwO2Tw7xrdVl/rW+LePE76 2SU6Usezump9uygfVcfjXlancsKdcGZNjwUqahIuWJhMDcQqBG7japNI51KkNkDmJPYz5J ojsfJCyUFpZmt45EV1d0D8k/tWR1WOOHg7V7+9NqrFHW2lQFirunP0mv2GtyWA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1734015450; a=rsa-sha256; cv=none; b=cnnqmMPvcIALzrMQS2XjwZI5pwsYaAPknJ9UWyzOEr/GVhJcgTh6QPa6m3v2H1GRi9I3F6 gf+CSDyg/ftHhjZEcZ20C4343XQldAFpgVB6Tm6bArdrGmW1Z6TZOvizY1/3MEUr4CHzG4 SW02ycJPezaZUk1DYnChoSZDBLu+0sg9EF1ohOHHexMLPZmeGWCMWEcKaAuM9HErE2qomN H8BWBesrMwHDO1YxS2KEOGQ05iEa8InJIvxcu+I7BgFd+8JMm1TrtWlvWfUmaf7tfNxDn9 kbW5n42iwC959OfnMogpzFBcYJ7dre28bHpcYsA6BpI0U7ShvJ02GH8Pszu43A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Y8Fty0dXDzwtK; Thu, 12 Dec 2024 14:57: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 4BCEvUrc022234; Thu, 12 Dec 2024 14:57:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BCEvRJv022229; Thu, 12 Dec 2024 14:57:27 GMT (envelope-from git) Date: Thu, 12 Dec 2024 14:57:27 GMT Message-Id: <202412121457.4BCEvRJv022229@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Martin Matuska Subject: git: 2ec8b6948070 - stable/14 - zfs: merge openzfs/zfs@e269af1b3 (zfs-2.2-release) into stable/14 List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mm X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 2ec8b69480708185a273254e4e254140eb2ce633 Auto-Submitted: auto-generated The branch stable/14 has been updated by mm: URL: https://cgit.FreeBSD.org/src/commit/?id=2ec8b69480708185a273254e4e254140eb2ce633 commit 2ec8b69480708185a273254e4e254140eb2ce633 Merge: a0e2fa50e737 e269af1b3c7b Author: Martin Matuska AuthorDate: 2024-12-12 12:22:56 +0000 Commit: Martin Matuska CommitDate: 2024-12-12 12:22:56 +0000 zfs: merge openzfs/zfs@e269af1b3 (zfs-2.2-release) into stable/14 OpenZFS release 2.2.7 Notable upstream pull request merges: #15457 022bf8637 Increase L2ARC write rate and headroom #15527 1ba5b2ef8 freebsd: remove __FBSDID macro use #15792 9e7af55e8 Add custom debug printing for your asserts #15793 a1ea40af8 libzfs: use zfs_strerror() in place of strerror() #16181 -multiple zdb/ztest: improve and harmonise crash output #16208 e5e4957a5 Allow block cloning to be interrupted by a signal #16210 ba4e582a6 FreeBSD: Add const qualifier to members of struct opensolaris_utsname #16225 a6198f34b Simplify issig() #16335 25ec9a903 zdb: fix BRT dump #16364 cf80a803d zvol: ensure device minors are properly cleaned up #16404 384b53be8 FreeBSD: Add missing memory reclamation accounting #16492 -multiple Split "shared" userspace & kernel code into separate files #16496 f1694496a zfs_file: rename zfs_file_fallocate to zfs_file_deallocate #16511 bc0d89bfc Fix an uninitialized data access #16529 2dc8529d9 Fix handling of DNS names with '-' in them for sharenfs #16539 30ea44296 zfs_log: add flex array fields to log record structs #16546 098789216 Evicting too many bytes from MFU metadata #16551 54278533a Reduce and handle EAGAIN errors on AIO label reads #16554 84ad1d536 FreeBSD: restore zfs_znode_update_vfs() #16565 21c40e6d9 FreeBSD: Sync taskq_cancel_id() returns with Linux #16567 48482bb2f Properly release key in spa_keystore_dsl_key_hold_dd() #16584 e8f4592a1 Avoid computing strlen() inside loops #16605 acc8a3186 ARC: Cache arc_c value during arc_evict() #16650 fc60e0c6e freebsd: Use compiler.h from FreeBSD's base's linuxkpi #16667 b32b35cea zdb: show bp in uberblock dump #16684 1f5e1b919 Pack dmu_buf_impl_t by 16 bytes #16688 73b3e8ace Fix gcc uninitialized warning in FreeBSD zio_crypt.c #16690 727506c94 On the first vdev open ignore impossible ashift hints #16692 d83cd5307 zdb: add extra -T flag to show histograms of BRT refcounts #16693 82ab837a0 Fix gcc unused value warning in FreeBSD simd.h #16740 2bba6e3c5 BRT: Don't call brt_pending_remove() on holes/embedded #16801 299da6ace Fix race in libzfs_run_process_impl Obtained from: OpenZFS OpenZFS commit: e269af1b3c7b1b1c000d05f147a2f75e5e72e0ca OpenZFS tag: zfs-2.2.7 cddl/lib/libicp/Makefile | 1 + cddl/lib/libicp_rescue/Makefile | 1 + cddl/lib/libzfs/Makefile | 4 +- cddl/lib/libzpool/Makefile | 19 +- cddl/sbin/zpool/Makefile | 1 + cddl/share/zfs/compatibility.d/Makefile | 4 +- cddl/usr.bin/zinject/Makefile | 1 + cddl/usr.bin/zstream/Makefile | 2 + cddl/usr.bin/ztest/Makefile | 1 + cddl/usr.sbin/zdb/Makefile | 1 + cddl/usr.sbin/zfsd/Makefile.common | 1 + cddl/usr.sbin/zhack/Makefile | 1 + lib/libbe/Makefile | 3 +- sys/conf/files | 4 +- sys/contrib/openzfs/.github/CONTRIBUTING.md | 18 +- .../.github/workflows/build-dependencies.txt | 57 --- .../.github/workflows/checkstyle-dependencies.txt | 5 - .../openzfs/.github/workflows/checkstyle.yaml | 23 +- sys/contrib/openzfs/.github/workflows/codeql.yml | 12 +- .../openzfs/.github/workflows/scripts/README.md | 14 + .../.github/workflows/scripts/generate-ci-type.py | 107 +++++ .../.github/workflows/scripts/generate-summary.sh | 119 ----- .../.github/workflows/scripts/merge_summary.awk | 109 +++++ .../.github/workflows/scripts/qemu-1-setup.sh | 93 ++++ .../.github/workflows/scripts/qemu-2-start.sh | 225 ++++++++++ .../.github/workflows/scripts/qemu-3-deps.sh | 229 ++++++++++ .../.github/workflows/scripts/qemu-4-build.sh | 153 +++++++ .../.github/workflows/scripts/qemu-5-setup.sh | 126 ++++++ .../.github/workflows/scripts/qemu-6-tests.sh | 105 +++++ .../.github/workflows/scripts/qemu-7-prepare.sh | 123 ++++++ .../.github/workflows/scripts/qemu-8-summary.sh | 71 +++ .../workflows/scripts/qemu-9-summary-page.sh | 57 +++ .../workflows/scripts/setup-dependencies.sh | 88 ---- .../.github/workflows/scripts/setup-functional.sh | 24 - .../openzfs/.github/workflows/zfs-linux-tests.yml | 124 ------ .../openzfs/.github/workflows/zfs-linux.yml | 64 --- sys/contrib/openzfs/.github/workflows/zfs-qemu.yml | 177 ++++++++ sys/contrib/openzfs/.github/workflows/zloop.yml | 77 ++++ sys/contrib/openzfs/META | 6 +- sys/contrib/openzfs/README.md | 2 +- sys/contrib/openzfs/cmd/zdb/zdb.c | 58 ++- sys/contrib/openzfs/cmd/zdb/zdb_il.c | 6 +- sys/contrib/openzfs/cmd/zed/zed.d/Makefile.am | 2 + .../openzfs/cmd/zed/zed.d/deadman-slot_off.sh | 71 +++ sys/contrib/openzfs/cmd/zed/zed.d/zed.rc | 7 + sys/contrib/openzfs/cmd/zed/zed_disk_event.c | 3 +- sys/contrib/openzfs/cmd/zpool/Makefile.am | 4 +- .../openzfs/cmd/zpool/compatibility.d/grub2-2.06 | 23 + .../zpool/compatibility.d/{grub2 => grub2-2.12} | 2 +- sys/contrib/openzfs/cmd/ztest.c | 36 +- sys/contrib/openzfs/config/Rules.am | 3 +- sys/contrib/openzfs/config/deb.am | 10 +- sys/contrib/openzfs/config/intlmacosx.m4 | 72 --- sys/contrib/openzfs/config/kernel-acl.m4 | 215 +-------- sys/contrib/openzfs/config/kernel-aio-fsync.m4 | 23 - sys/contrib/openzfs/config/kernel-assign_str.m4 | 62 +++ sys/contrib/openzfs/config/kernel-bdi.m4 | 81 ---- sys/contrib/openzfs/config/kernel-bio.m4 | 313 +------------ sys/contrib/openzfs/config/kernel-blk-queue.m4 | 183 +------- sys/contrib/openzfs/config/kernel-blkdev.m4 | 22 +- sys/contrib/openzfs/config/kernel-clear-inode.m4 | 39 -- .../openzfs/config/kernel-config-defined.m4 | 15 - sys/contrib/openzfs/config/kernel-current-time.m4 | 26 -- sys/contrib/openzfs/config/kernel-dentry-alias.m4 | 30 -- .../openzfs/config/kernel-dentry-operations.m4 | 135 ------ sys/contrib/openzfs/config/kernel-dirty-inode.m4 | 29 -- .../openzfs/config/kernel-encode-fh-inode.m4 | 27 -- sys/contrib/openzfs/config/kernel-evict-inode.m4 | 24 - sys/contrib/openzfs/config/kernel-fadvise.m4 | 23 - sys/contrib/openzfs/config/kernel-fallocate.m4 | 44 -- sys/contrib/openzfs/config/kernel-file-dentry.m4 | 24 - sys/contrib/openzfs/config/kernel-file-inode.m4 | 23 - sys/contrib/openzfs/config/kernel-file.m4 | 31 ++ sys/contrib/openzfs/config/kernel-filemap.m4 | 27 -- sys/contrib/openzfs/config/kernel-fsync.m4 | 53 --- .../openzfs/config/kernel-generic_fillattr.m4 | 4 + .../openzfs/config/kernel-generic_io_acct.m4 | 29 -- .../openzfs/config/kernel-generic_readlink.m4 | 25 -- sys/contrib/openzfs/config/kernel-genhd-flags.m4 | 21 +- sys/contrib/openzfs/config/kernel-get-link.m4 | 104 ----- .../openzfs/config/kernel-global_page_state.m4 | 128 ------ sys/contrib/openzfs/config/kernel-group-info.m4 | 22 - sys/contrib/openzfs/config/kernel-hotplug.m4 | 26 -- .../openzfs/config/kernel-in-compat-syscall.m4 | 24 - sys/contrib/openzfs/config/kernel-inode-getattr.m4 | 26 -- sys/contrib/openzfs/config/kernel-inode-lock.m4 | 24 - .../openzfs/config/kernel-inode-permission.m4 | 2 + .../openzfs/config/kernel-inode-set-flags.m4 | 22 - .../openzfs/config/kernel-inode-set-iversion.m4 | 23 - sys/contrib/openzfs/config/kernel-inode-setattr.m4 | 22 - sys/contrib/openzfs/config/kernel-inode-times.m4 | 23 - .../openzfs/config/kernel-kmap-local-page.m4 | 23 + sys/contrib/openzfs/config/kernel-kmem-cache.m4 | 41 -- sys/contrib/openzfs/config/kernel-kmem.m4 | 27 +- sys/contrib/openzfs/config/kernel-kstrtoul.m4 | 21 - sys/contrib/openzfs/config/kernel-kthread.m4 | 37 +- sys/contrib/openzfs/config/kernel-ktime.m4 | 55 --- sys/contrib/openzfs/config/kernel-lseek-execute.m4 | 27 -- .../openzfs/config/kernel-make-request-fn.m4 | 42 +- sys/contrib/openzfs/config/kernel-mkdir.m4 | 11 +- sys/contrib/openzfs/config/kernel-mm-page-flags.m4 | 24 + sys/contrib/openzfs/config/kernel-mm-pagemap.m4 | 4 +- sys/contrib/openzfs/config/kernel-percpu.m4 | 56 --- sys/contrib/openzfs/config/kernel-put-link.m4 | 61 --- .../openzfs/config/kernel-register_sysctl_table.m4 | 2 +- sys/contrib/openzfs/config/kernel-rename.m4 | 64 +-- sys/contrib/openzfs/config/kernel-rw.m4 | 69 --- sys/contrib/openzfs/config/kernel-rwsem.m4 | 60 --- sys/contrib/openzfs/config/kernel-sched.m4 | 53 --- .../openzfs/config/kernel-setattr-prepare.m4 | 2 + sys/contrib/openzfs/config/kernel-shrink.m4 | 163 +------ sys/contrib/openzfs/config/kernel-signal-stop.m4 | 21 - sys/contrib/openzfs/config/kernel-special-state.m4 | 21 - sys/contrib/openzfs/config/kernel-strlcpy.m4 | 25 +- sys/contrib/openzfs/config/kernel-super-userns.m4 | 25 -- sys/contrib/openzfs/config/kernel-symlink.m4 | 2 + sys/contrib/openzfs/config/kernel-timer.m4 | 75 ---- sys/contrib/openzfs/config/kernel-tmpfile.m4 | 4 - sys/contrib/openzfs/config/kernel-user-ns-inum.m4 | 23 - .../openzfs/config/kernel-userns-capabilities.m4 | 27 -- sys/contrib/openzfs/config/kernel-vfs-direct_IO.m4 | 54 +-- .../config/kernel-vfs-extended-file_range.m4 | 50 --- .../openzfs/config/kernel-vfs-file_range.m4 | 30 -- sys/contrib/openzfs/config/kernel-vfs-getattr.m4 | 86 ---- sys/contrib/openzfs/config/kernel-vfs-iov_iter.m4 | 163 ++----- sys/contrib/openzfs/config/kernel-vfs-iterate.m4 | 83 ---- .../openzfs/config/kernel-vfs-rw-iterate.m4 | 80 ---- sys/contrib/openzfs/config/kernel-wait.m4 | 99 ----- sys/contrib/openzfs/config/kernel-xattr-handler.m4 | 322 +------------- sys/contrib/openzfs/config/kernel-zlib.m4 | 26 -- sys/contrib/openzfs/config/kernel.m4 | 102 +---- sys/contrib/openzfs/config/user.m4 | 2 +- sys/contrib/openzfs/contrib/Makefile.am | 1 + .../openzfs/contrib/bash_completion.d/Makefile.am | 5 +- .../openzfs/contrib/bash_completion.d/zfs.in | 2 +- sys/contrib/openzfs/contrib/debian/Makefile.am | 48 ++ sys/contrib/openzfs/contrib/debian/not-installed | 1 - sys/contrib/openzfs/contrib/debian/rules.in | 8 +- sys/contrib/openzfs/contrib/initramfs/scripts/zfs | 5 +- sys/contrib/openzfs/include/Makefile.am | 1 + sys/contrib/openzfs/include/libzutil.h | 14 + sys/contrib/openzfs/include/os/freebsd/Makefile.am | 2 + .../openzfs/include/os/freebsd/linux/compiler.h | 83 +--- .../openzfs/include/os/freebsd/spl/sys/ccompat.h | 51 --- .../openzfs/include/os/freebsd/spl/sys/debug.h | 149 ++++++- .../openzfs/include/os/freebsd/spl/sys/kmem.h | 1 + .../openzfs/include/os/freebsd/spl/sys/policy.h | 6 - .../openzfs/include/os/freebsd/spl/sys/proc.h | 3 - .../openzfs/include/os/freebsd/spl/sys/random.h | 4 +- .../openzfs/include/os/freebsd/spl/sys/sig.h | 8 +- .../openzfs/include/os/freebsd/spl/sys/simd.h | 3 + .../openzfs/include/os/freebsd/spl/sys/vm.h | 16 - .../openzfs/include/os/freebsd/spl/sys/vnode.h | 6 +- .../zfs/sys/abd_impl_os.h} | 31 +- .../openzfs/include/os/freebsd/zfs/sys/abd_os.h | 46 ++ .../include/os/freebsd/zfs/sys/zfs_vfsops_os.h | 77 ---- sys/contrib/openzfs/include/os/linux/Makefile.am | 3 +- .../include/os/linux/kernel/linux/blkdev_compat.h | 229 +--------- .../include/os/linux/kernel/linux/dcache_compat.h | 6 - .../include/os/linux/kernel/linux/kmap_compat.h | 10 +- .../include/os/linux/kernel/linux/mm_compat.h | 14 + .../include/os/linux/kernel/linux/page_compat.h | 56 --- .../openzfs/include/os/linux/kernel/linux/simd.h | 4 + .../include/os/linux/kernel/linux/vfs_compat.h | 235 +--------- .../include/os/linux/kernel/linux/xattr_compat.h | 106 +---- .../openzfs/include/os/linux/spl/sys/condvar.h | 4 +- .../openzfs/include/os/linux/spl/sys/cred.h | 4 - .../openzfs/include/os/linux/spl/sys/debug.h | 152 ++++++- .../openzfs/include/os/linux/spl/sys/file.h | 11 - .../openzfs/include/os/linux/spl/sys/kmem_cache.h | 8 +- .../openzfs/include/os/linux/spl/sys/signal.h | 8 +- .../openzfs/include/os/linux/spl/sys/string.h | 7 - .../openzfs/include/os/linux/spl/sys/taskq.h | 6 +- .../openzfs/include/os/linux/spl/sys/thread.h | 7 - .../openzfs/include/os/linux/spl/sys/time.h | 28 -- .../openzfs/include/os/linux/spl/sys/timer.h | 20 - .../openzfs/include/os/linux/spl/sys/types.h | 6 + .../openzfs/include/os/linux/spl/sys/wait.h | 24 - .../openzfs/include/os/linux/spl/sys/wmsum.h | 9 - .../openzfs/include/os/linux/zfs/sys/abd_impl_os.h | 41 ++ .../openzfs/include/os/linux/zfs/sys/abd_os.h | 62 +++ .../include/os/linux/zfs/sys/trace_dbgmsg.h | 3 +- .../openzfs/include/os/linux/zfs/sys/trace_dbuf.h | 29 +- .../include/os/linux/zfs/sys/zfs_vfsops_os.h | 1 + .../include/os/linux/zfs/sys/zfs_vnops_os.h | 3 +- .../include/os/linux/zfs/sys/zfs_znode_impl.h | 25 -- sys/contrib/openzfs/include/os/linux/zfs/sys/zpl.h | 85 +--- sys/contrib/openzfs/include/sys/abd.h | 33 +- sys/contrib/openzfs/include/sys/abd_impl.h | 14 +- sys/contrib/openzfs/include/sys/dbuf.h | 53 +-- sys/contrib/openzfs/include/sys/sa_impl.h | 4 +- sys/contrib/openzfs/include/sys/vdev.h | 1 + sys/contrib/openzfs/include/sys/zfs_context.h | 4 +- sys/contrib/openzfs/include/sys/zfs_debug.h | 2 +- sys/contrib/openzfs/include/sys/zfs_file.h | 2 +- sys/contrib/openzfs/include/sys/zfs_znode.h | 2 + sys/contrib/openzfs/include/sys/zil.h | 30 +- sys/contrib/openzfs/include/sys/zio.h | 3 + sys/contrib/openzfs/include/sys/zio_impl.h | 3 + sys/contrib/openzfs/include/sys/zio_priority.h | 4 + sys/contrib/openzfs/include/sys/zvol_impl.h | 18 +- sys/contrib/openzfs/include/zfs_valstr.h | 84 ++++ sys/contrib/openzfs/lib/libshare/nfs.c | 21 +- sys/contrib/openzfs/lib/libshare/os/freebsd/nfs.c | 7 +- sys/contrib/openzfs/lib/libspl/include/assert.h | 97 ++++ sys/contrib/openzfs/lib/libspl/include/sys/simd.h | 3 + .../openzfs/lib/libspl/os/freebsd/getmntany.c | 5 +- sys/contrib/openzfs/lib/libspl/os/freebsd/mnttab.c | 3 - .../openzfs/lib/libspl/os/linux/getmntany.c | 3 +- sys/contrib/openzfs/lib/libzfs/Makefile.am | 1 + sys/contrib/openzfs/lib/libzfs/libzfs.abi | 51 +++ sys/contrib/openzfs/lib/libzfs/libzfs_crypto.c | 9 +- sys/contrib/openzfs/lib/libzfs/libzfs_dataset.c | 2 +- sys/contrib/openzfs/lib/libzfs/libzfs_diff.c | 17 +- sys/contrib/openzfs/lib/libzfs/libzfs_mount.c | 5 +- sys/contrib/openzfs/lib/libzfs/libzfs_sendrecv.c | 20 +- sys/contrib/openzfs/lib/libzfs/libzfs_util.c | 15 +- .../openzfs/lib/libzfs/os/freebsd/libzfs_compat.c | 2 +- .../openzfs/lib/libzfs/os/freebsd/libzfs_zmount.c | 3 - sys/contrib/openzfs/lib/libzpool/Makefile.am | 18 +- sys/contrib/openzfs/lib/libzpool/abd_os.c | 492 +++++++++++++++++++++ sys/contrib/openzfs/lib/libzpool/arc_os.c | 87 ++++ .../openzfs/lib/libzpool/include/Makefile.am | 4 + .../openzfs/lib/libzpool/include/sys/abd_impl_os.h | 41 ++ .../openzfs/lib/libzpool/include/sys/abd_os.h | 47 ++ sys/contrib/openzfs/lib/libzpool/kernel.c | 24 +- sys/contrib/openzfs/lib/libzpool/vdev_label_os.c | 51 +++ sys/contrib/openzfs/lib/libzpool/zfs_debug.c | 106 +++++ sys/contrib/openzfs/lib/libzpool/zfs_racct.c | 38 ++ sys/contrib/openzfs/lib/libzutil/zutil_import.c | 29 +- sys/contrib/openzfs/man/man4/zfs.4 | 32 +- sys/contrib/openzfs/man/man7/zfsprops.7 | 13 +- sys/contrib/openzfs/man/man7/zpool-features.7 | 29 +- sys/contrib/openzfs/man/man8/zdb.8 | 4 +- sys/contrib/openzfs/module/Kbuild.in | 5 +- sys/contrib/openzfs/module/Makefile.bsd | 4 +- sys/contrib/openzfs/module/lua/lobject.h | 21 +- sys/contrib/openzfs/module/lua/lstate.h | 2 +- sys/contrib/openzfs/module/lua/lstring.c | 2 +- sys/contrib/openzfs/module/lua/lstring.h | 2 +- .../openzfs/module/os/freebsd/spl/spl_acl.c | 3 - .../openzfs/module/os/freebsd/spl/spl_atomic.c | 3 - .../openzfs/module/os/freebsd/spl/spl_dtrace.c | 3 - .../openzfs/module/os/freebsd/spl/spl_kmem.c | 11 - .../openzfs/module/os/freebsd/spl/spl_kstat.c | 3 - .../openzfs/module/os/freebsd/spl/spl_misc.c | 3 - .../openzfs/module/os/freebsd/spl/spl_policy.c | 55 ++- .../module/os/freebsd/spl/spl_procfs_list.c | 3 - .../openzfs/module/os/freebsd/spl/spl_sunddi.c | 3 - .../openzfs/module/os/freebsd/spl/spl_sysevent.c | 3 - .../openzfs/module/os/freebsd/spl/spl_taskq.c | 12 +- .../openzfs/module/os/freebsd/spl/spl_vfs.c | 15 +- sys/contrib/openzfs/module/os/freebsd/spl/spl_vm.c | 3 - .../openzfs/module/os/freebsd/spl/spl_zlib.c | 3 - .../openzfs/module/os/freebsd/spl/spl_zone.c | 7 +- sys/contrib/openzfs/module/os/freebsd/zfs/abd_os.c | 4 +- sys/contrib/openzfs/module/os/freebsd/zfs/arc_os.c | 6 +- .../openzfs/module/os/freebsd/zfs/crypto_os.c | 252 ----------- sys/contrib/openzfs/module/os/freebsd/zfs/dmu_os.c | 30 +- .../openzfs/module/os/freebsd/zfs/event_os.c | 19 - .../openzfs/module/os/freebsd/zfs/kmod_core.c | 7 - .../openzfs/module/os/freebsd/zfs/sysctl_os.c | 3 - .../openzfs/module/os/freebsd/zfs/vdev_file.c | 11 +- .../openzfs/module/os/freebsd/zfs/vdev_geom.c | 4 - .../openzfs/module/os/freebsd/zfs/zfs_acl.c | 2 +- .../openzfs/module/os/freebsd/zfs/zfs_ctldir.c | 28 +- .../openzfs/module/os/freebsd/zfs/zfs_debug.c | 23 +- .../openzfs/module/os/freebsd/zfs/zfs_dir.c | 4 +- .../openzfs/module/os/freebsd/zfs/zfs_file_os.c | 27 +- .../module/os/freebsd/zfs/zfs_ioctl_compat.c | 3 - .../openzfs/module/os/freebsd/zfs/zfs_ioctl_os.c | 7 - .../openzfs/module/os/freebsd/zfs/zfs_vfsops.c | 36 +- .../openzfs/module/os/freebsd/zfs/zfs_vnops_os.c | 292 ++---------- .../os/freebsd/zfs/{zfs_znode.c => zfs_znode_os.c} | 388 +--------------- .../openzfs/module/os/freebsd/zfs/zvol_os.c | 18 +- .../openzfs/module/os/linux/spl/spl-condvar.c | 47 +- sys/contrib/openzfs/module/os/linux/spl/spl-cred.c | 21 +- .../openzfs/module/os/linux/spl/spl-generic.c | 30 +- .../openzfs/module/os/linux/spl/spl-kmem-cache.c | 29 +- sys/contrib/openzfs/module/os/linux/spl/spl-kmem.c | 2 - sys/contrib/openzfs/module/os/linux/spl/spl-proc.c | 13 +- .../openzfs/module/os/linux/spl/spl-shrinker.c | 46 +- .../openzfs/module/os/linux/spl/spl-taskq.c | 24 +- .../openzfs/module/os/linux/spl/spl-thread.c | 47 +- sys/contrib/openzfs/module/os/linux/spl/spl-vmem.c | 1 - sys/contrib/openzfs/module/os/linux/spl/spl-zlib.c | 3 +- sys/contrib/openzfs/module/os/linux/spl/spl-zone.c | 20 +- sys/contrib/openzfs/module/os/linux/zfs/abd_os.c | 190 ++------ sys/contrib/openzfs/module/os/linux/zfs/arc_os.c | 45 -- sys/contrib/openzfs/module/os/linux/zfs/policy.c | 9 - .../openzfs/module/os/linux/zfs/vdev_disk.c | 227 +++++----- .../openzfs/module/os/linux/zfs/vdev_file.c | 9 +- sys/contrib/openzfs/module/os/linux/zfs/zfs_acl.c | 2 +- .../openzfs/module/os/linux/zfs/zfs_ctldir.c | 112 ++++- .../openzfs/module/os/linux/zfs/zfs_debug.c | 40 -- .../openzfs/module/os/linux/zfs/zfs_file_os.c | 74 +--- sys/contrib/openzfs/module/os/linux/zfs/zfs_uio.c | 14 +- .../openzfs/module/os/linux/zfs/zfs_vfsops.c | 103 +---- .../openzfs/module/os/linux/zfs/zfs_vnops_os.c | 53 ++- .../os/linux/zfs/{zfs_znode.c => zfs_znode_os.c} | 406 +---------------- .../openzfs/module/os/linux/zfs/zpl_ctldir.c | 86 +--- .../openzfs/module/os/linux/zfs/zpl_export.c | 39 +- sys/contrib/openzfs/module/os/linux/zfs/zpl_file.c | 290 +----------- .../openzfs/module/os/linux/zfs/zpl_file_range.c | 8 +- .../openzfs/module/os/linux/zfs/zpl_inode.c | 117 +---- .../openzfs/module/os/linux/zfs/zpl_super.c | 26 +- .../openzfs/module/os/linux/zfs/zpl_xattr.c | 100 +---- sys/contrib/openzfs/module/os/linux/zfs/zvol_os.c | 84 ++-- sys/contrib/openzfs/module/zcommon/simd_stat.c | 203 +++++++++ sys/contrib/openzfs/module/zcommon/zfs_prop.c | 8 +- sys/contrib/openzfs/module/zcommon/zfs_valstr.c | 277 ++++++++++++ sys/contrib/openzfs/module/zcommon/zpool_prop.c | 5 +- sys/contrib/openzfs/module/zfs/arc.c | 26 +- sys/contrib/openzfs/module/zfs/dbuf.c | 18 +- sys/contrib/openzfs/module/zfs/dmu.c | 61 ++- sys/contrib/openzfs/module/zfs/dmu_diff.c | 2 +- sys/contrib/openzfs/module/zfs/dmu_objset.c | 2 +- sys/contrib/openzfs/module/zfs/dmu_recv.c | 2 +- sys/contrib/openzfs/module/zfs/dmu_redact.c | 2 +- sys/contrib/openzfs/module/zfs/dmu_send.c | 2 +- sys/contrib/openzfs/module/zfs/dmu_tx.c | 5 +- sys/contrib/openzfs/module/zfs/dnode.c | 4 +- sys/contrib/openzfs/module/zfs/dsl_crypt.c | 2 +- sys/contrib/openzfs/module/zfs/dsl_dataset.c | 11 +- sys/contrib/openzfs/module/zfs/lz4_zfs.c | 3 +- sys/contrib/openzfs/module/zfs/sa.c | 6 +- sys/contrib/openzfs/module/zfs/vdev.c | 15 +- sys/contrib/openzfs/module/zfs/zcp.c | 3 +- sys/contrib/openzfs/module/zfs/zfs_ioctl.c | 2 +- sys/contrib/openzfs/module/zfs/zfs_log.c | 92 ++-- sys/contrib/openzfs/module/zfs/zfs_replay.c | 147 +++--- sys/contrib/openzfs/module/zfs/zfs_vnops.c | 5 + sys/contrib/openzfs/module/zfs/zfs_znode.c | 397 +++++++++++++++++ sys/contrib/openzfs/module/zfs/zio.c | 4 + sys/contrib/openzfs/module/zfs/zvol.c | 116 ++++- sys/contrib/openzfs/scripts/Makefile.am | 1 - sys/contrib/openzfs/scripts/enum-extract.pl | 58 --- sys/contrib/openzfs/scripts/zfs-tests.sh | 73 ++- sys/contrib/openzfs/tests/runfiles/linux.run | 6 + .../tests/test-runner/bin/test-runner.py.in | 12 + .../openzfs/tests/test-runner/bin/zts-report.py.in | 69 +-- .../openzfs/tests/zfs-tests/cmd/mmap_seek.c | 10 + .../openzfs/tests/zfs-tests/cmd/mmap_sync.c | 2 +- .../openzfs/tests/zfs-tests/include/commands.cfg | 8 +- .../openzfs/tests/zfs-tests/include/libtest.shlib | 39 +- .../openzfs/tests/zfs-tests/include/tunables.cfg | 1 + .../openzfs/tests/zfs-tests/tests/Makefile.am | 3 +- .../tests/functional/bclone/bclone_common.kshlib | 4 +- .../functional/bclone/bclone_corner_cases.kshlib | 6 +- .../tests/functional/bclone/bclone_prop_sync.ksh | 8 +- .../functional/block_cloning/block_cloning.kshlib | 4 +- .../block_cloning_cross_enc_dataset.ksh | 8 +- .../tests/functional/cli_root/zdb/zdb_backup.ksh | 4 +- .../zfs_receive_compressed_corrective.ksh | 4 +- .../zfs_receive/zfs_receive_corrective.ksh | 6 +- .../zfs_receive/zfs_receive_from_encrypted.ksh | 6 +- .../cli_root/zfs_receive/zfs_receive_from_zstd.ksh | 4 +- .../zfs_receive_large_block_corrective.ksh | 4 +- .../cli_root/zfs_receive/zfs_receive_raw.ksh | 6 +- .../zfs_receive/zfs_receive_raw_incremental.ksh | 4 +- .../cli_root/zpool_add/zpool_add_dryrun_output.ksh | 6 +- .../cli_root/zpool_create/zpool_create.shlib | 5 +- .../zpool_create/zpool_create_dryrun_output.ksh | 4 +- .../import_cachefile_shared_device.ksh | 2 +- .../zpool_import/import_devices_missing.ksh | 8 +- .../zpool_import/import_rewind_config_changed.ksh | 4 +- .../zpool_import/import_rewind_device_replaced.ksh | 6 +- .../cli_root/zpool_import/zpool_import.cfg | 4 +- .../cli_root/zpool_import/zpool_import.kshlib | 34 +- ...ort_hostid_changed_cachefile_unclean_export.ksh | 10 +- .../zpool_import_hostid_changed_unclean_export.ksh | 9 +- .../cli_root/zpool_reopen/zpool_reopen_003_pos.ksh | 4 +- .../cli_root/zpool_set/user_property_001_pos.ksh | 4 +- .../cli_root/zpool_set/user_property_002_neg.ksh | 22 +- .../zpool_split/zpool_split_dryrun_output.ksh | 6 +- .../cli_root/zpool_status/zpool_status_008_pos.ksh | 6 +- .../tests/functional/cp_files/cp_files_002_pos.ksh | 4 +- .../tests/functional/cp_files/seekflood.c | 7 + .../tests/functional/deadman/deadman_ratelimit.ksh | 8 +- .../tests/functional/deadman/deadman_sync.ksh | 8 +- .../functional/fault/suspend_resume_single.ksh | 4 +- .../tests/functional/history/history_003_pos.ksh | 6 +- .../tests/functional/luks/luks_sanity.ksh | 90 ++++ .../tests/functional/no_space/enospc_ganging.ksh | 6 +- .../zfs-tests/tests/functional/rsend/rsend.kshlib | 14 +- .../tests/functional/rsend/send-c_volume.ksh | 12 +- .../functional/rsend/send-wR_encrypted_zvol.ksh | 6 +- .../functional/rsend/send_encrypted_props.ksh | 14 +- .../rsend/send_encrypted_truncated_files.ksh | 12 +- .../tests/functional/rsend/send_hole_birth.ksh | 2 +- .../tests/functional/slog/slog_replay_fs_001.ksh | 4 +- .../tests/functional/slog/slog_replay_volume.ksh | 4 +- .../functional/zvol/zvol_misc/zvol_misc_fua.ksh | 9 - .../zvol/zvol_misc/zvol_misc_snapdev.ksh | 13 + .../functional/zvol/zvol_misc/zvol_misc_trim.ksh | 9 - sys/contrib/openzfs/udev/zvol_id.c | 7 +- sys/modules/zfs/Makefile | 4 +- sys/modules/zfs/zfs_config.h | 488 ++------------------ sys/modules/zfs/zfs_gitrev.h | 2 +- usr.sbin/fstyp/Makefile | 1 + 400 files changed, 6453 insertions(+), 9830 deletions(-) diff --cc cddl/lib/libicp/Makefile index 1dbe4ace88ed,000000000000..1e90f3c85168 mode 100644,000000..100644 --- a/cddl/lib/libicp/Makefile +++ b/cddl/lib/libicp/Makefile @@@ -1,142 -1,0 +1,143 @@@ + +.PATH: ${SRCTOP}/sys/contrib/openzfs/module/icp + +PACKAGE= zfs +LIB= icp +LIBADD= + +.if ${MACHINE_ARCH} == "amd64" +ASM_SOURCES_C = asm-x86_64/aes/aeskey.c +ASM_SOURCES_AS = \ + asm-x86_64/aes/aes_amd64.S \ + asm-x86_64/aes/aes_aesni.S \ + asm-x86_64/modes/gcm_pclmulqdq.S \ + asm-x86_64/modes/aesni-gcm-x86_64.S \ + asm-x86_64/modes/ghash-x86_64.S \ + asm-x86_64/sha2/sha256-x86_64.S \ + asm-x86_64/sha2/sha512-x86_64.S \ + asm-x86_64/blake3/blake3_avx2.S \ + asm-x86_64/blake3/blake3_avx512.S \ + asm-x86_64/blake3/blake3_sse2.S \ + asm-x86_64/blake3/blake3_sse41.S + +CFLAGS+= -D__amd64 -D_SYS_STACK_H -UHAVE_AES +.elif ${MACHINE_CPUARCH} == "arm" +ASM_SOURCES_C = +ASM_SOURCES_AS = \ + asm-arm/sha2/sha256-armv7.S \ + asm-arm/sha2/sha512-armv7.S +.elif ${MACHINE_ARCH} == "aarch64" +ASM_SOURCES_C = +ASM_SOURCES_AS = \ + asm-aarch64/blake3/b3_aarch64_sse2.S \ + asm-aarch64/blake3/b3_aarch64_sse41.S \ + asm-aarch64/sha2/sha256-armv8.S \ + asm-aarch64/sha2/sha512-armv8.S +.elif ${MACHINE_ARCH} == "powerpc64" +ASM_SOURCES_C = +ASM_SOURCES_AS = \ + asm-ppc64/sha2/sha256-ppc.S \ + asm-ppc64/sha2/sha512-ppc.S \ + asm-ppc64/sha2/sha256-p8.S \ + asm-ppc64/sha2/sha512-p8.S +.elif ${MACHINE_ARCH} == "powerpc64le" +ASM_SOURCES_C = +ASM_SOURCES_AS = \ + asm-ppc64/blake3/b3_ppc64le_sse2.S \ + asm-ppc64/blake3/b3_ppc64le_sse41.S \ + asm-ppc64/sha2/sha256-ppc.S \ + asm-ppc64/sha2/sha512-ppc.S \ + asm-ppc64/sha2/sha256-p8.S \ + asm-ppc64/sha2/sha512-p8.S +.else +ASM_SOURCES_C = +ASM_SOURCES_AS = +.endif + +KERNEL_C = \ + spi/kcf_spi.c \ + api/kcf_ctxops.c \ + api/kcf_cipher.c \ + api/kcf_mac.c \ + algs/aes/aes_impl_aesni.c \ + algs/aes/aes_impl_generic.c \ + algs/aes/aes_impl_x86-64.c \ + algs/aes/aes_impl.c \ + algs/aes/aes_modes.c \ + algs/blake3/blake3.c \ + algs/blake3/blake3_generic.c \ + algs/blake3/blake3_impl.c \ + algs/edonr/edonr.c \ + algs/modes/modes.c \ + algs/modes/cbc.c \ + algs/modes/gcm_generic.c \ + algs/modes/gcm_pclmulqdq.c \ + algs/modes/gcm.c \ + algs/modes/ctr.c \ + algs/modes/ccm.c \ + algs/modes/ecb.c \ + algs/sha2/sha2_generic.c \ + algs/sha2/sha256_impl.c \ + algs/sha2/sha512_impl.c \ + algs/skein/skein.c \ + algs/skein/skein_block.c \ + algs/skein/skein_iv.c \ + illumos-crypto.c \ + io/aes.c \ + io/sha2_mod.c \ + io/skein_mod.c \ + core/kcf_sched.c \ + core/kcf_prov_lib.c \ + core/kcf_callprov.c \ + core/kcf_mech_tabs.c \ + core/kcf_prov_tabs.c \ + $(ASM_SOURCES_C) + +.PATH: ${SRCTOP}/sys/contrib/openzfs/module/zfs +KERNEL_C+= zfs_impl.c + +SRCS= $(ASM_SOURCES_AS) $(KERNEL_C) + +WARNS?= 2 +SHLIB_MAJOR= 3 +CSTD= c99 +CFLAGS+= -DIN_BASE +CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/include +CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libspl/include/ +CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libspl/include/os/freebsd +CFLAGS+= -I${SRCTOP}/sys +CFLAGS+= -I${SRCTOP}/cddl/compat/opensolaris/include +CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/module/icp/include ++CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libzpool/include +CFLAGS+= -include ${SRCTOP}/sys/contrib/openzfs/include/os/freebsd/spl/sys/ccompile.h +CFLAGS+= -DHAVE_ISSETUGID +CFLAGS+= -include ${SRCTOP}/sys/modules/zfs/zfs_config.h + +CFLAGS.aes_amd64.S+= -DLOCORE +CFLAGS.aes_aesni.S+= -DLOCORE +CFLAGS.gcm_pclmulqdq.S+= -DLOCORE +CFLAGS.aesni-gcm-x86_64.S+= -DLOCORE +CFLAGS.ghash-x86_64.S+= -DLOCORE +CFLAGS.sha256-x86_64.S+= -DLOCORE +CFLAGS.sha512-x86_64.S+= -DLOCORE +CFLAGS.blake3_avx2.S = -DLOCORE +CFLAGS.blake3_avx512.S = -DLOCORE +CFLAGS.blake3_sse2.S = -DLOCORE +CFLAGS.blake3_sse41.S = -DLOCORE +CFLAGS.b3_aarch64_sse2.S = -DLOCORE +CFLAGS.b3_aarch64_sse41.S = -DLOCORE +CFLAGS.sha256-armv7.S = -DLOCORE +CFLAGS.sha256-armv8.S = -DLOCORE +CFLAGS.sha512-armv7.S = -DLOCORE +CFLAGS.sha512-armv8.S = -DLOCORE +CFLAGS.b3_ppc64le_sse2.S = -DLOCORE +CFLAGS.b3_ppc64le_sse41.S = -DLOCORE +CFLAGS.sha256-p8.S = -DLOCORE +CFLAGS.sha256-ppc.S = -DLOCORE +CFLAGS.sha512-p8.S = -DLOCORE +CFLAGS.sha512-ppc.S = -DLOCORE + + +LDFLAGS.bfd+= -Wl,-znoexecstack + +.include diff --cc cddl/lib/libicp_rescue/Makefile index 196f96b1fcf8,000000000000..7a77e17bdfc0 mode 100644,000000..100644 --- a/cddl/lib/libicp_rescue/Makefile +++ b/cddl/lib/libicp_rescue/Makefile @@@ -1,139 -1,0 +1,140 @@@ + +.PATH: ${SRCTOP}/sys/contrib/openzfs/module/icp + +PACKAGE= utilities +LIB= icp_rescue +LIBADD= + +.if ${MACHINE_ARCH} == "amd64" +ASM_SOURCES_C = asm-x86_64/aes/aeskey.c +ASM_SOURCES_AS = \ + asm-x86_64/aes/aes_amd64.S \ + asm-x86_64/aes/aes_aesni.S \ + asm-x86_64/modes/gcm_pclmulqdq.S \ + asm-x86_64/modes/aesni-gcm-x86_64.S \ + asm-x86_64/sha2/sha256-x86_64.S \ + asm-x86_64/sha2/sha512-x86_64.S \ + asm-x86_64/blake3/blake3_avx2.S \ + asm-x86_64/blake3/blake3_avx512.S \ + asm-x86_64/blake3/blake3_sse2.S \ + asm-x86_64/blake3/blake3_sse41.S + +CFLAGS+= -D__amd64 -D_SYS_STACK_H +.elif ${MACHINE_CPUARCH} == "arm" +ASM_SOURCES_C = +ASM_SOURCES_AS = \ + asm-arm/sha2/sha256-armv7.S \ + asm-arm/sha2/sha512-armv7.S +.elif ${MACHINE_ARCH} == "aarch64" +ASM_SOURCES_C = +ASM_SOURCES_AS = \ + asm-aarch64/blake3/b3_aarch64_sse2.S \ + asm-aarch64/blake3/b3_aarch64_sse41.S \ + asm-aarch64/sha2/sha256-armv8.S \ + asm-aarch64/sha2/sha512-armv8.S +.elif ${MACHINE_ARCH} == "powerpc64" +ASM_SOURCES_C = +ASM_SOURCES_AS = \ + asm-ppc64/sha2/sha256-ppc.S \ + asm-ppc64/sha2/sha512-ppc.S \ + asm-ppc64/sha2/sha256-p8.S \ + asm-ppc64/sha2/sha512-p8.S +.elif ${MACHINE_ARCH} == "powerpc64le" +ASM_SOURCES_C = +ASM_SOURCES_AS = \ + asm-ppc64/blake3/b3_ppc64le_sse2.S \ + asm-ppc64/blake3/b3_ppc64le_sse41.S \ + asm-ppc64/sha2/sha256-ppc.S \ + asm-ppc64/sha2/sha512-ppc.S \ + asm-ppc64/sha2/sha256-p8.S \ + asm-ppc64/sha2/sha512-p8.S +.else +ASM_SOURCES_C = +ASM_SOURCES_AS = +.endif + +KERNEL_C = \ + spi/kcf_spi.c \ + api/kcf_ctxops.c \ + api/kcf_cipher.c \ + api/kcf_mac.c \ + algs/aes/aes_impl_aesni.c \ + algs/aes/aes_impl_generic.c \ + algs/aes/aes_impl_x86-64.c \ + algs/aes/aes_impl.c \ + algs/aes/aes_modes.c \ + algs/blake3/blake3.c \ + algs/blake3/blake3_generic.c \ + algs/blake3/blake3_impl.c \ + algs/edonr/edonr.c \ + algs/modes/modes.c \ + algs/modes/cbc.c \ + algs/modes/gcm_generic.c \ + algs/modes/gcm_pclmulqdq.c \ + algs/modes/gcm.c \ + algs/modes/ctr.c \ + algs/modes/ccm.c \ + algs/modes/ecb.c \ + algs/sha2/sha2_generic.c \ + algs/sha2/sha256_impl.c \ + algs/sha2/sha512_impl.c \ + algs/skein/skein_block.c \ + illumos-crypto.c \ + io/aes.c \ + io/sha2_mod.c \ + io/skein_mod.c \ + core/kcf_sched.c \ + core/kcf_prov_lib.c \ + core/kcf_callprov.c \ + core/kcf_mech_tabs.c \ + core/kcf_prov_tabs.c \ + $(ASM_SOURCES_C) + +.PATH: ${SRCTOP}/sys/contrib/openzfs/module/zfs +KERNEL_C+= zfs_impl.c + +SRCS= $(ASM_SOURCES_AS) $(KERNEL_C) + +WARNS?= 2 +SHLIB_MAJOR= 3 +CSTD= c99 +CFLAGS+= -DIN_BASE +CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/include +CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libspl/include/ +CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libspl/include/os/freebsd +CFLAGS+= -I${SRCTOP}/sys +CFLAGS+= -I${SRCTOP}/cddl/compat/opensolaris/include +CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/module/icp/include ++CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libzpool/include +CFLAGS+= -include ${SRCTOP}/sys/contrib/openzfs/include/os/freebsd/spl/sys/ccompile.h +CFLAGS+= -DHAVE_ISSETUGID -UHAVE_AVX -DRESCUE +CFLAGS+= -include ${SRCTOP}/sys/modules/zfs/zfs_config.h + +CFLAGS.aes_amd64.S+= -DLOCORE +CFLAGS.aes_aesni.S+= -DLOCORE +CFLAGS.gcm_pclmulqdq.S+= -DLOCORE +CFLAGS.aesni-gcm-x86_64.S+= -DLOCORE +CFLAGS.ghash-x86_64.S+= -DLOCORE +CFLAGS.sha256-x86_64.S+= -DLOCORE +CFLAGS.sha512-x86_64.S+= -DLOCORE +CFLAGS.gcm.c+= -UCAN_USE_GCM_ASM +CFLAGS.blake3_avx2.S = -DLOCORE +CFLAGS.blake3_avx512.S = -DLOCORE +CFLAGS.blake3_sse2.S = -DLOCORE +CFLAGS.blake3_sse41.S = -DLOCORE +CFLAGS.b3_aarch64_sse2.S = -DLOCORE +CFLAGS.b3_aarch64_sse41.S = -DLOCORE +CFLAGS.sha256-armv7.S = -DLOCORE +CFLAGS.sha512-armv7.S = -DLOCORE +CFLAGS.sha256-armv8.S = -DLOCORE +CFLAGS.sha512-armv8.S = -DLOCORE +CFLAGS.b3_ppc64le_sse2.S = -DLOCORE +CFLAGS.b3_ppc64le_sse41.S = -DLOCORE +CFLAGS.sha256-ppc.S = -DLOCORE +CFLAGS.sha256-p8.S = -DLOCORE +CFLAGS.sha512-ppc.S = -DLOCORE +CFLAGS.sha512-p8.S = -DLOCORE + +LDFLAGS.bfd+= -Wl,-znoexecstack + +.include diff --cc cddl/lib/libzfs/Makefile index c05fe0c1c12b,000000000000..bb0127a9108a mode 100644,000000..100644 --- a/cddl/lib/libzfs/Makefile +++ b/cddl/lib/libzfs/Makefile @@@ -1,108 -1,0 +1,108 @@@ - +.PATH: ${SRCTOP}/sys/contrib/openzfs/module/icp +.PATH: ${SRCTOP}/sys/contrib/openzfs/module/zcommon +.PATH: ${SRCTOP}/sys/contrib/openzfs/lib/libzfs +.PATH: ${SRCTOP}/sys/contrib/openzfs/lib/libzfs/os/freebsd +.PATH: ${SRCTOP}/sys/contrib/openzfs/lib/libshare +.PATH: ${SRCTOP}/sys/contrib/openzfs/include +.PATH: ${SRCTOP}/sys/contrib/openzfs/module/zstd +.PATH: ${SRCTOP}/sys/contrib/openzfs/module/zstd/lib + +PACKAGE= zfs +LIB= zfs +LIBADD= \ + avl \ + bsdxml \ + crypto \ + geom \ + m \ + md \ + nvpair \ + pthread \ + rt \ + umem \ + util \ + uutil \ + z \ + zfs_core \ + zutil + +INCS= libzfs.h +USER_C = \ + libzfs_changelist.c \ + libzfs_config.c \ + libzfs_crypto.c \ + libzfs_dataset.c \ + libzfs_diff.c \ + libzfs_import.c \ + libzfs_iter.c \ + libzfs_mount.c \ + libzfs_pool.c \ + libzfs_sendrecv.c \ + libzfs_status.c \ + libzfs_util.c + +# FreeBSD +USER_C += \ + libzfs_compat.c \ + libzfs_zmount.c + +# libshare +USER_C += \ + libshare.c \ + nfs.c \ + os/freebsd/nfs.c \ + os/freebsd/smb.c + +KERNEL_C = \ + cityhash.c \ + zfeature_common.c \ + zfs_comutil.c \ + zfs_deleg.c \ + zfs_fletcher.c \ + zfs_fletcher_superscalar.c \ + zfs_fletcher_superscalar4.c \ + zfs_namecheck.c \ + zfs_prop.c \ ++ zfs_valstr.c \ + zpool_prop.c \ + zprop_common.c + - +ARCH_C = +.if ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "i386" +ARCH_C += zfs_fletcher_intel.c \ + zfs_fletcher_sse.c +CFLAGS += -DHAVE_SSE2 +.endif +.if ${MACHINE_ARCH} == "amd64" +ARCH_C += zfs_fletcher_avx512.c +CFLAGS+= -DHAVE_AVX2 -DHAVE_AVX -D__x86_64 -DHAVE_AVX512F +.endif +.if ${MACHINE_CPUARCH} == "aarch64" +ARCH_C += zfs_fletcher_aarch64_neon.c +.endif + +SRCS= $(USER_C) $(KERNEL_C) $(ARCH_C) + +WARNS?= 2 +SHLIB_MAJOR= 4 +CSTD= c99 +CFLAGS+= -DIN_BASE +CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/include +CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/include/os/freebsd +CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libspl/include +CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libspl/include/os/freebsd +CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libshare ++CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/lib/libzpool/include +CFLAGS+= -I${SRCTOP}/sys/contrib/ck/include +CFLAGS+= -I${SRCTOP}/sys +CFLAGS+= -I${SRCTOP}/cddl/compat/opensolaris/include +CFLAGS+= -I${SRCTOP}/sys/contrib/openzfs/module/icp/include +CFLAGS+= -include ${SRCTOP}/sys/contrib/openzfs/include/os/freebsd/spl/sys/ccompile.h +CFLAGS+= -DHAVE_ISSETUGID +CFLAGS+= -DHAVE_EXECVPE +CFLAGS+= -include ${SRCTOP}/sys/modules/zfs/zfs_config.h +CFLAGS+= -DSYSCONFDIR=\"/etc\" +CFLAGS+= -DPKGDATADIR=\"/usr/share/zfs\" +CFLAGS+= -DZFSEXECDIR=\"${LIBEXECDIR}/zfs\" + +.include diff --cc cddl/lib/libzpool/Makefile index d05babdc26e0,000000000000..c9f8dc39cbdb mode 100644,000000..100644 --- a/cddl/lib/libzpool/Makefile +++ b/cddl/lib/libzpool/Makefile @@@ -1,336 -1,0 +1,339 @@@ - +ZFSTOP= ${SRCTOP}/sys/contrib/openzfs + ++.PATH: ${ZFSTOP}/lib/libzpool ++ +# ZFS_COMMON_SRCS +.PATH: ${ZFSTOP}/module/zfs +.PATH: ${ZFSTOP}/module/zcommon +.PATH: ${ZFSTOP}/module/unicode +# LUA_SRCS +.PATH: ${ZFSTOP}/module/lua +# ZSTD_SRCS +.PATH: ${ZFSTOP}/module/zstd +.PATH: ${ZFSTOP}/module/zstd/lib/common +.PATH: ${ZFSTOP}/module/zstd/lib/compress +.PATH: ${ZFSTOP}/module/zstd/lib/decompress + - .PATH: ${ZFSTOP}/module/os/linux/zfs - - .PATH: ${ZFSTOP}/lib/libzpool - +.if exists(${SRCTOP}/sys/cddl/contrib/opensolaris/common/atomic/${MACHINE_ARCH}/opensolaris_atomic.S) +.PATH: ${SRCTOP}/sys/cddl/contrib/opensolaris/common/atomic/${MACHINE_ARCH} +ATOMIC_SRCS= opensolaris_atomic.S +ACFLAGS+= -Wa,--noexecstack +.else +.PATH: ${SRCTOP}/sys/cddl/compat/opensolaris/kern +ATOMIC_SRCS= opensolaris_atomic.c +.endif + +.if ${MACHINE_ARCH} == "powerpc" || ${MACHINE_ARCH} == "powerpcspe" +# Don't waste GOT entries on small data. +PICFLAG= -fPIC +.endif + +PACKAGE= zfs +LIB= zpool + +USER_C = \ ++ arc_os.c \ + kernel.c \ + taskq.c \ - util.c ++ util.c \ ++ zfs_debug.c ++ ++.PATH: ${ZFSTOP}/module/os/linux/zfs + +KERNEL_C = \ ++ simd_stat.c \ + zfeature_common.c \ + zfs_comutil.c \ + zfs_deleg.c \ + zfs_fletcher.c \ + zfs_fletcher_superscalar.c \ + zfs_fletcher_superscalar4.c \ + zfs_namecheck.c \ + zfs_prop.c \ + zfs_zstd.c \ + zpool_prop.c \ + zprop_common.c \ + abd.c \ + abd_os.c \ + aggsum.c \ + arc.c \ - arc_os.c \ + blake3_zfs.c \ + blkptr.c \ + bplist.c \ + bpobj.c \ + bptree.c \ + bqueue.c \ + btree.c \ + brt.c \ + cityhash.c \ + dbuf.c \ + dbuf_stats.c \ + ddt.c \ + ddt_zap.c \ + dmu.c \ + dmu_diff.c \ + dmu_object.c \ + dmu_objset.c \ + dmu_recv.c \ + dmu_redact.c \ + dmu_send.c \ + dmu_traverse.c \ + dmu_tx.c \ + dmu_zfetch.c \ + dnode.c \ + dnode_sync.c \ + dsl_bookmark.c \ + dsl_dataset.c \ + dsl_deadlist.c \ + dsl_deleg.c \ + dsl_dir.c \ + dsl_crypt.c \ + dsl_pool.c \ + dsl_prop.c \ + dsl_scan.c \ + dsl_synctask.c \ + dsl_destroy.c \ + dsl_userhold.c \ + edonr_zfs.c \ + entropy_common.c \ + error_private.c \ + fm.c \ + fse_compress.c \ + fse_decompress.c \ + gzip.c \ + hist.c \ + hkdf.c \ + huf_compress.c \ *** 8127 LINES SKIPPED *** From nobody Thu Dec 12 15:38:33 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Y8GpQ21J9z5gQFy; Thu, 12 Dec 2024 15:38:38 +0000 (UTC) (envelope-from bapt@freebsd.org) Received: from smtp.freebsd.org (smtp.freebsd.org [96.47.72.83]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Y8GpQ1RD6z4dH5; Thu, 12 Dec 2024 15:38:38 +0000 (UTC) (envelope-from bapt@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734017918; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=1xGiJC4KyNedHGPztbQa+LWR+8FT01vgT/iQQu+Tb1o=; b=dgKSWRtNNVV7OzoHYupIsk9toI8tlK4V9VLtQhdYY6HlXpkx2itt9dXcJIWidX//J7sWHl Aot0tC9lVVqsytmeV3NOwlyHsrEpJbeb+84NlkO6Kzfg4YRhhsfGX2Cje6Vjf/MUzI7uJa UiSFQiO+c/KEvzH/jxTzqKEXwyJ+jLgY3hCucj0v19LVwsmD++bOwdFp8L6kkjpgx3Jl6v j6Tio/iBEsdFh5iWdIKgXCKKjdRu/nM+Vo/4FEMAfPLBVq9WFQ10weMSm7cNo0DVaF9jOU EKyDZAwZyospT5TrT1RXYu+9K8B5pjui9KH1F86ic8WhME9GJjzssgASR7rnxg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734017918; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=1xGiJC4KyNedHGPztbQa+LWR+8FT01vgT/iQQu+Tb1o=; b=VJWFph/rKEhbUq0x1jLcg4pGdiq2vWZMfgIF8eSVx7adra9swzlBGNkRr00AXjWgdpNmOB 0dZAXqz0ft+eQrnDhjyExhUlBjO+SbIahaTm8KZuEfNpUfGG7rGUq2OBeoFrFtzjGdE3/R qLRs8iutRYK14Q9H3UBDrCqa2dNj4YVLGazOcY42+trdGEhXZXsnL0RjBX5U016+zo9+e3 VdszFJp3+jju2+Mem2nHk+Xf6QJ9jxRVImargLGcTEdLFx1QwC872nPY8+mu9Q3L2dThCh wkFgQx6POqO8Vlz/rXj8LboWDWJSSaFZNQty2hLJ0UH4l+sz71XWfdt4aQxFzA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1734017918; a=rsa-sha256; cv=none; b=IFg6q9tAgioVqFhDXbJy+rvSVepXQ4BdPhGTR39VQ6N262o5d0g1UCn0qP5eTirOveD7ZQ X/YVplWDDtAf0oAxWVjXbG64cK+pjtFlY+nZIzEdwTIUOdOgxeEUtKOtEmD1pZKth0ZgsQ Mt7KGq1svQRx7/GaFI5Oo1BRC9IHXXK5unifjYAzxJLK1+2JjNrTcEoLpYK3uv7zmdQW3P 1AtqaLUSONFZC+pc745/wKyroqmL45vk3R4+AK4NuKCT9ShblSycZ94iu9WWArIeVNV5uJ gwjNK4RAXpCUy5XaGDxkULJjKnYNiDRJbo8lMiowU5cpyRlj8pxWUMHQHzwmsg== Received: from aniel.nours.eu (nours.eu [IPv6:2001:41d0:8:3a4d::1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) (Authenticated sender: bapt) by smtp.freebsd.org (Postfix) with ESMTPSA id 4Y8GpQ0KjVz1M1l; Thu, 12 Dec 2024 15:38:38 +0000 (UTC) (envelope-from bapt@freebsd.org) Received: by aniel.nours.eu (Postfix, from userid 1001) id D53F51CE58F; Thu, 12 Dec 2024 16:38:33 +0100 (CET) Date: Thu, 12 Dec 2024 16:38:33 +0100 From: Baptiste Daroussin To: Martin Matuska Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-branches@freebsd.org Subject: Re: git: 2ec8b6948070 - stable/14 - zfs: merge openzfs/zfs@e269af1b3 (zfs-2.2-release) into stable/14 Message-ID: <2yircadojekemjslcf63rrbyd5s6oe6hkwcmakhjzbdyhl6ze3@fgrg5qjbuyra> References: <202412121457.4BCEvRJv022229@gitrepo.freebsd.org> List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <202412121457.4BCEvRJv022229@gitrepo.freebsd.org> On Thu 12 Dec 14:57, Martin Matuska wrote: > The branch stable/14 has been updated by mm: > > URL: https://cgit.FreeBSD.org/src/commit/?id=2ec8b69480708185a273254e4e254140eb2ce633 > This does not build (at least does not incrementally build): /home/pkgbuild/worktrees/stable/14/sys/contrib/openzfs/module/os/linux/zfs/arc_os.c:45:10: fatal error: 'sys/shrinker.h' file not found the pkgbase builders are now broken ;) From nobody Thu Dec 12 15:51:27 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Y8H5C49Zzz5gQL7; Thu, 12 Dec 2024 15:51: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 4Y8H5C25Gqz4fQF; Thu, 12 Dec 2024 15:51:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734018687; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=U5++p9/TjBX2MXvd+ITfwtfSuM9UnBhTUu20q3ntBMo=; b=qx+d3MtEx76FVHdiWToStKaln3xuJYCNTU9WAb29Pr8GuPei+e5rIKxxaKoWJfTIxO4jTQ WcnbnSh3l+JKwu75Uw4RpNX7rkhsHTBl5nlZVcX6C0dlZkM+wfkzv3BjoeqFBoD7wAoYTX 2FJaS0a+TIel1VUqkLIFpjbLY+UJ3vkUTYiscJQRUr+JhHbZz2Q1qIBfLkwaTbOv6T+16p h0i3PW7m41HovSOAe7X+vK5Tj0dDkatDNvAcKo+kR5io3VOYIeTMSWXUo7gDbLtywRQ1Nb /LyOr3odgru01ahGAddQpL9VBRr7KukW/GO8zKFabPyB3mizPkVTw4xk4AIuAg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734018687; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=U5++p9/TjBX2MXvd+ITfwtfSuM9UnBhTUu20q3ntBMo=; b=XvzNjJJJqliRjDepx4j+Mz4qVhhO5E3ANcvoV1E/1XdqcFmRkZClY7Qj+0B1vHHND7+Rxe rFzZkpDxXOgZ6sLKWnV1h5eeMcvkUDJjoBvau8dSjUS1Tj6gyUhKYPztxE1y/eO21NJQaG IHzIMnzlxHnqJ0xTuznidKDZ1N9cf8DYH4F0zLRg6mIB8a/SevsC5QXPs6vGHDw4lh1xva 0dV/M36MAS46bCcM8w8RfQAMnrK2yMlkqYQ8rB35k4bG6FtH/a9cU1LfUrgmlNNEiFnznz xtVcDWdOdK22pPiBiWXEH79c97rAkSnPbn1KnUJsVdLCeCeUVSIpD/j0tba5pw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1734018687; a=rsa-sha256; cv=none; b=djTMMqXLY61Hb+EWORMwiGlnn/Di5TFx2fBbY0mCK3Lg5+Wx1f6KOg9oWSKmkP+zbvSVde G9ZTKu9TWohmpPGKfMrjTMCVjIPjpznFeGKB7kZvSXR2C1A4h8aaSIuxRGXGgaORD3+yDP pAKaCLioggrwmyzYkQA2UOKs/RAOborLuZ0/g/x73Up/CtgUWcHH+24BbPRgEMqq2ZSLPy QiaY6O8aBVx1SopErYIbcr+P8rjZq7/5WitUehABifZLrFke7zx4ue0YWwgRYCfAVUoQoM l6D7bf2SkotKz7P4yuLG3r7MsjxEORA1kvl62aneclMWTsSQ067c3ZkYLBNu7w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Y8H5C1SJlzyMc; Thu, 12 Dec 2024 15:51: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 4BCFpRUE031533; Thu, 12 Dec 2024 15:51:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BCFpRgq031530; Thu, 12 Dec 2024 15:51:27 GMT (envelope-from git) Date: Thu, 12 Dec 2024 15:51:27 GMT Message-Id: <202412121551.4BCFpRgq031530@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: 07d147a7fcbf - stable/14 - sh(1): add -l option List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bapt X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 07d147a7fcbf61125cad0470b83fe203f725dc39 Auto-Submitted: auto-generated The branch stable/14 has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=07d147a7fcbf61125cad0470b83fe203f725dc39 commit 07d147a7fcbf61125cad0470b83fe203f725dc39 Author: Baptiste Daroussin AuthorDate: 2024-11-20 10:48:39 +0000 Commit: Baptiste Daroussin CommitDate: 2024-12-12 15:51:17 +0000 sh(1): add -l option -l is required by LSB for login shell, all other shells: bash, zsh, oksh, mksh, ... implements it. with -l sh will act as a login shell and read the profile. MFC After: 1 week Obtained From: dash (3b7c8442bfe7c2fd0a6b0415df6ddf66a399fd55) Reviewed by: kib, lme Differential Revision: https://reviews.freebsd.org/D47681 (cherry picked from commit 65f5dd42f11cdcb7716e6cdd09fac2314c144c1f) --- bin/sh/main.c | 5 +++-- bin/sh/options.c | 24 ++++++++++++++++-------- bin/sh/options.h | 2 +- bin/sh/sh.1 | 10 ++++++---- 4 files changed, 26 insertions(+), 15 deletions(-) diff --git a/bin/sh/main.c b/bin/sh/main.c index 7a4dbc254f81..257f6b16162c 100644 --- a/bin/sh/main.c +++ b/bin/sh/main.c @@ -107,6 +107,7 @@ main(int argc, char *argv[]) static struct stackmark smark, smark2; volatile int state; char *shinit; + int login; (void) setlocale(LC_ALL, ""); initcharset(); @@ -140,13 +141,13 @@ main(int argc, char *argv[]) initvar(); setstackmark(&smark); setstackmark(&smark2); - procargs(argc, argv); + login = procargs(argc, argv); trap_init(); pwd_init(iflag); INTON; if (iflag) chkmail(1); - if (argv[0] && argv[0][0] == '-') { + if (login) { state = 1; read_profile("/etc/profile"); state1: diff --git a/bin/sh/options.c b/bin/sh/options.c index 87ee4ab5c658..43a8ee47411e 100644 --- a/bin/sh/options.c +++ b/bin/sh/options.c @@ -70,7 +70,7 @@ char *nextopt_optptr; /* used by nextopt */ char *minusc; /* argument to -c option */ -static void options(int); +static int options(int); static void minus_o(char *, int); static void setoption(int, int); static void setoptionbyindex(int, int); @@ -82,19 +82,20 @@ static int getopts(char *, char *, char **, char ***, char **); * Process the shell command line arguments. */ -void +int procargs(int argc, char **argv) { - int i; + int i, login; char *scriptname; argptr = argv; + login = argptr[0] != NULL && argptr[0][0] == '-'; if (argc > 0) argptr++; for (i = 0; i < NOPTS; i++) optval[i] = 2; privileged = (getuid() != geteuid() || getgid() != getegid()); - options(1); + login |= options(1); if (*argptr == NULL && minusc == NULL) sflag = 1; if (iflag != 0 && sflag == 1 && isatty(0) && isatty(1)) { @@ -125,6 +126,8 @@ procargs(int argc, char **argv) argptr++; } optschanged(); + + return (login); } @@ -145,12 +148,13 @@ optschanged(void) * to the set special builtin. */ -static void +static int options(int cmdline) { char *kp, *p; int val; int c; + int login = 0; if (cmdline) minusc = NULL; @@ -196,6 +200,8 @@ options(int cmdline) if (q == NULL || minusc != NULL) error("Bad -c option"); minusc = q; + } else if (c == 'l') { + login = 1; } else if (c == 'o') { minus_o(*argptr, val); if (*argptr) @@ -204,13 +210,13 @@ options(int cmdline) setoption(c, val); } } - return; + return (login); /* When processing `set', a single "-" means turn off -x and -v */ end_options1: if (!cmdline) { xflag = vflag = 0; - return; + return (login); } /* @@ -223,7 +229,7 @@ end_options2: if (!cmdline) { if (*argptr == NULL) setparam(0, argptr); - return; + return (login); } /* @@ -242,6 +248,8 @@ end_options2: /* We need to keep the final argument */ argptr--; } + + return (login); } static void diff --git a/bin/sh/options.h b/bin/sh/options.h index 9c516b07ad23..a477f24e90ca 100644 --- a/bin/sh/options.h +++ b/bin/sh/options.h @@ -111,7 +111,7 @@ extern char **argptr; /* argument list for builtin commands */ extern char *shoptarg; /* set by nextopt */ extern char *nextopt_optptr; /* used by nextopt */ -void procargs(int, char **); +int procargs(int, char **); void optschanged(void); void freeparam(struct shparam *); int nextopt(const char *); diff --git a/bin/sh/sh.1 b/bin/sh/sh.1 index 03e8af70c9aa..1a0275a396ea 100644 --- a/bin/sh/sh.1 +++ b/bin/sh/sh.1 @@ -31,7 +31,7 @@ .\" .\" from: @(#)sh.1 8.6 (Berkeley) 5/4/95 .\" -.Dd December 14, 2022 +.Dd November 20, 2024 .Dt SH 1 .Os .Sh NAME @@ -39,14 +39,14 @@ .Nd command interpreter (shell) .Sh SYNOPSIS .Nm -.Op Fl /+abCEefhIimnPpTuVvx +.Op Fl /+abCEefhIilmnPpTuVvx .Op Fl /+o Ar longname .Oo .Ar script .Op Ar arg ... .Oc .Nm -.Op Fl /+abCEefhIimnPpTuVvx +.Op Fl /+abCEefhIilmnPpTuVvx .Op Fl /+o Ar longname .Fl c Ar string .Oo @@ -54,7 +54,7 @@ .Op Ar arg ... .Oc .Nm -.Op Fl /+abCEefhIimnPpTuVvx +.Op Fl /+abCEefhIilmnPpTuVvx .Op Fl /+o Ar longname .Fl s .Op Ar arg ... @@ -253,6 +253,8 @@ Ignore from input when in interactive mode. .It Fl i Li interactive Force the shell to behave interactively. +.It Fl l +Force the shell to act as if it has been invoked as a login shell. .It Fl m Li monitor Turn on job control (set automatically when interactive). A new process group is created for each pipeline (called a job). From nobody Thu Dec 12 15:52:31 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Y8H6R6plRz5gQLS; Thu, 12 Dec 2024 15:52: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 4Y8H6R5JGrz4fW0; Thu, 12 Dec 2024 15:52:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734018751; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9fNXJTZaO9UOTUpVbV153feRnRhIMcE8zO5r8QVYTWg=; b=f7KfCAxfz1oQkf4rCGoyHCdOWe13BfLf0GfTq8RL0dI7ddvK9xSOW7SiwiJnGMfSOXWmCj WRiuIg9rsW9C+V9HjLt8zff5R7ieVV0YkYWWPXx7Iliz5aBhD03pNKDmJm7/8NQFN49K1s cJker2tTdTHQ9zIb3qq28gV3lUipREfaHC6PLLKpbXK+VeDFeRFpJaLlRkIykrWIuZDo1a wjft0oGiRMHZl83ovffDOHrT7M5ghfF/5uGF72vLf3OIvQToeGtgM6Re1FjQwETWrD8nxJ CVIgM+h43IqEiK80pOnHuKkXtZZaNGqE8+t1mKjDO59CAes8AKC+8gXYQmjE9w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734018751; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9fNXJTZaO9UOTUpVbV153feRnRhIMcE8zO5r8QVYTWg=; b=pQOPu6kN2abeNgqauLBPPu4/mrOpsa3EeonsU5iBvv0mY+K72FC2R2zf3Z5WqHHOtfVQPM zoJcKT+CruPbnR1xCe0SDHz3XnVYxJUjQRB4WhaDy6dZqfarLZT4BWGmYGhYL24Z9zwDsl /E7O9s+c2shyDE9+2bkehhnSmJkNfvrliMYPSZ8s71S8gkUJaUb9QFNqBVkOgwcdaf3Y8+ 23pDholAi4eSyjjV8FaAI1HhO3M26yGckf+8Fg0m/bQZQyKdfSLQdjkruxexRhB6j1GNWh pzDn/uu5NBBp5pcZRYqcGXsma3P8iCfz8Qk7BQV403H2KPIVxriGCA9XdoxkmA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1734018751; a=rsa-sha256; cv=none; b=WN6lvWIcmr+N4oO4WY7u9/S3dUPPQpAPaFZ5jlujtybFBPlczriJIK5XaFauGhk2z3O9wd DhOW75gjCNEgQsqeTAX77lOG+shEe/zVI1zwtze9Idxs3gU161jq/r6njrOa7O0Q9e92UF b8dr5cs/tfJAz/SVhxygf6Sxyi/bTwbkdKK/HqpN/fSRTfq2K1CZCEB0/UY8KP6kLjBkrK NTM2V9ya1uhdv0kGvE9/hhIrgmiaXosheOjjYUc8QXZ16EDNWbkdGbNygtbNgzL8BC6Gti XUvoQexGn9ZQdkZgqoert6Wb5qe3zskZDUsmlApfuh2M85T/OmGmSwhPslSfAA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Y8H6R4wLpz10Ch; Thu, 12 Dec 2024 15:52: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 4BCFqVsW031992; Thu, 12 Dec 2024 15:52:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BCFqVSe031989; Thu, 12 Dec 2024 15:52:31 GMT (envelope-from git) Date: Thu, 12 Dec 2024 15:52:31 GMT Message-Id: <202412121552.4BCFqVSe031989@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: c062d3ec6031 - stable/14 - nuageinit: implement ssh_keys 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: c062d3ec6031372c2591d3a0eac42de25efdc165 Auto-Submitted: auto-generated The branch stable/14 has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=c062d3ec6031372c2591d3a0eac42de25efdc165 commit c062d3ec6031372c2591d3a0eac42de25efdc165 Author: Baptiste Daroussin AuthorDate: 2024-11-27 08:52:29 +0000 Commit: Baptiste Daroussin CommitDate: 2024-12-12 15:52:25 +0000 nuageinit: implement ssh_keys support MFC After: 1 week Sponsored by: OVHCloud (cherry picked from commit 41fe9d53005ef213ff16d9b095c0a88e3f2fb296) --- libexec/nuageinit/nuageinit | 42 +++++++++++++++++++++++---- libexec/nuageinit/tests/nuageinit.sh | 56 ++++++++++++++++++++++++++++++++++++ 2 files changed, 93 insertions(+), 5 deletions(-) diff --git a/libexec/nuageinit/nuageinit b/libexec/nuageinit/nuageinit index c8f74d13b7fd..5249c09eb5f1 100755 --- a/libexec/nuageinit/nuageinit +++ b/libexec/nuageinit/nuageinit @@ -7,6 +7,7 @@ local nuage = require("nuage") local ucl = require("ucl") local yaml = require("yaml") +local sys_stat = require("posix.sys.stat") if #arg ~= 2 then nuage.err("Usage: " .. arg[0] .. " ( | )", false) @@ -28,13 +29,22 @@ if not root then root = "" end -local function open_config(name) - nuage.mkdir_p(root .. "/etc/rc.conf.d") - local f, err = io.open(root .. "/etc/rc.conf.d/" .. name, "w") +local function openat(dir, name) + local path_dir = root .. dir + local path_name = path_dir .. "/" .. name + nuage.mkdir_p(path_dir) + local f, err = io.open(path_name, "w") if not f then - nuage.err("unable to open " .. name .. " config: " .. err) + nuage.err("unable to open " .. path_name .. ": " .. err) end - return f + return f, path_name +end +local function open_ssh_key(name) + return openat("/etc/ssh", name) +end + +local function open_config(name) + return openat("/etc/rc.conf.d", name) end local function get_ifaces() @@ -268,6 +278,28 @@ if line == "#cloud-config" then -- default user if none are defined nuage.adduser(default_user) end + if obj.ssh_keys and type(obj.ssh_keys) == "table" then + for key, val in pairs(obj.ssh_keys) do + for keyname, keytype in key:gmatch("(%w+)_(%w+)") do + local sshkn = nil + if keytype == "public" then + sshkn = "ssh_host_" .. keyname .. "_key.pub" + elseif keytype == "private" then + sshkn = "ssh_host_" .. keyname .. "_key" + end + if sshkn then + local sshkey, path = open_ssh_key(sshkn) + if sshkey then + sshkey:write(val .. "\n") + sshkey:close() + end + if keytype == "private" then + sys_stat.chmod(path, 384) + end + end + end + end + end if obj.ssh_authorized_keys then local homedir = nuage.adduser(default_user) for _, k in ipairs(obj.ssh_authorized_keys) do diff --git a/libexec/nuageinit/tests/nuageinit.sh b/libexec/nuageinit/tests/nuageinit.sh index f7f39ce32ad8..7e1310c4f0f9 100644 --- a/libexec/nuageinit/tests/nuageinit.sh +++ b/libexec/nuageinit/tests/nuageinit.sh @@ -18,6 +18,7 @@ atf_test_case config2_pubkeys_user_data atf_test_case config2_pubkeys_meta_data atf_test_case config2_network atf_test_case config2_network_static_v4 +atf_test_case config2_ssh_keys args_body() { @@ -404,6 +405,60 @@ EOF atf_check -o file:routing cat "${PWD}"/etc/rc.conf.d/routing } +config2_ssh_keys_head() +{ + atf_set "require.user" root +} +config2_ssh_keys_body() +{ + here=$(pwd) + export NUAGE_FAKE_ROOTDIR=$(pwd) + mkdir -p media/nuageinit + touch media/nuageinit/meta_data.json + cat > media/nuageinit/user-data << EOF +#cloud-config +ssh_keys: + rsa_private: | + -----BEGIN RSA PRIVATE KEY----- + MIIBxwIBAAJhAKD0YSHy73nUgysO13XsJmd4fHiFyQ+00R7VVu2iV9Qco + ... + -----END RSA PRIVATE KEY----- + rsa_public: ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAGEAoPRhIfLvedSDKw7Xd ... + ed25519_private: | + -----BEGIN OPENSSH PRIVATE KEY----- + blabla + ... + -----END OPENSSH PRIVATE KEY----- + ed25519_public: ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIK+MH4E8KO32N5CXRvXVqvyZVl0+6ue4DobdhU0FqFd+ +EOF + mkdir -p etc/ssh + cat > etc/master.passwd << EOF +root:*:0:0::0:0:Charlie &:/root:/bin/csh +sys:*:1:0::0:0:Sys:/home/sys:/bin/csh +EOF + pwd_mkdb -d etc ${here}/etc/master.passwd + cat > etc/group << EOF +wheel:*:0:root +users:*:1: +EOF + atf_check /usr/libexec/nuageinit "${PWD}"/media/nuageinit config-2 + _expected="-----BEGIN RSA PRIVATE KEY----- +MIIBxwIBAAJhAKD0YSHy73nUgysO13XsJmd4fHiFyQ+00R7VVu2iV9Qco +... +-----END RSA PRIVATE KEY----- +" + atf_check -o inline:"${_expected}" cat ${PWD}/etc/ssh/ssh_host_rsa_key + _expected="ssh-rsa AAAAB3NzaC1yc2EAAAABIwAAAGEAoPRhIfLvedSDKw7Xd ...\n" + atf_check -o inline:"${_expected}" cat ${PWD}/etc/ssh/ssh_host_rsa_key.pub + _expected="-----BEGIN OPENSSH PRIVATE KEY----- +blabla +... +-----END OPENSSH PRIVATE KEY-----\n" + 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 +} + atf_init_test_cases() { atf_add_test_case args @@ -418,4 +473,5 @@ atf_init_test_cases() atf_add_test_case config2_pubkeys_meta_data atf_add_test_case config2_network atf_add_test_case config2_network_static_v4 + atf_add_test_case config2_ssh_keys } From nobody Thu Dec 12 16:00:53 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Y8HJ51zpFz5gRZp; Thu, 12 Dec 2024 16:00:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Y8HJ51QWNz4gLk; Thu, 12 Dec 2024 16:00:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734019253; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Ae9hUhsQ+0bKLQgDlvIN9zvzfSTEoFbi58ufviitY+g=; b=IeP3V/dq/ZPLZ5LVDzuYm2bILcvtgsb6JK7nWLMSfuZeTrU3CP4EX2wvnNEFRnrFm3HJ62 IGNs4Jb4xS8MPGTJP6cN9Y2JB0TGCeRUsRaXpBLCZLfjmXusaXfqtw0uzNjoMqlydhQDUU AcToMctqpWaGBzS1ncqOyb1zgAHQHvrqCV3T5+XYs/vN8WTgHagCa/6OF1yYZ3/nYOUVwU DkLLhWjwy18h3FF5AG1OqDz/KIx1HawFAkXKTDe7jFx5d1A5m2Es/WaoN8jfsoU4MkyQck Nq1weu6uvpQMAuvexCaFdDQEcXXwcQCNlBPyV9Bopi1HDp7RWuoyLWz5eA8rKw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734019253; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Ae9hUhsQ+0bKLQgDlvIN9zvzfSTEoFbi58ufviitY+g=; b=BB+WzcfwhbUM9R939nCcFInj9LKDq5G4V3fB6JyysFXfwNwiKEnRkxwD+h2Aq+9WxMg4zJ IMNWi9gxFqfVtYXjb4VfP4BmolxZXRH4J6C+o/pxtAiWE3N7VBUUXfOnwgtqN7Pa6r6jpu Ur9dnJM4fN0O3qxf22nbV4XctKmjKmDRuPVKtITbu7VK06pVbCrOMgfxKgsUTsl63S2ekE vWrfN5FtCYLQ2quikfHTYMK6F6akyeC7vXPxmNuJApfChWfxRS9Tg62P+qxO87hM4XeRg/ pfrvovVP8SA7H6/QSMzJG+YFmZX4ulJuUy0SEHnqNWmpTzbzlL/Jnf7b+MwppQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1734019253; a=rsa-sha256; cv=none; b=w2thS5gEHhhKwtHAEG+T0hfbICPq8XQfBH7mdUfAwyisVNsg5V+lNrM4iscuYXvQ7m/TKx 6ai4uVGFD+QkpRu6ap7BLEbFM+jSPlHATFiEQFpGydxQcZuAHjqTouKacEsbqYud5ZAJUb 9fOivegNuYppB3L6HXtyfYFFLhKbY8T+KcZAAzooyk9A3vE+mghl6n1Yr2AwVL6Tqo4YMD C9ftnrd0+EUMHDtSrlsKOvrDtgdg5De+IQnxIkKN5s6XaeKdEJrJgd9XUEcX/rjA+Ysc/Z 8D8ff3XRqE08k7Ooj9+E64ZEJGB3c2tRFjSD7OhDuhQLu5ssk8p/PbqmT10rEg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Y8HJ511kCzyx7; Thu, 12 Dec 2024 16:00: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 4BCG0row044366; Thu, 12 Dec 2024 16:00:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BCG0r6G044363; Thu, 12 Dec 2024 16:00:53 GMT (envelope-from git) Date: Thu, 12 Dec 2024 16:00:53 GMT Message-Id: <202412121600.4BCG0r6G044363@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: 973a9a36fd56 - stable/13 - sh(1): add -l option List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bapt X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 973a9a36fd56fefa44ce2ab22eb67bb2077c1f84 Auto-Submitted: auto-generated The branch stable/13 has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=973a9a36fd56fefa44ce2ab22eb67bb2077c1f84 commit 973a9a36fd56fefa44ce2ab22eb67bb2077c1f84 Author: Baptiste Daroussin AuthorDate: 2024-11-20 10:48:39 +0000 Commit: Baptiste Daroussin CommitDate: 2024-12-12 16:00:48 +0000 sh(1): add -l option -l is required by LSB for login shell, all other shells: bash, zsh, oksh, mksh, ... implements it. with -l sh will act as a login shell and read the profile. MFC After: 1 week Obtained From: dash (3b7c8442bfe7c2fd0a6b0415df6ddf66a399fd55) Reviewed by: kib, lme Differential Revision: https://reviews.freebsd.org/D47681 (cherry picked from commit 65f5dd42f11cdcb7716e6cdd09fac2314c144c1f) --- bin/sh/main.c | 5 +++-- bin/sh/options.c | 24 ++++++++++++++++-------- bin/sh/options.h | 2 +- bin/sh/sh.1 | 10 ++++++---- 4 files changed, 26 insertions(+), 15 deletions(-) diff --git a/bin/sh/main.c b/bin/sh/main.c index d422cff4cf0f..18bcf4ca0648 100644 --- a/bin/sh/main.c +++ b/bin/sh/main.c @@ -101,6 +101,7 @@ main(int argc, char *argv[]) struct stackmark smark, smark2; volatile int state; char *shinit; + int login; (void) setlocale(LC_ALL, ""); initcharset(); @@ -134,13 +135,13 @@ main(int argc, char *argv[]) initvar(); setstackmark(&smark); setstackmark(&smark2); - procargs(argc, argv); + login = procargs(argc, argv); trap_init(); pwd_init(iflag); INTON; if (iflag) chkmail(1); - if (argv[0] && argv[0][0] == '-') { + if (login) { state = 1; read_profile("/etc/profile"); state1: diff --git a/bin/sh/options.c b/bin/sh/options.c index f55e83f551a6..17fd878fa530 100644 --- a/bin/sh/options.c +++ b/bin/sh/options.c @@ -70,7 +70,7 @@ char *nextopt_optptr; /* used by nextopt */ char *minusc; /* argument to -c option */ -static void options(int); +static int options(int); static void minus_o(char *, int); static void setoption(int, int); static void setoptionbyindex(int, int); @@ -82,19 +82,20 @@ static int getopts(char *, char *, char **, char ***, char **); * Process the shell command line arguments. */ -void +int procargs(int argc, char **argv) { - int i; + int i, login; char *scriptname; argptr = argv; + login = argptr[0] != NULL && argptr[0][0] == '-'; if (argc > 0) argptr++; for (i = 0; i < NOPTS; i++) optval[i] = 2; privileged = (getuid() != geteuid() || getgid() != getegid()); - options(1); + login |= options(1); if (*argptr == NULL && minusc == NULL) sflag = 1; if (iflag != 0 && sflag == 1 && isatty(0) && isatty(1)) { @@ -125,6 +126,8 @@ procargs(int argc, char **argv) argptr++; } optschanged(); + + return (login); } @@ -145,12 +148,13 @@ optschanged(void) * to the set special builtin. */ -static void +static int options(int cmdline) { char *kp, *p; int val; int c; + int login = 0; if (cmdline) minusc = NULL; @@ -196,6 +200,8 @@ options(int cmdline) if (q == NULL || minusc != NULL) error("Bad -c option"); minusc = q; + } else if (c == 'l') { + login = 1; } else if (c == 'o') { minus_o(*argptr, val); if (*argptr) @@ -204,13 +210,13 @@ options(int cmdline) setoption(c, val); } } - return; + return (login); /* When processing `set', a single "-" means turn off -x and -v */ end_options1: if (!cmdline) { xflag = vflag = 0; - return; + return (login); } /* @@ -223,7 +229,7 @@ end_options2: if (!cmdline) { if (*argptr == NULL) setparam(0, argptr); - return; + return (login); } /* @@ -242,6 +248,8 @@ end_options2: /* We need to keep the final argument */ argptr--; } + + return (login); } static void diff --git a/bin/sh/options.h b/bin/sh/options.h index 811b395c1c5f..cd28baeeed6d 100644 --- a/bin/sh/options.h +++ b/bin/sh/options.h @@ -109,7 +109,7 @@ extern char **argptr; /* argument list for builtin commands */ extern char *shoptarg; /* set by nextopt */ extern char *nextopt_optptr; /* used by nextopt */ -void procargs(int, char **); +int procargs(int, char **); void optschanged(void); void freeparam(struct shparam *); int nextopt(const char *); diff --git a/bin/sh/sh.1 b/bin/sh/sh.1 index 8f4434165191..59334d2042a6 100644 --- a/bin/sh/sh.1 +++ b/bin/sh/sh.1 @@ -31,7 +31,7 @@ .\" .\" from: @(#)sh.1 8.6 (Berkeley) 5/4/95 .\" -.Dd May 10, 2021 +.Dd November 20, 2024 .Dt SH 1 .Os .Sh NAME @@ -39,14 +39,14 @@ .Nd command interpreter (shell) .Sh SYNOPSIS .Nm -.Op Fl /+abCEefhIimnPpTuVvx +.Op Fl /+abCEefhIilmnPpTuVvx .Op Fl /+o Ar longname .Oo .Ar script .Op Ar arg ... .Oc .Nm -.Op Fl /+abCEefhIimnPpTuVvx +.Op Fl /+abCEefhIilmnPpTuVvx .Op Fl /+o Ar longname .Fl c Ar string .Oo @@ -54,7 +54,7 @@ .Op Ar arg ... .Oc .Nm -.Op Fl /+abCEefhIimnPpTuVvx +.Op Fl /+abCEefhIilmnPpTuVvx .Op Fl /+o Ar longname .Fl s .Op Ar arg ... @@ -253,6 +253,8 @@ Ignore from input when in interactive mode. .It Fl i Li interactive Force the shell to behave interactively. +.It Fl l +Force the shell to act as if it has been invoked as a login shell. .It Fl m Li monitor Turn on job control (set automatically when interactive). A new process group is created for each pipeline (called a job). From nobody Thu Dec 12 16:02:51 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Y8HLM4pHSz5gRBV; Thu, 12 Dec 2024 16:02:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Y8HLM3xPGz4gj0; Thu, 12 Dec 2024 16:02:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734019371; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=s0XCFghncalSi/EzgSvyWY4F8xuNKKmhM0EvVVFTsXQ=; b=cxR7JHR35SqlT29Yt3VdJZTcTs44WRgfAv7DZYGzE7kL8s1NAcc/znO+XNw8nUigCGNlXG f8eEDmLCVIy33KmhBhD23dzxexrDGshAY9Vw9jTQu7pUpvlRQ2CUnfJJm+atWSYD/zmAte kkqchn5iB5dglIt+R69vWMweqRf6kIu1BgzWP5ZohOZD6bxV9SY5e/bzhk5+S1E+hsLc6o uQW0Hf/sRUtXKchWbrRiD/kESFLKZ2ybRu4MyDhk4Nc90Q2mQ5r7cjfM+HxSDZyRRdYsmi U4uERDet/1Ph3lYsmgpTLxowVPBbrZ2n14GWI5rABbiqbruXQ2xVsFB+qPHN9A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734019371; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=s0XCFghncalSi/EzgSvyWY4F8xuNKKmhM0EvVVFTsXQ=; b=aVxv5R2Wtao4KQ5jvT+OVbVaAHhEYk0QCk4v2L+rw6olE5EdNYrI1drcGq1kCfp87iLIr3 OxEARPdrhh5GhYUfpaGmyBVi+qwJcGdtvIAxVp+kYI01eazYh0OWAxczmYN8PFNbLTGEVT p1gXCkLFJifHoyHFjAveGFl857Tmc/xGja0Ww7GcL2Oo1HNb4Sj1UeFyrESX1FezrfUtMl yIKJn8Ctl23BUOIbDt4ASYzPWcLvgm3RR9yrnPaQWrS6GHPuNnQdSzhQNOtigOl1rTJysW ElE82dFHoylRCnWBg68Ly8bN860lh8iF8N0rnFMgWyGwDUN8s4avdOY7Jlotiw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1734019371; a=rsa-sha256; cv=none; b=M5tZh6qLM5kOZvhPQ9kN0UZ+q9/2vK5Auk9XTW/9oQtGKyPT0i2r/uESQvjt0cTYF7ZfTR xaT/isEeJ+iQdq7eXToGxtv4NrSXXkQWl1NuXO+rF4wTDdQvBmbzLjV/EhQtoebuoVwuZ4 LIgkueT5y6lRnRa3V1FOVaR4mAVBmJtV7tJGM6zgHfNwn5Q2mANAK+ap1ayU1jOAQdBjMF QaDpEkL0W0dkaVo3LcMEFYjTEtFKzZr2jfJlBoyRJNamyv/QnjfR+EuoRWUvkSk/iyvS3k Rlaot/IhsfMmtPufQDbBYxi0hwSgFikkCmdhFF3H9zCyHqBp8jaL3UCGxkd7nw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Y8HLM3Xn1z10B1; Thu, 12 Dec 2024 16:02:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4BCG2pug052802; Thu, 12 Dec 2024 16:02:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BCG2pjg052799; Thu, 12 Dec 2024 16:02:51 GMT (envelope-from git) Date: Thu, 12 Dec 2024 16:02:51 GMT Message-Id: <202412121602.4BCG2pjg052799@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: 6e1b857b89d4 - stable/13 - sh(1): add -l option List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bapt X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 6e1b857b89d4e22fe711eef45e2e32e6b6606a0b Auto-Submitted: auto-generated The branch stable/13 has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=6e1b857b89d4e22fe711eef45e2e32e6b6606a0b commit 6e1b857b89d4e22fe711eef45e2e32e6b6606a0b Author: Baptiste Daroussin AuthorDate: 2024-11-20 10:48:39 +0000 Commit: Baptiste Daroussin CommitDate: 2024-12-12 16:02:48 +0000 sh(1): add -l option -l is required by LSB for login shell, all other shells: bash, zsh, oksh, mksh, ... implements it. with -l sh will act as a login shell and read the profile. MFC After: 1 week Obtained From: dash (3b7c8442bfe7c2fd0a6b0415df6ddf66a399fd55) Reviewed by: kib, lme Differential Revision: https://reviews.freebsd.org/D47681 (cherry picked from commit 65f5dd42f11cdcb7716e6cdd09fac2314c144c1f) --- bin/sh/sh.1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/sh/sh.1 b/bin/sh/sh.1 index 59334d2042a6..c990a4adb3c0 100644 --- a/bin/sh/sh.1 +++ b/bin/sh/sh.1 @@ -29,7 +29,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" from: @(#)sh.1 8.6 (Berkeley) 5/4/95 +.\" from: @(#)sh.1 8.6 (Berkeley) 5/4/95 .\" .Dd November 20, 2024 .Dt SH 1 From nobody Thu Dec 12 16:02:52 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Y8HLN5rmJz5gRbC; Thu, 12 Dec 2024 16:02: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 4Y8HLN5GXBz4gj1; Thu, 12 Dec 2024 16:02:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734019372; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=IAccUbzL+7McEmT9eJhSGddCNfbepc+QXz8c9LEPskM=; b=rIMf44sWuJpdgSyj96PH/FJkkVN9ly8QaCRvBWCqphLUiBZyQNaWLyND7vCj1ouS5wLao2 +s06sTmchDQYRfnfrZn07AIlhkdnMVoOqFVDr6yKyl3gMELThVYw5q3266EkxXryNEtWIG maJdxbcWN+9WAEjrhqJk0Hg1wrhpm/2B88vbHxr6ga1NA9guFxOG5hmMURLFVs+Oo+s8/i Rdz3QlNIWoSjQo4NeoYdzQZhAFY6uolQkFVca8iyz1OHacYL1FHYfHi+6tW4vl3PYJ42tA nf32u5U4vf2DWP1l0yVxgSgvCmqne0bseLFDk+DEpONzngpHEgv+4+E9epqhqg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734019372; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=IAccUbzL+7McEmT9eJhSGddCNfbepc+QXz8c9LEPskM=; b=Y473ysaxz5HR+/6Gf1JKxC2EeFllKR+vHu25jv9HOx84Xil9CsJk+MXinGA1SHFad25nmX W7H2SLBiiV2KrMxRXUbSPowpNMPU5lkfbncKsACd82VfVf93SlZHS56Xej+4ITmL6N/IUQ sU/aR06g+3qso561nUHEmLbQcBX0zU7w7iYkW2afHmt3ug7j5IMeF16ah+Rj/ogjmCd0ZU Y6K2x+Nksv9o8SQvuJUpllu+BBj5kSL8eY5moMWPypEGRY0k3pG2LPuZ3WtEPdX8raZV57 C3RNZ472HSV8a7ER8a5IK0EnH+GXB1b6ZhnzMQcAlgJce3RjrSFH91I+ET+/MA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1734019372; a=rsa-sha256; cv=none; b=aysh0D8dVvear2Ih6Ycq6x6CktnJiF+TaHVSfdP5ZuX/WtGZyt30heHeXfjZfxiLYnk73z qpP9jwCM7RQBuCPHowcQO2kfl5iOkWfhvM1galCG5sSK/61jnVS2DvOzuiXhD+Hq6pzg6d KRnmA85vkSsXYjijxMnMt53MDb97pCREFpzw0k/Dg9jXIoNEoGkUIQ/8aLbKRCpwT9LdPc 8HHhWpYl/NsyiZ9ZTlvbEQEfNTEYMjbALhREHsn55ObTI/lKiywoN6Yx6Ml8lwJIDCQnfB lsN+VQ7Wun1MJ4g/F4ePJqrNELoq4+J9aeWbvEgK9IN0MI1Y4rpKAr0D8NlpQA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Y8HLN4tXTz10Gf; Thu, 12 Dec 2024 16:02: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 4BCG2qrX052865; Thu, 12 Dec 2024 16:02:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BCG2qmB052862; Thu, 12 Dec 2024 16:02:52 GMT (envelope-from git) Date: Thu, 12 Dec 2024 16:02:52 GMT Message-Id: <202412121602.4BCG2qmB052862@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: 1e502fc1c421 - stable/13 - sh(1): -l is only valid in cli option not as set -l List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-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/13 X-Git-Reftype: branch X-Git-Commit: 1e502fc1c4215ac61db04598eb0a15d0e1ff7d6a Auto-Submitted: auto-generated The branch stable/13 has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=1e502fc1c4215ac61db04598eb0a15d0e1ff7d6a commit 1e502fc1c4215ac61db04598eb0a15d0e1ff7d6a Author: Baptiste Daroussin AuthorDate: 2024-11-20 13:14:43 +0000 Commit: Baptiste Daroussin CommitDate: 2024-12-12 16:02:48 +0000 sh(1): -l is only valid in cli option not as set -l (cherry picked from commit 0df81552d74d2c188a9323ffe18f6ebe799b86f9) --- bin/sh/options.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/sh/options.c b/bin/sh/options.c index 17fd878fa530..283bceb04e62 100644 --- a/bin/sh/options.c +++ b/bin/sh/options.c @@ -200,7 +200,7 @@ options(int cmdline) if (q == NULL || minusc != NULL) error("Bad -c option"); minusc = q; - } else if (c == 'l') { + } else if (c == 'l' && cmdline) { login = 1; } else if (c == 'o') { minus_o(*argptr, val); From nobody Thu Dec 12 16:03:50 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Y8HMV5ZmQz5gRlC; Thu, 12 Dec 2024 16:03: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 4Y8HMV4ytRz4hCj; Thu, 12 Dec 2024 16:03:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734019430; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=H7Z601bOXFM5u/UN5CQuFHNPZhhOAvJDxXjPyFoMhmI=; b=dloIQdCiWE0vOVELubY7wtpRPPmaTd5wMYATisY+QK1Chmd81z80Cw66chxINDIXIjUU1O gARyx8jbmgKqmUyiFk/vVppzhRLTJbto4N4GddsFW1VH5sMGkPfc4N1rBRxRKQMKAr6sFc xCMHd6GcDjLzNmaJVCA2vXMAj5JnzN7m5G3i+gc15UyZWNj2BU12+nrM/5YgyYzPhzu8y+ lsGmGlvevoJRZ+DNKrtYT6wZIhOXGAv1NNgff5/14powtwdT8wvaOeOLZ5MNg0ClkjIstm BD7aTqaHESwq92NDX4OYj4/7RhLjzSGDr79+tQ4qG2yMGIksZrRxraEAeFP/KQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734019430; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=H7Z601bOXFM5u/UN5CQuFHNPZhhOAvJDxXjPyFoMhmI=; b=NzQKQX/MuKzr03Zv1WvYpe8WCD9vJiELwtdfufAiLX3N+uzvbMztthVx0NO1WBBAiwpn6a wUJELaCmhD8K1Ean70u1l336Rexm9R5r7C3oGqIjHtNDzMxCXctjwZahf3ORtvaREHLJM3 /7RpqkzyFVUo2Ajp7mrfWxhkMdVQuP8h1v3hmu4KdDkJDYsw8liBuPTxRPLFOSWLDcoSaK t2VuqcjT0YciriZtmasUYa1Cgbzg1Ig4JyFZWH6ZncsP8nSADwmCRNkc5eTkCiGqFUD49h fvoy3r630YYOpJRd0gc+ajWMRYQlyraXVGTXrRNMWzexjGxwKZNr0TRKZCrPOQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1734019430; a=rsa-sha256; cv=none; b=vRSHFeH9GiP/3sjDvk8wKo0vWhtr8zG7BLU3k9jdi/aBi49ljrnOPEc6c+qHhMUNDv5b61 872fgI3CciMrzea6UswXvXrEB+IXG0PZvBlXa3EJmsjGG2K8ciC9rFbCOg9lFXYL4Hee8O JUEALmMmZ/+9dFq22icQZ6eTR3aubNR6BKqF6XJdwQ8N7KLqMW325qtTQYSBYq3bvFeROX 0+heLNMak6LrdPIpQ/yRsZ70ymLlKEBGDlbps7HNVhZwCfVvzd4llU107NR4gbtImGY0tc lCLXJ3xPB3SsZeW16NDuUQzMyFEhHhNjyxYZYaiiV03p+FEgMvH/jhZfRfV6ew== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Y8HMV4LXkz10Gg; Thu, 12 Dec 2024 16:03: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 4BCG3onX053312; Thu, 12 Dec 2024 16:03:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BCG3o6G053309; Thu, 12 Dec 2024 16:03:50 GMT (envelope-from git) Date: Thu, 12 Dec 2024 16:03:50 GMT Message-Id: <202412121603.4BCG3o6G053309@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: 35a6770dde02 - stable/14 - sh(1): -l is only valid in cli option not as set -l List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-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: 35a6770dde027d85e6b9a9b6fd9f7d254a320ef3 Auto-Submitted: auto-generated The branch stable/14 has been updated by bapt: URL: https://cgit.FreeBSD.org/src/commit/?id=35a6770dde027d85e6b9a9b6fd9f7d254a320ef3 commit 35a6770dde027d85e6b9a9b6fd9f7d254a320ef3 Author: Baptiste Daroussin AuthorDate: 2024-11-20 13:14:43 +0000 Commit: Baptiste Daroussin CommitDate: 2024-12-12 16:03:34 +0000 sh(1): -l is only valid in cli option not as set -l (cherry picked from commit 0df81552d74d2c188a9323ffe18f6ebe799b86f9) --- bin/sh/options.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/sh/options.c b/bin/sh/options.c index 43a8ee47411e..383f9523975d 100644 --- a/bin/sh/options.c +++ b/bin/sh/options.c @@ -200,7 +200,7 @@ options(int cmdline) if (q == NULL || minusc != NULL) error("Bad -c option"); minusc = q; - } else if (c == 'l') { + } else if (c == 'l' && cmdline) { login = 1; } else if (c == 'o') { minus_o(*argptr, val); From nobody Thu Dec 12 16:05:11 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Y8HP519Jdz5gRql; Thu, 12 Dec 2024 16:05:13 +0000 (UTC) (envelope-from bapt@freebsd.org) Received: from smtp.freebsd.org (smtp.freebsd.org [96.47.72.83]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Y8HP50fNbz4hMl; Thu, 12 Dec 2024 16:05:13 +0000 (UTC) (envelope-from bapt@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734019513; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=xftsdLPSfwHL2QLk+nNMOuM0KODVdIZur+M5/I2XdG0=; b=VLK/GtkGxhPxk6393Hh22rXJvbwOKW4LqeWLNLHYAlVZv6ghKCAv6vhEF7MbDjsrKDbb5U 3CHdnBZZlwU9ti1WWAS1xkSFMi6vEGqxu8kQFh3JFwPiFijxNK3LPOOZ8c9FS7ZMYpm82G CquZvi7R5O1LEfUJoRpsZ1MU/1RVFY6C64z0KTKz4Czz/bUhSt13UkoFsdtEDAaTJQvV/q fmYxUG8BpG571UbFRpZ48mQ7pGV0QcFfeEKPWQ4hvFm42rp6hkLh5d5PHdxuWbHrhH18Pp 1WvxP3ON7OvK8VOyo4+ptUpCKYKIi3kURsmjpLYAHcSKbYE45w2TEs+OzN2qZQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734019513; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=xftsdLPSfwHL2QLk+nNMOuM0KODVdIZur+M5/I2XdG0=; b=G5y+6jiShS59YgWDpyjawUZ9TFVmOxJZh3ET9SXEWOASEgPqzgJELzfq1bzWMAVk1zKqWy bAe0DR7ByAWSVflLGz/nsXxy7ICaLr0vuvC2t03suQJR9pPMyAgywGpNOrvZcVM9nW3nbz aOCvQEIFUIFbDETB3I1gKGihyncyxrBbDaWe3WBDmsKcVjmboJU8VDYtpstVbxIUQy1uf0 cTJEL0MtRdzdJCLvDTx24ce9+cVGyam6eQ3/LS7E/WbiMpjm5GuBLgqJj/lwB9ToyfzL/M JYsYe5zyHAu6BJZHvEDTaiVNLq+k0fr1roA1dHn5jAS4QAYuuAD/4Vw+z/9wdQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1734019513; a=rsa-sha256; cv=none; b=mzpyrVQ2Ihwo8wfa5qvR1lxPqMG1jqDuRCRZE7zS7mhJU8ctVVyWL8Gp/5cH974OgPTDyj NcTPk3aObvogt4NImlog3dB6NJs7Sv06YYJLCECDSCXD4dp/OwAvYuWzn4c17sSevYZfq3 GEEmHR/GkAI5hmLmNwbUFoNhenEMqIwNt6FIfpb5wqa31BXI3r9QiaFzFOIG8XvLq8+XiI bwccMK/JE8qpzEKy/m2h4MS5YCuk89VU7Uz3PBfH5mvpvQkI6hqegeYZinoEAu58/EEWNp Ivn3cqo4Ljh4tTdTmFuENFEcxnVDUgC/h58AfcPkxIaajjJa92GrtAG/HImBWQ== Received: from aniel.nours.eu (nours.eu [IPv6:2001:41d0:8:3a4d::1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (Client did not present a certificate) (Authenticated sender: bapt) by smtp.freebsd.org (Postfix) with ESMTPSA id 4Y8HP46Pk3z1MCy; Thu, 12 Dec 2024 16:05:12 +0000 (UTC) (envelope-from bapt@freebsd.org) Received: by aniel.nours.eu (Postfix, from userid 1001) id 634041CE375; Thu, 12 Dec 2024 17:05:11 +0100 (CET) Date: Thu, 12 Dec 2024 17:05:11 +0100 From: Baptiste Daroussin To: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-branches@freebsd.org Subject: Re: git: 6e1b857b89d4 - stable/13 - sh(1): add -l option Message-ID: References: <202412121602.4BCG2pjg052799@gitrepo.freebsd.org> List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <202412121602.4BCG2pjg052799@gitrepo.freebsd.org> On Thu 12 Dec 16:02, Baptiste Daroussin wrote: > The branch stable/13 has been updated by bapt: > > URL: https://cgit.FreeBSD.org/src/commit/?id=6e1b857b89d4e22fe711eef45e2e32e6b6606a0b > > commit 6e1b857b89d4e22fe711eef45e2e32e6b6606a0b > Author: Baptiste Daroussin > AuthorDate: 2024-11-20 10:48:39 +0000 > Commit: Baptiste Daroussin > CommitDate: 2024-12-12 16:02:48 +0000 > > sh(1): add -l option > > -l is required by LSB for login shell, all other shells: bash, zsh, > oksh, mksh, ... implements it. > > with -l sh will act as a login shell and read the profile. > > MFC After: 1 week > Obtained From: dash (3b7c8442bfe7c2fd0a6b0415df6ddf66a399fd55) > Reviewed by: kib, lme > Differential Revision: https://reviews.freebsd.org/D47681 > > (cherry picked from commit 65f5dd42f11cdcb7716e6cdd09fac2314c144c1f) > --- > bin/sh/sh.1 | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/bin/sh/sh.1 b/bin/sh/sh.1 > index 59334d2042a6..c990a4adb3c0 100644 > --- a/bin/sh/sh.1 > +++ b/bin/sh/sh.1 > @@ -29,7 +29,7 @@ > .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF > .\" SUCH DAMAGE. > .\" > -.\" from: @(#)sh.1 8.6 (Berkeley) 5/4/95 > +.\" from: @(#)sh.1 8.6 (Berkeley) 5/4/95 > .\" > .Dd November 20, 2024 > .Dt SH 1 Sorry for the noise, I don't know how I managed to get this commit in the merge conflict resolution... Best regards, Bapt From nobody Thu Dec 12 16:09:06 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Y8HTd0ZPxz5gRcY; Thu, 12 Dec 2024 16:09:09 +0000 (UTC) (envelope-from mavbsd@gmail.com) Received: from mail-yw1-x1132.google.com (mail-yw1-x1132.google.com [IPv6:2607:f8b0:4864:20::1132]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "WR4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Y8HTc5d25z4hr1; Thu, 12 Dec 2024 16:09:08 +0000 (UTC) (envelope-from mavbsd@gmail.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-yw1-x1132.google.com with SMTP id 00721157ae682-6efe4e3d698so6040387b3.0; Thu, 12 Dec 2024 08:09:08 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1734019748; x=1734624548; darn=freebsd.org; h=content-transfer-encoding:in-reply-to:autocrypt:from :content-language:references:cc:to:subject:user-agent:mime-version :date:message-id:sender:from:to:cc:subject:date:message-id:reply-to; bh=TNAgCBsZnYw2g/0WJTbvcXCnmHR8if76dDgIw3k/We0=; b=Kpz2JN2c5qOP4CXoK4p2p5yAAYmc2zSLgKNyCp7SCd2aqlS8UYYHCgyMAA768dGfAH eueR8ln02XgWzT1m3X+iIiFLgxvueXfNRd8U6+WyuAB46nGfk98vnMhSEwOUshym+eH2 aezApo8BfwcJ7gHt2keaySfPF2/RU1Q9uetOadmUrEvI3KlO7llcBPpQGm4McuET9g5r pBBDtQo9pxfPevSWTQzXmntPxi1lpBdMw12MsWYJtGyWKrKlSxwv6++SS2IVM9NWG92h zeLUVZyTcPwZrOcDgYitYExKKsTufFPVvi6Rdhf99iUKQvyygV9sH5NEeRFA9NR/wVD5 Puzg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1734019748; x=1734624548; h=content-transfer-encoding:in-reply-to:autocrypt:from :content-language:references:cc:to:subject:user-agent:mime-version :date:message-id:sender:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=TNAgCBsZnYw2g/0WJTbvcXCnmHR8if76dDgIw3k/We0=; b=d8oovcZizSxOhbLLH3AYfEF30zezH8XqLNuw2gObDdQFHQsOA3Ny7WmcUeIvgjSkUz gkk9zQut09QEgr+qKYQ3w9Zr6rHYedQiZrNkaYhldUtLQ7lsp7VvLC3/7Wc9+WCYF3Fc WMugGbn+rhQmGBLqXyQbFBKS8cexKmpc6KgV9bhKIpSShvY6oUoDwtc3WlaCMGVqzawz XROM9DYOvD0IoTPkNes9h9UQWqrFkvs3Epx9ue8Oz5IGP+CvbCYP6rL0IBsQbiWxfxLZ 0/jXEUNnw8uIpZYn4u1tGNy4uJXytZXqWbzYr50+KYolQUEXgwVyHiI3S1iN42afqJ9E zLPQ== X-Forwarded-Encrypted: i=1; AJvYcCW8rHdfm4eXnxHGIjgClyFHB11OtBt1cDMB5t8vzvBcEwPRkU91nLJqL7utckEk+lqgDijLRtlhNRTSDY5cn8DMhgPVob8iELhk@freebsd.org, AJvYcCWsts9qlGLPg42lp5THh/U2Bcd3x21GY1orLKH0gwsWpmI+gKV+Rs8T7NMWlY/jzRe1mkI=@freebsd.org, AJvYcCXkwwQYJOIouF71/gYCA9t16xOcCt6VMP8dnsfmkgjYnHKttbQ/IEN7e3NNjF97y9tKx3f2DPPV8nOmMZeuroBNcpqU@freebsd.org X-Gm-Message-State: AOJu0YwyL6JJ1RsfrGUcMOLaoh5Q+rIq7YCrpLpuv88LTIgqj+P34HVR 0iCSVDaUZ2q65pqFVOOZVauTxWgLqeS/DVkqa/fPS9BdIBquMoJ8mKQ2fg== X-Gm-Gg: ASbGncsaS9FKEHnTwmHvK76ABdlv6FM1lTlse8i3CSYLS1PpOHnmTCOpmrd9MPg37bL pwQByliVHsgm3cTsnbORNUetc3SimW/dhXmw+6H/Ih7D7BekrgJNus82ZuqTBQCCB9NvmwQA1c0 V0hUtxtDPbuVSYiknS5Jlw9jdBSDNB+7GhFWOIWa547HUKjKPF5veRDwUgsnm9moOLaaKZQ9vkF 89vXoP+/I/u8tvGi47NUxmBJ9gkRYT1HyD4yTrYxumd7Q== X-Google-Smtp-Source: AGHT+IEH9W4LZD3rvxdjAxwM9031yZHY/LuCjmwojZ9HwB9T7Ph0jyE76adbGbpNf/00efFvkduaqQ== X-Received: by 2002:a05:690c:4b10:b0:6ef:5fee:1ca0 with SMTP id 00721157ae682-6f27529a6ffmr8622837b3.18.1734019747799; Thu, 12 Dec 2024 08:09:07 -0800 (PST) Received: from [10.230.45.5] ([38.32.73.2]) by smtp.gmail.com with ESMTPSA id 00721157ae682-6f14cd95034sm7442097b3.31.2024.12.12.08.09.06 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 12 Dec 2024 08:09:07 -0800 (PST) Message-ID: <4cf70734-c8f7-4f16-8d56-dd5dbf4297f3@FreeBSD.org> Date: Thu, 12 Dec 2024 11:09:06 -0500 List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: git: 2ec8b6948070 - stable/14 - zfs: merge openzfs/zfs@e269af1b3 (zfs-2.2-release) into stable/14 To: Baptiste Daroussin , Martin Matuska Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-branches@freebsd.org References: <202412121457.4BCEvRJv022229@gitrepo.freebsd.org> <2yircadojekemjslcf63rrbyd5s6oe6hkwcmakhjzbdyhl6ze3@fgrg5qjbuyra> Content-Language: en-US From: Alexander Motin Autocrypt: addr=mav@FreeBSD.org; keydata= xsBNBFOzxAwBCADkPrax0pI2W/ig0CK9nRJJwsHitAGEZ2HZiFEuti+6/4UVxj81yr4ak/4g 9bKUyC7rMEAp/ZHNhd+MFCPAAcHPvtovnfykqE/vuosCS3wlSLloix2iKVLks0CwbLHGAyne 46lTQW74Xl/33c3W1Z6d8jD9gVFT/xaVzZ0U9xdzOmsYAZaAj4ki0tuxO9F7L+ct9grRe7iP g8t9hai7BL4ee3VRwk2JXnKb7UvBiVITKYWKz1jRvZIrjPokgEcCLOSlv7x/1kjuFnj3xWZU 7HSFFT8J93epBbrSSCsYsppIk2fZH41kaaFXsMQfTPH8wkeM6qwrvOh4HiQM08R+9tThABEB AAHNIUFsZXhhbmRlciBNb3RpbiA8bWF2QEZyZWVCU0Qub3JnPsLAlwQTAQoAQQIbAwULCQgH AwUVCgkICwUWAwIBAAIeAQIXgAIZARYhBOmM88TmnMPNDledVYMYw5VbqyJ/BQJiOjayBQkU Kg0mAAoJEIMYw5VbqyJ/wxUIANAqbfF6tgjgdWk4c8yE0HNG+ptVOZp/wszRZ8olC0rgfK4S sND2Y+bP1fvkG1a+U1JRZzYt1s2IyIoIX6gkriUnX7VVOjcqyZ2QjKxxgACmDGoYC3c/ZvfF ysrqZ/eB0U6yp1AHQ7MCwmDNFHQbh7JhQ/pnG1NYpw/8splYfwYKhbDNyzCqOvk7WAyOJV7v TbTCF40jLzCUpyjOJj8HkdbGZsBACr7KF7kfVVq3tVLXY+NfzVKQoAs+LwfDqe8m0nnCBqU8 nNZ76normAp2z2cclAt2UCaMXnUwOLf0dj4daDG41vb+4jXTxm8Fksfj1NflVjgFcpd4FC4a Q8hd89fOwE0EU7PEDAEIAOZgWf2cJIu+58IzP2dkXE/urj3tr4OqrB/yHGWUf71Lz6D0Fi6Z AXgDtmcFLGPfMyWuLAvSM+xmoguk7zC4hRBYvQycmIhuqBq1jO1Wp/Z+lpoPM/1cDYLn8Flv mI/c40MhUZh345DA4jYWWaZNjQHUWVQ1fPf595vdVVMPT/abE8E5DaF6fSkRmqFTmfYRkfbt 3ytU8NdUapDcJVY7cEP2nJBVNZPnOIObR/ZIgSxjjrG5o34yXoqeup8JvwEv+/NylzzuyXEZ R1EdEIzQ/a1nh/0j4NXtzZEqKW4aTWlmSqb6wN8jh1OSOOqkYsfnE3nfxcZbxi4IRoNQYlm5 9R8AEQEAAcLAfAQYAQoAJgIbDBYhBOmM88TmnMPNDledVYMYw5VbqyJ/BQJiOjbIBQkUKg08 AAoJEIMYw5VbqyJ/rXwH/2UaH7Z7893+uEPo20gJkw94xDw5Fji9M8pLNpfiF7dKXfJMUe2T 0J3rHZaMlShy6ImDc/Iketxq+KvBWa4mWajEZcxFrevhuQe2ALO+GabvT2p0++L4QgE+WXs3 lwask4wrc4f/aRBHKWWgXWeVwc3OuTchq4O5AYxzgjyEmwZshrdN5szpzNg6+vFO4NWiMhlv eDULjtXEqXJJc2weIW0RpUIfCp7YLVC+Ff1j6+7DfeiM9WqWXPHzmKatwWwlk8rvDMMZ3gSy wXL32LpWKU76bIWxB6w1uykDk643swZTG0XyoOZgYH6a8931y06Jng50XARXIYm8+LgfpTMW pNk= In-Reply-To: <2yircadojekemjslcf63rrbyd5s6oe6hkwcmakhjzbdyhl6ze3@fgrg5qjbuyra> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:15169, ipnet:2607:f8b0::/32, country:US] X-Rspamd-Queue-Id: 4Y8HTc5d25z4hr1 X-Spamd-Bar: ---- On 12.12.2024 10:38, Baptiste Daroussin wrote: > On Thu 12 Dec 14:57, Martin Matuska wrote: >> The branch stable/14 has been updated by mm: >> >> URL: https://cgit.FreeBSD.org/src/commit/?id=2ec8b69480708185a273254e4e254140eb2ce633 >> > > This does not build (at least does not incrementally build): > > /home/pkgbuild/worktrees/stable/14/sys/contrib/openzfs/module/os/linux/zfs/arc_os.c:45:10: > fatal error: 'sys/shrinker.h' file not found > > the pkgbase builders are now broken ;) This is a Linux-specific file as you can see from the path. So the question is why FreeBSD tries to build it to predictably fail. I just run my own 14-stable build and it passed clean. -- Alexander Motin From nobody Thu Dec 12 16:21:04 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Y8HlQ5bp8z5gSgd; Thu, 12 Dec 2024 16:21:06 +0000 (UTC) (envelope-from bapt@freebsd.org) Received: from smtp.freebsd.org (smtp.freebsd.org [IPv6:2610:1c1:1:606c::24b:4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Y8HlQ56Phz4jkh; Thu, 12 Dec 2024 16:21:06 +0000 (UTC) (envelope-from bapt@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734020466; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=ZjLjNmAV9AaPLHhuB2Z+5rWlJVPW427laNOB1Y1Qkqg=; b=pbe7eWFWUwqHM33aYuqXpzdfS6O+GqXTLtmfsrJ6QVWXsA/WKREngAT07MAJ1FYEarjWNf BDAQpU+MbUxyh5s/EtGHDTxsc76f5LzHE2wF3SdFTnKzpnneqame9o04+JCpkg8ZWcKdUF 9h9L0BN2LqygKVeGVZXCBqdnLRh3EZQIse1WhXmrJdqrSbHLRv8k+3f9UYSb2vVEY3PtEw 8B8KTImuPtSIUe9XzhoIwiyulKsIlJ01SfKMMqkkhEH319bQ0TyF2oV1yATq40WiLI3J7i xFVXlAnaKqNK+OMXcbxwVg22RqzC+H/Ygv15kwx4Eh62o+WtHdGvvjuuUgkmKw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734020466; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=ZjLjNmAV9AaPLHhuB2Z+5rWlJVPW427laNOB1Y1Qkqg=; b=Aagdls3hB1P5VjeQ8DtCTobiGi0jhitIn4/I4xFkzltu0F10wTiVYCYMaZVmHUMFiWiwkY 3vWMF3JhaySYFuMGLkQlMNCwL09lQESy1vHKpAeN305I9xFXsBvOtLxkYUyX99mJ/9UENW eNm5kZ8ByZ/k95SuydFFcxSYHSAFhfZ1jTkU0n/7Ukxe3BAm5JgWPRpKy0SALB2s+1POdO Dw9bLRv8lFoYKKjVeuguECXzoY4D8m8Z5ngVHB0nSxOrC56Qvf9NGdWK+Q86CNYji5SF51 53YHhbOv8hCHolXkzVKamB04j983Nebtl2khpMaA0Z6+NpY87qdjFlWrVo2grg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1734020466; a=rsa-sha256; cv=none; b=gUz9PDgVE/MSLHKx1mPHr3Kx9UhubU8Vwtpq/Uwzn554MHk+1g5Bjikojs7MBYgWLeHYGT jvR2j16v32q5FgIhqner9LSHg64FTFa1bD6LwlI32lLjydIkoAWtMbGqtD+TpcWStrYgPU WVp9dg5c8yBPg9x5Fw1RBlcg4Kttc8TxTZFCTbpTP2pQ9IwpyDYKVNWYfMnQi0aEXN8Ibb vBDOse6dPnNtYmlUItb8PqpbD0YhJM0gkDqDkadcmAM/6ngGdd7XVersH2EEKNXA14L6Qx 363103MnSUCsRp7sLdywhAOwJEST/KRUl4Yqb/M9ZGF2pWZUrbRCqN6e+lyurA== Received: from aniel.nours.eu (nours.eu [IPv6:2001:41d0:8:3a4d::1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) (Authenticated sender: bapt) by smtp.freebsd.org (Postfix) with ESMTPSA id 4Y8HlQ402sz1M3V; Thu, 12 Dec 2024 16:21:06 +0000 (UTC) (envelope-from bapt@freebsd.org) Received: by aniel.nours.eu (Postfix, from userid 1001) id D55AF1CE538; Thu, 12 Dec 2024 17:21:04 +0100 (CET) Date: Thu, 12 Dec 2024 17:21:04 +0100 From: Baptiste Daroussin To: Alexander Motin Cc: Martin Matuska , src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-branches@freebsd.org Subject: Re: git: 2ec8b6948070 - stable/14 - zfs: merge openzfs/zfs@e269af1b3 (zfs-2.2-release) into stable/14 Message-ID: References: <202412121457.4BCEvRJv022229@gitrepo.freebsd.org> <2yircadojekemjslcf63rrbyd5s6oe6hkwcmakhjzbdyhl6ze3@fgrg5qjbuyra> <4cf70734-c8f7-4f16-8d56-dd5dbf4297f3@FreeBSD.org> List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <4cf70734-c8f7-4f16-8d56-dd5dbf4297f3@FreeBSD.org> On Thu 12 Dec 11:09, Alexander Motin wrote: > On 12.12.2024 10:38, Baptiste Daroussin wrote: > > On Thu 12 Dec 14:57, Martin Matuska wrote: > > > The branch stable/14 has been updated by mm: > > > > > > URL: https://cgit.FreeBSD.org/src/commit/?id=2ec8b69480708185a273254e4e254140eb2ce633 > > > > > > > This does not build (at least does not incrementally build): > > > > /home/pkgbuild/worktrees/stable/14/sys/contrib/openzfs/module/os/linux/zfs/arc_os.c:45:10: > > fatal error: 'sys/shrinker.h' file not found > > > > the pkgbase builders are now broken ;) > > This is a Linux-specific file as you can see from the path. So the question > is why FreeBSD tries to build it to predictably fail. I just run my own > 14-stable build and it passed clean. > > -- > Alexander Motin We don't do anything specific on the pkgbase builders, except running an incremental build, how to we end up building this I have no idea. Best regards, Bapt From nobody Thu Dec 12 16:29:05 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Y8Hwt28Gcz5gT92 for ; Thu, 12 Dec 2024 16:29:18 +0000 (UTC) (envelope-from jrtc27@jrtc27.com) Received: from mail-wr1-f52.google.com (mail-wr1-f52.google.com [209.85.221.52]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "WR4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Y8Hws5nJBz4lKh for ; Thu, 12 Dec 2024 16:29:17 +0000 (UTC) (envelope-from jrtc27@jrtc27.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-wr1-f52.google.com with SMTP id ffacd0b85a97d-385e1fcb0e1so434167f8f.2 for ; Thu, 12 Dec 2024 08:29:17 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1734020956; x=1734625756; h=to:references:message-id:content-transfer-encoding:cc:date :in-reply-to:from:subject:mime-version:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=cIsnu/quNRc2oz+9Vrl81+JoUprJzY5w7HVxscex20o=; b=QjHY/41SSUFZWHauz5SOEhJCq2DqGq/wGvvcdENRwpGyneH5CfLJI6Nr91mBUJ0gLD QL9fRdr2y+sePGbfBmBiAoxaIHcq3ebd1IcHcM4RJ7O1/xtZMI23cXLHGjwmmTeOYgTB KeOuIQ+sBl/mT9jBy9CH06dCP4la18yPVPBIjbspmtvuvtHI9CXA4KNq69BeF5lOW9U4 L6k8EKoQuoYc9i6ArFqhoO2j1H2hsb7lS0mdK6jIkzw5sb0tPhnfM4djcKyHJdRYgzDQ FLVowdndjpaGmYBqDGLUvnxAlKiV6pX9KA9dQEUCs+S6l/QxjFEeyA5LtHDdyCSs9bzZ 23Sw== X-Forwarded-Encrypted: i=1; AJvYcCWak+RtiQQ18Edbb8bk6dAVrIvudfFF+QTHTtNhdBRWVCIs4YtumQyDchBz9t72DGsuJtPGMyoRWjObFiHhdj2LA/baWrlQFE8=@freebsd.org X-Gm-Message-State: AOJu0YwWyLyHKX5Z5ONClk76RF4TWVmDmFVTExdgLfWx7UQ7kCUD16+v TUiJNMxHrPao56VO+tyDx+9SNZRyIRv4SaAnzq/9vlizrfi1zRu89uQ62DVOu0Y= X-Gm-Gg: ASbGncsnuJu+So4rElYnlNp2M+RfHiyVHfiHqHQCtrJb/l6X6pjozVIRSD/YX0Ys1HD f8ymH32veL3rqwe2sg7y9WTQltgJ+/7BoXQyTn6fgT4uIKV+CwKWpsBNiJqdPtvWY2vNJJlmWH4 k4NYvB27OvX3TPrPR7cxak9ekhKSmJyRjvWlpy+YJsEfBPFLPa1slKC33BCTuu7Jel9n5VtyqY6 GmoRoOPC2tCkgyNIGHhoREqzuSgc77MRIHfnc36IC5gO3s4yMeZYwK/9/K6vfilvFoQAoA= X-Google-Smtp-Source: AGHT+IFyMzgNrXlZ6yWeZgPPtJIxz4PTLq11/hbyUVGXZY1gp93kuFIMBHpjSezA+PL2c395dF0kEw== X-Received: by 2002:a05:6000:2ca:b0:385:e67d:9e0 with SMTP id ffacd0b85a97d-3864cea447cmr5456805f8f.29.1734020955095; Thu, 12 Dec 2024 08:29:15 -0800 (PST) Received: from smtpclient.apple ([131.111.5.201]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-3878251dd0csm4395507f8f.101.2024.12.12.08.29.14 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 12 Dec 2024 08:29:14 -0800 (PST) Content-Type: text/plain; charset=us-ascii List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org Mime-Version: 1.0 (Mac OS X Mail 16.0 \(3826.200.121\)) Subject: Re: git: 2ec8b6948070 - stable/14 - zfs: merge openzfs/zfs@e269af1b3 (zfs-2.2-release) into stable/14 From: Jessica Clarke In-Reply-To: Date: Thu, 12 Dec 2024 16:29:05 +0000 Cc: Alexander Motin , Martin Matuska , src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-branches@freebsd.org Content-Transfer-Encoding: quoted-printable Message-Id: <3D7A5918-3BD4-446E-8797-C4A4BFA20D4E@freebsd.org> References: <202412121457.4BCEvRJv022229@gitrepo.freebsd.org> <2yircadojekemjslcf63rrbyd5s6oe6hkwcmakhjzbdyhl6ze3@fgrg5qjbuyra> <4cf70734-c8f7-4f16-8d56-dd5dbf4297f3@FreeBSD.org> To: Baptiste Daroussin X-Mailer: Apple Mail (2.3826.200.121) X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:15169, ipnet:209.85.128.0/17, country:US] X-Rspamd-Queue-Id: 4Y8Hws5nJBz4lKh X-Spamd-Bar: ---- On 12 Dec 2024, at 16:21, Baptiste Daroussin wrote: >=20 > On Thu 12 Dec 11:09, Alexander Motin wrote: >> On 12.12.2024 10:38, Baptiste Daroussin wrote: >>> On Thu 12 Dec 14:57, Martin Matuska wrote: >>>> The branch stable/14 has been updated by mm: >>>>=20 >>>> URL: = https://cgit.FreeBSD.org/src/commit/?id=3D2ec8b69480708185a273254e4e254140= eb2ce633 >>>>=20 >>>=20 >>> This does not build (at least does not incrementally build): >>>=20 >>> = /home/pkgbuild/worktrees/stable/14/sys/contrib/openzfs/module/os/linux/zfs= /arc_os.c:45:10: >>> fatal error: 'sys/shrinker.h' file not found >>>=20 >>> the pkgbase builders are now broken ;) >>=20 >> This is a Linux-specific file as you can see from the path. So the = question >> is why FreeBSD tries to build it to predictably fail. I just run my = own >> 14-stable build and it passed clean. >>=20 >> --=20 >> Alexander Motin >=20 > We don't do anything specific on the pkgbase builders, except running = an > incremental build, how to we end up building this I have no idea. There have been various depend-cleanup.sh changes in main for files including this one. Jess From nobody Thu Dec 12 17:38:46 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Y8KT24YyBz5gXkV; Thu, 12 Dec 2024 17:38:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Y8KT243Xjz4t7Q; Thu, 12 Dec 2024 17:38:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734025126; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fVNMN1121aR9PQFgFAt3aPQ0NKNGQ8PvvoVO9XOErFA=; b=CqswI/amDagvwrUDqTonOsqA5Fo86hHyx/rnOOMTrD00MPKGlJH08JWmy/ry26C04Z8Dv6 z2phuQc0L1h8YY/VpQ5V80n7FErOgAARSO24vWXP3FocLi302XoWxus9o8MgKL90iV1JLN nVN5j5OQ5L5NaNHGosGv6k11zEnOFievCFGlclLhL6+yatsR9J2f7ivCU/ATKvaURBMe7j F4h3ZAv72wImhE3EmqU+8/LOUzgrKYzDjHgL2q/baHgPS9+QPiAAz/TPX5z5cZh3BrTBV7 3tMzu17tGv4zJ9TtrtxDfx+eOAeuxyZ0JseM/8s+QzE97OFNkM8KaPbJyTm7uQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734025126; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fVNMN1121aR9PQFgFAt3aPQ0NKNGQ8PvvoVO9XOErFA=; b=e4mHxHotZ39+bKk7kDWPgpz4WPh1i+jIbsvCad076v8XUeTrdw9iRsxUI8kq1VaWPkoDcu mVjsGZs0kYxr4QcbtXacoKsHZrmupA3ZwoTkMQnKPp785UL2ERW80hnhjLUwgIyp7jo4zA KyBMFP0XWGq2ONocg7Hr/O9lIpR3mFJYZ+Jh3cLr7lLjJZd22b4Zh9BmnMFaNZ47SsJ7mo q4FWR6FOgqsBJvpjSU+InixZVSKEY35rl7vRxbXxFgUylZBirmiMvVmen5eZRM/cGtjvWo x1WnvNwbn1RzR8UTs8SJarYS5pYLW1ySPdFgSkpCOHgoRDyCGOcilOlbYa2D3Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1734025126; a=rsa-sha256; cv=none; b=NLB7jjzxfhtz7Ggm81m5WrLDebtSVawQbHcrR401lZ8NmgVJSrGC2oW1WHeTopYPAKtJyF 3SF6d39fM4fwCbVxhyMr5Ag9/BA+EOw1hxmvxDgN5srb1LF3kgbiNV3kO3njoY3pco3MxX Cw3+RAx1aye5j55ngjKSKFggozdJe6u8KjHFU1zK8R/7PngZUO5Zj5Xjs9MsCodQbj+OJo o0EkM3He4wWiz33CaW2m5fIygHegwO54J+ZgHd17+sgATDzzpsWrQyP5MOTKAFb6MI0j1j PicfvViJ/w82B0ez4P5i4p2D8fZ9Yh9EiiSwvIz7sML9vzCLQtYySg0/NhNQHQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Y8KT23XWKz12SH; Thu, 12 Dec 2024 17:38: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 4BCHckC3022075; Thu, 12 Dec 2024 17:38:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BCHckNx022072; Thu, 12 Dec 2024 17:38:46 GMT (envelope-from git) Date: Thu, 12 Dec 2024 17:38:46 GMT Message-Id: <202412121738.4BCHckNx022072@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Martin Matuska Subject: git: 397a3893db1d - stable/14 - depend-cleanup.sh: fix dependency changes from latest OpenZFS import List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mm X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 397a3893db1dabd9497e6324ba6afb489fbca037 Auto-Submitted: auto-generated The branch stable/14 has been updated by mm: URL: https://cgit.FreeBSD.org/src/commit/?id=397a3893db1dabd9497e6324ba6afb489fbca037 commit 397a3893db1dabd9497e6324ba6afb489fbca037 Author: Martin Matuska AuthorDate: 2024-12-12 17:23:55 +0000 Commit: Martin Matuska CommitDate: 2024-12-12 17:29:09 +0000 depend-cleanup.sh: fix dependency changes from latest OpenZFS import Backports fd3d3240b, 0980d0a03, 7a7741af18d (partial), 73c7cb57a --- tools/build/depend-cleanup.sh | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/tools/build/depend-cleanup.sh b/tools/build/depend-cleanup.sh index 7441cd1d7d81..a4d367d7c463 100755 --- a/tools/build/depend-cleanup.sh +++ b/tools/build/depend-cleanup.sh @@ -176,3 +176,8 @@ if [ -e "$f" ]; then run rm -f "$p"/*.inc fi fi + +# 20241212 2ec8b6948070 zfs: merge openzfs/zfs@e269af1b3 (zfs-2.2-release) into stable/14 +clean_dep cddl/lib/libzpool abd_os c "linux/zfs/abd_os\.c" +clean_dep cddl/lib/libzpool arc_os c "linux/zfs/arc_os\.c" +clean_dep cddl/lib/libzpool zfs_debug c "linux/zfs/zfs_debug\.c" From nobody Thu Dec 12 21:10:21 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Y8Q9C3bZQz5glZQ; Thu, 12 Dec 2024 21:10: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 4Y8Q9C1CT4z4KqK; Thu, 12 Dec 2024 21:10:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734037823; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/H7koBHu0gb6Y1UcZ6LyTp6bvjUozgWe4QUUOZznboo=; b=p7ZGTlboQCZdFEA3r8xR7Tm5mYQyj30QLLO8IayePoXlsUkSOkfvHeminiVRrqZz08hMvW d6hGn++psHc/mrWXe0LPos9li6o+GJPMeXdBTgH42VVAWUhjw3YmRp8KJrJoTUQgthY57s V/JBYYUTw7NlSatecAlyFl8nsQpwQDJKyhgDO94O831GtmQPA1i4Vfnm4GHN5IcRFnjcEy yCb3bRHdui2SyoyHFQNDs+XfgdLI3XNb9tiHCsZ2QnuTtcD1gDKZ+sYtoTf33mPEBGZlVl b6mRxsyE7Jlburxn/PYC3dzpuLXT6GEI+H7oudAoWoSgpehno2GsyjN5p+L3IA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734037823; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/H7koBHu0gb6Y1UcZ6LyTp6bvjUozgWe4QUUOZznboo=; b=tmDAsy5PCc1R07IFiuxiooE45HEdhFny813psvueyvEo1p2b7BjaZTl7y3sCvJtTJPRoXb KhHPieg7ZKctizKOetveIsMZj5+FyJetiu4hhl7PSznFGKNsqxU/ECwl8OyT4NCUhoFg2h na8q8BIDqVqq1opjnc6T9vB3R5xL+VxZ6Euj713Ay5lRlM65qOsSDcP82ZxHMcGXP3790y s4ApatLU7VEaC+KyV/LxVa6KRNpS7LRSnBtvYLw2Ol9SZnG/wSm6NHk81oQeNufksBiNPR oa3aa2piO4YyYCIFjGiIcUlfBg97CrHq3qciMYlxbv6rKXRGJ1Qa7w8xxSrNVQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1734037823; a=rsa-sha256; cv=none; b=qNwWxtEUiv+W3NzBMO9YMo71JvumNGHyWzPhZWaoFLYbjAb3xGvft2Z6NhFsZnYc2XKqaU laj2yiWXtVjTy7s74Xq6iBxEIwmEzJ946KS68AyMCWtBbPjGliN/1u+68wA889HEbbyrW9 pImOT/JadeOjbkWMb6myZXg6cihhHraEC/6cb1U9qfpzj33z4XizncCQDeDzbCcioZGVoy 8ktPVIcgP73gkyDUKaMDrUK223C+d+DE3Z0JL0YPt+ujmqV9kqWrsj5/2qPhVwp2BTBLeu GLcw/gOo0XziB1V0m+g1bf08yUt5VDP7fimd0g8E2xvdLuzveV+5iK0tkQoGjg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Y8Q9B0qjmz189b; Thu, 12 Dec 2024 21:10: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 4BCLALpf024117; Thu, 12 Dec 2024 21:10:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BCLALaw024114; Thu, 12 Dec 2024 21:10:21 GMT (envelope-from git) Date: Thu, 12 Dec 2024 21:10:21 GMT Message-Id: <202412122110.4BCLALaw024114@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Jessica Clarke Subject: git: cc521bcf790b - stable/13 - mips/malta: Explicitly set AP entry point to _locore List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jrtc27 X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: cc521bcf790bdcc76fddd619f35d0279f22e535a Auto-Submitted: auto-generated The branch stable/13 has been updated by jrtc27: URL: https://cgit.FreeBSD.org/src/commit/?id=cc521bcf790bdcc76fddd619f35d0279f22e535a commit cc521bcf790bdcc76fddd619f35d0279f22e535a Author: Jessica Clarke AuthorDate: 2024-12-12 21:07:14 +0000 Commit: Jessica Clarke CommitDate: 2024-12-12 21:07:14 +0000 mips/malta: Explicitly set AP entry point to _locore Otherwise we rely on the firmware implicitly ending up there without faulting. Perhaps the hardware this was tested on does so, but on QEMU this is not the case, as the AP will otherwise re-run bootloader code that tries to reconfigure PCI BARs and ends up faulting, so the AP is never seen by FreeBSD to have started. This matches Linux's arch/mips/kernel/smp-mt.c:vsmp_boot_secondary, which unconditionally writes to TCRestart (this register), albeit using a separate entry point, whilst ours is shared. This is a direct commit to stable/13 as mips no longer exists in main. Obtained from: CheriBSD (diagnosis; patch rewritten from scratch) --- sys/mips/malta/malta_mp.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/sys/mips/malta/malta_mp.c b/sys/mips/malta/malta_mp.c index 693c6b13248e..fe284501dffb 100644 --- a/sys/mips/malta/malta_mp.c +++ b/sys/mips/malta/malta_mp.c @@ -44,6 +44,9 @@ #include #include +void _locore(__register_t a0, __register_t a1, __register_t a2, + __register_t a3); + #define VPECONF0_VPA (1 << 0) #define MVPCONTROL_VPC (1 << 1) #define MVPCONF0_PVPE_SHIFT 10 @@ -235,11 +238,8 @@ platform_start_ap(int cpuid) set_thread_context(cpuid); - /* - * Hint: how to set entry point. - * reg = 0x80000000; - * mttc0(2, 3, reg); - */ + /* Set entry point */ + mttc0(2, 3, (register_t)&_locore); /* Enable thread */ reg = mftc0(2, 1); From nobody Thu Dec 12 21:11:26 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Y8QBQ6PDyz5glPl; Thu, 12 Dec 2024 21:11: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 4Y8QBQ5rLHz4LDq; Thu, 12 Dec 2024 21:11:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734037886; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=TmndM7CUaLyYYiFALdZCWN+zNd3REfdgbsVqTPPiAxM=; b=omS8sB6N9/9vyargFiOwz4UKU5kQCEt0/W/Iy+TTKP5gh3Agfypic9StXIp536Mdj3XI1z 1VhCsGxXkQeWmWkuQgBN1ncO9k7NjNk8Q7sUJbm2hyyRb5WEvilLV+4JhEAatwX3F/woM7 8KKv9tktwR28FTak9S89FnPR9k+C7KyCXnLGERjNhQvCPuix6ZKI+6/SYNLdyfwX6BYHDo 2VX13MjixcToOOiKq5KNfN4iLfm2ECzzH5aFqqTEhGfRyz0LZBxR83zDy2H9crd15yrhId /Hc8MSZ6pG5zB2QEjisX6aslq+y3NKwezQqX1de1Tg9fDtBkasuc4V09KxFm7Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734037886; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=TmndM7CUaLyYYiFALdZCWN+zNd3REfdgbsVqTPPiAxM=; b=F/wPkfHmpgkMloLUqv9UPWjfyBCMdhfg63EdeZ1EVA20CQ9+fyWku9UitgCSxHxNpnGSRV GgAqRiqFDGebARvNFBTzbcxBTmHwu5ZymR6CQfMhwM80PXms0JoxmPxGJ0bb9X1kqDyXXK cShp3GdO3KYke98YYle5N5vWI+7+N5aK53kFGuL4/rCJ4pPzDRoeo+B3S3wdBFvywQmYjv TyZ5srYlHh9N3uTUb1eZuSxpAdKL0a3EWj4E0PFwi7GQaGWQv9xhLuZ0BdOIqvfcON5pPv NohEboWvfSSUE6wFmXmPeQMNELHItNNRSV4Nebye8muptz9cp+zdDU3BrVcdoQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1734037886; a=rsa-sha256; cv=none; b=KabA365eE8j09UobvKXSDAE//FZnmFzU24dUJZ50YTXKQNzwfHK28RSh8rphzV/n9+A57A h+/zHHkDkghkN0ZOgkxjQRQSt3Jm40xUN7q28AbGdmq/frsmw2hGOUpsebBp9mpK8gEAr3 PzHEdRo52hj/2A/OaBwsN0eh5VdxqpWNLPc7ntT87jUDprg5oKMvQmHnvsh5TqWKBapHkT CkCFAZRS5XPTycsSX6EzdsnIQY4NuTGaP7NZ5BWFTv6iDAsrjHRfpkx+KdttpRhuxaTRCc sKdKEmcwiZLbV2nzksej6Kgu954/uWSQrL2WFMkeO07yRdlsSxzCo72Xzb/pNg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Y8QBQ5Rlcz18P4; Thu, 12 Dec 2024 21:11: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 4BCLBQZc026564; Thu, 12 Dec 2024 21:11:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BCLBQCY026561; Thu, 12 Dec 2024 21:11:26 GMT (envelope-from git) Date: Thu, 12 Dec 2024 21:11:26 GMT Message-Id: <202412122111.4BCLBQCY026561@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Jessica Clarke Subject: git: 2151a0bec08c - stable/12 - mips/malta: Explicitly set AP entry point to _locore List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jrtc27 X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: 2151a0bec08c5c08ca1e2cc5419a5392bc76a6cd Auto-Submitted: auto-generated The branch stable/12 has been updated by jrtc27: URL: https://cgit.FreeBSD.org/src/commit/?id=2151a0bec08c5c08ca1e2cc5419a5392bc76a6cd commit 2151a0bec08c5c08ca1e2cc5419a5392bc76a6cd Author: Jessica Clarke AuthorDate: 2024-12-12 21:07:14 +0000 Commit: Jessica Clarke CommitDate: 2024-12-12 21:11:15 +0000 mips/malta: Explicitly set AP entry point to _locore Otherwise we rely on the firmware implicitly ending up there without faulting. Perhaps the hardware this was tested on does so, but on QEMU this is not the case, as the AP will otherwise re-run bootloader code that tries to reconfigure PCI BARs and ends up faulting, so the AP is never seen by FreeBSD to have started. This matches Linux's arch/mips/kernel/smp-mt.c:vsmp_boot_secondary, which unconditionally writes to TCRestart (this register), albeit using a separate entry point, whilst ours is shared. This is a direct commit to stable/13 as mips no longer exists in main. Obtained from: CheriBSD (diagnosis; patch rewritten from scratch) (cherry picked from commit cc521bcf790bdcc76fddd619f35d0279f22e535a) --- sys/mips/malta/malta_mp.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/sys/mips/malta/malta_mp.c b/sys/mips/malta/malta_mp.c index 64aeb3bee93c..efdadae0952d 100644 --- a/sys/mips/malta/malta_mp.c +++ b/sys/mips/malta/malta_mp.c @@ -48,6 +48,9 @@ __FBSDID("$FreeBSD$"); #include #include +void _locore(__register_t a0, __register_t a1, __register_t a2, + __register_t a3); + #define VPECONF0_VPA (1 << 0) #define MVPCONTROL_VPC (1 << 1) #define MVPCONF0_PVPE_SHIFT 10 @@ -239,11 +242,8 @@ platform_start_ap(int cpuid) set_thread_context(cpuid); - /* - * Hint: how to set entry point. - * reg = 0x80000000; - * mttc0(2, 3, reg); - */ + /* Set entry point */ + mttc0(2, 3, (register_t)&_locore); /* Enable thread */ reg = mftc0(2, 1); From nobody Thu Dec 12 21:25:03 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Y8QV76s3Dz5glcf; Thu, 12 Dec 2024 21:25: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 4Y8QV76BnGz4NRT; Thu, 12 Dec 2024 21:25:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734038703; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=N0oWNhKJ2wEaIt6+rsAGcP7gbcKouS4zQJZ1gknvd5I=; b=IdBmtbcrogQ7TPT8IVpCZkoMxw1VyNVMYaEBbgKiQz4sb/67fXhvrtY39OXc3xHYvM9tBP PKSOwFXrOYgUzQyrU7JrXN5M/8hn2TEGZMtpuEXoJ/v9rwHLMkf579lFBgkrWA0w6VrB7W UW3jqTdm0ZBzAuCVolpe6OOvrFl7cN036MMLtWTQhSKhqy0c3FXd+aspHUm3MT9tJDCLRk mnPXKiJsR8pXbw483zCqKDZTjIMgjaLLpFeCt//cLalwNnz4ydPh6uzy85gt5AOaYwMbjn LZYqbUaiEywduU/hzYTprWiZg6vSq6cpBcjRo63OHGO6yAxuZjrlkdhe/DOYew== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734038703; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=N0oWNhKJ2wEaIt6+rsAGcP7gbcKouS4zQJZ1gknvd5I=; b=sZec6nAcHq2WpNExPP9nlHMkctLrHXhV8gkwqdW6UetTo2lnIR4NcHI4XRt9Z+qCmRGsNI Cu4K0z/JpajYPsgkzw6NTcr9iUVfj2HXqOS7V3QT5JTQBNx9ytQaj7xS/4282FytWrhwBM VwnI9R7K+X4XAeky334M7t+2oU6+F8tlqHG5EaZpSKvWPzJBGLQk/Q16LTb+uNZxH1p29i qIeV+NBCWIo376FKfqgB6MBWBg7o9ixFIolApde2v2zuqUFj7Vq12Co2uyTZHoRU6XmkCw GbxjN2fm4u/DaFT24Fm1qSINg12At7ZNi7iJfsgtlIR+3moMpsl1Q8a9gJH34A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1734038703; a=rsa-sha256; cv=none; b=dBIHlXvn0j7FnGPvxTf8Ar7l8yFlBNvbA7wT27bQuog+vlg2FC8YN+vprg/vJQYld40xPt isUa1kNLBiy6U8bavxjVgcmTktUyXl19a2kK2z15qx9dOhch4GeI7wyUsdNcKm9vivar0U XOAWUQdYJx2W75gqQ1kO8wzmAbjxPP9cNyI1vVB37InxbeDEHOSjoNb2JOQYLjUb7w11NK 1pAmyHL6QK/2N68ZLnv8Tt0L1hHuTLUB+s9OGYbqLU7DWJCGSVAL6Y+AojGXGVyq/hypL0 cxWJNlsUJM+XpNf43vjF+iftMNBU8LUzI+ypYfVjmNQuPVp2J39QNhNMCpXiLQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Y8QV75fSJz18dY; Thu, 12 Dec 2024 21:25: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 4BCLP3vM050596; Thu, 12 Dec 2024 21:25:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BCLP3KR050593; Thu, 12 Dec 2024 21:25:03 GMT (envelope-from git) Date: Thu, 12 Dec 2024 21:25:03 GMT Message-Id: <202412122125.4BCLP3KR050593@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Jessica Clarke Subject: git: e32b14ef10a7 - stable/13 - mips/malta: Prefer _start over _locore for entry point symbol List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jrtc27 X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: e32b14ef10a7b0c3130ead9e676c8e6f261f0b69 Auto-Submitted: auto-generated The branch stable/13 has been updated by jrtc27: URL: https://cgit.FreeBSD.org/src/commit/?id=e32b14ef10a7b0c3130ead9e676c8e6f261f0b69 commit e32b14ef10a7b0c3130ead9e676c8e6f261f0b69 Author: Jessica Clarke AuthorDate: 2024-12-12 21:19:04 +0000 Commit: Jessica Clarke CommitDate: 2024-12-12 21:19:04 +0000 mips/malta: Prefer _start over _locore for entry point symbol These are aliases, but it's probably nicer to use the same symbol as we use for the actual ELF entry point. This is a direct commit to stable/13 as mips no longer exists in main. --- sys/mips/malta/malta_mp.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/mips/malta/malta_mp.c b/sys/mips/malta/malta_mp.c index fe284501dffb..e88b5d9f0f46 100644 --- a/sys/mips/malta/malta_mp.c +++ b/sys/mips/malta/malta_mp.c @@ -44,7 +44,7 @@ #include #include -void _locore(__register_t a0, __register_t a1, __register_t a2, +void _start(__register_t a0, __register_t a1, __register_t a2, __register_t a3); #define VPECONF0_VPA (1 << 0) @@ -239,7 +239,7 @@ platform_start_ap(int cpuid) set_thread_context(cpuid); /* Set entry point */ - mttc0(2, 3, (register_t)&_locore); + mttc0(2, 3, (register_t)&_start); /* Enable thread */ reg = mftc0(2, 1); From nobody Thu Dec 12 21:25:07 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Y8QVC4nwCz5glcj; Thu, 12 Dec 2024 21:25: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 4Y8QVC4MwFz4NQf; Thu, 12 Dec 2024 21:25:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734038707; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=WyD5vdfrkxrL4aR4Y68X8tgGi4puYlF3lKErc2elM7k=; b=oxW0eYMIpuWoIM5/3Fh42/s7nWTlyRfntshTOxl59DHi16M/AGzOg8sCg157qR4AmqnIaT qaxvG/mIS/MA8SnLY6PpugQptBycl2Y582H/mCktYNd0aaHPKV5xnxSUBSkntPq4QZu3xB RVKoXV0dlrfwzahIqfhyoY4dwAZ9oG0W62doybNy4lKf1cAADHW46yrcNAVkH17NbiFAM+ 3rnejjzvHIzPaOcI9mbyg/kx9WON0KXAPx/qJrXyTHKK2AotGNnB3z4SW1wPflzSrnKvCb fijIa9dUmcREU1q2rgnlLjwNyk8Wd1lJG0p4lPmahWySI775dMqzjrtUIfrpjw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734038707; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=WyD5vdfrkxrL4aR4Y68X8tgGi4puYlF3lKErc2elM7k=; b=JqH1dhzY5beTGHUELKY/fWI4qzjd98oZ18PcrmaF0aYHAqIEeCDSFy2uFDoI9wWmjA1eAW Oxth/whaghQhe8VkzRApNSKJ/5bgQOmDcMjCW28K5wVbrsixQWb39JPN6OYQ4KnJ3rHzMq ja7m8dvhvt/1v5d5VCYSAOUFV/29AyY2nb8a3gk+aZbqOjpDbjBFzSjyhoGgz/ddqD5jPC BFSXRXR0GfNUzGs2TGkYicvvlXFbSO18kHHUOw+d076eBeTELaJ1pZrnM4vssPdmNpks/B Cc+BTU39dmogBhJJNdMd6IR2oasmzmfMbtnEJQO3LbwXVYyNgiQJGFxPkf0zmw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1734038707; a=rsa-sha256; cv=none; b=DorwaHO22C7KSeQ+M2XBLCu5mXjea3y+5Hfza4V46mnwZ7HmblWfkNVbytF5R6HxeKPbqz Fa9KZi89ZwCtfuXpztRv33YZ2LWuOA8ErQM7ZRpJP7M4WJGBlAq/3e1hZcIjqAC6iAfly4 2TOphdTPTV3ScfZaoHizgf2LKBF6ihJvHO8VNWV4UTNJ6+lwW3wbUm7/FJw3coCFqCLRE5 +BJe56ygRIAyKfgnkTU4KMDnmSmf4bq68K/D9u5La8bpT+GmY+utyp3WL18tgS3pMgvRPy UYSMrypch7j9sBIh2+B89pvYVHAzT0XNFYG8Glw4Bu7c1NNhujviuRU3N+qSlA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Y8QVC3zznz18K6; Thu, 12 Dec 2024 21:25: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 4BCLP7MH050750; Thu, 12 Dec 2024 21:25:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BCLP7Ex050747; Thu, 12 Dec 2024 21:25:07 GMT (envelope-from git) Date: Thu, 12 Dec 2024 21:25:07 GMT Message-Id: <202412122125.4BCLP7Ex050747@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Jessica Clarke Subject: git: 0c9b413e1a73 - stable/12 - mips/malta: Prefer _start over _locore for entry point symbol List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jrtc27 X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: 0c9b413e1a7340452edd52332659929f860c5c20 Auto-Submitted: auto-generated The branch stable/12 has been updated by jrtc27: URL: https://cgit.FreeBSD.org/src/commit/?id=0c9b413e1a7340452edd52332659929f860c5c20 commit 0c9b413e1a7340452edd52332659929f860c5c20 Author: Jessica Clarke AuthorDate: 2024-12-12 21:19:04 +0000 Commit: Jessica Clarke CommitDate: 2024-12-12 21:20:32 +0000 mips/malta: Prefer _start over _locore for entry point symbol These are aliases, but it's probably nicer to use the same symbol as we use for the actual ELF entry point. This is a direct commit to stable/13 as mips no longer exists in main. (cherry picked from commit e32b14ef10a7b0c3130ead9e676c8e6f261f0b69) --- sys/mips/malta/malta_mp.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/mips/malta/malta_mp.c b/sys/mips/malta/malta_mp.c index efdadae0952d..fba220cd1cb4 100644 --- a/sys/mips/malta/malta_mp.c +++ b/sys/mips/malta/malta_mp.c @@ -48,7 +48,7 @@ __FBSDID("$FreeBSD$"); #include #include -void _locore(__register_t a0, __register_t a1, __register_t a2, +void _start(__register_t a0, __register_t a1, __register_t a2, __register_t a3); #define VPECONF0_VPA (1 << 0) @@ -243,7 +243,7 @@ platform_start_ap(int cpuid) set_thread_context(cpuid); /* Set entry point */ - mttc0(2, 3, (register_t)&_locore); + mttc0(2, 3, (register_t)&_start); /* Enable thread */ reg = mftc0(2, 1); From nobody Thu Dec 12 22:43:53 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Y8SF603l6z5gr4M; Thu, 12 Dec 2024 22:43: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 4Y8SF56bcTz4TJc; Thu, 12 Dec 2024 22:43:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734043433; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=VfaXe4FXrCWMSYcspKr/MKWJxNZikFuHEQT1IJm8p7M=; b=He+QbCEAKgK7XUu93aSQJ+m5fmD8X/q66+H43NKmYTfxh1UxE0jxHC9CzDUOPXE2YrZUmy A1/vsfxnBT4Oa4GaVgBJTZsOHCrra1rszQlVYfvWogHJscoK6wBTothBrNrfykIKVkNYrY d2n6EcBXvy4+Q7wjNHT8Z1QnVJF6oLT9Y0bvTXs6PUN8o+uZY3+kzY8y1AeAq3yo7N93Aa J9PpQ2/j7lG0slYVehRWXLs2KKgYMulrh7ASpbZhHepwUT2ScZUB6mdKQWea0vSR/OWpDT jL0SpXL6Zrbef28INokkJ7JzTi8vrq/AE6ZAUDfa3YpA8P1rHNtU4YPgheGvqQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734043433; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=VfaXe4FXrCWMSYcspKr/MKWJxNZikFuHEQT1IJm8p7M=; b=v+poOAiDvTQ7AH5ZZtOejNklyB+yYnywzk3n+fbKHUPAvY7sh+Mn+OViwQQyUmRtSyTOrM vYg3m2mLivDtSlBmcuZ93vOoRTXrwS7AtnHEW3N5pzdV+eOxn6KDHl9SuYhAtAvsLbga1I ANVgEh0MqOQCgCF3lc6u1ESsXdMMPjG92CLmENu3csc3A39EWhrgorMFT9jOpeBTKS+Yw7 K6hoRhN+TWlra/Qbs2GnvrMIybfjmfT+c3q9wLY7JeoLO/9Uyc7Grl0ZQEOQo8IOxPHg4R 4rrkAX8KE7pqJLHzzhy3WoLkUj/5dJbn6yMrnVr781tyJb2+YQnyoXPCPCTsEA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1734043433; a=rsa-sha256; cv=none; b=I/wbmjbUxWjes9YgNArOAoYBFP4FKIwTjNQ2dboKNlCAhxUk6C3rLMDOv127tn/Y7ARjzx O/OJL8HiYW2/Vu+puc+VBtArbQiFjjmmtG3DmryI0D/FYO8oViLfts3egJVW4cgKPdsgu7 a4rjY07MCUBWYXjoq8V+P95ARwysiZblhMT0g4aTuepsFdqpdKF7PAP8ZhD13hk7km+ZAA bADitO5hbZq50cZImq51FnQRndmD5ZfQ4xvH4UN0l6mVP0bb/S1lMkY3mrNeFmBi9/Zyv3 CAn3V3K/1v54HR6Q+R7pPSOsaLtD0MRhsgV3Wo9A0szas+RZT7nw43CKoySEpQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Y8SF561d7z1BVs; Thu, 12 Dec 2024 22:43:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4BCMhrlh098686; Thu, 12 Dec 2024 22:43:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BCMhrOv098683; Thu, 12 Dec 2024 22:43:53 GMT (envelope-from git) Date: Thu, 12 Dec 2024 22:43:53 GMT Message-Id: <202412122243.4BCMhrOv098683@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Jessica Clarke Subject: git: 3e750057fbba - stable/12 - makefs: avoid warning when creating FAT filesystem on existing 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: jrtc27 X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: 3e750057fbbab6bbc1075825fb79517af8f94876 Auto-Submitted: auto-generated The branch stable/12 has been updated by jrtc27: URL: https://cgit.FreeBSD.org/src/commit/?id=3e750057fbbab6bbc1075825fb79517af8f94876 commit 3e750057fbbab6bbc1075825fb79517af8f94876 Author: Ed Maste AuthorDate: 2019-11-08 14:11:25 +0000 Commit: Jessica Clarke CommitDate: 2024-12-12 21:40:40 +0000 makefs: avoid warning when creating FAT filesystem on existing file Previously the mkfs_msdos function (from newfs_msdos) emitted warnings in the case that an image size is specified and the target is not a file, or no size is specified and the target is not a character device. The latter warning (not a character device) doesn't make sense when this code is used in makefs, regardless of whether an image size is specified or not. Sponsored by: The FreeBSD Foundation (cherry picked from commit d9aee13f6fdad3de080ac0f8b9847daf6b9d567b) --- sbin/newfs_msdos/mkfs_msdos.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sbin/newfs_msdos/mkfs_msdos.c b/sbin/newfs_msdos/mkfs_msdos.c index 96080849ca9c..2369a5089fcf 100644 --- a/sbin/newfs_msdos/mkfs_msdos.c +++ b/sbin/newfs_msdos/mkfs_msdos.c @@ -291,8 +291,10 @@ mkfs_msdos(const char *fname, const char *dtype, const struct msdos_options *op) if (!S_ISREG(sb.st_mode)) warnx("warning, %s is not a regular file", fname); } else { +#ifndef MAKEFS if (!S_ISCHR(sb.st_mode)) warnx("warning, %s is not a character device", fname); +#endif } if (!o.no_create) if (check_mounted(fname, sb.st_mode) == -1) From nobody Thu Dec 12 22:43:54 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Y8SF719cZz5grS7; Thu, 12 Dec 2024 22:43: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 4Y8SF702fCz4TZ6; Thu, 12 Dec 2024 22:43:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734043435; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fI7fF0wybFY+sdba6NR4Ar8vS5egaA6rWxRra65atOE=; b=xJ05JHWHZcuBv3mylYPbKsXk9gIid1hnQ5ApP6dVQ3r1G9qH0lmyCozrVHR4mVhHKgScfr P6vhgY1mQ17qWirYELcrUk3J15pdozoisX2heVRHpA55xRBRob6HicxPJQMSr4rRAcob/e NKZEyRlEGjbxihKblFnMMx5cgmBBRAuVMQbbL3TuU0/gW4GzaaWOpGujYXM9WamXHF5qHg nVCBWFy123tWOscIqDar0SY9jczCZ98SoZ3RfTeXy12xJcyP65wbvDSBL6mBcL8giI+5fn eR5zWTS5oidD6ugTLJ0LbCTPX3aHNyLFRi9iZzfd/EZzINA+8sUoJVyCGV01qA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734043435; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fI7fF0wybFY+sdba6NR4Ar8vS5egaA6rWxRra65atOE=; b=qHtn4n3gL0uOJE+9vWFeQt+nFPc0n9JCtMZmx3UscTpoBqpt/2cbUQraTk0aJLAmyt0Has NKcOusQxoszcpoWzCNqw5jYK0XdvtgUXmMyI/jszimGGaeukj4HqEX0KhOOVYWDEvHrIMg dBtSb/8QSnvTYjf/7oDtYjz+ggCPB68llBc0LUEuA1RNIGmGXtGZShLESEfqapNnMHV7fK 2fU4mzTTI0JbEFXLXQTxPIX0L8nBye+cZg5ScVSXATo90KyQnwOpk+tt//Q1JVS9PubHBY 3kPPg5YGOYPlW7H4+s120nQ4nRFoq9WvK6q+jjpS14wO1ULoskIqAXensfx/mg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1734043435; a=rsa-sha256; cv=none; b=RawFeAoRqxD7JUc2LutPdq6xGJmYI2uj60V9L4RrdL3kJNFaN6zmBSNmKea6ugEcF+p0Lg ag9ISxNxLWmBjhDSIAtGZd3S41DAhxZ5tK/dIpqldyTgRSJ6jNorpn78vFvgeZVg2ZC9c/ UOSBAgQnH2WgX1Mh7kQI/vs01qbVrrqwPNFeWEWhkjJfsow8DKENRgXs2X+yAAff0NiATv 94E5dGWq0Jnl3YPs29kCxOkB2ur5kwKVvsznFyaZggcxGOgHOQ5Ogy0PH9eN1RMtzOIkVv 5UE2T6/qQyCNiz4sllH5ipBH17Aa/jQK/aDesfyYoID50F0Ldvh2YevTPaGPqw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Y8SF66llTz1BDd; Thu, 12 Dec 2024 22:43: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 4BCMhsth098746; Thu, 12 Dec 2024 22:43:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BCMhs9C098744; Thu, 12 Dec 2024 22:43:54 GMT (envelope-from git) Date: Thu, 12 Dec 2024 22:43:54 GMT Message-Id: <202412122243.4BCMhs9C098744@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Jessica Clarke Subject: git: 50a53aacc9d3 - stable/12 - Allow bootstrapping makefs on older FreeBSD hosts and Linux/macOS List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jrtc27 X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: 50a53aacc9d39f1f40e96e3949f876567cbb8091 Auto-Submitted: auto-generated The branch stable/12 has been updated by jrtc27: URL: https://cgit.FreeBSD.org/src/commit/?id=50a53aacc9d39f1f40e96e3949f876567cbb8091 commit 50a53aacc9d39f1f40e96e3949f876567cbb8091 Author: Alex Richardson AuthorDate: 2020-01-27 12:02:41 +0000 Commit: Jessica Clarke CommitDate: 2024-12-12 21:41:16 +0000 Allow bootstrapping makefs on older FreeBSD hosts and Linux/macOS In order to do so we need to install the msdosfs headers to the bootstrap sysroot and avoid includes of kernel headers that may not exist on every host (e.g. sys/lockmgr.h). This change should allow bootstrapping of makefs on FreeBSD 11+ as well as Linux and macOS. We also have to avoid using the IO_SYNC macro since that may not be available. In makefs it is only used to switch between calling bwrite() and bdwrite() which both call the same function. Therefore we can simply always call bwrite(). For our CheriBSD builds we always bootstrap makefs by setting LOCAL_XTOOL_DIRS='lib/libnetbsd usr.sbin/makefs' and use the makefs binary from the build tree to create a bootable disk image. Reviewed By: brooks Differential Revision: https://reviews.freebsd.org/D23201 (cherry picked from commit 162ae9c834f6d9f9cb443bd62cceb23e0b5fef48) --- sbin/newfs_msdos/mkfs_msdos.c | 55 +++++++++++++++++++++++++++------- sys/fs/msdosfs/msdosfsmount.h | 4 +++ tools/build/Makefile | 20 ++++++++++++- usr.sbin/makefs/msdos/msdosfs_denode.c | 4 --- usr.sbin/makefs/msdos/msdosfs_vnops.c | 4 +++ 5 files changed, 71 insertions(+), 16 deletions(-) diff --git a/sbin/newfs_msdos/mkfs_msdos.c b/sbin/newfs_msdos/mkfs_msdos.c index 2369a5089fcf..18545a79ea01 100644 --- a/sbin/newfs_msdos/mkfs_msdos.c +++ b/sbin/newfs_msdos/mkfs_msdos.c @@ -31,10 +31,15 @@ static const char rcsid[] = #endif /* not lint */ #include +#ifdef MAKEFS +/* In the makefs case we only want struct disklabel */ +#include +#else #include #include #include #include +#endif #include #include #include @@ -291,14 +296,18 @@ mkfs_msdos(const char *fname, const char *dtype, const struct msdos_options *op) if (!S_ISREG(sb.st_mode)) warnx("warning, %s is not a regular file", fname); } else { -#ifndef MAKEFS +#ifdef MAKEFS + errx(1, "o.create_size must be set!"); +#else if (!S_ISCHR(sb.st_mode)) warnx("warning, %s is not a character device", fname); #endif } +#ifndef MAKEFS if (!o.no_create) if (check_mounted(fname, sb.st_mode) == -1) goto done; +#endif if (o.offset && o.offset != lseek(fd, o.offset, SEEK_SET)) { warnx("cannot seek to %jd", (intmax_t)o.offset); goto done; @@ -629,10 +638,12 @@ mkfs_msdos(const char *fname, const char *dtype, const struct msdos_options *op) bpb.bpbBigFATsecs) * bpb.bpbFATs; memset(&si_sa, 0, sizeof(si_sa)); si_sa.sa_handler = infohandler; +#ifdef SIGINFO if (sigaction(SIGINFO, &si_sa, NULL) == -1) { warn("sigaction SIGINFO"); goto done; } +#endif for (lsn = 0; lsn < dir + (fat == 32 ? bpb.bpbSecPerClust : rds); lsn++) { if (got_siginfo) { fprintf(stderr,"%s: writing sector %u of %u (%u%%)\n", @@ -792,6 +803,11 @@ done: static int check_mounted(const char *fname, mode_t mode) { +/* + * If getmntinfo() is not available (e.g. Linux) don't check. This should + * not be a problem since we will only be using makefs to create images. + */ +#if !defined(MAKEFS) struct statfs *mp; const char *s1, *s2; size_t len; @@ -816,6 +832,7 @@ check_mounted(const char *fname, mode_t mode) return -1; } } +#endif return 0; } @@ -878,6 +895,23 @@ getstdfmt(const char *fmt, struct bpb *bpb) return 0; } +static void +compute_geometry_from_file(int fd, const char *fname, struct disklabel *lp) +{ + struct stat st; + off_t ms; + + if (fstat(fd, &st)) + err(1, "cannot get disk size"); + if (!S_ISREG(st.st_mode)) + errx(1, "%s is not a regular file", fname); + ms = st.st_size; + lp->d_secsize = 512; + lp->d_nsectors = 63; + lp->d_ntracks = 255; + lp->d_secperunit = ms / lp->d_secsize; +} + /* * Get disk slice, partition, and geometry information. */ @@ -886,8 +920,10 @@ getdiskinfo(int fd, const char *fname, const char *dtype, __unused int oflag, struct bpb *bpb) { struct disklabel *lp, dlp; + off_t hs = 0; +#ifndef MAKEFS + off_t ms; struct fd_type type; - off_t ms, hs = 0; lp = NULL; @@ -899,16 +935,8 @@ getdiskinfo(int fd, const char *fname, const char *dtype, __unused int oflag, /* Maybe it's a floppy drive */ if (lp == NULL) { if (ioctl(fd, DIOCGMEDIASIZE, &ms) == -1) { - struct stat st; - - if (fstat(fd, &st)) - err(1, "cannot get disk size"); /* create a fake geometry for a file image */ - ms = st.st_size; - dlp.d_secsize = 512; - dlp.d_nsectors = 63; - dlp.d_ntracks = 255; - dlp.d_secperunit = ms / dlp.d_secsize; + compute_geometry_from_file(fd, fname, &dlp); lp = &dlp; } else if (ioctl(fd, FD_GTYPE, &type) != -1) { dlp.d_secsize = 128 << type.secsize; @@ -948,6 +976,11 @@ getdiskinfo(int fd, const char *fname, const char *dtype, __unused int oflag, hs = (ms / dlp.d_secsize) - dlp.d_secperunit; lp = &dlp; } +#else + /* In the makefs case we only support image files: */ + compute_geometry_from_file(fd, fname, &dlp); + lp = &dlp; +#endif if (bpb->bpbBytesPerSec == 0) { if (ckgeom(fname, lp->d_secsize, "bytes/sector") == -1) diff --git a/sys/fs/msdosfs/msdosfsmount.h b/sys/fs/msdosfs/msdosfsmount.h index 77985e56d65b..adcee78abf7e 100644 --- a/sys/fs/msdosfs/msdosfsmount.h +++ b/sys/fs/msdosfs/msdosfsmount.h @@ -56,8 +56,10 @@ #ifdef _KERNEL #include +#ifndef MAKEFS #include #include +#endif #include #ifdef MALLOC_DECLARE @@ -110,7 +112,9 @@ struct msdosfsmount { void *pm_w2u; /* Unicode->Local iconv handle */ void *pm_u2d; /* Unicode->DOS iconv handle */ void *pm_d2u; /* DOS->Local iconv handle */ +#ifndef MAKEFS struct lock pm_fatlock; /* lockmgr protecting allocations */ +#endif }; /* diff --git a/tools/build/Makefile b/tools/build/Makefile index 0e6d77716852..690237aca490 100644 --- a/tools/build/Makefile +++ b/tools/build/Makefile @@ -4,10 +4,15 @@ LIB= egacy SRC= -INCSGROUPS= INCS SYSINCS +INCSGROUPS= INCS SYSINCS UFSINCS FFSINCS MSDOSFSINCS DISKINCS INCS= SYSINCSDIR= ${INCLUDEDIR}/sys +# Also add ufs/ffs/msdosfs/disk headers to allow building makefs as a bootstrap tool +UFSINCSDIR= ${INCLUDEDIR}/ufs/ufs +FFSINCSDIR= ${INCLUDEDIR}/ufs/ffs +MSDOSFSINCSDIR= ${INCLUDEDIR}/fs/msdosfs +DISKINCSDIR= ${INCLUDEDIR}/sys/disk BOOTSTRAPPING?= 0 @@ -56,6 +61,19 @@ SRCS= dummy.c SUBDIR= cross-build .endif +# To allow bootstrapping makefs on FreeBSD 11 or non-FreeBSD systems: +UFSINCS+= ${SRCTOP}/sys/ufs/ufs/dinode.h +UFSINCS+= ${SRCTOP}/sys/ufs/ufs/dir.h +FFSINCS+= ${SRCTOP}/sys/ufs/ffs/fs.h + +MSDOSFSINCS+= ${SRCTOP}/sys/fs/msdosfs/bootsect.h +MSDOSFSINCS+= ${SRCTOP}/sys/fs/msdosfs/bpb.h +MSDOSFSINCS+= ${SRCTOP}/sys/fs/msdosfs/denode.h +MSDOSFSINCS+= ${SRCTOP}/sys/fs/msdosfs/direntry.h +MSDOSFSINCS+= ${SRCTOP}/sys/fs/msdosfs/fat.h +MSDOSFSINCS+= ${SRCTOP}/sys/fs/msdosfs/msdosfsmount.h +DISKINCS+= ${SRCTOP}/sys/sys/disk/bsd.h + # Needed to build config (since it uses libnv) SYSINCS+= ${SRCTOP}/sys/sys/nv.h ${SRCTOP}/sys/sys/cnv.h diff --git a/usr.sbin/makefs/msdos/msdosfs_denode.c b/usr.sbin/makefs/msdos/msdosfs_denode.c index 39131921bce3..6711bb3f5e3e 100644 --- a/usr.sbin/makefs/msdos/msdosfs_denode.c +++ b/usr.sbin/makefs/msdos/msdosfs_denode.c @@ -54,7 +54,6 @@ __FBSDID("$FreeBSD$"); #include #include -#include #include #include @@ -287,10 +286,7 @@ detrunc(struct denode *dep, u_long length, int flags) return (error); } memset(bp->b_data + boff, 0, pmp->pm_bpcluster - boff); - if (flags & IO_SYNC) bwrite(bp); - else - bdwrite(bp); } } diff --git a/usr.sbin/makefs/msdos/msdosfs_vnops.c b/usr.sbin/makefs/msdos/msdosfs_vnops.c index fbd2a1542fce..5ee693dd5ce8 100644 --- a/usr.sbin/makefs/msdos/msdosfs_vnops.c +++ b/usr.sbin/makefs/msdos/msdosfs_vnops.c @@ -104,7 +104,11 @@ msdosfs_times(struct denode *dep, const struct stat *st) if (stampst.st_ino) st = &stampst; +#ifdef HAVE_STRUCT_STAT_BIRTHTIME unix2fattime(&st->st_birthtim, &dep->de_CDate, &dep->de_CTime); +#else + unix2fattime(&st->st_ctim, &dep->de_CDate, &dep->de_CTime); +#endif unix2fattime(&st->st_atim, &dep->de_ADate, NULL); unix2fattime(&st->st_mtim, &dep->de_MDate, &dep->de_MTime); } From nobody Fri Dec 13 00:18:57 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Y8VLn3mDVz5gwYp; Fri, 13 Dec 2024 00:18: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 4Y8VLn3CwBz4cSG; Fri, 13 Dec 2024 00:18:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734049137; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ojggn5Y+8bMog03jKvGQcP/q+She2pWRrDXddFphvFw=; b=NHpzzsC+sXjvqpcC76AwUj1kHxYEHdwfdRYUDkGn2Zp+vS51lfZVacDL1qJ1Px618Hc4Zv aF5c6wTyGxjH4Yhh1vUG1YPn/Bfz49UhjJk8MkrDQXkTjGNnFxXuoMd1pxIY2rvnRRARvN NXOY6oUNKAwyDpWodol9dNc1RVVWEQi3gqMDdPptTIRhzY7hl8ceEPxXB6MoeJ3N3nDlyG p1UqFWYFyZBuXsnv74zFeXKkBT+sutrc5byl2UR45gDgFK2xlPOKcu6u4P8y0VlmES0gNe 7HCMPmZmf/UP4GPy8flkwQkp7sv3zribMvgrFvr4ZVlpyeXHZIRR3Ic6iOdIRQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734049137; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ojggn5Y+8bMog03jKvGQcP/q+She2pWRrDXddFphvFw=; b=Yu2r/SbWQeoEISbESk5FrW11Z8SfWTGFtzVxxV/+Ygu/KHyA0vxt0KXSsolWosy6EDhnSn YB8v4hTOsXiOIxB89rhtD6q4FfpATow+fSeBC6A/hpSAlR5crmTRoSd3Lafm1rV0N45zj2 erMShIvOsrITmFk0vXqp6KS4EDlmeB9jWuxN2+Haxaj71etICjLIQKBD/pYvuaoTt7lZWu xuUfWNJxVdSKFMSFuV+vDSMSjguUT3vhJzdAyTgSpxv5DkDsNZlinJKTPWE8AuYhlIqCbe UN7QQpKctzCkfp612xeGVpUqU1lnOWAy2HVfhUnGue5xCWAhl3xsI45Nb/ezYQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1734049137; a=rsa-sha256; cv=none; b=NHG/UAifnPbC6ocBPjdelXsmkmagIxTdMZk+snM2jWHRnK4gcxbdsC0Yaw+WVBXLEF2VpS 32h9cq8HxA2gUcz1/Psat8rk/KBP5yunhuao+XW9+Q4LqQ1OB4AXjKRq+xS1ce+NeEVnr1 JBaTapEjzX9Z3PwQsqg1iNsXzQDT04guHwsxUjNNg4Baj3LaLnzn2cCo7KJiYKUiooUdn9 u8F/+t1XDyHdPHJw9JtrFhwbHH1KlxNVuVz7sdnWNAR9kPSbbs/Wa4h5MKxBXxwrOp/FjU FLerQctAHfVMesxrtnn3eLj+xaEp8U8SQvVRydCB4Bv8XE7gh73HIhiiAGGjzw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Y8VLn2jGzzFVq; Fri, 13 Dec 2024 00:18: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 4BD0Ivdt068866; Fri, 13 Dec 2024 00:18:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BD0IvGe068863; Fri, 13 Dec 2024 00:18:57 GMT (envelope-from git) Date: Fri, 13 Dec 2024 00:18:57 GMT Message-Id: <202412130018.4BD0IvGe068863@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Jessica Clarke Subject: git: d7bf409a6350 - stable/13 - rtld-elf: Fix for mips with LLD 14+ List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jrtc27 X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: d7bf409a63501a28357a9a9ec24628e1208d530d Auto-Submitted: auto-generated The branch stable/13 has been updated by jrtc27: URL: https://cgit.FreeBSD.org/src/commit/?id=d7bf409a63501a28357a9a9ec24628e1208d530d commit d7bf409a63501a28357a9a9ec24628e1208d530d Author: Jessica Clarke AuthorDate: 2024-12-13 00:18:33 +0000 Commit: Jessica Clarke CommitDate: 2024-12-13 00:18:33 +0000 rtld-elf: Fix for mips with LLD 14+ As of LLD 14, it no longer falls back to the address of .text if it can't find the entry point, and instead just uses address 0. Since the mips port has always used rtld_start as its entry point symbol but has never set RTLD_ENTRY to match (instead getting the default .rtld_start), with LLD 14+ it ends up using an entry point of 0, i.e. reinterpreting various headers and metadata sections as code, and thus quickly dies, in my case with SIGILL. This has seemingly always been a warning with LLD even when it defaulted to .text, but that went unnoticed this whole time, until now. Fix this by specifying the right symbol name. This is a direct commit to stable/13 as mips no longer exists in main. --- libexec/rtld-elf/mips/Makefile.inc | 1 + 1 file changed, 1 insertion(+) diff --git a/libexec/rtld-elf/mips/Makefile.inc b/libexec/rtld-elf/mips/Makefile.inc index dc41c0cfab27..f2d2ae6d8c36 100644 --- a/libexec/rtld-elf/mips/Makefile.inc +++ b/libexec/rtld-elf/mips/Makefile.inc @@ -1,2 +1,3 @@ +RTLD_ENTRY= rtld_start CFLAGS.reloc.c+=-fno-jump-tables From nobody Fri Dec 13 00:30:03 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Y8Vbc0P8Cz5gxTH; Fri, 13 Dec 2024 00:30: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 4Y8Vbb6n8Gz4cwS; Fri, 13 Dec 2024 00:30:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734049804; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=O3UD11Ke/dAoS4FOEnKf4++0B03LOiMkOiKrARs/5qo=; b=rgVQtzf4QQhLiJZy2eM1oOI0MIHZUwt+nYC4Vy4JIIeCyRmlCEvVwQYAqjaWCI+V8vwV8B o3WZaaPAaJKQEYyvwp4/T4Mhk7w8nnXPrnYPVEJuHJ60Y93ZUzuq0JQXKqoUe5qtv5Bm45 AWvECk+m9sIFbtBrTYf5vIyYiQ11ROP8FhJF6Uq92qMjMBToLZAkN/9fVTItivVv9wYGlc 82HloOuDJrczbFqbf8B9kHo84UKLNRbfZaqFODZj+oPBqSDlUqUomctynIdTWqUIpJvqVB Wjqnj6MfPF/Tmr28nmHSrsaK/Q5giq3mK6TKVSJSPXrLRN3wVeQBAKuGwtyEKQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734049803; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=O3UD11Ke/dAoS4FOEnKf4++0B03LOiMkOiKrARs/5qo=; b=ym/2pG60ELp6QkBvPNIzQp+WsRjOoXV3nZPsaKcpoaUdUQaNFyhla7C9k2MkX9xc/aGv5/ DCj305w6RCKRRmTThk+HdbEtJxxKytM5XJyBfIeCY9iQKykxn5zl8tpRVyWOLTxpD5+IpO WtJXRAypB2rz3TqVT3GnZtqrHdx0HV8Fh4hkeuWhbxBrREpqJUqLf5Oz0yEYYBIru3fKFU IBmH1efay3VXY/OAM6rNN75aamdIHNpqWhhKQfmGMyPM1G1Hid3xGySD4oETpN3lwDEJmW r92CygjmvcQKJ1HK5Sw+++xsCV8I0/DVQuroJpa1PPWXGj1fLE+d5GORukgeXA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1734049803; a=rsa-sha256; cv=none; b=j8BR9gNhSltAUQwvANPzjgBokixi0U2oOMbIwZQDcV95Ctd6tLTejxl4GWI+TRs9b8RBF2 lS7HjvN1G2LEFVjs8+kD2cTa9LIkVe0isjmSeGjVJI5jGphCi5eoi4YqmmLtcGMz4PrUfK S5ZNQ2Bb0JsFRwDVhbNmrEPvJpkdzJm905CMdQ2ZHxpmZ2KR0YE4FJZ9HfNunO+psk4C4C qPTFnOE+7B09X2wM5wbJCrWyBVerJg2w4Ak2NpiBXWf5A9nl1SNCrFz+aNLSOPTM+F3DcZ ti1KdVRUDmYY+x+6+BSOPV/vOHiwfNRSieSRlvzqZ7EoPtrOgm1tckVeaKSOOw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Y8Vbb6NKtzFgB; Fri, 13 Dec 2024 00:30: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 4BD0U3Uw089650; Fri, 13 Dec 2024 00:30:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BD0U3ru089645; Fri, 13 Dec 2024 00:30:03 GMT (envelope-from git) Date: Fri, 13 Dec 2024 00:30:03 GMT Message-Id: <202412130030.4BD0U3ru089645@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Jessica Clarke Subject: git: d4e02f74fe8d - stable/12 - rtld-elf: Fix for mips with LLD 14+ List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jrtc27 X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: d4e02f74fe8de9acbb5370d66b5d507200f2ff42 Auto-Submitted: auto-generated The branch stable/12 has been updated by jrtc27: URL: https://cgit.FreeBSD.org/src/commit/?id=d4e02f74fe8de9acbb5370d66b5d507200f2ff42 commit d4e02f74fe8de9acbb5370d66b5d507200f2ff42 Author: Jessica Clarke AuthorDate: 2024-12-13 00:18:33 +0000 Commit: Jessica Clarke CommitDate: 2024-12-13 00:29:50 +0000 rtld-elf: Fix for mips with LLD 14+ As of LLD 14, it no longer falls back to the address of .text if it can't find the entry point, and instead just uses address 0. Since the mips port has always used rtld_start as its entry point symbol but has never set RTLD_ENTRY to match (instead getting the default .rtld_start), with LLD 14+ it ends up using an entry point of 0, i.e. reinterpreting various headers and metadata sections as code, and thus quickly dies, in my case with SIGILL. This has seemingly always been a warning with LLD even when it defaulted to .text, but that went unnoticed this whole time, until now. Fix this by specifying the right symbol name. This is a direct commit to stable/13 as mips no longer exists in main. (cherry picked from commit d7bf409a63501a28357a9a9ec24628e1208d530d) --- libexec/rtld-elf/Makefile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libexec/rtld-elf/Makefile b/libexec/rtld-elf/Makefile index dfa6d4e6b85e..5604cb80a6e7 100644 --- a/libexec/rtld-elf/Makefile +++ b/libexec/rtld-elf/Makefile @@ -37,6 +37,8 @@ RTLD_ARCH= ${MACHINE_CPUARCH} CFLAGS+= -I${.CURDIR}/${RTLD_ARCH} -I${.CURDIR} .if ${MACHINE_ARCH} == "powerpc64" LDFLAGS+= -nostdlib -e _rtld_start +.elif ${MACHINE_CPUARCH} == "mips" +LDFLAGS+= -nostdlib -e rtld_start .else LDFLAGS+= -nostdlib -e .rtld_start .endif From nobody Fri Dec 13 01:43:56 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Y8XDs0hPXz5h1WK; Fri, 13 Dec 2024 01:43: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 4Y8XDs0451z4jQW; Fri, 13 Dec 2024 01:43:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734054237; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=91YqumezXyoHcptjQ6pmEJJO3X0DAbJ4G7eKQ4HZKZE=; b=Twd5wjr2vPyir+q2EXrGN6Cc0y+SPRRXLYxpAT4XszjvNjo3ssKqXrZxSyeXYChtnNGzBJ JNWke8x1fvdb0A6eyYi/5APKXbtkrR6L9tZjxmZLubQvp/+Xf7N739A3djgFdreXWYk0WO SVn6yCUP8On/FkCikhQwfLkeVeW7xwa191X2splWPVvX/Iaf2h9BhfQCA9pV4vrRCc5gcm 3PRNSguXcoB9e6Ev1Vt38+PGvlsWC9K9yjkI/pzCsrx5d4T3lSAsaWuEhB0emCrwbXOMvp /bCVc9juKqs2RwNU3lsr2m/ThHjetAfJL1HKQoN1aAq9oE/St2HsGMiIsyFbQw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734054237; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=91YqumezXyoHcptjQ6pmEJJO3X0DAbJ4G7eKQ4HZKZE=; b=RucmPhohWe+HJusodgSTXx3ACLlAG7g3l19EqDspMgKK/SEr4IBDtK3BLIoUAXfNB6xjj1 Chn40xkKvQfVy/6107VXSRoZ+kJP/eWeIc1RVdSDM3kS2UjIne7eidxGavRTGKNUpIj9p+ PZS07ZINAVqu5h7xU2f5BubW+ADQT5431dtZB1QRQoQbwoB71z6mxi6AkseAs7zgMdj1Ji 7h7HrZSRSH8QQXQKyqRmFGG/lkqmKM2DbrNp4ckvDkA1pLQFZxWQK5h3id7DtS2p7L9yBV o8cXyw9LWe4WEYNfJzHofy+Ai81kWvFvskPqPlPpdE+qgo3fcatzLyuMZp3/zg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1734054237; a=rsa-sha256; cv=none; b=craka1raaKwgFJPO3leSIQ/zfifu+exBVkraKQbxxemYVWX2mXE2nFmeOUqRicCaIfR/RK Cwxj5h4LCn/8+BVpiySgxzXzG8mTlHW0Lk7avf1zXLKroMXDqES4bzmBUaYY0s+qnAVCRC decbT6Le6XLS1tGBBtlmMTpAJBiUirj59TrF104aXrj/nGSmIUcN1cOl+sLylhj8s+uFvY IgGn3kUKOGFhV4BkwBBFfL6pPMA9YfmIyoKzLjFPEUy6FglfAW+yCG1KmwA3V+sPuysIz8 kQ2YHxeCAF9CrsxIfEFiT7me8HTQm5UNpTNUZjHt+7Nv1Zec+/ou0gkXH0a53Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Y8XDr6mdfzHGq; Fri, 13 Dec 2024 01:43:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4BD1huk8033684; Fri, 13 Dec 2024 01:43:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BD1huOe033681; Fri, 13 Dec 2024 01:43:56 GMT (envelope-from git) Date: Fri, 13 Dec 2024 01:43:56 GMT Message-Id: <202412130143.4BD1huOe033681@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: 2bd47ff64577 - stable/14 - dtrace: Add some more annotations for KMSAN List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-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: 2bd47ff6457759cb5b90245519c0f9f660c2dcc3 Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=2bd47ff6457759cb5b90245519c0f9f660c2dcc3 commit 2bd47ff6457759cb5b90245519c0f9f660c2dcc3 Author: Mark Johnston AuthorDate: 2024-11-23 02:32:36 +0000 Commit: Mark Johnston CommitDate: 2024-12-13 01:34:14 +0000 dtrace: Add some more annotations for KMSAN - Don't allow FBT and kinst to instrument the KMSAN runtime. - When fetching data from the traced thread's stack, mark it as initialized. It may well be uninitialized, but as dtrace permits arbitrary inspection of kernel memory, it isn't very useful to raise KMSAN reports. - Mark data copied in from userspace as initialized, as we do for copyin() etc. using interceptors. MFC after: 2 weeks (cherry picked from commit fdeb273d49bf2fa2544d3c98114859db10385550) --- sys/cddl/dev/dtrace/amd64/dtrace_isa.c | 55 +++++++++++++++++++++++++++------- sys/cddl/dev/fbt/fbt.c | 7 +++++ sys/cddl/dev/kinst/kinst.c | 7 +++++ 3 files changed, 59 insertions(+), 10 deletions(-) diff --git a/sys/cddl/dev/dtrace/amd64/dtrace_isa.c b/sys/cddl/dev/dtrace/amd64/dtrace_isa.c index 83d34abbd270..f14e90d974bc 100644 --- a/sys/cddl/dev/dtrace/amd64/dtrace_isa.c +++ b/sys/cddl/dev/dtrace/amd64/dtrace_isa.c @@ -29,6 +29,7 @@ #include #include #include +#include #include #include @@ -73,6 +74,8 @@ dtrace_getpcstack(pc_t *pcstack, int pcstack_limit, int aframes, frame = (struct amd64_frame *)rbp; td = curthread; while (depth < pcstack_limit) { + kmsan_mark(frame, sizeof(*frame), KMSAN_STATE_INITED); + if (!kstack_contains(curthread, (vm_offset_t)frame, sizeof(*frame))) break; @@ -99,6 +102,7 @@ dtrace_getpcstack(pc_t *pcstack, int pcstack_limit, int aframes, for (; depth < pcstack_limit; depth++) { pcstack[depth] = 0; } + kmsan_check(pcstack, pcstack_limit * sizeof(*pcstack), "dtrace"); } static int @@ -399,8 +403,10 @@ dtrace_getarg(int arg, int aframes) goto load; } - for (i = 1; i <= aframes; i++) + for (i = 1; i <= aframes; i++) { + kmsan_mark(fp, sizeof(*fp), KMSAN_STATE_INITED); fp = fp->f_frame; + } /* * We know that we did not come through a trap to get into @@ -430,6 +436,8 @@ load: val = stack[arg]; DTRACE_CPUFLAG_CLEAR(CPU_DTRACE_NOFAULT); + kmsan_mark(&val, sizeof(val), KMSAN_STATE_INITED); + return (val); } @@ -444,10 +452,13 @@ dtrace_getstackdepth(int aframes) rbp = dtrace_getfp(); frame = (struct amd64_frame *)rbp; depth++; - for(;;) { + for (;;) { + kmsan_mark(frame, sizeof(*frame), KMSAN_STATE_INITED); + if (!kstack_contains(curthread, (vm_offset_t)frame, sizeof(*frame))) break; + depth++; if (frame->f_frame <= frame) break; @@ -574,76 +585,100 @@ void dtrace_copyin(uintptr_t uaddr, uintptr_t kaddr, size_t size, volatile uint16_t *flags) { - if (dtrace_copycheck(uaddr, kaddr, size)) + if (dtrace_copycheck(uaddr, kaddr, size)) { dtrace_copy(uaddr, kaddr, size); + kmsan_mark((void *)kaddr, size, KMSAN_STATE_INITED); + } } void dtrace_copyout(uintptr_t kaddr, uintptr_t uaddr, size_t size, volatile uint16_t *flags) { - if (dtrace_copycheck(uaddr, kaddr, size)) + if (dtrace_copycheck(uaddr, kaddr, size)) { + kmsan_check((void *)kaddr, size, "dtrace_copyout"); dtrace_copy(kaddr, uaddr, size); + } } void dtrace_copyinstr(uintptr_t uaddr, uintptr_t kaddr, size_t size, volatile uint16_t *flags) { - if (dtrace_copycheck(uaddr, kaddr, size)) + if (dtrace_copycheck(uaddr, kaddr, size)) { dtrace_copystr(uaddr, kaddr, size, flags); + kmsan_mark((void *)kaddr, size, KMSAN_STATE_INITED); + } } void dtrace_copyoutstr(uintptr_t kaddr, uintptr_t uaddr, size_t size, volatile uint16_t *flags) { - if (dtrace_copycheck(uaddr, kaddr, size)) + if (dtrace_copycheck(uaddr, kaddr, size)) { + kmsan_check((void *)kaddr, size, "dtrace_copyoutstr"); dtrace_copystr(kaddr, uaddr, size, flags); + } } uint8_t dtrace_fuword8(void *uaddr) { + uint8_t val; + if ((uintptr_t)uaddr > VM_MAXUSER_ADDRESS) { DTRACE_CPUFLAG_SET(CPU_DTRACE_BADADDR); cpu_core[curcpu].cpuc_dtrace_illval = (uintptr_t)uaddr; return (0); } - return (dtrace_fuword8_nocheck(uaddr)); + val = dtrace_fuword8_nocheck(uaddr); + kmsan_mark(&val, sizeof(val), KMSAN_STATE_INITED); + return (val); } uint16_t dtrace_fuword16(void *uaddr) { + uint16_t val; + if ((uintptr_t)uaddr > VM_MAXUSER_ADDRESS) { DTRACE_CPUFLAG_SET(CPU_DTRACE_BADADDR); cpu_core[curcpu].cpuc_dtrace_illval = (uintptr_t)uaddr; return (0); } - return (dtrace_fuword16_nocheck(uaddr)); + val = dtrace_fuword16_nocheck(uaddr); + kmsan_mark(&val, sizeof(val), KMSAN_STATE_INITED); + return (val); } uint32_t dtrace_fuword32(void *uaddr) { + uint32_t val; + if ((uintptr_t)uaddr > VM_MAXUSER_ADDRESS) { DTRACE_CPUFLAG_SET(CPU_DTRACE_BADADDR); cpu_core[curcpu].cpuc_dtrace_illval = (uintptr_t)uaddr; return (0); } - return (dtrace_fuword32_nocheck(uaddr)); + val = dtrace_fuword32_nocheck(uaddr); + kmsan_mark(&val, sizeof(val), KMSAN_STATE_INITED); + return (val); } uint64_t dtrace_fuword64(void *uaddr) { + uint64_t val; + if ((uintptr_t)uaddr > VM_MAXUSER_ADDRESS) { DTRACE_CPUFLAG_SET(CPU_DTRACE_BADADDR); cpu_core[curcpu].cpuc_dtrace_illval = (uintptr_t)uaddr; return (0); } - return (dtrace_fuword64_nocheck(uaddr)); + val = dtrace_fuword64_nocheck(uaddr); + kmsan_mark(&val, sizeof(val), KMSAN_STATE_INITED); + return (val); } /* diff --git a/sys/cddl/dev/fbt/fbt.c b/sys/cddl/dev/fbt/fbt.c index a31c6eb3631c..355c56627afe 100644 --- a/sys/cddl/dev/fbt/fbt.c +++ b/sys/cddl/dev/fbt/fbt.c @@ -137,6 +137,13 @@ fbt_excluded(const char *name) strcmp(name, "owner_sx") == 0) return (1); + /* + * The KMSAN runtime can't be instrumented safely. + */ + if (strncmp(name, "__msan", 6) == 0 || + strncmp(name, "kmsan_", 6) == 0) + return (1); + /* * Stack unwinders may be called from probe context on some * platforms. diff --git a/sys/cddl/dev/kinst/kinst.c b/sys/cddl/dev/kinst/kinst.c index 60400a452b95..82b78d98987c 100644 --- a/sys/cddl/dev/kinst/kinst.c +++ b/sys/cddl/dev/kinst/kinst.c @@ -132,6 +132,13 @@ kinst_excluded(const char *name) strcmp(name, "owner_sx") == 0) return (true); + /* + * The KMSAN runtime can't be instrumented safely. + */ + if (strncmp(name, "__msan", 6) == 0 || + strncmp(name, "kmsan_", 6) == 0) + return (1); + /* * When DTrace is built into the kernel we need to exclude the kinst * functions from instrumentation. From nobody Fri Dec 13 01:43:57 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Y8XDt21vrz5h24T; Fri, 13 Dec 2024 01:43: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 4Y8XDt0TkVz4jJM; Fri, 13 Dec 2024 01:43:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734054238; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=WBdavUopBnWjxbzw7ejg+duElCW1qc3etK29AinaJr8=; b=aX/7xSZ3fyWIWDWC61qbpA9wMgLh2X+rL7wMyfHeZ08uXzsjTueTBF4WxCutUKzl/AICg6 p2QMBl5gX3D3HjEryN+1BpuXb0mcwIHt8cu4JQcwr/qiZ5C9oD8PYgfAhBy0/3P5PCgXNn 7sjRGlJBfEHPfX1ieMGBr7IbUzkS4Ga9pY0kJmZ7sKOEML9pNYtaWJuPBjmWZmzfcbrG7a kS9lV993bz4GA5MYfBoUR2s4eOrMuLo2h8osc8aRYiwuarsERcpQ4uG7FNLuvf/geX/vSH c6ctPaPJ6zNE4svp+cA/EzPJnzEUJSY6T4gbeeCW/xb/U4wM0mwZEzfbvJG7Fg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734054238; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=WBdavUopBnWjxbzw7ejg+duElCW1qc3etK29AinaJr8=; b=afTPeKbRANm1Sv+AMv7i8sOvPpHahnwwxkpMkguR0Ee5b31BbBrZzyAjdjgYcorD8bhNhV lhNgzN40fb9+mcJ1mXacXpyIZM/XUBlJxwpaM77aw5xp7OGT2noAJtcsqqKJRRHvKQsjfx dDk0+YMuUk2ZW9AMWwS6aqLMDoaAIOZ/gh9YpJ8HxkNBg+Gh7uceR/Ucmu+kgJop1ZPncc ex4NMIxz6JyUhAzhEexwG99x6S6WGbteYmxTLktOYW5bm0uEPYaAJLTZzO/8qC45ilSohy 71Oq+8lsbQyGLaYpLBHMEi2mQeY4eCLTNPMlUbUejDt00aQahOuI1eESDHCf/g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1734054238; a=rsa-sha256; cv=none; b=Awj2/tmclRkjtFWZF12ojoTidjAJ00RCWY/efnTKLNdeE8EOYek4PLGuO0kuPpWEH8FKT/ 2bWxjqBITF/DlnFzUIKxT3Blc8kOiwSHU1czqT4ft41Yd1dTwEIRavqcxGxHmizpBD6D4R kcJ4N6Kv+OjaZK8PB6ONG57kK18TEQgVP3fhs6bbG8JYcVFQx6TberksJfLU8r498uB2hR LVH7Ovn30n0kCELhMLrhSoYU66NdbuANMpvVMeISxUAKpNDUzMtUBhWeE5rD0NfU9dojfc Quc038XGAVn7W3wMTNa270dnhBLBLlkV2JY9d4rKGizKBLBhCA6XD/BdP3kU/A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Y8XDt04tXzHGr; Fri, 13 Dec 2024 01:43: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 4BD1hvYQ033735; Fri, 13 Dec 2024 01:43:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BD1hvXI033732; Fri, 13 Dec 2024 01:43:57 GMT (envelope-from git) Date: Fri, 13 Dec 2024 01:43:57 GMT Message-Id: <202412130143.4BD1hvXI033732@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: 8e3c0a69fed2 - stable/14 - livedump: Silence KASAN and KMSAN when livedumping List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-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: 8e3c0a69fed2805157f61c5024e0948b48f80559 Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=8e3c0a69fed2805157f61c5024e0948b48f80559 commit 8e3c0a69fed2805157f61c5024e0948b48f80559 Author: Mark Johnston AuthorDate: 2024-11-25 21:11:37 +0000 Commit: Mark Johnston CommitDate: 2024-12-13 01:34:14 +0000 livedump: Silence KASAN and KMSAN when livedumping The livedumper triggers reports from both of these sanitizers since it necessarily accesses uninitialized or freed memory. Add a flag to silence reports from both sanitizers. Reviewed by: mhorne, khng MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D47714 (cherry picked from commit 37cef00192ef1347d27ac64be419267a4ba604ac) --- sys/kern/kern_vnodedumper.c | 2 ++ sys/kern/subr_asan.c | 3 +++ sys/kern/subr_msan.c | 6 ++++++ sys/sys/proc.h | 1 + 4 files changed, 12 insertions(+) diff --git a/sys/kern/kern_vnodedumper.c b/sys/kern/kern_vnodedumper.c index 0104369b9d67..78979f906abd 100644 --- a/sys/kern/kern_vnodedumper.c +++ b/sys/kern/kern_vnodedumper.c @@ -117,8 +117,10 @@ livedump_start(int fd, int flags, uint8_t compression) if (error != 0) goto out; + curthread->td_pflags2 |= TDP2_SAN_QUIET; dump_savectx(); error = minidumpsys(livedi, true); + curthread->td_pflags2 &= ~TDP2_SAN_QUIET; EVENTHANDLER_INVOKE(livedumper_finish); out: diff --git a/sys/kern/subr_asan.c b/sys/kern/subr_asan.c index bd143a816932..c934ff83874e 100644 --- a/sys/kern/subr_asan.c +++ b/sys/kern/subr_asan.c @@ -395,6 +395,9 @@ kasan_shadow_check(unsigned long addr, size_t size, bool write, if (__predict_false(!kasan_enabled)) return; + if (__predict_false(curthread != NULL && + (curthread->td_pflags2 & TDP2_SAN_QUIET) != 0)) + return; if (__predict_false(size == 0)) return; if (__predict_false(kasan_md_unsupported(addr))) diff --git a/sys/kern/subr_msan.c b/sys/kern/subr_msan.c index 029c5ed8df96..b596443de2aa 100644 --- a/sys/kern/subr_msan.c +++ b/sys/kern/subr_msan.c @@ -179,6 +179,9 @@ kmsan_report_hook(const void *addr, msan_orig_t *orig, size_t size, size_t off, if (__predict_false(KERNEL_PANICKED() || kdb_active || kmsan_reporting)) return; + if (__predict_false(curthread != NULL && + (curthread->td_pflags2 & TDP2_SAN_QUIET) != 0)) + return; kmsan_reporting = true; __compiler_membar(); @@ -232,6 +235,9 @@ kmsan_report_inline(msan_orig_t orig, unsigned long pc) if (__predict_false(KERNEL_PANICKED() || kdb_active || kmsan_reporting)) return; + if (__predict_false(curthread != NULL && + (curthread->td_pflags2 & TDP2_SAN_QUIET) != 0)) + return; kmsan_reporting = true; __compiler_membar(); diff --git a/sys/sys/proc.h b/sys/sys/proc.h index 3815571cd46f..c43d00a223f7 100644 --- a/sys/sys/proc.h +++ b/sys/sys/proc.h @@ -568,6 +568,7 @@ enum { #define TDP2_COMPAT32RB 0x00000002 /* compat32 ABI for robust lists */ #define TDP2_ACCT 0x00000004 /* Doing accounting */ #define TDP2_EFIRT 0x20000000 /* In firmware (EFI RT) call */ +#define TDP2_SAN_QUIET 0x00000008 /* Disable warnings from K(A|M)SAN */ /* * Reasons that the current thread can not be run yet. From nobody Fri Dec 13 01:43:59 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Y8XDv43s8z5h1WN; Fri, 13 Dec 2024 01:43: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 4Y8XDv136Zz4jN5; Fri, 13 Dec 2024 01:43:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734054239; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=UFHTQn/gMCh4+CpM9ZYb5sQbGvEUO7UDzc/uK+zdfk0=; b=da5BR7nixAHIOsdyXgp8dXF5XjLUMc9IZFfdcqpSQHfwUyIWPDr3cOp1H6yID7xbblXpVR mnsEwwDIxlbZL5kBSGEHhre7T6Pe4iIP2jV1WPAuzPGfJo+GMUV8+XS8LyD7wCWXQ7qKQ5 ApbtjNM0jACS1vccLHpluBmzpAwg0opXA/oXnymCztLAHZ/LQJIZk5+W/vFiuotz8W0hwD jtDni0m32zRIX6GsvGD3hdaCS8wMvDAZkOz6NqZ0hY5z6vTG+ldY0GuxSDRP4/c4Jf1HA9 KTFc1+ms5ouzYx7bHMyO4NEZ0b5+80KD0ZCNHCZUnuDoeIELqj0ZJypj401Hpg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734054239; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=UFHTQn/gMCh4+CpM9ZYb5sQbGvEUO7UDzc/uK+zdfk0=; b=YrxRe4/1qyMxZ1ca2+2tGBPbgCr+DjL70EKem51OZvKpsrsjuSapFLfLMAls3l84Nc56wD yDunwzrims/IyaJ9C9QyHgI0yQa2l0f+2XbpOhIKASuG0GsGuHqjm8HI54Lf7Nfn5k9Vjx xiq/c1DuM8FsAt0iwy5uN/pfarQrwm5U9JGHw/jRAN6FvwRg9mkQ5za90XFJKJkB07hzgS Yf1/+Hl6HoLpuW8A1F4nkBV4OHUyr6bP6rUAAbtwZ82/QrL9uiQkatoafC8671jKw6k/wD e4NJmh5mtUpNsGv6ymcFGGq/vuNWsFFvVhGWdEJQysn5MEdSFGkEx4dIto7BNw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1734054239; a=rsa-sha256; cv=none; b=nTEFYBr2M/Ny3EG3ypFohqM1XppIsoB3QJopu2bo2OPajOTaYz8pU7I1zr8DJuoS5CBkKR DTorgdxyMQxAb8lZnQiX4u8M+7f5gVf6hdGCy6UC2f0TaH6edga1eVn3dZ+Xolhr+O4S7p HW1xF975vJ8Y0dRlRkKQp+mdCxKBG0q/JqC+/cINS1lpJImuA67vIBrQbPISIjbUPQHpE/ dTapC+fQazPlLPlYEkjSHPaaj5P8PfOAQaqGe4d8rVm0YQ6MA3C2t/KmbMHNQESHlMt702 j4BIXiWUZ3FFkmhMWqgDtR6z9qNOqSZcj67aP9+e+1D81Ooyd0eyBbX0AAvlIg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Y8XDv0ZZpzHR2; Fri, 13 Dec 2024 01:43: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 4BD1hxe6033788; Fri, 13 Dec 2024 01:43:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BD1hxKG033785; Fri, 13 Dec 2024 01:43:59 GMT (envelope-from git) Date: Fri, 13 Dec 2024 01:43:59 GMT Message-Id: <202412130143.4BD1hxKG033785@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: fea53bf43f85 - stable/14 - savecore: Add a livedump regression test List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-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: fea53bf43f85a6b42245fe5f1330eea27cf6f0db Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=fea53bf43f85a6b42245fe5f1330eea27cf6f0db commit fea53bf43f85a6b42245fe5f1330eea27cf6f0db Author: Mark Johnston AuthorDate: 2024-11-25 21:12:12 +0000 Commit: Mark Johnston CommitDate: 2024-12-13 01:34:14 +0000 savecore: Add a livedump regression test MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D47715 (cherry picked from commit 73465bb47bb37e6efdc61827e260a070dda0a0dc) --- etc/mtree/BSD.tests.dist | 2 ++ sbin/savecore/Makefile | 3 ++ sbin/savecore/tests/Makefile | 3 ++ sbin/savecore/tests/livedump_test.sh | 54 ++++++++++++++++++++++++++++++++++++ 4 files changed, 62 insertions(+) diff --git a/etc/mtree/BSD.tests.dist b/etc/mtree/BSD.tests.dist index b152fb6e5271..7fa7ed24f897 100644 --- a/etc/mtree/BSD.tests.dist +++ b/etc/mtree/BSD.tests.dist @@ -477,6 +477,8 @@ .. route .. + savecore + .. sysctl .. .. diff --git a/sbin/savecore/Makefile b/sbin/savecore/Makefile index fe10df459309..338d168bba0a 100644 --- a/sbin/savecore/Makefile +++ b/sbin/savecore/Makefile @@ -19,4 +19,7 @@ CFLAGS+= -DWITH_CASPER LIBADD+= casper cap_fileargs cap_syslog .endif +HAS_TESTS= +SUBDIR.${MK_TESTS}+= tests + .include diff --git a/sbin/savecore/tests/Makefile b/sbin/savecore/tests/Makefile new file mode 100644 index 000000000000..b58e79f518ef --- /dev/null +++ b/sbin/savecore/tests/Makefile @@ -0,0 +1,3 @@ +ATF_TESTS_SH= livedump_test + +.include diff --git a/sbin/savecore/tests/livedump_test.sh b/sbin/savecore/tests/livedump_test.sh new file mode 100644 index 000000000000..42c726bfad4e --- /dev/null +++ b/sbin/savecore/tests/livedump_test.sh @@ -0,0 +1,54 @@ +# +# SPDX-License-Identifier: BSD-2-Clause +# +# Copyright (c) 2024 Mark Johnston +# + +atf_test_case livedump_kldstat +livedump_kldstat_head() +{ + atf_set "descr" "Test livedump integrity" + atf_set "require.progs" kgdb + atf_set "require.user" root +} +livedump_kldstat_body() +{ + atf_check savecore -L . + + kernel=$(sysctl -n kern.bootfile) + + if ! [ -f /usr/lib/debug/${kernel}.debug ]; then + atf_skip "No debug symbols for the running kernel" + fi + + # Implement kldstat using gdb script. + cat >./kldstat.gdb <<'__EOF__' +printf "Id Refs Address Size Name\n" +set $_lf = linker_files.tqh_first +while ($_lf) + printf "%2d %4d %p %8x %s\n", $_lf->id, $_lf->refs, $_lf->address, $_lf->size, $_lf->filename + set $_lf = $_lf->link.tqe_next +end +__EOF__ + + # Ignore stderr since kgdb prints some warnings about inaccessible + # source files. + # + # Use a script to source the main gdb script, otherwise kgdb prints + # a bunch of line noise that is annoying to filter out. + echo "source ./kldstat.gdb" > ./script.gdb + atf_check -o save:out -e ignore \ + kgdb -q ${kernel} ./livecore.0 < ./script.gdb + + # Get rid of gunk printed by kgdb. + sed -i '' -n -e 's/^(kgdb) //' -e '/^Id Refs /,$p' out + + # The output of kgdb should match the output of kldstat. + atf_check -o save:kldstat kldstat + atf_check diff kldstat out +} + +atf_init_test_cases() +{ + atf_add_test_case livedump_kldstat +} From nobody Fri Dec 13 01:44:00 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Y8XDw3xjdz5h22D; Fri, 13 Dec 2024 01:44: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 4Y8XDw2N0Rz4jfg; Fri, 13 Dec 2024 01:44:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734054240; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=e/mILR7LNT+bnyBcxwJ0PXxCE/cBQufLXC8+GSA1Wx0=; b=ksqLV8gMCwzw4/aD9/Z2QFwDnbN7Gdz9VSWWz62Qi8XjOcwpiD/uo3GE69bXnIEEl7g3LN yWoNysY3giktkE7tIBeoqj+GSvazL6U9amUN8hOgPgW8rt6cEKQz1YrtotXnzMcBAMYOf5 9OOBI8Ai2fHrGadIhwiSR/7+icbH+Jho8IX1kBJhxVfpUQ1yCvBiKLk7b+0UMpE4lyb6EZ o/cbP6/2G3xiTcFqNfpnbecMt5B6lH2gM/jYV0+TC1IxvIB2n1apwBYHAZwEfy+FbYvqUm ZoWCTKBLrqZVKx+vtYAhniO2Cs/WlgBKCeWiRRpf066OJx0b8Ipu4Qi+nrT79A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734054240; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=e/mILR7LNT+bnyBcxwJ0PXxCE/cBQufLXC8+GSA1Wx0=; b=mITxffzKVaffUrWOsAeF56QUP7z+sqABktbsw+H7zyneWLe6CB8mA6MaWESt83Efl+R4KS naSv+fgdZmnVfoXDW2cINpWIGQkg0vYkiIbmBQOEyr87LaGZj8MpuWgBsjBeCIMlBk58hx QbKykznDYJbgGQrr8SpaJ5AW5hFLHCj9bjX95txA+V/u7NBgj3Wx7OJDab+a7A/p9WBpOG SvkJc1S5w0cUuHGoYLbnjORzv8JkZ11IJWpz9vQVRYEr6sfinBw+v+J4sspKCf6E21cJ5w sFZpqDxDLnl/awHdi91jEu79kF7NP27DGFem1WtdRuSFIqsyXNjWkP4M1J2SDg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1734054240; a=rsa-sha256; cv=none; b=PbtO/Z/XEM96gfLvWw0L+qqCy/RG/HiIkvzJlqCAPigofH3b/RmSagNNOPGdzByypd2C/O gQsKzuOLf/mUkvig5NZrOaJWEuRL0TD57l4plSrZQhSc1aWkS7/a9sOvnrm4P2QLt3D4VP 2f7r5/x16qmRc6a+qzIBoCER9bwhQszDbPSukVKfJ7/Hu+kJVMMuxb3IhwHCRbVMs2IpQ2 GKQjzE9HhzkJuFP/8LAjV+nZQfHyExwrxh2dH/1wb+60nnzWgnmChGCRGR76Cf9M5kkcRv 1qCewGMWCxp6EPRCMIUqUR5HW3hFdSRh8RNzY7YqB8cKyV+9QrmMsiCmIMr6Ww== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Y8XDw1ykqzHn0; Fri, 13 Dec 2024 01:44:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4BD1i0ij033872; Fri, 13 Dec 2024 01:44:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BD1i0Ij033869; Fri, 13 Dec 2024 01:44:00 GMT (envelope-from git) Date: Fri, 13 Dec 2024 01:44:00 GMT Message-Id: <202412130144.4BD1i0Ij033869@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: 54974e731f27 - stable/14 - cd9660: Make sure that struct ifid fits in generic filehandle structure List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-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: 54974e731f279941ef7aebd7d30ba2e9299a4056 Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=54974e731f279941ef7aebd7d30ba2e9299a4056 commit 54974e731f279941ef7aebd7d30ba2e9299a4056 Author: Mark Johnston AuthorDate: 2024-12-06 02:03:59 +0000 Commit: Mark Johnston CommitDate: 2024-12-13 01:34:17 +0000 cd9660: Make sure that struct ifid fits in generic filehandle structure File system specific *fid structures are copied into the generic struct fid defined in sys/mount.h. As such, they cannot be larger than struct fid. This patch packs the structure and checks via a __Static_assert(). Reported by: Kevin Miller Reviewed by: olce, imp, kib, emaste MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D47879 (cherry picked from commit 205659c43d87bd42c4a0819fde8f81e8ebba068e) --- sys/fs/cd9660/cd9660_vnops.c | 3 +++ sys/fs/cd9660/iso.h | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/sys/fs/cd9660/cd9660_vnops.c b/sys/fs/cd9660/cd9660_vnops.c index cb619379e2cc..31dacb392a6b 100644 --- a/sys/fs/cd9660/cd9660_vnops.c +++ b/sys/fs/cd9660/cd9660_vnops.c @@ -761,6 +761,9 @@ cd9660_pathconf(struct vop_pathconf_args *ap) /* NOTREACHED */ } +_Static_assert(sizeof(struct ifid) <= sizeof(struct fid), + "struct ifid must be no larger than struct fid"); + /* * Vnode pointer to File handle */ diff --git a/sys/fs/cd9660/iso.h b/sys/fs/cd9660/iso.h index bf98e75c42d9..b54f5f8e5cf4 100644 --- a/sys/fs/cd9660/iso.h +++ b/sys/fs/cd9660/iso.h @@ -269,7 +269,7 @@ struct ifid { u_short ifid_pad; cd_ino_t ifid_ino; long ifid_start; -}; +} __packed; #define VFSTOISOFS(mp) ((struct iso_mnt *)((mp)->mnt_data)) From nobody Fri Dec 13 01:44:01 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Y8XDx3nP3z5h1x2; Fri, 13 Dec 2024 01:44:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Y8XDx2cB8z4jbp; Fri, 13 Dec 2024 01:44:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734054241; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=B1bX1HqVsfjm5UYU5Rj3BYfaPxxMxX4I4q8KrmtvhKk=; b=Mpg6ppcRhlGAyXdMjhFj5nTVOTXj37ZAzi/3LHM9ykST/4HAQNqzgprIh+KxyDafIjj6T1 3jnR+pk2v8LqSUr7nUii6i42aQMh9qQscaqcwsIGOGE/aAtDjW1CBXC2UzL70ZYqpSW9py qYh233ZdVYzTviSkfOSsCfKd3LDlIjPEQY4fjxewF5Byi87echpYG2SeDEVOAq79wPHsKb vk1p3jdb/la/Nz+/0UouhCgJZA1qSfgykwFvJef4WQ6tHV4nHpEUBGjNjt+KfH/cAs91rK HV54L4pLNlvilfVIyrEJ7z20qRGvzCuIjg+MQ77B/IzSGudC87LrnP+DRlLGmQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734054241; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=B1bX1HqVsfjm5UYU5Rj3BYfaPxxMxX4I4q8KrmtvhKk=; b=FlHgpNPZP7JlHQ03hHbRmgsqfJMT1YiJAX7bODjPnrGA9Bl28WXgUoBnxlNMhprvmmJEuC Q/3tVbBRrjlRrpGhQX0XvHYfuF1b/CSRKrm5c/kpUMmsp/+AQuoVsCF451C9IwmNBm6ZBa VVey80Mg+NtJuwXcgwVMWMY+SSt+LCByNFMwcfjAblOk5zzuQB00DEh6NtjtN+rkS+NtlY 4wvmjc+HX7BXeAbgarKHBXCvc3hlkYZBK0FvRw0mdN9mKwXi6d6DL2rl/hPsRhgfGTjB9D mBZNZT5gQeRliwCxAOgge7w+THBXAaAzRcuGbFHfqP9skEsZQbdjC4oklovqMg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1734054241; a=rsa-sha256; cv=none; b=X2bBRQrEIQ+nIfyu/ii+v2Ox7VoebxUr4d3Q8Yq5epVGIoca0AsNjJyYNmQ1xwmr3WHlel cpS+RC1nCE19AHjFOdgcw7bFX6jFbKqbOXOFdkTE+IEtVRe9kCrGf+A23uLGz4gl8FQyTD PMpMYztjpGnUb8lRv2v+RB2PuubRdCjUUuDpB5gvorx+euAZrcjDUd8YiVy2PzOJJJX/Ke QS3Me4OrQ+1h/POlq/Yt0aExGGX+0x3lkCcKd8OA1/3Jk1w5Wz7cGz/ZFK/kSnC01ggJPN Pw8kTfVHhSwU2wWXMvNSwFvSIfeVhGGotzs3lHuWYazoJ7kZgjpuAv5sQmW2dA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Y8XDx2DC3zHn1; Fri, 13 Dec 2024 01:44:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4BD1i1Nx033922; Fri, 13 Dec 2024 01:44:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BD1i1P4033919; Fri, 13 Dec 2024 01:44:01 GMT (envelope-from git) Date: Fri, 13 Dec 2024 01:44:01 GMT Message-Id: <202412130144.4BD1i1P4033919@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: fe0506ce89b1 - stable/14 - cd9660: Remove some unneeded definitions List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-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: fe0506ce89b1dc0bd0abbe707307da0c8dbe567d Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=fe0506ce89b1dc0bd0abbe707307da0c8dbe567d commit fe0506ce89b1dc0bd0abbe707307da0c8dbe567d Author: Mark Johnston AuthorDate: 2024-12-06 02:04:23 +0000 Commit: Mark Johnston CommitDate: 2024-12-13 01:39:21 +0000 cd9660: Remove some unneeded definitions - cd_ino_t can be dropped since ino_t is now 64 bits wide. - ISOFSMNT_ROOT is unused (and defined only for the kernel). No functional change intended. Reviewed by: olce, imp, kib, emaste MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D47880 (cherry picked from commit 96e69c8e3167a57b8b37317796eba3068d12a771) --- sys/fs/cd9660/cd9660_lookup.c | 6 +++--- sys/fs/cd9660/cd9660_node.c | 6 +++--- sys/fs/cd9660/cd9660_node.h | 2 +- sys/fs/cd9660/cd9660_rrip.c | 2 +- sys/fs/cd9660/cd9660_vfsops.c | 8 ++++---- sys/fs/cd9660/cd9660_vnops.c | 2 +- sys/fs/cd9660/iso.h | 15 +++------------ sys/fs/cd9660/iso_rrip.h | 4 ++-- 8 files changed, 18 insertions(+), 27 deletions(-) diff --git a/sys/fs/cd9660/cd9660_lookup.c b/sys/fs/cd9660/cd9660_lookup.c index 0b12a5ffd52e..02e9c6bb5aa6 100644 --- a/sys/fs/cd9660/cd9660_lookup.c +++ b/sys/fs/cd9660/cd9660_lookup.c @@ -51,8 +51,8 @@ #include struct cd9660_ino_alloc_arg { - cd_ino_t ino; - cd_ino_t i_ino; + ino_t ino; + ino_t i_ino; struct iso_directory_record *ep; }; @@ -119,7 +119,7 @@ cd9660_lookup(struct vop_cachedlookup_args *ap) struct cd9660_ino_alloc_arg dd_arg; u_long bmask; /* block offset mask */ int error; - cd_ino_t ino, i_ino; + ino_t ino, i_ino; int ltype, reclen; u_short namelen; int isoflags; diff --git a/sys/fs/cd9660/cd9660_node.c b/sys/fs/cd9660/cd9660_node.c index f6855b0e3d5d..0fbd9916a17a 100644 --- a/sys/fs/cd9660/cd9660_node.c +++ b/sys/fs/cd9660/cd9660_node.c @@ -284,10 +284,10 @@ cd9660_tstamp_conv17(u_char *pi, struct timespec *pu) return cd9660_tstamp_conv7(buf, pu, ISO_FTYPE_DEFAULT); } -cd_ino_t +ino_t isodirino(struct iso_directory_record *isodir, struct iso_mnt *imp) { - cd_ino_t ino; + ino_t ino; /* * Note there is an inverse calculation in @@ -296,7 +296,7 @@ isodirino(struct iso_directory_record *isodir, struct iso_mnt *imp) * and also a calculation of the isodir pointer * from an inode in cd9660_vnops.c:cd9660_readlink() */ - ino = ((cd_ino_t)isonum_733(isodir->extent) + + ino = ((ino_t)isonum_733(isodir->extent) + isonum_711(isodir->ext_attr_length)) << imp->im_bshift; return ino; } diff --git a/sys/fs/cd9660/cd9660_node.h b/sys/fs/cd9660/cd9660_node.h index b1fc187f503d..a9506cb4b68e 100644 --- a/sys/fs/cd9660/cd9660_node.h +++ b/sys/fs/cd9660/cd9660_node.h @@ -58,7 +58,7 @@ typedef struct { struct iso_node { struct vnode *i_vnode; /* vnode associated with this inode */ - cd_ino_t i_number; /* the identity of the inode */ + ino_t i_number; /* the identity of the inode */ /* we use the actual starting block of the file */ struct iso_mnt *i_mnt; /* filesystem associated with this inode */ struct lockf *i_lockf; /* head of byte-level lock list */ diff --git a/sys/fs/cd9660/cd9660_rrip.c b/sys/fs/cd9660/cd9660_rrip.c index f53d483d24e9..d3b8ccab16ae 100644 --- a/sys/fs/cd9660/cd9660_rrip.c +++ b/sys/fs/cd9660/cd9660_rrip.c @@ -596,7 +596,7 @@ static RRIP_TABLE rrip_table_getname[] = { int cd9660_rrip_getname(struct iso_directory_record *isodir, char *outbuf, - u_short *outlen, cd_ino_t *inump, struct iso_mnt *imp) + u_short *outlen, ino_t *inump, struct iso_mnt *imp) { ISO_RRIP_ANALYZE analyze; RRIP_TABLE *tab; diff --git a/sys/fs/cd9660/cd9660_vfsops.c b/sys/fs/cd9660/cd9660_vfsops.c index 25a56ea1595e..76c20c3cf5ca 100644 --- a/sys/fs/cd9660/cd9660_vfsops.c +++ b/sys/fs/cd9660/cd9660_vfsops.c @@ -563,7 +563,7 @@ cd9660_root(struct mount *mp, int flags, struct vnode **vpp) struct iso_mnt *imp = VFSTOISOFS(mp); struct iso_directory_record *dp = (struct iso_directory_record *)imp->root; - cd_ino_t ino = isodirino(dp, imp); + ino_t ino = isodirino(dp, imp); /* * With RRIP we must use the `.' entry of the root directory. @@ -663,15 +663,15 @@ static int cd9660_vfs_hash_cmp(struct vnode *vp, void *pino) { struct iso_node *ip; - cd_ino_t ino; + ino_t ino; ip = VTOI(vp); - ino = *(cd_ino_t *)pino; + ino = *(ino_t *)pino; return (ip->i_number != ino); } int -cd9660_vget_internal(struct mount *mp, cd_ino_t ino, int flags, +cd9660_vget_internal(struct mount *mp, ino_t ino, int flags, struct vnode **vpp, int relocated, struct iso_directory_record *isodir) { struct iso_mnt *imp; diff --git a/sys/fs/cd9660/cd9660_vnops.c b/sys/fs/cd9660/cd9660_vnops.c index 31dacb392a6b..ddc5fa8b0f38 100644 --- a/sys/fs/cd9660/cd9660_vnops.c +++ b/sys/fs/cd9660/cd9660_vnops.c @@ -446,7 +446,7 @@ cd9660_readdir(struct vop_readdir_args *ap) u_short namelen; u_int ncookies = 0; uint64_t *cookies = NULL; - cd_ino_t ino; + ino_t ino; dp = VTOI(vdp); imp = dp->i_mnt; diff --git a/sys/fs/cd9660/iso.h b/sys/fs/cd9660/iso.h index b54f5f8e5cf4..4a35bee59bcc 100644 --- a/sys/fs/cd9660/iso.h +++ b/sys/fs/cd9660/iso.h @@ -220,15 +220,6 @@ struct iso_extended_attributes { enum ISO_FTYPE { ISO_FTYPE_DEFAULT, ISO_FTYPE_9660, ISO_FTYPE_RRIP, ISO_FTYPE_JOLIET, ISO_FTYPE_ECMA, ISO_FTYPE_HIGH_SIERRA }; -#ifndef ISOFSMNT_ROOT -#define ISOFSMNT_ROOT 0 -#endif - -/* - * When ino_t becomes 64-bit, we can remove this definition in favor of ino_t. - */ -typedef __uint64_t cd_ino_t; - struct iso_mnt { uint64_t im_flags; @@ -267,7 +258,7 @@ struct iso_mnt { struct ifid { u_short ifid_len; u_short ifid_pad; - cd_ino_t ifid_ino; + ino_t ifid_ino; long ifid_start; } __packed; @@ -278,7 +269,7 @@ struct ifid { #define lblkno(imp, loc) ((loc) >> (imp)->im_bshift) #define blksize(imp, ip, lbn) ((imp)->logical_block_size) -int cd9660_vget_internal(struct mount *, cd_ino_t, int, struct vnode **, int, +int cd9660_vget_internal(struct mount *, ino_t , int, struct vnode **, int, struct iso_directory_record *); #define cd9660_sysctl ((int (*)(int *, u_int, void *, size_t *, void *, \ size_t, struct proc *))eopnotsupp) @@ -289,7 +280,7 @@ extern struct vop_vector cd9660_fifoops; int isochar(u_char *, u_char *, int, u_short *, int *, int, void *); int isofncmp(u_char *, int, u_char *, int, int, int, void *, void *); void isofntrans(u_char *, int, u_char *, u_short *, int, int, int, int, void *); -cd_ino_t isodirino(struct iso_directory_record *, struct iso_mnt *); +ino_t isodirino(struct iso_directory_record *, struct iso_mnt *); u_short sgetrune(const char *, size_t, char const **, int, void *); #endif /* _KERNEL */ diff --git a/sys/fs/cd9660/iso_rrip.h b/sys/fs/cd9660/iso_rrip.h index 09917893df15..a11cd825b826 100644 --- a/sys/fs/cd9660/iso_rrip.h +++ b/sys/fs/cd9660/iso_rrip.h @@ -65,7 +65,7 @@ typedef struct { off_t iso_ce_off; /* offset of continuation area */ int iso_ce_len; /* length of continuation area */ struct iso_mnt *imp; /* mount structure */ - cd_ino_t *inump; /* inode number pointer */ + ino_t *inump; /* inode number pointer */ char *outbuf; /* name/symbolic link output area */ u_short *outlen; /* length of above */ u_short maxlen; /* maximum length of above */ @@ -78,7 +78,7 @@ int cd9660_rrip_analyze(struct iso_directory_record *isodir, struct iso_node *inop, struct iso_mnt *imp); int cd9660_rrip_getname(struct iso_directory_record *isodir, char *outbuf, u_short *outlen, - cd_ino_t *inump, struct iso_mnt *imp); + ino_t *inump, struct iso_mnt *imp); int cd9660_rrip_getsymname(struct iso_directory_record *isodir, char *outbuf, u_short *outlen, struct iso_mnt *imp); From nobody Fri Dec 13 01:44:10 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Y8XF64qY9z5h1vF; Fri, 13 Dec 2024 01:44: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 4Y8XF62gPHz4k2C; Fri, 13 Dec 2024 01:44:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734054250; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=lhlvP8H880S/q94osCbPHjVxRkof1GkdTHIO+sqAJM8=; b=dOUARolIA5q2EhG11wnxQxLTVEtWFNxgE1EJFR597sgFfVc9SxgIfwsBCW74ZEJbwpkNdC ogBh8jXnOwjJNN6g/IPCaGzuDqK+hae0zV6BDSwJ5QyeXW0NvFaMgG189QIW0vUmrODQKx j/ax7VAL84thlEvxlbm6XeJUaoAxJrQisbO4EYbt3tLzQkaSYt60BbIy0uYJ9SFk2hlNkm YU7K9o0NdOoh8bzrJn6g0W+dTQFLLbjNsrHCimf9BnDQlKMOJUFK1Epxz8DtiedYycVRhG dltIGBI7wsY1NgKEPFbugjHobA4K2SicmEBt9uav/VarJ2qe21c+pEPTW+I2JA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734054250; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=lhlvP8H880S/q94osCbPHjVxRkof1GkdTHIO+sqAJM8=; b=NAzaH3zhHEE9TPVkoyELTpgrt6oPsqMm2n8THcd2gR3CUz0uAGPnm+8rSrhRVwtu3UPYSv omp7CJnuiiZ7spdBXSxGZZmsGRwKUI7QXM6ZPAxGC5hMnx5ozdDlECa/1Wqs955Jdac55s O3vLLW7OzRifZEq2ONKT1RB9Lnssw4nJhdDXS5WaJDsKza8mozrPTj2RuZ02yj7diTCksf NfE3EGe9iNMY7QDcdaN+cOthGgkEhnpNgwWFdSWZ1KPK/q8LZdssvDj4FFMmSzQQO2yz8I b5+D0r8mzfPzaLIa8OzvFg9NMMqUqS6AsJDf0e/Rw2F52pg7hVWwPshUxLtMlA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1734054250; a=rsa-sha256; cv=none; b=tc5YJ52T9G5sRzODJxP5CH7HTRiKUooPLfTGeBT1JTHTNipy8W5tq3ept3wUdPza77kpyU J+Wt2a0uiGWXhbHJA8Xwuo39wtdzWO0t6ljoIvbiisiE8KG6ppk0cyW31LNMCQBmhasKZo FhooNWbJ+B/tcF7J5ITMAgPFaUI+KFY5gC0TmZ1adWat3zwrHSejga/4LB+nuuGbf6t28j Lb7yj45rmuAxHwaIx3ecJp+HIxR7ye+51Zri9E33VX/xf11lfN1Wi5ULc6uyPaY1VEREFZ 863WikAOONLIIfX3i0K5T8nRh4/TBy0GwVL0hTRdO1UWT3pup1JzgmBvcnUTzQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Y8XF62Hf8zH9x; Fri, 13 Dec 2024 01:44: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 4BD1iAM7034096; Fri, 13 Dec 2024 01:44:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BD1iApp034093; Fri, 13 Dec 2024 01:44:10 GMT (envelope-from git) Date: Fri, 13 Dec 2024 01:44:10 GMT Message-Id: <202412130144.4BD1iApp034093@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: cd597b4bb194 - stable/13 - cd9660: Make sure that struct ifid fits in generic filehandle structure List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-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/13 X-Git-Reftype: branch X-Git-Commit: cd597b4bb194f7a0bd756b5299b40ad3607b1baf Auto-Submitted: auto-generated The branch stable/13 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=cd597b4bb194f7a0bd756b5299b40ad3607b1baf commit cd597b4bb194f7a0bd756b5299b40ad3607b1baf Author: Mark Johnston AuthorDate: 2024-12-06 02:03:59 +0000 Commit: Mark Johnston CommitDate: 2024-12-13 01:39:46 +0000 cd9660: Make sure that struct ifid fits in generic filehandle structure File system specific *fid structures are copied into the generic struct fid defined in sys/mount.h. As such, they cannot be larger than struct fid. This patch packs the structure and checks via a __Static_assert(). Reported by: Kevin Miller Reviewed by: olce, imp, kib, emaste MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D47879 (cherry picked from commit 205659c43d87bd42c4a0819fde8f81e8ebba068e) --- sys/fs/cd9660/cd9660_vnops.c | 3 +++ sys/fs/cd9660/iso.h | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/sys/fs/cd9660/cd9660_vnops.c b/sys/fs/cd9660/cd9660_vnops.c index 9598ecdd7712..60b33fa9a493 100644 --- a/sys/fs/cd9660/cd9660_vnops.c +++ b/sys/fs/cd9660/cd9660_vnops.c @@ -826,6 +826,9 @@ cd9660_pathconf(ap) /* NOTREACHED */ } +_Static_assert(sizeof(struct ifid) <= sizeof(struct fid), + "struct ifid must be no larger than struct fid"); + /* * Vnode pointer to File handle */ diff --git a/sys/fs/cd9660/iso.h b/sys/fs/cd9660/iso.h index bf98e75c42d9..b54f5f8e5cf4 100644 --- a/sys/fs/cd9660/iso.h +++ b/sys/fs/cd9660/iso.h @@ -269,7 +269,7 @@ struct ifid { u_short ifid_pad; cd_ino_t ifid_ino; long ifid_start; -}; +} __packed; #define VFSTOISOFS(mp) ((struct iso_mnt *)((mp)->mnt_data)) From nobody Fri Dec 13 07:08:05 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Y8gQs3nTtz5g7rF; Fri, 13 Dec 2024 07:08: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 4Y8gQs2xkXz59S5; Fri, 13 Dec 2024 07:08:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734073685; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=58/bPNfLwgxH9zCAdrOPhNAFCibkWVLR47KNeDxh+zU=; b=nOIz05Sw9Swv0hSL1kuXFll7OMQE0aHOcxxwQoUZ3o/Kkig5z26OPSlVU8L3XOi3SQJGA3 3S4Uotw7QnlIaMhNFfebZP5QEQbjppZBR+VXAk+od2a6uGPwI7n6raRztjQwTyNAco414D KMO6cAV31uau7zi7jOv7vqNgWMMYpMYJ8iKZcEu5Hvgh6jPdyXEo8SS9A2z+CEHZJuCwO7 D6TNBedFdJ6qsxfCHR6ykT+nnO+4N7/KzpKf/pg5LKOAFnwI0JY5c274vo00s8hUY5epka qllUjqdfwRJdeabgSFaSw4A3WHzLIIjjkeQqIyaBKGaVHolRlvgBsGzsUkZeJA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734073685; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=58/bPNfLwgxH9zCAdrOPhNAFCibkWVLR47KNeDxh+zU=; b=W13JGSvcFz2sEOI3qSb3iUHSSORwspyXGZkWumiH+FgrPyh9fNIWuynpWoAdYfEgYMzuwj SGj5oKvy86HX2u375smRKFCZQd/W/+OLf5PE7mZf03pI9W21kWrUsJ5fOm38KA0nxnKGHW o6fFpVp38EfHuL3H16kPa+EOIff6Ic9Ga5o6fgkR2krUfzAVh2RZRjIVTzGukRkYQP5jg5 VhFz4Lbaq+0IhP7rCHfhcrs2Qk0YCPiKEpoxqZAxWJo5c7ISdX8+ZO3E0dz3S0fgCfF+yn J0FyFuMpe859tMv0PBSKImJBk4gJ+KyBGiLPF6UNu+YMWvV8Lod00HYR5BgCJw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1734073685; a=rsa-sha256; cv=none; b=sTAci5lT/j1AeEeD/FwCC3AHGrlqOl7mBIDGYuyI3Aj+yh4QRtVobVw0qUF6IFyY7lgcDH 72s26oKh515Q6dnbrvSTv6PZ+k7E5xPjrDBOEQvLe9761eqvXu5YtW9y4RtL+aPmCxXrZy HnnIMYzE6hmuzRt7G0Kf3pWh0WnhL/SU6WnGYX5k/gR8bL8L4Dpl3sWKbl2A81XxR5x9le sW8G+v+MMthR7Ayisw9qHsXdY5fdrpZxV6/0nRS3Typs2YQsOMyRP//tV+ypqqcACPCWrD j64hMYx2V3mmRTZttvUKm8TqOFxgz6aNIvYW2D/jHG2ZmdCmyhaxZ9UgPSconQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Y8gQs2Y6xzS7n; Fri, 13 Dec 2024 07:08: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 4BD785pG035963; Fri, 13 Dec 2024 07:08:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BD785r2035960; Fri, 13 Dec 2024 07:08:05 GMT (envelope-from git) Date: Fri, 13 Dec 2024 07:08:05 GMT Message-Id: <202412130708.4BD785r2035960@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: 2699315134ab - stable/14 - vmcb.h: fix typo in the comment List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 2699315134abccc98417368e2d143f05ea974c15 Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=2699315134abccc98417368e2d143f05ea974c15 commit 2699315134abccc98417368e2d143f05ea974c15 Author: Konstantin Belousov AuthorDate: 2024-12-10 08:22:01 +0000 Commit: Konstantin Belousov CommitDate: 2024-12-13 07:07:51 +0000 vmcb.h: fix typo in the comment (cherry picked from commit 36b39281a666a4c7269c61f909199131b18783c6) --- sys/amd64/vmm/amd/vmcb.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/amd64/vmm/amd/vmcb.h b/sys/amd64/vmm/amd/vmcb.h index b11dabe5b6de..027e894936bd 100644 --- a/sys/amd64/vmm/amd/vmcb.h +++ b/sys/amd64/vmm/amd/vmcb.h @@ -167,7 +167,7 @@ #define VMCB_NPF_INFO1_GPT BIT(33) /* Guest page table. */ /* - * EXITINTINFO, Interrupt exit info for all intrecepts. + * EXITINTINFO, Interrupt exit info for all interecepts. * Section 15.7.2, Intercepts during IDT Interrupt Delivery. */ #define VMCB_EXITINTINFO_VECTOR(x) ((x) & 0xFF) From nobody Fri Dec 13 07:08:06 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Y8gQt4zsWz5g7hs; Fri, 13 Dec 2024 07:08: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 4Y8gQt4DzWz58xF; Fri, 13 Dec 2024 07:08:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734073686; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=wcq107S6rQAmd6rPlc6Y09d/ootVUfNiuJcZDsUhhS4=; b=UNJ+QvHAbzmdp0lAVmXZaV2L7wClKetAlGwIxLp6d9lEmSFYtoBlBy5QUf3WGAgAoxf57a lcZJ1/hnyMCaD8Ie1D8odCvD4zwylN+E8s7dXO50RKVekp1MRvcPMn2ab9fuWLRKBp7Jbm CMKvnJo3+nfe5esi6BE6pcNKt/bnLXWgDiQaW/jSZe4isPXQtaR0mDLs7mEVmorcMb1e9i tEn0NCUvNwENQVKltRCtDj2EdG6fBRCQWXw1mlS9+CkZwR0s4WK+1ixVX0tATnfjixCqvU vwallHg6OgBglwFRP+6pQaP7VqzN70lEzt0Qrw9Qz2GBpREtSvLOmNuqaPKTFw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734073686; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=wcq107S6rQAmd6rPlc6Y09d/ootVUfNiuJcZDsUhhS4=; b=SjFsy88RR2qjmB4PEd/tNLBguBQUILcbpi8iZvHqn8yN5leJtXnEkNOCH33Zxp60jU3s9n asoFvg6ZgXaa8Jx484xoFljv4yzhsQm0NTvRClapfmu/VM5pP3MR4o9uhvwVhIPg6AaE1f zqM2sQrQpxxooWNyLLCWYhQb8E4eCsLi7N7EyIM4Riju353C8duZ6S3iFU8d5qcRz+ozYO +3QLU6Oirzi5h487a4v2c+ZO8y+csde1mjcxPgRk7gL9nvhiEKU+TWZpbk3s465hHP1d00 KDN9iQosgInIcEZwqb+XlMtDHEJnUp4NBt6pbuxJrHrw26kosVR5EYX+OHcFUA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1734073686; a=rsa-sha256; cv=none; b=ofoEkeo764MACGR0734SW/+ocosRQmvWxaJj/iUgSZudDAMTF4ZkZWXwsSvwvZE/It7z5a gEWPp1FA5y7hCTQ9YZ8R5GuWNrdkEC3g5k3Q/4O0CXP1xJj1O2pKtxTnowBcophUC1+zGq wnqP/GW+54CNiEThP2hT6cY7ZKg93rHc67E6Ja1l+ghCBlwZShqw1vEA4rCXKjyyoPQE4o +YVPOq1xDHZHI1D4YjLjCsrsJVgT2d1l77uc/JufrEE4P0frjsApiAbRFWsFWwx2QvfzGT mLvrT2GuCIm3Qmw89ASOFNiu5lHOknTbEN7kViw2HIUyJEclaxyl0543+0t+iw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Y8gQt3rDTzRmK; Fri, 13 Dec 2024 07:08: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 4BD786vJ036042; Fri, 13 Dec 2024 07:08:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BD7861D036039; Fri, 13 Dec 2024 07:08:06 GMT (envelope-from git) Date: Fri, 13 Dec 2024 07:08:06 GMT Message-Id: <202412130708.4BD7861D036039@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: c924f6176994 - stable/14 - vmcb.h: fix typo in the comment, try two List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-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: c924f6176994b63e416184ef4117e4950643cb6f Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=c924f6176994b63e416184ef4117e4950643cb6f commit c924f6176994b63e416184ef4117e4950643cb6f Author: Konstantin Belousov AuthorDate: 2024-12-10 08:48:55 +0000 Commit: Konstantin Belousov CommitDate: 2024-12-13 07:07:51 +0000 vmcb.h: fix typo in the comment, try two (cherry picked from commit e02029e6f48789394f3ad137fd992b5f33e336fc) --- sys/amd64/vmm/amd/vmcb.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/amd64/vmm/amd/vmcb.h b/sys/amd64/vmm/amd/vmcb.h index 027e894936bd..09150fc26a72 100644 --- a/sys/amd64/vmm/amd/vmcb.h +++ b/sys/amd64/vmm/amd/vmcb.h @@ -167,7 +167,7 @@ #define VMCB_NPF_INFO1_GPT BIT(33) /* Guest page table. */ /* - * EXITINTINFO, Interrupt exit info for all interecepts. + * EXITINTINFO, Interrupt exit info for all intercepts. * Section 15.7.2, Intercepts during IDT Interrupt Delivery. */ #define VMCB_EXITINTINFO_VECTOR(x) ((x) & 0xFF) From nobody Fri Dec 13 19:13:58 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Y8zXR1kDrz5gyL6; Fri, 13 Dec 2024 19:13: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 4Y8zXQ6Xnfz4Jwy; Fri, 13 Dec 2024 19:13:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734117238; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=RfFf6rwE29N3krBhgKiMz9qlD9yK3MK5J4Q/xvy6fto=; b=OYuVNTpYFZhVcf0YOVlFO5WJ5V5kwPuXabyCbVM8voPZ5jXj7UI4i4K1jBd9xr9IwtKYUe d+G23jGwaM12zwlu7EeLSOZteAnXa2mxuLVksalSt+gEWIoy7PJq7I0buTTmfNq/B76pTn IZWNgUEk9YWqyejqL4fxzCM14LKB9nQ4fDxzho6SSqbCh+05gwgkSzgMpBXFrRUM2E/5Ha tibPY88nUhu+iHic0QIVGO5cr7vJQWR2/CXplDjIg8aqO8YK+ex1oqvoKZz8TM/Lk76SQ6 ZJ5Pth/CCNDHLEFFEP/CTs2lWAnD0D25ZGysZjWZtBxtm3jAn14z8cmoqougEQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734117238; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=RfFf6rwE29N3krBhgKiMz9qlD9yK3MK5J4Q/xvy6fto=; b=kHQ2DW9uKX4Z2kmGsuIUu9LF1YddB5Gww3WZc5D+jIZkXWiO17OYstDCiznTC8Gt0mV8v2 BN483oYXtJrn/v/+PiEYZr1zguU1khptBGiDa9pKVS9LM5xT4cLfRb4hFj5QMRVi+BHNDc OoEg31IdjlOfcbkQOYQYwEd3+9aIrNwzp8XtAJsiF82SIb7emk6pDDnBbC+O9wZIELhHCz Z2K8PtPSFjWMxRMkdEchAU/Yss5IC2VhgV7z7N4NdPCu8jswFz8REef39grvjF0sWDFqLj 60r5B/9RTJ9wmovkD0gJLP/gdG/ENO0ISZfQ3AA0KnNvuNJm/qCHkKVNOERQFg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1734117238; a=rsa-sha256; cv=none; b=ryMRJGlaHM+L5iH18liJJlS917JjRu+VUp1OR3ykontQWfuGDpAwU922kBGG/vG2MIGbZY gTEQJWqNxS4uaMybas/TA2t3xP+xRof2Sg0cLUm3Hi+hDSjgoXVy/xlsABUkdvD6KZDYxI u5TnQR/r+BR9GFOOW9iMCLtaImI57NDeSkoaF/CdGWd464of7/9+CfRWcTGDZKjMCdj4HA nwfnz0A1bfKLMPHJf8Mm6uqa4R2d2NgUFG+pa8DPvcS3KjldbsMCvXp5QInJTj5BVQrePh l7JRrirHlVYiNaMeeb6/Ez1V6R55rIEv7qj0iOZBnsLbO+vwdwqhQf+kxdcpMg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Y8zXQ67rszq5P; Fri, 13 Dec 2024 19:13: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 4BDJDwHA000598; Fri, 13 Dec 2024 19:13:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BDJDwOQ000595; Fri, 13 Dec 2024 19:13:58 GMT (envelope-from git) Date: Fri, 13 Dec 2024 19:13:58 GMT Message-Id: <202412131913.4BDJDwOQ000595@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Maxim Konovalov Subject: git: 7620bade4c75 - stable/14 - login.conf.5: remove a stray quote List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: maxim X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 7620bade4c75bc92e885126e0cbcf53ca1f12feb Auto-Submitted: auto-generated The branch stable/14 has been updated by maxim: URL: https://cgit.FreeBSD.org/src/commit/?id=7620bade4c75bc92e885126e0cbcf53ca1f12feb commit 7620bade4c75bc92e885126e0cbcf53ca1f12feb Author: Maxim Konovalov AuthorDate: 2024-12-11 18:23:22 +0000 Commit: Maxim Konovalov CommitDate: 2024-12-13 19:13:53 +0000 login.conf.5: remove a stray quote PR: 282858 (cherry picked from commit d6917af2b9da76ac1df1977b2a3c09fb9d45db11) --- lib/libutil/login.conf.5 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/libutil/login.conf.5 b/lib/libutil/login.conf.5 index b1e7211e4c18..d43fdfb761f3 100644 --- a/lib/libutil/login.conf.5 +++ b/lib/libutil/login.conf.5 @@ -204,7 +204,7 @@ login environment. .It "pseudoterminals number Maximum number of pseudo-terminals." .It "swapuse size Maximum swap space size limit." .It "umtxp number Maximum number of process-shared pthread locks." -.It "pipebuf" size Maximum size of pipe buffers." +.It "pipebuf size Maximum size of pipe buffers." .El .Pp These resource limit entries actually specify both the maximum From nobody Fri Dec 13 20:04:20 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Y90fX6NVKz5g3Kg; Fri, 13 Dec 2024 20:04: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 4Y90fX5c9Nz4QKl; Fri, 13 Dec 2024 20:04:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734120260; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qKh4tqFWbm6ohq+Nv1CNB2TRmgWDXpdWQsv7i2b66eY=; b=xkLs0K1jGtxpLKzUL/PFDdrmvKpk5N8QgNCUH8PcuAsqlwxZ1boDgc2ipJMxRozcRVnN8+ 2QdKlSRUuMhoPbuUHM69LxZpd2GgpP/64md8QIU0V5/t4RbrMpW107oA7pebaEcFhu6R4g 88c26NwdrX9dvnYSnTdgUMWfqpvJrK7+cEBFf1wKSFDnp0wx7FdIPx8nnRgF/UmKF/sWB0 ZjiYe+lpc51Sbg1/b1B6WLTKI1xLulrCxIbZte9cwmmpW+IZvwZ75hO249l842SDb0/Nm7 hGP4+mHq5CWDJqC3KqK7bTwPQAGfRsySYHm6tKa0xrc0xnYRmitPFiwgOE40Og== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734120260; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qKh4tqFWbm6ohq+Nv1CNB2TRmgWDXpdWQsv7i2b66eY=; b=RuZE80GPth/AviHfsbsnxH2r2QHtKtfTvRJvFPhuItS2xu4v2swK1Zo0dnrB3NK6KOEuni owjsXQgzgwCCbxpp5EoQxNAnN8/mdXIB7Q8lYYqsRyD1BWubdZO3M2O81obAKwptYuz48f qo+3VmGS0/i9yGE31T5/ll73y64tL6ozANpYqtR81+lpjD7kPKzH60jaTIdhufQUnxEKlE naJEp3mxi5BJY5gLHRi/nNdOiRgwejMSBXsOyuW3rVAsS/IsnTdrOZ6M0W9LfRLqlS/en1 GkecxWPPiPXNhJk+VMzaF8LBXOfYLn741O35m49vwh3/N09yt9xK3BVn3gjqXg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1734120260; a=rsa-sha256; cv=none; b=H6rGMoxMq6VEdgbKpGKjPo/ALODOzLoFheKbuA9WF3BIW6pFiKr9TDDsAKhCf2iyBV1X6d FDcGXr6sNuXqf/02v22kSaHtJ0LpLDSTa9/EISqDgohfsQXGUiBL33O5ujY4qztEmQcVKl TIQwm0B0cm5gX1PmJVTAHLoOKY2aWVwi6jWzdm7KrWkxw81PAa8tVX3VU5MzpyBKCz2T/f KTlR6hp8Bwk6dJMmUpExIkJlh8bgEUXU2yCqk9x/0DkhLnNkKM6hEZpAD1MsRfbiqT6Qob +iziECknRduUIwZAUUqcFselnTi1150RmUVtdPXdxdkmz5JClEO1LDM9bQx8Lg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Y90fX5Cs6zs6F; Fri, 13 Dec 2024 20:04: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 4BDK4KKe094197; Fri, 13 Dec 2024 20:04:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BDK4K7Q094194; Fri, 13 Dec 2024 20:04:20 GMT (envelope-from git) Date: Fri, 13 Dec 2024 20:04:20 GMT Message-Id: <202412132004.4BDK4K7Q094194@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dmitry Salychev Subject: git: 05150edd1e30 - stable/13 - dpaa2: Fix kernel built with ACPI_DEBUG List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dsl X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 05150edd1e303d47362bef5d25e2fd5e66de092b Auto-Submitted: auto-generated The branch stable/13 has been updated by dsl: URL: https://cgit.FreeBSD.org/src/commit/?id=05150edd1e303d47362bef5d25e2fd5e66de092b commit 05150edd1e303d47362bef5d25e2fd5e66de092b Author: Dmitry Salychev AuthorDate: 2024-11-18 21:56:11 +0000 Commit: Dmitry Salychev CommitDate: 2024-12-13 20:02:28 +0000 dpaa2: Fix kernel built with ACPI_DEBUG PR: 282800 Reported by: phk Tested by: bz MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D47666 (cherry picked from commit c2dd2be344fbf59cf95f6773d4b09cc7dda0f876) --- sys/dev/dpaa2/dpaa2_mc_acpi.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/sys/dev/dpaa2/dpaa2_mc_acpi.c b/sys/dev/dpaa2/dpaa2_mc_acpi.c index 388bb764afff..75cbfcb0791f 100644 --- a/sys/dev/dpaa2/dpaa2_mc_acpi.c +++ b/sys/dev/dpaa2/dpaa2_mc_acpi.c @@ -46,6 +46,7 @@ #include #include +#include #include #include "acpi_bus_if.h" @@ -56,6 +57,9 @@ #include "dpaa2_mc.h" #include "dpaa2_mc_if.h" +#define _COMPONENT ACPI_BUS +ACPI_MODULE_NAME("DPAA2_MC") + struct dpaa2_mac_dev_softc { int uid; uint64_t reg; From nobody Fri Dec 13 20:06:37 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Y90j930bmz5g3QV; Fri, 13 Dec 2024 20:06: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 4Y90j92S2Bz4QcX; Fri, 13 Dec 2024 20:06:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734120397; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=uQLQFoQXFgG0wKalSFcCZEQqwYOJHsIsxNWez/Ny3xU=; b=u6zIMZRP1Wj8qF/Zagqv9KQpKlTqvHvTmYwcHLin5dtyAFblFANtNmw8bqgHsgrjH2kicj +EKzrwykruKHkTYUsFrroqYHdsBfmncfX44NwPYTbrMMgssXwXPslrSHyzb0AhyIUFxcQG +SdXyuRcCxGysZEoRlTKq0YKdXrgbwyEwMCVLGgiRjBdrES3gNb8z/3RkC4GO3MDptFklf F6pKudM+BImNMeAeK4ajVFVvHyK8v0MVQBrtpzk1ZoN4jPwFHA6Yoy9p97k/MRwBIDfc9Q BKbhqbAxa8awvioc/ZqB3pQePzcHaHIm9bHr38DcwIVfVwdCIr8gYh9ZA0JOEw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734120397; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=uQLQFoQXFgG0wKalSFcCZEQqwYOJHsIsxNWez/Ny3xU=; b=ZXuRcrawplVlkKxoF7pE9kZWfBx02uOGzlZr1HR+M+0mcrpb+Pxu2bx+MCQdie3HzCprjU pESKPkzJkfPowbKUH2HLlNim/71k5yfpjRvH9ptTqD0VM7YRkPDTH2BmqyFZl/D+de9mQG V7j//pAPM6f0lXS/P2heaXOwpEiZLTP6ptmcbspz0wm4g+sk3JuEmqQrS7ksMcd7RuYDl2 EotKwijQ2/tDVSY1Kl6X7sLF+HkrMBYAF7lO8kWwvwJFUVkPD2SsJlbQg1T+OJ+VZ8zd6F EUawT8wLBiXcbc7uMZ8dEOznun26CruuyfV/aWNes6ol/DAfEkCBjgAQkfgz/w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1734120397; a=rsa-sha256; cv=none; b=ObXhIe4WaiCrCXDhwGk0ATvP8Q4cen98S2iD3qxiGnRZpT+viw9IaKLUe2OQvoa3z2pmlu 6mVSgIc1VyktK7yjqk9eK4n4pGgEyqVGaKr2MLpLagpLDiAgmNX/674QIY6Mc3RK/fPgGZ zEEKDrJO221SUj+BA8hyTIWupxmA3WU6MXVHziqye2S7XdQiv92ZTrNNyM2fAjvxow1cvB 39FGvbQQgRugBRQIgJxXiWdXAIXco/fgWR17gSRGrkC+YgRy62l+buLHSmdYdkyONjLGOk Gi//F651kJtJhh/xURNGKDFBisx/b4cKfz2u5JcBMNDvNURKdWLoJ1/W/HXCkw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Y90j923L2zrkC; Fri, 13 Dec 2024 20:06: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 4BDK6b9G094985; Fri, 13 Dec 2024 20:06:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BDK6bnU094982; Fri, 13 Dec 2024 20:06:37 GMT (envelope-from git) Date: Fri, 13 Dec 2024 20:06:37 GMT Message-Id: <202412132006.4BDK6bnU094982@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dmitry Salychev Subject: git: 795e9c9b5503 - stable/14 - dpaa2: Fix kernel built with ACPI_DEBUG List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dsl X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 795e9c9b55036ede124ac5821644477da757aa52 Auto-Submitted: auto-generated The branch stable/14 has been updated by dsl: URL: https://cgit.FreeBSD.org/src/commit/?id=795e9c9b55036ede124ac5821644477da757aa52 commit 795e9c9b55036ede124ac5821644477da757aa52 Author: Dmitry Salychev AuthorDate: 2024-11-18 21:56:11 +0000 Commit: Dmitry Salychev CommitDate: 2024-12-13 20:05:53 +0000 dpaa2: Fix kernel built with ACPI_DEBUG PR: 282800 Reported by: phk Tested by: bz MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D47666 (cherry picked from commit c2dd2be344fbf59cf95f6773d4b09cc7dda0f876) --- sys/dev/dpaa2/dpaa2_mc_acpi.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/sys/dev/dpaa2/dpaa2_mc_acpi.c b/sys/dev/dpaa2/dpaa2_mc_acpi.c index 388bb764afff..75cbfcb0791f 100644 --- a/sys/dev/dpaa2/dpaa2_mc_acpi.c +++ b/sys/dev/dpaa2/dpaa2_mc_acpi.c @@ -46,6 +46,7 @@ #include #include +#include #include #include "acpi_bus_if.h" @@ -56,6 +57,9 @@ #include "dpaa2_mc.h" #include "dpaa2_mc_if.h" +#define _COMPONENT ACPI_BUS +ACPI_MODULE_NAME("DPAA2_MC") + struct dpaa2_mac_dev_softc { int uid; uint64_t reg; From nobody Fri Dec 13 21:05:08 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Y920j0kf5z5g7Lt; Fri, 13 Dec 2024 21: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 4Y920h75Rpz4XYK; Fri, 13 Dec 2024 21:05:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734123909; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=FJ0Q5Qx3ksV1Ni2qyM0hla0YCfTEi+t5TdpYOztW0Fs=; b=GmNsdWBUpt3xW2TIt/afevTO+5J07Z5ZsnSTPLwBi9YwnyHlFXYpN5EFf7bEb/K3gc6WLE 7onJIbv92G3ICT8nz3YeqaJ9tp6EhjK17VEvYG23fxa57lHERjN6UXkVe/6FGLCIPIdL63 3JYDkVE0fuadzLggWNSjRbQ4tFlQAqx3xDZQ2kpCapQ60Y8NhoMX2AET/NjSQ71Lt1Oeah qHmqqQBfAVgOAN450zvzLoEpCamsNss/m5tlXTuIdRD087uF7fzq0BKI6L60GtxtTKueCs cmN1Rrr2iArLqSZF66RVRDO5phFQgCZJx1nOjSfivjLw51E8nBwcKGyUz8WAoQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734123909; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=FJ0Q5Qx3ksV1Ni2qyM0hla0YCfTEi+t5TdpYOztW0Fs=; b=IixpgNvIbTrmaLOBzfnUkMuHfPdCkKOdDPx0A7ftd5sGYswZOkGb7VTvQtbbXXUN1WTet5 Lm0NTIg9oewRuB3lt0+wvBLSvY1BTPZFA5ILKMylV7xeT3aRApC6bTUvx+Zn8n+Q3gOk6d QIj2boNqsG+5paU016ebSEbJ4APnUWJUnCiZ5L6uuqA1n2Yw1LK5t1mO+9sKFn22Hvt7vs AAaexmyKsY0TXLfL7CsQ6lO5s55S6+hS/R4x3lw3YNZS+rSc71DP6ihxc2LkBpfF/xtDh+ ipYIrevpgNW1PXIF8mYWYQjjcmjJ8h6qSpqW12PPsgDyCBM4ZVSlgs5B5m7Tdw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1734123909; a=rsa-sha256; cv=none; b=LQ+RrlMc2Xikd5RNSUQOZKkdZxitPQa+qHrsvMndbDXx/uj2zmw1fbKlkcluQxRQRPMzPD zmXt6W1k3H0lcHxy8FKdTsg6LBcU5fbCYLAY+cz+Es7amaYIvuIQTBdRduez+uSSSb9kQq pO+pRs9dvb+/Re5iRW6FWc7oc013P8fr4+4Pr7SZvCoROWkPG1NXPRhEEmeJIZQWnaT242 t+3qUXBzZ0DolT6aJD7kP5/W6K3I6gYV32pGkrVKIuQVZZXC7HRYVFw3o1jPIgKSIt6S91 bIC5HhyUfkpwYevtk438VlszobiVzNcmcYswJx9uXe0BlFXBEFc92ofJajXIeQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Y920h6jPSzt5M; Fri, 13 Dec 2024 21:05: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 4BDL58aZ005384; Fri, 13 Dec 2024 21: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 4BDL58wO005381; Fri, 13 Dec 2024 21:05:08 GMT (envelope-from git) Date: Fri, 13 Dec 2024 21:05:08 GMT Message-Id: <202412132105.4BDL58wO005381@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Brooks Davis Subject: git: f69b6410a632 - stable/14 - depend-cleanup.sh: Extend clean_dep to support a custom regex List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: brooks X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: f69b6410a632655896a4c31280604c4af5f1a4ed Auto-Submitted: auto-generated The branch stable/14 has been updated by brooks: URL: https://cgit.FreeBSD.org/src/commit/?id=f69b6410a632655896a4c31280604c4af5f1a4ed commit f69b6410a632655896a4c31280604c4af5f1a4ed Author: Jessica Clarke AuthorDate: 2024-09-10 17:54:44 +0000 Commit: Brooks Davis CommitDate: 2024-12-13 20:58:38 +0000 depend-cleanup.sh: Extend clean_dep to support a custom regex This will avoid having to duplicate the loop every time the default regex isn't good enough, and will be used by upcoming commits. (cherry picked from commit cc30f4ae6790cf4f19bc4787d7528dfea79ef27a) --- tools/build/depend-cleanup.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tools/build/depend-cleanup.sh b/tools/build/depend-cleanup.sh index a4d367d7c463..c560a079f43c 100755 --- a/tools/build/depend-cleanup.sh +++ b/tools/build/depend-cleanup.sh @@ -89,11 +89,12 @@ run() # $1 directory # $2 source filename w/o extension # $3 source extension +# $4 optional regex for egrep -w clean_dep() { for libcompat in "" $ALL_libcompats; do dirprfx=${libcompat:+obj-lib${libcompat}/} - if egrep -qw "$2\.$3" "$OBJTOP"/$dirprfx$1/.depend.$2.*o 2>/dev/null; then + if egrep -qw "${4:-$2\.$3}" "$OBJTOP"/$dirprfx$1/.depend.$2.*o 2>/dev/null; then echo "Removing stale ${libcompat:+lib${libcompat} }dependencies and objects for $2.$3" run rm -f \ "$OBJTOP"/$dirprfx$1/.depend.$2.* \ From nobody Fri Dec 13 21:37:38 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Y92kB4MDYz5g9Zn; Fri, 13 Dec 2024 21:37:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Y92kB3rmmz4dhf; Fri, 13 Dec 2024 21:37:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734125858; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=DOhTl5zFL2jliJ7mfsEPcDa7Pk1tgZ+zvyL/H5ZPkEA=; b=hEbrrL4wvgP8L8krYwVY/7cfAljx1N+zwWaS/4Wh2m1kTFunA72S1Sn8kzPkA9PhBvL+wb 1Dv9aAuLeJD8NAJjrby33hYGkm8H/HNODBpJK6PJ14iHxq2aWmGzYYE/T+zmpfHUReCINe 0u0S2pzzeyKjHwWjRaZwt4sv3N7EKTki6hcxMt1FJ7OMwcyf+bUu6Rg4f2eNySyjdsLCs5 BO/fuDRXUwWhxIAGBTSAQ1Mc/C4LpMD2h0SjT+BNfoh/J+A2W1rFJ57FtL8iP3ZoWGTcDe L6x/lXBljVi7a/yXVnP6m7bj07k/J6gL+G1LTR0hPY1eYO012nECyVATSz0P3g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734125858; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=DOhTl5zFL2jliJ7mfsEPcDa7Pk1tgZ+zvyL/H5ZPkEA=; b=xjOC2Q9GmhYsqEYbbN6kl+fnTJ0LUCmNv5LHDFCl5XOzoy35q4FGrZB3MykFh9JtfC8fMw gheDd8gJax+hvP74BEk+OVa5Z+zZU4Hs1NRs2vs3ujv/499M0d3CGfUZujNoRlHLice+FP eHKY+REXVRrZ4ELRzbjMwwmPhTDadNDKU9iOtBSPwjzY7NGwRiIxl0hrCYz9ZpVOy7g+NB Pl050hnHk02tIROivJovq7ojD1C4IHJ/1sp4yymLWFMLXiRpD8yCn1Pdr70OIfHpmoupRs Zj7Xa6JamCp+gojkJcZiZ7Hvf25zi5TZz/OeS582QX3eG8ysdLdDQ4pJphEfLw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1734125858; a=rsa-sha256; cv=none; b=ARGzfX0nzaKTkhCq5Bsie34cW0DpA6as1RvhEPJJfPoB/T4JnAmfUOidzzez6IL581bcW8 uRFrbBEBXjovCaB0tEEh3cPcGReQTm4t1mVdvYu3KiJqSNMztXJ1W0JoSe3thHRJuFx2m9 Hs2OZSyT8T9ztesc12/D5+dWfJtLBPHovPRv8XHK5P8n68qDBDp32aWr/abhRw29r+eiom OAtL4grthBoL72fMZFhygQN4hsbc3SwG8nbUSKa5WN6/FOxL+qm3YD5s/VN/hTd9FAu7ED XZ6Qi9tDnlUfqoFbSws3P3lcb38NsevTQ27Ahk5eKCKq3gkCU5zBA2isIOWUcg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Y92kB3LX2zv5H; Fri, 13 Dec 2024 21:37: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 4BDLbcPR061628; Fri, 13 Dec 2024 21:37:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BDLbcHE061625; Fri, 13 Dec 2024 21:37:38 GMT (envelope-from git) Date: Fri, 13 Dec 2024 21:37:38 GMT Message-Id: <202412132137.4BDLbcHE061625@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Jessica Clarke Subject: git: 8176157d69b8 - stable/13 - mips: Extract HWREna configuration and call from APs List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jrtc27 X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 8176157d69b89a811f997cbbe490dfd57595f264 Auto-Submitted: auto-generated The branch stable/13 has been updated by jrtc27: URL: https://cgit.FreeBSD.org/src/commit/?id=8176157d69b89a811f997cbbe490dfd57595f264 commit 8176157d69b89a811f997cbbe490dfd57595f264 Author: Jessica Clarke AuthorDate: 2024-12-13 21:37:00 +0000 Commit: Jessica Clarke CommitDate: 2024-12-13 21:37:00 +0000 mips: Extract HWREna configuration and call from APs The intent of mips_get_identity is to perform any feature detection and corresponding global system configuration, but currently it is also abused to set HWREna.UL on the BSP when available, with APs being left unconfigured. Extract that part out into its own function that gets called after mips_get_identity on the BSP, and call it on the APs from smp_init_secondary. This is a direct commit to stable/13 as mips no longer exists in main. Reviewed by: jhibbits Differential Revision: https://reviews.freebsd.org/D48064 --- sys/mips/include/md_var.h | 1 + sys/mips/mips/cpu.c | 21 ++++++++++++++++++--- sys/mips/mips/mp_machdep.c | 3 +++ 3 files changed, 22 insertions(+), 3 deletions(-) diff --git a/sys/mips/include/md_var.h b/sys/mips/include/md_var.h index ac2b7b692139..cfc13c950d4f 100644 --- a/sys/mips/include/md_var.h +++ b/sys/mips/include/md_var.h @@ -71,6 +71,7 @@ void mips_wait(void); void mips_vector_init(void); void mips_cpu_init(void); +void mips_hwrena_init(void); void mips_pcpu0_init(void); void mips_proc0_init(void); void mips_postboot_fixup(void); diff --git a/sys/mips/mips/cpu.c b/sys/mips/mips/cpu.c index d504d6c34d14..fc8c9bddbc42 100644 --- a/sys/mips/mips/cpu.c +++ b/sys/mips/mips/cpu.c @@ -141,10 +141,11 @@ mips_get_identity(struct mips_cpuinfo *cpuinfo) /* Check to see if UserLocal register is implemented. */ if (cfg3 & MIPS_CONFIG3_ULR) { - /* UserLocal register is implemented, enable it. */ + /* + * UserLocal register is implemented, enable it later in + * mips_hwrena_init. + */ cpuinfo->userlocal_reg = true; - tmp = mips_rd_hwrena(); - mips_wr_hwrena(tmp | MIPS_HWRENA_UL); } else { /* * UserLocal register is not implemented. Patch @@ -275,11 +276,25 @@ mips_get_identity(struct mips_cpuinfo *cpuinfo) #endif } +void +mips_hwrena_init(void) +{ + uint32_t reg; + + reg = mips_rd_hwrena(); + + if (cpuinfo.userlocal_reg) + reg |= MIPS_HWRENA_UL; + + mips_wr_hwrena(reg); +} + void mips_cpu_init(void) { platform_cpu_init(); mips_get_identity(&cpuinfo); + mips_hwrena_init(); num_tlbentries = cpuinfo.tlb_nentries; mips_wr_wired(0); tlb_invalidate_all(); diff --git a/sys/mips/mips/mp_machdep.c b/sys/mips/mips/mp_machdep.c index dfc3b59f0533..8a5903b2b514 100644 --- a/sys/mips/mips/mp_machdep.c +++ b/sys/mips/mips/mp_machdep.c @@ -52,6 +52,7 @@ #include #include #include +#include struct pcb stoppcbs[MAXCPU]; @@ -276,6 +277,8 @@ void smp_init_secondary(u_int32_t cpuid) { + mips_hwrena_init(); + /* TLB */ mips_wr_wired(0); tlb_invalidate_all(); From nobody Fri Dec 13 21:38:00 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Y92kc2vqDz5g9pJ; Fri, 13 Dec 2024 21:38: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 4Y92kc2RgYz4drQ; Fri, 13 Dec 2024 21:38:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734125880; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8YCp2/13aWvy3/ehhMU2CHBTZqzU0U1vJLfIhApN13c=; b=mncqBo76ECyk+fC+gTn8RhGzAVbvrzk/pxA/JySRDqV0vtIMHx0GH/NCd+t9DiIKJj5hnF +oi8y2jau5mhPLR2eVmPM6TxZMyfvx+Ej3ZL7e1eE5iFe2pUCISZ/X1PrvtAOM3ZXpPee3 rR4dLQ+wVh2YCbTICvAjovyeJ93PALaLZ3rOOHmgdBwk5UqzrY8b9lDCqGewtLlfnhG7VR FQ9Zk2niqJL5MdR0hKCvetvP6cYUIwchTgeftIBJoOWDE/lURz+VUOVD+cUC4ht0NcNNWJ O8YqT1aMa00rWKlIw386pTU/jgADT2XTzbphuFt7ewGQ+MfFNvzPdd1Nj0bU5A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734125880; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8YCp2/13aWvy3/ehhMU2CHBTZqzU0U1vJLfIhApN13c=; b=ePT74kzXXS9Zgyd6ugxu5S6Z/teDoSafCnISX6wHNj35OQkDS7Td1aq20umIEQqMMFbzss H1s5vum8SpyqtlDyD2H2+2gewpQup26KLRFc3hqiEQtBvxsE1jq0aQz2N33FjUVQju4wl8 9Bl81mA6KEYNNZjD3r4kCSVtyykJrsY2QUlFy4CqPfd7Low+fAuKEMabV32wRwb5B4PfhS Mf69ehVmoLgOjA8L8iuEnC2kOdWgQV9jRQ32obDtsi+YuARoCYk4sFfK2FiYpRubnHssV7 e9MSH/kEME23Smb2ZVQ6vAizyNa9DTXDc97cAFe0USo0OpZx8IHC0Vqnm2hc3w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1734125880; a=rsa-sha256; cv=none; b=mdoTDmxATunGTleb1dRbWsob72m5o4+cSZj4kj6EWoITcYpqGwETHE/PRi8/8geVlbJrjX YUoZolsLMjbuEXO6R1qGJg2POvrusGCVoZspfmwb3e6nhfd+D/PyyDodQ1wOljwq2ChtN0 HibDwUouxdibpyQs0PWIbe/jbkqzYDNERLd1JT/R3izFCej2n3rrOh6GhUCDm7qTJ5g3cn mTO4H/Li7QSuMdJBDs4qBP+nDqj2LHFQmzsm9guAnqJXJExG/XMX23R95sxp0EiGmGxXup RXoZgI0sqFZtEIr6bKpbtDDOS/G5oQyn5Gb5bawWbt5w6zM/sH+DV6R/7huYZg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Y92kc22npztpH; Fri, 13 Dec 2024 21:38: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 4BDLc08a061877; Fri, 13 Dec 2024 21:38:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BDLc0bK061874; Fri, 13 Dec 2024 21:38:00 GMT (envelope-from git) Date: Fri, 13 Dec 2024 21:38:00 GMT Message-Id: <202412132138.4BDLc0bK061874@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Jessica Clarke Subject: git: 9aed7107bbfb - stable/12 - mips: Extract HWREna configuration and call from APs List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jrtc27 X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: 9aed7107bbfbe9f919b547d68e9cd228a1a1852c Auto-Submitted: auto-generated The branch stable/12 has been updated by jrtc27: URL: https://cgit.FreeBSD.org/src/commit/?id=9aed7107bbfbe9f919b547d68e9cd228a1a1852c commit 9aed7107bbfbe9f919b547d68e9cd228a1a1852c Author: Jessica Clarke AuthorDate: 2024-12-13 21:37:00 +0000 Commit: Jessica Clarke CommitDate: 2024-12-13 21:37:51 +0000 mips: Extract HWREna configuration and call from APs The intent of mips_get_identity is to perform any feature detection and corresponding global system configuration, but currently it is also abused to set HWREna.UL on the BSP when available, with APs being left unconfigured. Extract that part out into its own function that gets called after mips_get_identity on the BSP, and call it on the APs from smp_init_secondary. This is a direct commit to stable/13 as mips no longer exists in main. Reviewed by: jhibbits Differential Revision: https://reviews.freebsd.org/D48064 (cherry picked from commit 8176157d69b89a811f997cbbe490dfd57595f264) --- sys/mips/include/md_var.h | 1 + sys/mips/mips/cpu.c | 21 ++++++++++++++++++--- sys/mips/mips/mp_machdep.c | 3 +++ 3 files changed, 22 insertions(+), 3 deletions(-) diff --git a/sys/mips/include/md_var.h b/sys/mips/include/md_var.h index 0150e6acd354..cca58e5cd1b3 100644 --- a/sys/mips/include/md_var.h +++ b/sys/mips/include/md_var.h @@ -72,6 +72,7 @@ void mips_wait(void); void mips_vector_init(void); void mips_cpu_init(void); +void mips_hwrena_init(void); void mips_pcpu0_init(void); void mips_proc0_init(void); void mips_postboot_fixup(void); diff --git a/sys/mips/mips/cpu.c b/sys/mips/mips/cpu.c index 0f8583dbd40a..37acb0d5effa 100644 --- a/sys/mips/mips/cpu.c +++ b/sys/mips/mips/cpu.c @@ -192,10 +192,11 @@ mips_get_identity(struct mips_cpuinfo *cpuinfo) /* Check to see if UserLocal register is implemented. */ if (cfg3 & MIPS_CONFIG3_ULR) { - /* UserLocal register is implemented, enable it. */ + /* + * UserLocal register is implemented, enable it later in + * mips_hwrena_init. + */ cpuinfo->userlocal_reg = true; - tmp = mips_rd_hwrena(); - mips_wr_hwrena(tmp | MIPS_HWRENA_UL); } else { /* * UserLocal register is not implemented. Patch @@ -327,11 +328,25 @@ mips_get_identity(struct mips_cpuinfo *cpuinfo) #endif } +void +mips_hwrena_init(void) +{ + uint32_t reg; + + reg = mips_rd_hwrena(); + + if (cpuinfo.userlocal_reg) + reg |= MIPS_HWRENA_UL; + + mips_wr_hwrena(reg); +} + void mips_cpu_init(void) { platform_cpu_init(); mips_get_identity(&cpuinfo); + mips_hwrena_init(); num_tlbentries = cpuinfo.tlb_nentries; mips_wr_wired(0); tlb_invalidate_all(); diff --git a/sys/mips/mips/mp_machdep.c b/sys/mips/mips/mp_machdep.c index 1a5a023db381..0bf0981ecaae 100644 --- a/sys/mips/mips/mp_machdep.c +++ b/sys/mips/mips/mp_machdep.c @@ -54,6 +54,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include struct pcb stoppcbs[MAXCPU]; @@ -278,6 +279,8 @@ void smp_init_secondary(u_int32_t cpuid) { + mips_hwrena_init(); + /* TLB */ mips_wr_wired(0); tlb_invalidate_all(); From nobody Fri Dec 13 21:49:51 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Y930J0kQwz5gBf9; Fri, 13 Dec 2024 21:49:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Y930H6MMTz4gcx; Fri, 13 Dec 2024 21:49:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734126591; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=n3J/XFDQVgWu4iKEX5JByTYdCHDQhIw2M3obEWlathk=; b=sELOzUATZII47tkLuQ6GB3wX7m5C9ZVqEHO5ilc5R0F3yK1ykIJl0AHbeHo5/adkrnPAkN LkBQ91qWzc8mQQ0SD2NFXxmNtwI29QfvG+AuBT7Zt8gA+D0yriS0+I5nbjACh1RVz/nePr lU+H7/9ha+y16MC0ZdzKJWMwftRTbGx9Rv5Ucz53Rn1bl/3VZ90jQDVDQLS6TnWPbgoSIF Pl1YnkmJ51s/X5ABgW17IN8elJkvCpKjnXQq3OrhtZaUjeV8ce4kTz+r1j2XZchFqTZKbE AO6cZs1phO0QR915n2nRTyeDO3LTXN5lOuWDrHA3YR6k/4nrdmoadXL53lSR2w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734126591; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=n3J/XFDQVgWu4iKEX5JByTYdCHDQhIw2M3obEWlathk=; b=AfhS1cfYZ4cIXqAsgQPwLIlqu0YNl6L+qkcngrtzGcPj5vXlpwDjgeIBGzF65i8CYXkhzo VXeWfmYUj04xisEGpv31UWhjI61lAKMMBEBr2LPmrbrcBx+yv6TBwk96KtJ74y2jw8TqgW qKXE40BhptFm2XWWEBJmtbU5JRDgOD8RtfZw0ZkuQPvtuIxjK9iW9ibSNmRLTpf7rNlApe cie2FGTS93kua5eid+CYTVFzZx6GT3GvUsPgTkmg2ojHa2mwHkvbk0ZBhYd1nGHaWjTspx o1XH8tIu2O7CRZUfa0hL8CfFQOL9v1b1E41+TNYpHr7q8jcncNmbT35fp7MTJA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1734126591; a=rsa-sha256; cv=none; b=V5ZuBNdbH4VMqt8Nbzrd3POolYtJjhPGofNpUN9JDqbImoFGA2qywlmnYv2h3la5MiZGIt MZZoHxF9deaWw93JnVoCvunHexvReya4yUnXi1XnsNrUs8jgL+Qz4y6E1WMwISrvZaSmM8 cFZ6kPbf10I6U5TD12+PSvhsNQ4SMIvuaD0IeOeJ4gGmH0CmtM8ygQGGfVyoYrK2q7GBg2 RXx5S4NvkXdkhuWx5hXkMPLCRAMYA1H3JPKeKXgfbha4te70nzNRoxDZvZL9gmPrvs+xuO n0FKwVLJyQ35SyhAERE1ZbM3R7Eq+780yyRfh2kgQlDdx38qdKfqGzDM57hGpg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Y930H5zh5zvX0; Fri, 13 Dec 2024 21:49:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4BDLnpuM081116; Fri, 13 Dec 2024 21:49:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BDLnpNR081113; Fri, 13 Dec 2024 21:49:51 GMT (envelope-from git) Date: Fri, 13 Dec 2024 21:49:51 GMT Message-Id: <202412132149.4BDLnpNR081113@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Brooks Davis Subject: git: 3e9f61464ee3 - stable/14 - nvi: use memmove to realign buffers List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: brooks X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 3e9f61464ee36a01d60fa21572e3d44475f4cade Auto-Submitted: auto-generated The branch stable/14 has been updated by brooks: URL: https://cgit.FreeBSD.org/src/commit/?id=3e9f61464ee36a01d60fa21572e3d44475f4cade commit 3e9f61464ee36a01d60fa21572e3d44475f4cade Author: Brooks Davis AuthorDate: 2024-11-27 17:38:42 +0000 Commit: Brooks Davis CommitDate: 2024-12-13 21:05:19 +0000 nvi: use memmove to realign buffers Replace a rather convoluted realignment algorithm with memmove(). In addition to being hard to understand, the code would read beyond the end of the input buffer in certain conditions (found on CheriBSD). Sponsored by: DARPA Pull Request: https://github.com/lichray/nvi2/pull/122 (cherry picked from commit 56ef9c872bc5b086d73fed6317159e40be32d40e) --- contrib/nvi/common/log.c | 22 +++++----------------- 1 file changed, 5 insertions(+), 17 deletions(-) diff --git a/contrib/nvi/common/log.c b/contrib/nvi/common/log.c index 96b246efad02..d9b142b16d01 100644 --- a/contrib/nvi/common/log.c +++ b/contrib/nvi/common/log.c @@ -706,30 +706,18 @@ apply_with(int (*db_func)(SCR *, recno_t, CHAR_T *, size_t), SCR *sp, recno_t lno, u_char *p, size_t len) { #ifdef USE_WIDECHAR - typedef unsigned long nword; - static size_t blen; - static nword *bp; - nword *lp = (nword *)((uintptr_t)p / sizeof(nword) * sizeof(nword)); - - if (lp != (nword *)p) { - int offl = ((uintptr_t)p - (uintptr_t)lp) << 3; - int offr = (sizeof(nword) << 3) - offl; - size_t i, cnt = (len + sizeof(nword) / 2) / sizeof(nword); + static u_char *bp; + if (!__builtin_is_aligned(p, sizeof(unsigned long))) { if (len > blen) { blen = p2roundup(MAX(len, 512)); - REALLOC(sp, bp, nword *, blen); + REALLOC(sp, bp, u_char *, blen); if (bp == NULL) return (1); } - for (i = 0; i < cnt; ++i) -#if BYTE_ORDER == BIG_ENDIAN - bp[i] = (lp[i] << offl) ^ (lp[i+1] >> offr); -#else - bp[i] = (lp[i] >> offl) ^ (lp[i+1] << offr); -#endif - p = (u_char *)bp; + memmove(bp, p, len); + p = bp; } #endif return db_func(sp, lno, (CHAR_T *)p, len / sizeof(CHAR_T)); From nobody Fri Dec 13 21:49:52 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Y930K2Td9z5gBNX; Fri, 13 Dec 2024 21:49:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Y930K06phz4gr7; Fri, 13 Dec 2024 21:49:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734126593; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Be0tWhxOLn4u5mjXAbUs8p4s42IOfLhrjx6RJak4ZJY=; b=KYKs5dCcN8OxuHXCdFW3jjx6EAlZteDAC5ZxnOcEg+YXODFoP/UByAVKSj5qYz4rSfy24i FyQGmPWuglEjxito1MdOMpj+7YAWKqrFgEQGi+zz6GD/uVpVZ5YmTACJwvfBZrTDU+Qgz4 s6CzQjX1kyWcSePwoSf2O8EE6ijnQq+O8PRPY2Lf3E0IEM7k3l4zdwGDQHVhkjDuD/cUAq LckclYcXrEOGghV18ZQC57sOHXLMRUJdJhZkJbbtO2K6Ce9EM8XreF8pXa7lvM19Q3zHgV 0c7R5nGsdHBlO0d0jRJkH14ex2OJUsWlKGYtg0IHwgRZyL5AQA4oD9Uy3NzJlw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734126593; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Be0tWhxOLn4u5mjXAbUs8p4s42IOfLhrjx6RJak4ZJY=; b=i+ifWQNDMFqupgl5jGOYKigvwAGcOB8YxrFqwNi0yx2v8u3lSHNjE9P09nOoYpakkK3Mtg ItTnSeMaPXkte39gjJFn3tttDe4oSyXv6/2mRVJM8jDhcYaVs0KesTxvlZpnmG9teqiPr6 IGmaLkZVsk5E51mIZYfYMr233UIvQmDqGZ/v2BcfuCj8dYY0JmqsICH1PxxPX/wm/fGKb4 udLg1PMrOeFwByTIvrTacQc60tTn0OAglcnbTdlQg16r0fQwNVZeVfwKOlruqMMXsqODbh ki7Xj3SD/HeRmg/JdR4P1TIuJMAlmr2aCjQbG61tpRW50fw8SmQ2Kl9piyw2wQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1734126593; a=rsa-sha256; cv=none; b=XfV3hDk/ftL6eRMcCmVz91hLuHOv2Jva1HA9uONNXR/o3JfIV/E4aroaJNA2yGRFOrhxQV TesIiYhUJ/abnr7Kcb+ZuVA3F/Dehebey+VkTU++br3iXQkkaYTkyzboyqF2AsbUlwkDM2 zmHdnRCg0abrVO7sR3wXvDAcyIrJX2jBVl1uHWIhKUs3iZza26Owdl7KBIDL7uN/QEHV7x SLgjXWQ9GBobkC/OEeU0eptVIJfHA4YP6nJxkoFSYngUjK+jY2Bduwg5lXrVDWgUB9HY9z vGoBs4C+qoAcGR72+r+cLczSn8Ei7THy0mA6zPkyfYNMQ5YCZOEN20lR2kAACA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Y930J6rx2zv4d; Fri, 13 Dec 2024 21:49:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4BDLnqmb081167; Fri, 13 Dec 2024 21:49:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BDLnquF081164; Fri, 13 Dec 2024 21:49:52 GMT (envelope-from git) Date: Fri, 13 Dec 2024 21:49:52 GMT Message-Id: <202412132149.4BDLnquF081164@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Brooks Davis Subject: git: c71b427bfa9a - stable/14 - nvi: Replace Clang-only __builtin_is_aligned with C code (#124) List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: brooks X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: c71b427bfa9aca65d64cbc95231df5883fc582c9 Auto-Submitted: auto-generated The branch stable/14 has been updated by brooks: URL: https://cgit.FreeBSD.org/src/commit/?id=c71b427bfa9aca65d64cbc95231df5883fc582c9 commit c71b427bfa9aca65d64cbc95231df5883fc582c9 Author: Zhihao Yuan AuthorDate: 2024-11-27 18:30:46 +0000 Commit: Brooks Davis CommitDate: 2024-12-13 21:05:24 +0000 nvi: Replace Clang-only __builtin_is_aligned with C code (#124) We should use alignof in the future. Obtained from: https://github.com/lichray/nvi2/commit/25c4d7db4ea638a31ac458b733a3b67b0a0ff634 (cherry picked from commit 06a98fefd3d3ff42b7e7832af6c0736b98f167ac) --- contrib/nvi/common/log.c | 2 +- contrib/nvi/common/mem.h | 12 ++++++++++++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/contrib/nvi/common/log.c b/contrib/nvi/common/log.c index d9b142b16d01..d1a1bc6f704a 100644 --- a/contrib/nvi/common/log.c +++ b/contrib/nvi/common/log.c @@ -709,7 +709,7 @@ apply_with(int (*db_func)(SCR *, recno_t, CHAR_T *, size_t), SCR *sp, static size_t blen; static u_char *bp; - if (!__builtin_is_aligned(p, sizeof(unsigned long))) { + if (!is_aligned(p, sizeof(unsigned long))) { if (len > blen) { blen = p2roundup(MAX(len, 512)); REALLOC(sp, bp, u_char *, blen); diff --git a/contrib/nvi/common/mem.h b/contrib/nvi/common/mem.h index d24ec0b50b09..0c83b70dec2f 100644 --- a/contrib/nvi/common/mem.h +++ b/contrib/nvi/common/mem.h @@ -212,6 +212,18 @@ p2roundup(size_t n) return (n); } +/* + * is_aligned -- + * Determine whether the program can safely read an object with an + * alignment requirement from ptr. + * + * See also: https://clang.llvm.org/docs/LanguageExtensions.html#alignment-builtins + */ +static __inline int +is_aligned(void *ptr, size_t alignment) { + return ((uintptr_t)ptr % alignment) == 0; +} + /* Additional TAILQ helper. */ #define TAILQ_ENTRY_ISVALID(elm, field) \ ((elm)->field.tqe_prev != NULL) From nobody Sat Dec 14 00:11:49 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Y96855qSrz5gMG1; Sat, 14 Dec 2024 00:11: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 4Y96855K0wz3x6d; Sat, 14 Dec 2024 00:11:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734135109; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=41HCaU7E6W6AWC6YAPRp+X65MADOnk3A0Gl6etd5tz8=; b=vWLXF2zwK1RVejvueRT4rxiGoCQrRRV+8wsadp8MklLmS//t2wx8b0xLx3YRcFyJrLyj1I bQlYgsX7DZJI7Xj2cQeHS3vAWkh8YCQMD9WldBplx3xp4FiqcBMKz7MwR6GUcXE572o1cW VsqUWxZD5kpcEwXyAIvWfEGLzZibpYp0U6dnI2q96JBa8EyDCEc3C5LSMTzzGRkBowwFOi dmAg9ihWM6mB6zAcdTvFZ8GirCK352kiYkCsc9V93V/l2P0zMkG9ftRfivX2tk7/LXraWa 7O14hDIBV/nGgAwt6NcSaghPwFCifx9aQt3554zCNeJ8ej/xZmyKD33/uez6LA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734135109; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=41HCaU7E6W6AWC6YAPRp+X65MADOnk3A0Gl6etd5tz8=; b=B32ysg4BasBDXrb6m921UVjlPXWmOtEOMGCAR9zOdMhK2mvMOc5hgrhgGaS1+676tZMvS0 s6ei+mLatjHvc2+NIm958sQ0NhoLLk+FTKq3cMqpl2GNWDjb/QewS2XXlpRx/qhLdZsal+ WZclAKOEDqUGhNwAE2H9gbFhdkNVrIKxwUBjFWWpDAmiYVmcLib6G5RYQSswYP6gSLrJaF yFqNTxFMJnRUZWkQqySQo6mSbaoFFu+S784Jih3DirW54TjPbNMrmZU/WbKY59Bl6pXv/Z GaQn1JsH/Vu5QZDQCkwh/b/MyOIPM6eVnaTFU4hR4LJoEbp6qGMkCndlPpg24A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1734135109; a=rsa-sha256; cv=none; b=FYAb2A9K+u+B221iddCc5ZZGxmTu+3dtwtppipms3YzLlkM4zU/6mGWmmM7hBvlWDoEGJH x6k3gojl3Fdecjpwrz1SElM4VoVVK4nUwnLFss4qZSfV/pYsEE6GyOv+iHcMlRU/Tb1sBy 3+WoHiZ5XDIuC+rBjOkbtI8c89nlcQar9bAq/hdocusq9v2eB3767icLAOCuNyvUVnwPUI kP/7KbN03sy/eDoA9CqZS3bO3OBNiAPjDZroUCEPnyrmc0N7qTm9XBbzZQr6Zp2vkom4qT fMq8UiLK4DKKl4g7TjYadlK4CMOK2GWhKt9utFGAVEuTpNA3am5U228zf+OOjg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Y96854pfdz10MZ; Sat, 14 Dec 2024 00:11: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 4BE0BnZp055151; Sat, 14 Dec 2024 00:11:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BE0BnMt055148; Sat, 14 Dec 2024 00:11:49 GMT (envelope-from git) Date: Sat, 14 Dec 2024 00:11:49 GMT Message-Id: <202412140011.4BE0BnMt055148@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Brooks Davis Subject: git: 960665e47f0b - stable/14 - style(9): Remove ancient SCCS tags. List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: brooks X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 960665e47f0bb04b01a471f40272e450a397d6a4 Auto-Submitted: auto-generated The branch stable/14 has been updated by brooks: URL: https://cgit.FreeBSD.org/src/commit/?id=960665e47f0bb04b01a471f40272e450a397d6a4 commit 960665e47f0bb04b01a471f40272e450a397d6a4 Author: Brooks Davis AuthorDate: 2024-12-13 21:27:04 +0000 Commit: Brooks Davis CommitDate: 2024-12-13 21:27:04 +0000 style(9): Remove ancient SCCS tags. This is a partial, manual merge of 97759ccc as not merging it here causes every docdate bump to conflict. --- share/man/man9/style.9 | 5 ----- 1 file changed, 5 deletions(-) diff --git a/share/man/man9/style.9 b/share/man/man9/style.9 index 75daea47ca96..fbf14e9b8430 100644 --- a/share/man/man9/style.9 +++ b/share/man/man9/style.9 @@ -22,8 +22,6 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" From: @(#)style 1.14 (Berkeley) 4/28/95 -.\" .Dd April 26, 2024 .Dt STYLE 9 .Os @@ -46,8 +44,6 @@ is silent on an issue. .Bd -literal /* * Style guide for FreeBSD. Based on the CSRG's KNF (Kernel Normal Form). - * - * @(#)style 1.14 (Berkeley) 4/28/95 */ /* @@ -140,7 +136,6 @@ and FreeBSD git hash with full path name if the file was derived from another FreeBSD file and include relevant copyright info from the original file. .Bd -literal -/* From: @(#)style 1.14 (Berkeley) 4/28/95 */ .Ed .Pp Leave one blank line before the header files. From nobody Sat Dec 14 00:11:50 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Y96870Lh0z5gLym; Sat, 14 Dec 2024 00:11:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Y96866Crdz3wwj; Sat, 14 Dec 2024 00:11:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734135110; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=yxs13Y/IEIsyQFX/mFhEAJCDuBehSNtojUU68DmhU7U=; b=H80aIyWfiDuR3KfY9KvstTkbnNL7w//3C+/xXH4ZztLmWUYjFpErWI4w7sL2zaBIvhFfEV STvJ9LUWQUfr2xuMupS8rpw9uBxPrbq/hXIqKJA1SWJMFPLVOgYVndUHcErMDwtgvwJR1F YPBo3f0EoD3gJoKqMSb+hg/j34tbO27pvP4P3f3vOTYBdGzoZk45mHppoqDxri15O8n/JU 3yE3Ho/xjo4JxZAPLlSBunoFOcylVn1m/GmoYTF4EQRLzrAfyJpVETHkFTW7ak1O7zCx/r w5UoEsHJ6jWDkDpH0SV+tObeTpnDhk9FcS6z7MQeBPG/dnW+DfLBOP/xXMpIBw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734135110; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=yxs13Y/IEIsyQFX/mFhEAJCDuBehSNtojUU68DmhU7U=; b=BSxLfcC7n6l7xiAsZ2gfF1EYllemIlMurtyHC4/3FELune/1kDnIUa5g9zFWgwKdYOpFSg NUN9s0bPeoyy+O8DF/V5eFV1iuJIEKstid/TFn4aFeM+rU6NTTwTXhNbzizSi/40Z0l76X Xq5RX/Phwl3yCMkYbR23sPkfa7nXdV/pFcoesvGAXuifuae8DzrCjOazQrlE0vUpnKGHFp ZtMKdADbU2O84tyT40hdaV3yuT6n/s9DdmjSYuCfoaQpL2wf7begeG7not+Yz/LAlSFe7q qOoxtpqj8YnjitegX1bY0PZhd2Ojj8/gR+WUk1Z6vK/01MjZx06PzOADDOk94w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1734135110; a=rsa-sha256; cv=none; b=v2LwqC0U+4J6RQ7HV+1zMm8N/m1zSxyQ4N9L+O0u2LHMEHkJOeuKZzACAYMniE+ysMzfPi 8ZT17y+h37282AYHJGAv5+WXnpGTwCW2T6BZy4pC7dAwNAvSejpDT9aCbp8XB3iK0lve8l PzdhrTPOnqQYRmSVvNFbN5AnfpJ1rK2eBgS3YQmKZa3yoD92itawyhcFEmyqTJaj7gr38C NOaKCVZSy1LhXbtQYZfKzITZy2JS8LAe8nr+o6Gh2VvTLKjNh8nLJP40kCVClNXBefzOEh psC/pxJKFZfliG2NLak1dI/kbCvs13e9DmYAnehU+ryfegfLhQqO9rj9EDyMqw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Y96865pZzz10Hv; Sat, 14 Dec 2024 00:11: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 4BE0BoNf055190; Sat, 14 Dec 2024 00:11:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BE0Bo0Z055187; Sat, 14 Dec 2024 00:11:50 GMT (envelope-from git) Date: Sat, 14 Dec 2024 00:11:50 GMT Message-Id: <202412140011.4BE0Bo0Z055187@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Brooks Davis Subject: git: 866420279949 - stable/14 - style(9): Remove $FreeBSD$ recommendation. List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: brooks X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 866420279949e5807c2d5f2136d7c2b0a12be6b3 Auto-Submitted: auto-generated The branch stable/14 has been updated by brooks: URL: https://cgit.FreeBSD.org/src/commit/?id=866420279949e5807c2d5f2136d7c2b0a12be6b3 commit 866420279949e5807c2d5f2136d7c2b0a12be6b3 Author: Minsoo Choo AuthorDate: 2024-01-29 23:53:31 +0000 Commit: Brooks Davis CommitDate: 2024-12-13 21:30:25 +0000 style(9): Remove $FreeBSD$ recommendation. Now that stable/12 is now EOL, there's no reason to do this. They've been proactively removed from the tree. Reviewed by: imp, lwhsu Differential Revision: https://reviews.freebsd.org/D43641 (cherry picked from commit bea67504c66d455ae2a5ebea2677682cdab8e576) --- share/man/man9/style.9 | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/share/man/man9/style.9 b/share/man/man9/style.9 index fbf14e9b8430..1b6716c582ce 100644 --- a/share/man/man9/style.9 +++ b/share/man/man9/style.9 @@ -22,7 +22,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.Dd April 26, 2024 +.Dd December 13, 2024 .Dt STYLE 9 .Os .Sh NAME @@ -107,12 +107,6 @@ lines should only be added when making substantial changes to the file, not for trivial changes. .Pp After any copyright and license comment, there is a blank line. -Include -.Li $\&FreeBSD$ -or -.Li __FBSDID("$\&FreeBSD$"); -only if you are certain the new code will be merged to stable/12. -The tag will be removed from legacy code in the future. Non-C/C++ source files follow the example above, while C/C++ source files follow the one below. Version control system ID tags should only exist once in a file From nobody Sat Dec 14 00:11:51 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Y96882BpQz5gMG4; Sat, 14 Dec 2024 00:11: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 4Y968804tfz3x58; Sat, 14 Dec 2024 00:11:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734135112; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0dl8x0BMwS6K3VYtSo5gAvKRwMU7hYgbqrkCY3nl4jc=; b=uTDsZiwXFd5ULoVSWQSv4da3B5KcmXGmrgmIcbel3D1YyXb5FsqlfueZp74KRHG4g0mHA+ brIsSqdVRfR+DKo1nk+4aVKzBa1qOsHlaaMjH6FSh2soejNcEZWjfd23lAhlSAtK7X8d6p 3NzqbX7tYXfZw9GMjGYZpAVCHgFaMazmgyaZhiiNFpunf5tFEh0BZIoYLJppDX++q8O+5c bXos1kWvhOZ12g0ePHdO/nAYWjtSz1cct+QeZXeGUUtTiiO9J5GeeUl4PHUoAczscm1WqS JZk59/aTpWwgB3Oq6yDp0BK9xfzsAStGzc5nQweiA+dBLuJQMWjGMdOLEkXEGw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734135112; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0dl8x0BMwS6K3VYtSo5gAvKRwMU7hYgbqrkCY3nl4jc=; b=wipUuNdECKETFy79s7WTMoNg9aQ2TTC1gCNIsgzWN5PscFurmdcyDge59jYsjjyA/Hknk5 HPTAEsHGqo+NLHYUS0VQxAOi9v17MjAnrFlH8czGaBsHv9t3KiubgV5c+jPP9UCoyPzDOF NXAw1GLhxBviNhPL6wnULUgUeZexIIeWvGZTLnWIssTvAK2tysvoc0FRMB+II7VoVRY0HV CmD4hhNXpLZee6lar8xxLI5XW4UK6pW+/t2RsDx/4ZdD9MqqViJZAduc81yRlBUFlld1f9 t2nriw+rLpgT6GjxLg+PZIstzCdnpdul8crZjGemjMCesnz09Ux1X2AweWt4Fg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1734135112; a=rsa-sha256; cv=none; b=LtXOKyL3iHa0P5kHON7Do5IIN2rbfNG5MlqhMKy+5nx1nCtbfsH9FxW5baeovw6HFhzVxI ZqS/WXSCzKHToFhDQ2Tw8f8c/Ly50qLgQTV6mqYeChgIFKVAC8rwX26k7SLVBOGTsM0Vlw qABB7lYz2Ll18LG5///qfmGfsROBET2P941DhCNPPRkRYBxqpUFWr53PEgYGMDV9zDHLbG iewIyRdgQsgal/ol51hrefBSr4NjPGFYVlmp6RFD70FKC0hrElMSTzKR/29tBtGEhtrI29 m8KMcHbECokptP+2DXNdprEhqi8UdgsQq096wtLhgbj7V+aivIZRzTnz2yoXgQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Y96876nzCz104b; Sat, 14 Dec 2024 00:11: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 4BE0Bpxv055245; Sat, 14 Dec 2024 00:11:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BE0BpgA055241; Sat, 14 Dec 2024 00:11:51 GMT (envelope-from git) Date: Sat, 14 Dec 2024 00:11:51 GMT Message-Id: <202412140011.4BE0BpgA055241@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Brooks Davis Subject: git: 2317a685241a - stable/14 - style(9): Note larger divergence than implied List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: brooks X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 2317a685241af51104dda83cdceb169b8fa81d6c Auto-Submitted: auto-generated The branch stable/14 has been updated by brooks: URL: https://cgit.FreeBSD.org/src/commit/?id=2317a685241af51104dda83cdceb169b8fa81d6c commit 2317a685241af51104dda83cdceb169b8fa81d6c Author: Warner Losh AuthorDate: 2024-01-29 23:57:19 +0000 Commit: Brooks Davis CommitDate: 2024-12-13 21:30:43 +0000 style(9): Note larger divergence than implied Times have changed, and we've diverged somewhat from the original style guide, while still keeping much of the flavor and flair of its spirit as the C language has evolved over the last 30 years since 4.4 was released. Sponsored by: Netflix (cherry picked from commit a26b96a930da44bbc0cc28e5764b9b6a2cf5b352) --- share/man/man9/style.9 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/share/man/man9/style.9 b/share/man/man9/style.9 index 1b6716c582ce..13bfc1302c46 100644 --- a/share/man/man9/style.9 +++ b/share/man/man9/style.9 @@ -938,11 +938,11 @@ indentation rules. .Xr style.mdoc 5 , .Xr style.lua 9 .Sh HISTORY -This manual page is largely based on the +This manual page was originally based on the .Pa src/admin/style/style file from the .Bx 4.4 Lite2 -release, with occasional updates to reflect the current practice and +release, with frequent updates to reflect the current practice and desire of the .Fx project. From nobody Sat Dec 14 00:11:52 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Y96894Swjz5gMD5; Sat, 14 Dec 2024 00:11:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Y968912nWz3wwx; Sat, 14 Dec 2024 00:11:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734135113; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=FUgR1Qmdx3pNqR08PwF7rDtVNsgo/dWaFBvuXVJj31Q=; b=wOWagP1ua4c++qU3Bc6YLkI7ZHfhS6FZevixoAcujoCag0Tf9YjOH2hi1LYNGciwzOR0Lk rmNU2e4h8ShRs8CDNarJx+m5A9gGrlB+LwHJuGeleMGJsw+cqTHfer/Iduv5OvhGmCjBhk 9XKCstdr2NGB8kQrKrx0ERn8dqpLM6lh/7hX2eNWfFomdrh+6+l3VmHJn+sbgwPzNL9RDL emXOyxF3bsqHvKS9CW+jzxSUCwY1sDGAyT4l4zDjpwl2qO+3j3Y1MxMqyXqGo5etmQf5FA R8GPGqe/m7bhkkaYOVQHkpurUCHDR8XjIFYi39K3AhuD5YJQEtnOKeOvQPsarQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734135113; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=FUgR1Qmdx3pNqR08PwF7rDtVNsgo/dWaFBvuXVJj31Q=; b=AEJ12YRUmwUlhBuNzQhOM6D6IrkJJGOOpcRh4zoi1JYfFV8DOqOPDjkF0u06JS5mEXNPvb Xywd1o7403ws2wEQ7pT9YWGlHkpI7/R1QL6z0SraRCv2o6/se7mCt8RHFkiMKTDueVdRAJ YVFtO2IFX/7/IC1jjiLrxt/iGFeCaSAbAdR6lrVLuKRFsz9dAOSzkvVCIlSuiMHRg3rmy6 rs+1EV2IR8bJwXL1/M92DJDqH3Pd2XDeuZfx/ukIKkY2PpKYWELqmn+jzLfCfBaBoXa+IS riZa9IT12+/m519oyKu9ur8zVkQrQsaEBFoi4/EziJFCLq+io7y8TKyhWJmKIg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1734135113; a=rsa-sha256; cv=none; b=ph5iz1Pwck+H9I/fn3vanywR8tfim4wTVktEXBEkJfZstYU4JgxiJbDD1ltBo5o5rnGQ4c eG8NrScLPT6ZDt0S5d0OWr6T4QpcjOo9V7HD0Zt8L4yofs41e7k7NjVHFUe/WE73fvRFv1 yVYNWq4tD76EvNbGGCRosyEEVKY0WDrXMvNo7e+PHpe80LLvh3J7Bqx1K9nxyjLU8L5PIc psMinBUcBHnlnKF4mGgrqAflodJmxE9OWsuSKZsORl+VS5+It2wWzUzV94PwMFpNCnUoT1 wYtjvMpAMvOx5Jt9FC1Tye5+jDl37nZCHa+D9byihPp6GIlmCkmetHWz0X7dcg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Y96890gJSz10Mc; Sat, 14 Dec 2024 00:11: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 4BE0BqNT055287; Sat, 14 Dec 2024 00:11:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BE0Bqs2055284; Sat, 14 Dec 2024 00:11:52 GMT (envelope-from git) Date: Sat, 14 Dec 2024 00:11:52 GMT Message-Id: <202412140011.4BE0Bqs2055284@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Brooks Davis Subject: git: 76ec0faf1ce7 - stable/14 - style(9): Delete __FBSDID straggler List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: brooks X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 76ec0faf1ce73e470d4f2663026320e5fd1ea021 Auto-Submitted: auto-generated The branch stable/14 has been updated by brooks: URL: https://cgit.FreeBSD.org/src/commit/?id=76ec0faf1ce73e470d4f2663026320e5fd1ea021 commit 76ec0faf1ce73e470d4f2663026320e5fd1ea021 Author: Warner Losh AuthorDate: 2024-07-02 23:09:36 +0000 Commit: Brooks Davis CommitDate: 2024-12-13 21:31:15 +0000 style(9): Delete __FBSDID straggler We no longer need advice on __FBSDID, so delete it. Sponsored by: Netflix (cherry picked from commit a1cfe4c7646bcae56276ba89c1fe316f426c3d8c) --- share/man/man9/style.9 | 5 ----- 1 file changed, 5 deletions(-) diff --git a/share/man/man9/style.9 b/share/man/man9/style.9 index 13bfc1302c46..a4ff85a07bcd 100644 --- a/share/man/man9/style.9 +++ b/share/man/man9/style.9 @@ -137,11 +137,6 @@ Leave one blank line before the header files. Kernel include files .Pa ( sys/*.h ) come first. -If -.In sys/cdefs.h -is needed for -.Fn __FBSDID , -include it first. If either .In sys/types.h or From nobody Sat Dec 14 00:11:54 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Y968B4Bd8z5gMG5; Sat, 14 Dec 2024 00:11: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 4Y968B1xgMz3x78; Sat, 14 Dec 2024 00:11:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734135114; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=AqasK76F2oxu0JsgFqgUzuO6J3L8eQDY1dIiyqVSzEU=; b=xmmmLKNHqWInVla3Zvs+RANuhEdRm0DbcH1iWvSpAut09DETIhzDBB4L43fzJqI7DVZZpi 3/a0wB8uTGOqiPbii2EfeMLzAAieMELvoeXvqx9lMRfkfkMC6kvL7JoXYxkxHH7rpfUOsc mnHpBOThXTeRV5N0P0uvI8ewOCeeWrmjOGF4CRj/VLhulsxw7yQimCjOGWgHc4FeFf1ffq rq2Akdm2TYE2+35eVjDDz0ES2O+ZsoFNuR2/QqVAO8/NJmeui6Tzh4oMd6yKyUTH3PgGVr WdSFUZY5Nq5fHtMOwQhHANj6cuP6Vv6Uvdd/xaHHqacCGtJTGFW0ZcPxMA1lAQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734135114; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=AqasK76F2oxu0JsgFqgUzuO6J3L8eQDY1dIiyqVSzEU=; b=ho2+k0vzvZiHPzyiHBgOK3jLIO46ufz0J39ID0QYdklEC02E6lXP53vVIktROhpqGrvx17 2FWuw+FSYvY7ywVObHF7nR12I8bHrhIMd7tbrNSDvNHo337ovBxj6BJguEIdimxZlm5dTI TZFQvmAI1vptnKbJWnLyWbkkJDYW9bcXcI7A/l00exDCmQmnRmfI5LtpHS+MmjV409im11 bMeus3ibCgYBvcWVjXGhUB39WFGn06/wv7PgMILak8rDJSe2hwW/zEr9NK7JlsrSeh+erh r3b8gZ4m+U7vL6xR0lENljztx8MMAsbSOub2GUbuFwrchTatckFhC2e1OUa6+A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1734135114; a=rsa-sha256; cv=none; b=Dh8WNSWIlBBrZSIKUCznMonnKs6FklVqEAoE+f22DVcyXhiUs39MQcdxJUXYd3oQGk92i6 S9HzlvysXYBbF9TXhRwl7FWrCaLVkeibLyXVfT1/ACaKilQ8L8iqmkjByatZno3STC86Vl RSQ3mneUUF3eqHuF/d+pJVebsjNDTnOdE9gA8UhX3cOoKAjgN78XGlbsQHz/Ipa61Kfypd VOAia8MxwAnLOG4sj0esRiCIoaxTGCrpP+7niGdMlamaYsiuaHYwQ/3bn+1Tun+LjfS7fs XEB7T1uif+GikkbwfG7D7s48eyUB7uJyrwgPFvGWT8lRvQLN0Jru+64yN6N5CQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Y968B1YzPz10D6; Sat, 14 Dec 2024 00:11: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 4BE0BsPY055343; Sat, 14 Dec 2024 00:11:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BE0BsR9055340; Sat, 14 Dec 2024 00:11:54 GMT (envelope-from git) Date: Sat, 14 Dec 2024 00:11:54 GMT Message-Id: <202412140011.4BE0BsR9055340@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Brooks Davis Subject: git: ecfe30854204 - stable/14 - style(9): Add comments about branch prediction List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: brooks X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: ecfe30854204e8de29ae637d493bd9de689ababa Auto-Submitted: auto-generated The branch stable/14 has been updated by brooks: URL: https://cgit.FreeBSD.org/src/commit/?id=ecfe30854204e8de29ae637d493bd9de689ababa commit ecfe30854204e8de29ae637d493bd9de689ababa Author: Warner Losh AuthorDate: 2024-07-03 18:52:38 +0000 Commit: Brooks Davis CommitDate: 2024-12-13 21:34:08 +0000 style(9): Add comments about branch prediction This is a partial merge of: cdefs.h: Add back comment about branch prediction Add back, with editing, the comments about branch prediction, when to use it, etc. Offer stronger opinions about this in style(9). Add in the convention for FreeBSD that we do only the entire expression in the if expression. Advise use only when it makes things measurably faster. Requested by: jhb Sponsored by: Netflix Reviewed by: brooks, jhb Differential Revision: https://reviews.freebsd.org/D45837 (cherry picked from commit fd31c0946ee2240491db1301c2d33eb846221a54) --- share/man/man9/style.9 | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/share/man/man9/style.9 b/share/man/man9/style.9 index a4ff85a07bcd..2e7c614b2a6d 100644 --- a/share/man/man9/style.9 +++ b/share/man/man9/style.9 @@ -908,6 +908,22 @@ New code should use .Fn _Static_assert instead of the older .Fn CTASSERT . +.Pp +.Fn __predict_true +and +.Fn __predict_false +should only be used in frequently executed code when it makes the code +measurably faster. +It is wasteful to make predictions for infrequently run code, like subsystem +initialization. +When using branch prediction hints, atypical error conditions should use +.Fn __predict_false +(document the exceptions). +Operations that almost always succeed use +.Fn __predict_true . +Only use the annotation for the entire if statement, rather than individual clauses. +Do not add these annotations without empirical evidence of the likelihood of the +branch. .Sh FILES .Bl -tag -width indent .It Pa /usr/src/tools/build/checkstyle9.pl From nobody Sat Dec 14 00:11:55 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Y968C3rNvz5gLsv; Sat, 14 Dec 2024 00:11: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 4Y968C2wycz3x06; Sat, 14 Dec 2024 00:11:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734135115; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0LHcgH/tAYq1h7Eu1IsMgo4ijtFnTDrk5+bYUdO8cvI=; b=rGw4GqItQnXUMTS3FDve7qtagHQU4Lf5yq2DjIvf2cNYpfAu5EuSbj9KBTWCjk6KqvSvpl kD3sAfRYMFXtB0kHlmfS5DlismAHeh9tOfh43l39kqZPlOcbs0EswO/va8BMHLtuc0hFE9 4zSuVfYgcxa5hbf1wlz75vhgxJsC9ZbQa9YnmAFyCn/t9Hq0n7ZXx0QoM9tjIZvgb2mXqS szfJ8q51U+F1iUS2Sxq39LEEVSSRp+cpMKCFtpl95LBfLSLByv7ZR3Om8bUpCsgfk2/bSl VQZz7nu9c5wq59YiEBXFWEEPzO8AsxZxRxLu0K0AdeSCWaoWbHQOSsPHa80n5Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734135115; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0LHcgH/tAYq1h7Eu1IsMgo4ijtFnTDrk5+bYUdO8cvI=; b=LT7LqzeQEDrx5PqcWxul0wt4VbCjEOHAB55KTjk8ucL6tHVLnH0dqAWKEubvlTwcRUAvMx dVbd69RspcR0Xe+ExD0CjxpOz9PgT/4D2LjFUZUtqLI4b76h7IpGVfZIWOEYx8AEu8zDom SAsVs+nOUkcDxvrRpaqjJ++YX5ixKsuQ02dNDZPzwzacshzx/+Y/Tw70mwTw/SAYmEQF/3 mcqVQkAWaoG2UuHjI+IlGYb+rYjHBQQYL/EgXae5V9rWqijbqe3NSKD0kD8LGJDA7tn4sU FHLDJdhlAuA4sneYJbk1g6y0zOMKglWliKb7ZR8IE3q8Sn1CCGJxzc4xby14Tg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1734135115; a=rsa-sha256; cv=none; b=xAdtgl9fLVh6G/Mfb43KIuJEl0wg4fJkKaFYuCJqha22Mzfl9ZDSYHhmOHNCnMlSwT+iU9 0yJ5xXHbEyuWcXo1g9ykNhzbppvO03XMjdpIAxSxh2z+ND6m7YxYdM5EQ2Fgcqm2ILBsEC 3uxrzqi5UqK0tE4T8hqb6VUthRrMoUp73+npqU9X7p8cWh9HWKiWy2URXsAd8YsrQ2jPkB v/e6by/GEXp/Tr76dAWcEJmOmPkkfYVbVcvbRxohqqXvdx1PmhqJot+9PMmVHzZ9Q6tcy4 7r+pWT30vFkK+zTm8555TM7QdLKagjn7SHn2O3A0TBNG/EY8SDpOS8xEvF+qww== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Y968C2W2fz10Mf; Sat, 14 Dec 2024 00:11: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 4BE0Btjh055414; Sat, 14 Dec 2024 00:11:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BE0BtUA055411; Sat, 14 Dec 2024 00:11:55 GMT (envelope-from git) Date: Sat, 14 Dec 2024 00:11:55 GMT Message-Id: <202412140011.4BE0BtUA055411@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Brooks Davis Subject: git: 1ad44b7f0e0d - stable/14 - style: Allow C++ comments List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: brooks X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 1ad44b7f0e0d0960ec94ce4a7cdbd884499386c9 Auto-Submitted: auto-generated The branch stable/14 has been updated by brooks: URL: https://cgit.FreeBSD.org/src/commit/?id=1ad44b7f0e0d0960ec94ce4a7cdbd884499386c9 commit 1ad44b7f0e0d0960ec94ce4a7cdbd884499386c9 Author: Warner Losh AuthorDate: 2024-07-25 04:34:56 +0000 Commit: Brooks Davis CommitDate: 2024-12-13 21:35:28 +0000 style: Allow C++ comments Attempt to craft the more-or-less conesnsus view on C++ BCPL-style comments. Allowing them seemed to have wide support. Consistent use was highly desired. What constituted consistent use, however, didn't have good consensus especially with multi-line comments. Craft something that's a little vague to allow what appears to be a range in common practices elsewhere and no good way to drive this do absolute agreement. We should revisit this point in 6-12 months after we get some experience with it. Sponsored by: Netflix Discussed with: many in the code reivew, see discussion there Differential Revision: https://reviews.freebsd.org/D35960 (cherry picked from commit 0a59a6b02fccef82644439a5165b7e0b751049c3) --- share/man/man9/style.9 | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/share/man/man9/style.9 b/share/man/man9/style.9 index 2e7c614b2a6d..ca96f05f8d55 100644 --- a/share/man/man9/style.9 +++ b/share/man/man9/style.9 @@ -52,11 +52,17 @@ is silent on an issue. /* Most single-line comments look like this. */ +// Although they may look like this. + /* * Multi-line comments look like this. Make them real sentences. Fill * them so they look like real paragraphs. */ .Ed +C++ comments may be used in C and C++ code. +Single-line comments should be consistently either C or C++ within a file. +Multi-line comments should also be consistently either C or C++, but may differ +from single-line comments. .Pp The copyright header should be a multi-line comment, with the first line of the comment having a dash after the star like so: From nobody Sat Dec 14 00:11:56 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Y968F0D8Dz5gM9L; Sat, 14 Dec 2024 00:11:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Y968D3xpcz3x0K; Sat, 14 Dec 2024 00:11:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734135116; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=PkkMDjUBOfkCa7yXyEAYBAcDQXKNGCm/VFNGS5Nq8bw=; b=WoQzEatJwb3QOCzfyoJvaDzaVWOIhsff3iCkNW7/ZNovFU60B4gb7vP55iZbR7AbyMUkWM 2dFvfEXjRfByt58nc4ASvKxTyxn2flhbEvNc98siuj01rUPu6BdPjH9udacc6LqFTTSJKm ucH7jGpEPu1ZZuu6VVZ5ansENX6kmVFd+TcJ+XBm/UbSZuj+KcOmPVuRJpHiZM18Knoe+A YnI/+NDVyVSl+OFlWpvdcmm0cTkVWqYcdDJcjSldBin1LXbKPuP2OF9isp8ZlKXl60Fs1Z ZRTAOrnQJJo3uW1BSmkvPSH2Xe3rKS1Hsfwkx2FzM5hRhcNkKypUDtcu/qG54w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734135116; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=PkkMDjUBOfkCa7yXyEAYBAcDQXKNGCm/VFNGS5Nq8bw=; b=LG/4VN8DgD0dHFiNVKqQt38YU9tNq8djw6/MqLGgPne73WOjBEEtuEaFb6ibVanKiWol78 VUB8hdJWv4aFtbzQjYNft/BAQdObPKG9WFb6XPOFFvp4OWUlzGaRDYQCSbqE4TxHaURU3B wfa+fPoT4DzajGWVJpnfo38FdjOmi/WUADLMqBrpIfzTaw0ZDont1PNPJOMX8XbsHcDi/Z 3EifKF3qtvohYwl02AamVtyxlNDcpOImoWKrnrAxkiNvzZt4M7Fp0pjBSPo+VHMY6fYAFm Bnlb65azwzyOva17papMv+SV2+NyjkgZIzRHhJqUukD2EV76CcBm75Fx58FEfQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1734135116; a=rsa-sha256; cv=none; b=jTI9cSDv16k68eLuE1RxLADYbzzYyzQ15RU7S5rNyYms1PR9b0yBvCP5SJTh7/IDeWy8ok ZhY4IC5up/NC6OVQQ6A+oWsEieAWRbJcULuqw/5gZIoVoRWY/nyxnD4+wV+4dOBLUHPx4t GOYdUTtuOCvBXvOn4hF+9/iWuy0y/loAFOuOKg+FMuRiwekl2y9lNzXv/Zpi7QMXMcUKIp 87PAxzad61xj2n47hFUe28m5apMqWb+Wao9OgCkeAV9JW0uMxaHBEFDwzKgDDLq4nVnsJV 0LFbdVw+zYRNMlAm5W0Ap+ZAs1936JeG9KDdTAaMrvrL9R+eB4fvfJ5iALGt5g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Y968D3XxQz10Hx; Sat, 14 Dec 2024 00:11:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4BE0BuJt055482; Sat, 14 Dec 2024 00:11:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BE0BugY055479; Sat, 14 Dec 2024 00:11:56 GMT (envelope-from git) Date: Sat, 14 Dec 2024 00:11:56 GMT Message-Id: <202412140011.4BE0BugY055479@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Brooks Davis Subject: git: 9bc9cf4a2ae7 - stable/14 - style(9): deprecate blank lines without local vars List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: brooks X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 9bc9cf4a2ae7209ccb19874234304301ed510e77 Auto-Submitted: auto-generated The branch stable/14 has been updated by brooks: URL: https://cgit.FreeBSD.org/src/commit/?id=9bc9cf4a2ae7209ccb19874234304301ed510e77 commit 9bc9cf4a2ae7209ccb19874234304301ed510e77 Author: Brooks Davis AuthorDate: 2024-12-04 21:43:02 +0000 Commit: Brooks Davis CommitDate: 2024-12-13 21:37:40 +0000 style(9): deprecate blank lines without local vars Previously (208be1617cda) such lines were made optional and several of us had the impression that they were more completely deprecated. Do that now. Requiring a blank line at the top of a function if there are no local declerations dates to the original style.9 commit (b030a30523649) and was present in the first version of admin/style/style from mckusick@ in 1991. It's certainly consistant to have a blank line after a null-set of variables, but today it's unique to BSD source code and an occational point of friction to new developers. Document the historic practice and encourage removal in the context of other changes, but not sweeping removal commits for their own sake. Reviewed by: imp, emaste Differential Revision: https://reviews.freebsd.org/D47887 (cherry picked from commit ebfb117e2e04ea71b88e4285cbb1b54d9cc5248c) (cherry picked from commit 028dae5d3e886fe4c171689d9fc733e1bd68be71) --- share/man/man9/style.9 | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/share/man/man9/style.9 b/share/man/man9/style.9 index ca96f05f8d55..59f0ff8b5c88 100644 --- a/share/man/man9/style.9 +++ b/share/man/man9/style.9 @@ -818,19 +818,15 @@ vaf(const char *fmt, ...) static void usage(void) { - /* Optional blank line goes here. */ .Ed .Pp -Optionally, insert a blank line at the beginning of functions with no local -variables. +Functions should have local variable declarations first, followed by one +blank line, followed by the first statement. +If no local variables are declared, the first line should be a statement. Older versions of this .Nm -document required the blank line convention, so it is widely used in existing -code. -.Pp -Do not insert a blank line at the beginning of functions with local variables. -Instead, these should have local variable declarations first, followed by one -blank line, followed by the first statement. +document required a blank line before code. +Such lines should be removed when signficant changes are made to the code. .Pp Use .Xr printf 3 , From nobody Sat Dec 14 14:41:37 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Y9TRj3Fhwz5gJs6; Sat, 14 Dec 2024 14:41: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 4Y9TRj2jHRz4xYp; Sat, 14 Dec 2024 14:41:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734187297; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zbpV+Y1HqhT9h4L5vPjP54FvUteejttPsREjTFDTbZ8=; b=vhOssPL9F+S6ztbOhkHeWETvjus5w0iqPcSyvhG4yHoLe08yOOmzpScmdlSD0JOeH1T1Vp BfqvcLt8TrE/qKof3dJzw5Fi0hcQfmt0KudFQ9WlRP8QHzUciGwThsWUNHNI1mqpbZ0JUE DU3tmoKLB3NW7CXZifFYC2isUsOyxpmQK12DZNpQNYY7/N1xuilbXz4Y9toGOHxhE3QjJB JKHibztf5CdfVP4pHtQ0de+yjjNb10DH/OqMzCrPKpc2r4f23UVYg+ZcC+N7FbHVbj6zc5 7lOjmExUZT8lTZs91KvKM0ZKqqKYsCWCrLe21V/fhF/1+MGzcsgCjgP9923SUQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734187297; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zbpV+Y1HqhT9h4L5vPjP54FvUteejttPsREjTFDTbZ8=; b=Drp+r/u6sXgWDqRMiFQ6rfsqRpT19KF7h7BolhzGRXlhcF3oEQa3cOyfck2+DzpISAtuhK wlGUdX4/LGxmi26A9WYgenIlC9Wj/HBX8i7KdSoLhyg/jbrWInsKrf+6i7J1UR7u61MIw6 zCFFFG/G8NXMuhFTWtKPeqvqonf2BNcXeOMguntLRGCb/wS/IpHDYoJqY+d96WxQ9zIdnY n3ylP8MbElyYc36Scdt00aD2D6xjXxZHEC8jYaE4SMh7/9OEsEgEcXzOfqAANBhQKDvdut YJLoDQDqALE4O/BbmLVRDKkA+gEwx+J0j9Mog7J2jlTXWghpt/jIE71qhCTcPg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1734187297; a=rsa-sha256; cv=none; b=FSWSscZkOGuEacY8LXUH86HzWxjcv4zEZs9o/JngvyUW+d1RtJVuGWL6Zl3Q+VHH+DWhUS iXE8ENtNeZML6dN5DK1bW1VS8GPUpFCGZfayKgl5ApHxhWA2rFtCsq08gW63W3vJ6kWrkd URRtNvHgrEUEh/qpnq1Z5bU5CLPC4nDeUjCQO/vBUgB88EwGVNqfL96HBvCEQTRVJRy2i/ q6BwnhbvYHwCeD9+INvXjQTXJbqLO3qRZDAZc/dZ7u00zddoBxBWIZEf5AadH3/RuPm78I P3XW9uHa1B7eh3fsYqXCUseImcDRRctd91AejP3HIx+dq12GidjPB/wHRHn0Pw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Y9TRj2K1nzRNT; Sat, 14 Dec 2024 14:41: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 4BEEfbaL080373; Sat, 14 Dec 2024 14:41:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BEEfbl6080370; Sat, 14 Dec 2024 14:41:37 GMT (envelope-from git) Date: Sat, 14 Dec 2024 14:41:37 GMT Message-Id: <202412141441.4BEEfbl6080370@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: 642ade0a3d82 - stable/13 - pfctl: clear statistic for specified addresses List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kp X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 642ade0a3d8244c4c0cf82a335c4e940cb300a96 Auto-Submitted: auto-generated The branch stable/13 has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=642ade0a3d8244c4c0cf82a335c4e940cb300a96 commit 642ade0a3d8244c4c0cf82a335c4e940cb300a96 Author: Kristof Provost AuthorDate: 2024-11-21 20:33:41 +0000 Commit: Kristof Provost CommitDate: 2024-12-14 10:03:25 +0000 pfctl: clear statistic for specified addresses The ioctl DIOCRCLRASTATS provides the functionality of clearing stats not only for the whole table for for addresses stored in that table. The functionality was missing from pfctl, though. Add it now. PR: 282877 Obtained from: OpenBSD, kirill , e496dff3a7 MFC after: 3 weeks (cherry picked from commit 6463b6b59152fb1695bbe0de78f6e2675c5a765a) --- sbin/pfctl/pfctl.8 | 6 ++--- sbin/pfctl/pfctl.h | 1 + sbin/pfctl/pfctl_radix.c | 23 +++++++++++++++++ sbin/pfctl/pfctl_table.c | 17 +++++++++++-- tests/sys/netpfil/pf/table.sh | 57 +++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 99 insertions(+), 5 deletions(-) diff --git a/sbin/pfctl/pfctl.8 b/sbin/pfctl/pfctl.8 index 196ce0f1766f..c1b570f225b1 100644 --- a/sbin/pfctl/pfctl.8 +++ b/sbin/pfctl/pfctl.8 @@ -24,7 +24,7 @@ .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.Dd July 23, 2024 +.Dd November 20, 2024 .Dt PFCTL 8 .Os .Sh NAME @@ -493,8 +493,8 @@ Automatically create a nonexisting table. Show the content (addresses) of a table. .It Fl T Cm test Test if the given addresses match a table. -.It Fl T Cm zero -Clear all the statistics of a table. +.It Fl T Cm zero Op Ar address ... +Clear all the statistics of a table, or only for specified addresses. .It Fl T Cm load Load only the table definitions from .Xr pf.conf 5 . diff --git a/sbin/pfctl/pfctl.h b/sbin/pfctl/pfctl.h index 18f4abf8b4c4..ee068a0d01ea 100644 --- a/sbin/pfctl/pfctl.h +++ b/sbin/pfctl/pfctl.h @@ -58,6 +58,7 @@ int pfr_del_tables(struct pfr_table *, int, int *, int); int pfr_get_tables(struct pfr_table *, struct pfr_table *, int *, int); int pfr_get_tstats(struct pfr_table *, struct pfr_tstats *, int *, int); int pfr_clr_tstats(struct pfr_table *, int, int *, int); +int pfr_clr_astats(struct pfr_table *, struct pfr_addr *, int, int *, int); int pfr_clr_addrs(struct pfr_table *, int *, int); int pfr_add_addrs(struct pfr_table *, struct pfr_addr *, int, int *, int); int pfr_del_addrs(struct pfr_table *, struct pfr_addr *, int, int *, int); diff --git a/sbin/pfctl/pfctl_radix.c b/sbin/pfctl/pfctl_radix.c index 1e93a8972d9e..7d8c146c1dda 100644 --- a/sbin/pfctl/pfctl_radix.c +++ b/sbin/pfctl/pfctl_radix.c @@ -287,6 +287,29 @@ pfr_get_astats(struct pfr_table *tbl, struct pfr_astats *addr, int *size, return (0); } +int +pfr_clr_astats(struct pfr_table *tbl, struct pfr_addr *addr, int size, + int *nzero, int flags) +{ + struct pfioc_table io; + + if (size < 0 || (size && !tbl) || addr == NULL) { + errno = EINVAL; + return (-1); + } + bzero(&io, sizeof io); + io.pfrio_flags = flags; + io.pfrio_table = *tbl; + io.pfrio_buffer = addr; + io.pfrio_esize = sizeof(*addr); + io.pfrio_size = size; + if (ioctl(dev, DIOCRCLRASTATS, &io) == -1) + return (-1); + if (nzero) + *nzero = io.pfrio_nzero; + return (0); +} + int pfr_clr_tstats(struct pfr_table *tbl, int size, int *nzero, int flags) { diff --git a/sbin/pfctl/pfctl_table.c b/sbin/pfctl/pfctl_table.c index 3184e225b152..cb04b2b30bac 100644 --- a/sbin/pfctl/pfctl_table.c +++ b/sbin/pfctl/pfctl_table.c @@ -345,9 +345,22 @@ pfctl_table(int argc, char *argv[], char *tname, const char *command, } if (nmatch < b.pfrb_size) rv = 2; + } else if (!strcmp(command, "zero") && (argc || file != NULL)) { + b.pfrb_type = PFRB_ADDRS; + if (load_addr(&b, argc, argv, file, 0)) + goto _error; + if (opts & PF_OPT_VERBOSE) + flags |= PFR_FLAG_FEEDBACK; + RVTEST(pfr_clr_astats(&table, b.pfrb_caddr, b.pfrb_size, + &nzero, flags)); + xprintf(opts, "%d/%d addresses cleared", nzero, b.pfrb_size); + if (opts & PF_OPT_VERBOSE) + PFRB_FOREACH(a, &b) + if (opts & PF_OPT_VERBOSE2 || + a->pfra_fback != PFR_FB_NONE) + print_addrx(a, NULL, + opts & PF_OPT_USEDNS); } else if (!strcmp(command, "zero")) { - if (argc || file != NULL) - usage(); flags |= PFR_FLAG_ADDRSTOO; RVTEST(pfr_clr_tstats(&table, 1, &nzero, flags)); xprintf(opts, "%d table/stats cleared", nzero); diff --git a/tests/sys/netpfil/pf/table.sh b/tests/sys/netpfil/pf/table.sh index ef43d222b4c1..9e0990941466 100644 --- a/tests/sys/netpfil/pf/table.sh +++ b/tests/sys/netpfil/pf/table.sh @@ -109,6 +109,62 @@ v6_counters_cleanup() pft_cleanup } +atf_test_case "zero_one" "cleanup" +zero_one_head() +{ + atf_set descr 'Test zeroing a single address in a table' + atf_set require.user root +} + +zero_one_body() +{ + epair_send=$(vnet_mkepair) + ifconfig ${epair_send}a 192.0.2.1/24 up + ifconfig ${epair_send}a inet alias 192.0.2.3/24 + + vnet_mkjail alcatraz ${epair_send}b + jexec alcatraz ifconfig ${epair_send}b 192.0.2.2/24 up + jexec alcatraz pfctl -e + + pft_set_rules alcatraz \ + "table counters { 192.0.2.1, 192.0.2.3 }" \ + "block all" \ + "pass in from to any" \ + "pass out from any to " \ + "set skip on lo" + + atf_check -s exit:0 -o ignore ping -c 3 -S 192.0.2.1 192.0.2.2 + atf_check -s exit:0 -o ignore ping -c 3 -S 192.0.2.3 192.0.2.2 + + jexec alcatraz pfctl -t foo -T show -vv + + atf_check -s exit:0 -e ignore \ + -o match:'In/Block:.*'"$TABLE_STATS_ZERO_REGEXP" \ + -o match:'In/Pass:.*'"$TABLE_STATS_NONZERO_REGEXP" \ + -o match:'Out/Block:.*'"$TABLE_STATS_ZERO_REGEXP" \ + -o match:'Out/Pass:.*'"$TABLE_STATS_NONZERO_REGEXP" \ + jexec alcatraz pfctl -t foo -T show -vv + + atf_check -s exit:0 -e ignore \ + jexec alcatraz pfctl -t foo -T zero 192.0.2.3 + + # We now have a zeroed and a non-zeroed counter, so both patterns + # should match + atf_check -s exit:0 -e ignore \ + -o match:'In/Pass:.*'"$TABLE_STATS_NONZERO_REGEXP" \ + -o match:'Out/Pass:.*'"$TABLE_STATS_NONZERO_REGEXP" \ + jexec alcatraz pfctl -t foo -T show -vv + atf_check -s exit:0 -e ignore \ + -o match:'In/Pass:.*'"$TABLE_STATS_ZERO_REGEXP" \ + -o match:'Out/Pass:.*'"$TABLE_STATS_ZERO_REGEXP" \ + jexec alcatraz pfctl -t foo -T show -vv +} + +zero_one_cleanup() +{ + pft_cleanup +} + atf_test_case "pr251414" "cleanup" pr251414_head() { @@ -324,6 +380,7 @@ atf_init_test_cases() { atf_add_test_case "v4_counters" atf_add_test_case "v6_counters" + atf_add_test_case "zero_one" atf_add_test_case "pr251414" atf_add_test_case "network" atf_add_test_case "automatic" From nobody Sat Dec 14 14:41:37 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Y9TRk3fHdz5gJvN; Sat, 14 Dec 2024 14:41:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Y9TRk1LXDz4y1M; Sat, 14 Dec 2024 14:41:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734187298; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7Qy9PUGb3Vyl6g0gy8C4hYLBJEMWcL0/i0DMURLuK3I=; b=XIumbv6LcJaRdLNKk17dvrHkcD1G5owXBtgeaqlaSo+TlFKdzMqwJcTQsE0mymg7+B+UXC NMgVmIGZ+Z0Lp0AzUpXKwS9qXwvJfOkwKlNGqnOGT/DWicvm2RPmdK2fXvAesG3MysgBG+ B9FAHuJ9mC9gGi3aOg98RnQSnUvr+TClr10G8gkjj6+hgYSOm/4NGwJpnu6vZY5vqINTy/ YPX8XU+QbHpgdnpkbo53OanU7m1ngViQtPN9dn1/CL8FOlHt5o9uQ4j+3tNohHAYEeFMPK 1+sTYcDgCtFiPLU5jydBaj+PLl+pk1V0UL/FnWHQAEk9VjaGn90So+Sly6ajVA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734187298; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7Qy9PUGb3Vyl6g0gy8C4hYLBJEMWcL0/i0DMURLuK3I=; b=IBgCw4JLc3bgXVjDhRUI2qDbrSuxRbb+V9vcf8e7OzRANeSGANFIgk7jdPdGumlPc62ML2 KdykB5FHeD1HOR7BicQDUv8RdLoRchctOmYn7UQTkxZ7KdoDqZVkmQbOFHX5yXC0gZRYf3 E0yGCZYyQHdxn6t3cui8Pz9lj5LWWZiHOzdlC/077UqLcaXxtiylBB6IXvnxCwpc9ccPgL 8b2ho+h9vLP7V/ozgQKUyeO2k1UXMMwcgRSiNJKer59wL0dRun0JNTIoyTQXSvyEx86E8Z UdyJ8lnvWyDIzLpskyAxt/O02Jg4nGrlNy+37azLVm4zKJmn2Sr19HBDLyPBoQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1734187298; a=rsa-sha256; cv=none; b=c4CZhjUdwWdMvEbMMM8RsrcKY/qMdwcaGBCfu3B9y4ycgNPyiGqRAtZjdjb7pTSjAUvRjb ugr017WByEIApX2YmIJBg8fSFuEy9nToWLYum9d/zPEirpQj4oXBeqG11HjJ4wFnbm72PC A2dT1RfcW6h2uZn+PDIFttS0TC2oEZ/No3a9iIdOz7XoZGOk+DrkCYHqvzFRayuMvhARAD nOyG3hZizJrLN37rL5R9AeZYT/POTaPcXnV9crOX128Rt4UQyhmo4ft2536r5B0LuAlr/j 82H50OkfYjTSg31UZXSHdaY4pHroQXQN11rCYV+5Jkou0a466itygsTBVe/b9w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Y9TRk0dyyzRj6; Sat, 14 Dec 2024 14:41: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 4BEEfbBo080476; Sat, 14 Dec 2024 14:41:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BEEfbgP080473; Sat, 14 Dec 2024 14:41:37 GMT (envelope-from git) Date: Sat, 14 Dec 2024 14:41:37 GMT Message-Id: <202412141441.4BEEfbgP080473@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: ac92792bbdb2 - stable/14 - pfctl: clear statistic for specified addresses List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kp X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: ac92792bbdb297d7da90d510387e8528b87899c7 Auto-Submitted: auto-generated The branch stable/14 has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=ac92792bbdb297d7da90d510387e8528b87899c7 commit ac92792bbdb297d7da90d510387e8528b87899c7 Author: Kristof Provost AuthorDate: 2024-11-21 20:33:41 +0000 Commit: Kristof Provost CommitDate: 2024-12-14 10:03:27 +0000 pfctl: clear statistic for specified addresses The ioctl DIOCRCLRASTATS provides the functionality of clearing stats not only for the whole table for for addresses stored in that table. The functionality was missing from pfctl, though. Add it now. PR: 282877 Obtained from: OpenBSD, kirill , e496dff3a7 MFC after: 3 weeks (cherry picked from commit 6463b6b59152fb1695bbe0de78f6e2675c5a765a) --- sbin/pfctl/pfctl.8 | 6 ++--- sbin/pfctl/pfctl.h | 1 + sbin/pfctl/pfctl_radix.c | 23 +++++++++++++++++ sbin/pfctl/pfctl_table.c | 17 +++++++++++-- tests/sys/netpfil/pf/table.sh | 57 +++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 99 insertions(+), 5 deletions(-) diff --git a/sbin/pfctl/pfctl.8 b/sbin/pfctl/pfctl.8 index ac0106fb560b..3a75c9a62eec 100644 --- a/sbin/pfctl/pfctl.8 +++ b/sbin/pfctl/pfctl.8 @@ -24,7 +24,7 @@ .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" -.Dd July 23, 2024 +.Dd November 20, 2024 .Dt PFCTL 8 .Os .Sh NAME @@ -501,8 +501,8 @@ Automatically create a nonexisting table. Show the content (addresses) of a table. .It Fl T Cm test Test if the given addresses match a table. -.It Fl T Cm zero -Clear all the statistics of a table. +.It Fl T Cm zero Op Ar address ... +Clear all the statistics of a table, or only for specified addresses. .It Fl T Cm load Load only the table definitions from .Xr pf.conf 5 . diff --git a/sbin/pfctl/pfctl.h b/sbin/pfctl/pfctl.h index b9da5e96a90e..e29af0eb5eee 100644 --- a/sbin/pfctl/pfctl.h +++ b/sbin/pfctl/pfctl.h @@ -60,6 +60,7 @@ int pfr_del_tables(struct pfr_table *, int, int *, int); int pfr_get_tables(struct pfr_table *, struct pfr_table *, int *, int); int pfr_get_tstats(struct pfr_table *, struct pfr_tstats *, int *, int); int pfr_clr_tstats(struct pfr_table *, int, int *, int); +int pfr_clr_astats(struct pfr_table *, struct pfr_addr *, int, int *, int); int pfr_clr_addrs(struct pfr_table *, int *, int); int pfr_add_addrs(struct pfr_table *, struct pfr_addr *, int, int *, int); int pfr_del_addrs(struct pfr_table *, struct pfr_addr *, int, int *, int); diff --git a/sbin/pfctl/pfctl_radix.c b/sbin/pfctl/pfctl_radix.c index 1e93a8972d9e..7d8c146c1dda 100644 --- a/sbin/pfctl/pfctl_radix.c +++ b/sbin/pfctl/pfctl_radix.c @@ -287,6 +287,29 @@ pfr_get_astats(struct pfr_table *tbl, struct pfr_astats *addr, int *size, return (0); } +int +pfr_clr_astats(struct pfr_table *tbl, struct pfr_addr *addr, int size, + int *nzero, int flags) +{ + struct pfioc_table io; + + if (size < 0 || (size && !tbl) || addr == NULL) { + errno = EINVAL; + return (-1); + } + bzero(&io, sizeof io); + io.pfrio_flags = flags; + io.pfrio_table = *tbl; + io.pfrio_buffer = addr; + io.pfrio_esize = sizeof(*addr); + io.pfrio_size = size; + if (ioctl(dev, DIOCRCLRASTATS, &io) == -1) + return (-1); + if (nzero) + *nzero = io.pfrio_nzero; + return (0); +} + int pfr_clr_tstats(struct pfr_table *tbl, int size, int *nzero, int flags) { diff --git a/sbin/pfctl/pfctl_table.c b/sbin/pfctl/pfctl_table.c index fe934a8d2ea2..95a0d0c9171c 100644 --- a/sbin/pfctl/pfctl_table.c +++ b/sbin/pfctl/pfctl_table.c @@ -345,9 +345,22 @@ pfctl_table(int argc, char *argv[], char *tname, const char *command, } if (nmatch < b.pfrb_size) rv = 2; + } else if (!strcmp(command, "zero") && (argc || file != NULL)) { + b.pfrb_type = PFRB_ADDRS; + if (load_addr(&b, argc, argv, file, 0)) + goto _error; + if (opts & PF_OPT_VERBOSE) + flags |= PFR_FLAG_FEEDBACK; + RVTEST(pfr_clr_astats(&table, b.pfrb_caddr, b.pfrb_size, + &nzero, flags)); + xprintf(opts, "%d/%d addresses cleared", nzero, b.pfrb_size); + if (opts & PF_OPT_VERBOSE) + PFRB_FOREACH(a, &b) + if (opts & PF_OPT_VERBOSE2 || + a->pfra_fback != PFR_FB_NONE) + print_addrx(a, NULL, + opts & PF_OPT_USEDNS); } else if (!strcmp(command, "zero")) { - if (argc || file != NULL) - usage(); flags |= PFR_FLAG_ADDRSTOO; RVTEST(pfr_clr_tstats(&table, 1, &nzero, flags)); xprintf(opts, "%d table/stats cleared", nzero); diff --git a/tests/sys/netpfil/pf/table.sh b/tests/sys/netpfil/pf/table.sh index 32943e659bd0..828d76a998be 100644 --- a/tests/sys/netpfil/pf/table.sh +++ b/tests/sys/netpfil/pf/table.sh @@ -109,6 +109,62 @@ v6_counters_cleanup() pft_cleanup } +atf_test_case "zero_one" "cleanup" +zero_one_head() +{ + atf_set descr 'Test zeroing a single address in a table' + atf_set require.user root +} + +zero_one_body() +{ + epair_send=$(vnet_mkepair) + ifconfig ${epair_send}a 192.0.2.1/24 up + ifconfig ${epair_send}a inet alias 192.0.2.3/24 + + vnet_mkjail alcatraz ${epair_send}b + jexec alcatraz ifconfig ${epair_send}b 192.0.2.2/24 up + jexec alcatraz pfctl -e + + pft_set_rules alcatraz \ + "table counters { 192.0.2.1, 192.0.2.3 }" \ + "block all" \ + "pass in from to any" \ + "pass out from any to " \ + "set skip on lo" + + atf_check -s exit:0 -o ignore ping -c 3 -S 192.0.2.1 192.0.2.2 + atf_check -s exit:0 -o ignore ping -c 3 -S 192.0.2.3 192.0.2.2 + + jexec alcatraz pfctl -t foo -T show -vv + + atf_check -s exit:0 -e ignore \ + -o match:'In/Block:.*'"$TABLE_STATS_ZERO_REGEXP" \ + -o match:'In/Pass:.*'"$TABLE_STATS_NONZERO_REGEXP" \ + -o match:'Out/Block:.*'"$TABLE_STATS_ZERO_REGEXP" \ + -o match:'Out/Pass:.*'"$TABLE_STATS_NONZERO_REGEXP" \ + jexec alcatraz pfctl -t foo -T show -vv + + atf_check -s exit:0 -e ignore \ + jexec alcatraz pfctl -t foo -T zero 192.0.2.3 + + # We now have a zeroed and a non-zeroed counter, so both patterns + # should match + atf_check -s exit:0 -e ignore \ + -o match:'In/Pass:.*'"$TABLE_STATS_NONZERO_REGEXP" \ + -o match:'Out/Pass:.*'"$TABLE_STATS_NONZERO_REGEXP" \ + jexec alcatraz pfctl -t foo -T show -vv + atf_check -s exit:0 -e ignore \ + -o match:'In/Pass:.*'"$TABLE_STATS_ZERO_REGEXP" \ + -o match:'Out/Pass:.*'"$TABLE_STATS_ZERO_REGEXP" \ + jexec alcatraz pfctl -t foo -T show -vv +} + +zero_one_cleanup() +{ + pft_cleanup +} + atf_test_case "pr251414" "cleanup" pr251414_head() { @@ -324,6 +380,7 @@ atf_init_test_cases() { atf_add_test_case "v4_counters" atf_add_test_case "v6_counters" + atf_add_test_case "zero_one" atf_add_test_case "pr251414" atf_add_test_case "automatic" atf_add_test_case "network" From nobody Sat Dec 14 18:07:34 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Y9Z1M0VGjz5gYbW; Sat, 14 Dec 2024 18:07:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Y9Z1L70Gqz42cJ; Sat, 14 Dec 2024 18:07:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734199655; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Xt5ytFIDIsZhtEXfiRoApkFjOULm2M/lI3EK5WryYrM=; b=JWFDtJVj2K03Qe1vZyA5jXNqhQxgGY3Bqc+MSXIZUH3U+G/g0OTAtGv6Hmat52TKbVrWxy 9aqPaJZoo+VKoE4/lW/G3b96FncDFxd2+WHJVmBvx4WwJIosT4cFbyE4uHRlUeTyCtKUzs o8qLUycYT/04JbPX688eb46tQ+xipxb6lb534GtEtbuN1sqrOHYQJGi0i5j/hP0S/DLH0y 3IFmZDgeFzKdc7Bw7g8a07Ebhl0GY3kqsCJHEfw09R7LxLoTN6KB6oSGYY3IZ1FnbrdVBz UQ0sdJovOPJ2YZfZH7ak6z6bfoN62EnArYQ+zzXw8VklDo2kzONBQ+XRx7PzkA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734199655; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Xt5ytFIDIsZhtEXfiRoApkFjOULm2M/lI3EK5WryYrM=; b=mg2AFUrhYRDR5GxFfdwmW4raPdERGO6PpieCDUrl+oqyZb15cVBFkdbPkL21wSuUSKJ8sF PVxPZlaWBaYPbIVanDEpYazT0A4IhIPNtMub3P8bDeEYXQS4+qB/zt3213rq169O0wjGer I0sKAOycLIz4UI6jmM92PN0GGnViJ9BVLg14GRDgmIwyLNVFErR+Bb5ZFWpko2n+PGRO3O NsSXeuBG59PSSvQQPBL/C8VxA2OhF+W/S31bSbtdqzFTKIGi+38n0hF/+Ow+PUmKlNRUXw /wf/OKOfuE5fWnYGSPOSYneJmYR8HSVHtsDBSqM//6AqX5wQ/hcSxTxc8eKNVQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1734199655; a=rsa-sha256; cv=none; b=BSkIB2Mv41e31JT4KkvHcfrq+RHIBdFN03wKfvClu3cgG72FVt8Q6rSKq62taRZKJpHmV3 jmFck7oMkEvEWBKacoEV8sDVovVGdL6SiUWyg5vX10iFrg6XTG0EfH0Eiwj6LOwssMWM4c xMTKXfe6g9rmNnAIvjr6+N6xyJSimmoAf+L7zRmd7SHKhV59m+5C+BBAXAXoCuLMt3yQBp Ejbnoi2E9E2RepYRomNdPG+3G0MDMMSwC06XW2HLei3P+SVR+3C/7Rs0GwF2wBdu9E8Aej a7IJH+M7SwVDkfi9VfJqhCb071yprIwaw0rH4wSyo8M5X07KQ16l0++i3R4Tvw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Y9Z1L6bYtzYsm; Sat, 14 Dec 2024 18:07:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4BEI7YeO061372; Sat, 14 Dec 2024 18:07:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BEI7YLo061369; Sat, 14 Dec 2024 18:07:34 GMT (envelope-from git) Date: Sat, 14 Dec 2024 18:07:34 GMT Message-Id: <202412141807.4BEI7YLo061369@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Ed Maste Subject: git: 8f944cba503e - stable/14 - Cirrus-CI: Add manual LLVM 19 jobs List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 8f944cba503ea32d11afba3d11e285b9b126c177 Auto-Submitted: auto-generated The branch stable/14 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=8f944cba503ea32d11afba3d11e285b9b126c177 commit 8f944cba503ea32d11afba3d11e285b9b126c177 Author: Ed Maste AuthorDate: 2024-12-09 21:27:01 +0000 Commit: Ed Maste CommitDate: 2024-12-14 18:07:21 +0000 Cirrus-CI: Add manual LLVM 19 jobs The base system compiler is now Clang/LLVM 19. Sponsored by: The FreeBSD Foundation (cherry picked from commit 944f45b8094ce70eef14d07afc333250ad063a49) --- .cirrus.yml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/.cirrus.yml b/.cirrus.yml index 45c31c9f07b2..62766904de2b 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -37,6 +37,14 @@ task: TARGET_ARCH: amd64 TOOLCHAIN: llvm18 TOOLCHAIN_PKG: ${TOOLCHAIN}-lite + - name: amd64-llvm19 World and kernel build and boot smoke test + only_if: $CIRRUS_REPO_FULL_NAME != 'freebsd/freebsd-src' + trigger_type: manual + env: + TARGET: amd64 + TARGET_ARCH: amd64 + TOOLCHAIN: llvm19 + TOOLCHAIN_PKG: ${TOOLCHAIN}-lite - name: arm64-llvm16 World and kernel build and boot smoke test only_if: $CIRRUS_REPO_FULL_NAME != 'freebsd/freebsd-src' trigger_type: manual @@ -61,6 +69,14 @@ task: TARGET_ARCH: aarch64 TOOLCHAIN: llvm18 TOOLCHAIN_PKG: ${TOOLCHAIN} + - name: arm64-llvm19 World and kernel build and boot smoke test + only_if: $CIRRUS_REPO_FULL_NAME != 'freebsd/freebsd-src' + trigger_type: manual + env: + TARGET: arm64 + TARGET_ARCH: aarch64 + TOOLCHAIN: llvm19 + TOOLCHAIN_PKG: ${TOOLCHAIN} - name: amd64-gcc12 World and kernel build and boot smoke test (manual) only_if: $CIRRUS_REPO_FULL_NAME != 'freebsd/freebsd-src' trigger_type: manual From nobody Sun Dec 15 02:21:28 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Y9mzF0h48z5h6tL; Sun, 15 Dec 2024 02:21: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 4Y9mzD72SXz4nX4; Sun, 15 Dec 2024 02:21:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734229289; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=R6sWFMt6dqdJhJk0atXJ4LqLqsXv3a0Exsc7/EayvmM=; b=eBRc6TF+W8fQ35Xmort/AVDa9DR5qxiI1YszADeaS4Mc8ZxCA3wcco1LC8Fz+ICyUSjzEc DxHa+mdLnXzYKmawsWtyhO56jcWz6HaTOxxA/4Wouvud9VED60qHzvnB7AwhoRVstiVuEZ yR0W0yKpzC7Gb8lyljeC2fuTDbGDwLqc1vkfLkJjHlcLgBZYqO5X/JZoB5MrnP5qB5m9Xi KyZLnQi3PQajhXcP/ZDzJ/8s5nywAZ80fSNn+KZq9mrTyoqjRzhh1YNPK1fYbuy5zZpE2w KLYqY6K2fIefeARsq7dOjO0XVAhJxa2sa1DoGIus8aUZ5LIWhdMAn+V1dHktVA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734229289; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=R6sWFMt6dqdJhJk0atXJ4LqLqsXv3a0Exsc7/EayvmM=; b=DhvjH8tAH+HQh+FmEmbngmh2hID6f5lZoRVs57KQrKjPvEFosqkoc3JZIt4+AOLYdDBxKB WiGRgSqkLKw6gQGfhFQEMIF8NEYj1vmgVO252Rm0XKRSddEeJLoGi3YRFSZ9UU4f732DQa s23cI3yiHW727yFvjtTPgLpRc/ZwOIU0X/ylVb1sZ3PKRZShHzt+IiB7+gvnw6SC2h6cbL dGUujXYP/xs+wGgU9qxQtVHLwNl2seiSOBlFSvcQDWy9D4EqGcWAeXtOV8DLHt36gVK120 0j0JxzCenBvU2/f4UVwUFOsn01Be+xLPEXs9fCU1movhy2HyLCnFmeB+zv+Yow== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1734229289; a=rsa-sha256; cv=none; b=QimFiZRUYRF6g8k7DdS2MqzU9/6vaDOAcLOfRB6isgICI6YtvRtgd1jnbXn5qk11/24kWf OZCf/HFmEKNoRvwDdLKvMWS8QsxocVVopR+aedttYtAPlgkotGZHyDxGi28PF8pIOUJKkb FJjj6iDwSNI+kU/xeKelvquALLQTEnTbcnZnSQYnxlxt0oJx/Cl6Mp7AHo87EqxklrvTHo H4N2OWEXY8B6H6SeM65L4UX0FeDE8DlHNcigbwkbSTfJOC90muqQ+V2DLLrCHstlfjwpB0 RZVQZsituYiq4pMbp/qBFnbBXteolusZU1mUMiQamLUfA9aAmPirmNYdXMx+lQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Y9mzD6dZSzp12; Sun, 15 Dec 2024 02:21: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 4BF2LSas081551; Sun, 15 Dec 2024 02:21:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BF2LSAV081548; Sun, 15 Dec 2024 02:21:28 GMT (envelope-from git) Date: Sun, 15 Dec 2024 02:21:28 GMT Message-Id: <202412150221.4BF2LSAV081548@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: 9c6454fe7048 - stable/14 - init_main: Use TUNABLE_INT_FETCH to initialize verbose_sysinit List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-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: 9c6454fe7048ade86faa1a864b04c7b250a660ec Auto-Submitted: auto-generated The branch stable/14 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=9c6454fe7048ade86faa1a864b04c7b250a660ec commit 9c6454fe7048ade86faa1a864b04c7b250a660ec Author: Zhenlei Huang AuthorDate: 2024-12-06 13:46:55 +0000 Commit: Zhenlei Huang CommitDate: 2024-12-15 02:20:52 +0000 init_main: Use TUNABLE_INT_FETCH to initialize verbose_sysinit It is too late to initialize verbose_sysinit via TUNABLE_INT, as TUNABLE_INT runs at the order of SI_SUB_TUNABLES, thus any subsystems those have order prior or equal to SI_SUB_TUNABLES are not logged. Reviewed by: kevans Fixes: c7962400c9a7 Add debug.verbose_sysinit tunable for VERBOSE_SYSINIT MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D47907 (cherry picked from commit a7cfcb26451219d6f4e60c486c855adeea288397) --- sys/kern/init_main.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/kern/init_main.c b/sys/kern/init_main.c index 1575287716ee..3c907da945b2 100644 --- a/sys/kern/init_main.c +++ b/sys/kern/init_main.c @@ -141,7 +141,6 @@ SYSCTL_INT(_debug, OID_AUTO, bootverbose, CTLFLAG_RW, &bootverbose, 0, * - 1, 'compiled in but verbose by default' (default) */ int verbose_sysinit = VERBOSE_SYSINIT; -TUNABLE_INT("debug.verbose_sysinit", &verbose_sysinit); #endif #ifdef INVARIANTS @@ -274,8 +273,9 @@ mi_startup(void) /* Construct and sort sysinit list. */ sysinit_mklist(&sysinit_list, SET_BEGIN(sysinit_set), SET_LIMIT(sysinit_set)); - last = SI_SUB_COPYRIGHT; + last = SI_SUB_DUMMY; #if defined(VERBOSE_SYSINIT) + TUNABLE_INT_FETCH("debug.verbose_sysinit", &verbose_sysinit); verbose = 0; #if !defined(DDB) printf("VERBOSE_SYSINIT: DDB not enabled, symbol lookups disabled.\n"); From nobody Sun Dec 15 02:21:29 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Y9mzG1mfMz5h7FQ; Sun, 15 Dec 2024 02:21: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 4Y9mzG0cY6z4nqs; Sun, 15 Dec 2024 02:21:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734229290; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=aH+bWUHKPue+XSNoHNLFaz9usYU2+lkahRMR+4cGZ+g=; b=Gy6R9KZspI0+3XllPE2DlI5Xe5+2O//wUUt/fXOrUbx2a+OaePQgtF8W5q3k2eTiaTT/TS jrX0DIn0hk4FrmXBUCB0LQDCcGOlPqQPMsABPBDORknIdDcbxgBSkkTvCgFovsOacAaKV/ R4leezFbCYh2hOqM5uLqJIDYmYNEbMZGJ6cLeCMwWPNu9yW7DQvAckXpixQnj/Y42CwtPP wbxU1ETIS42z00WQix0yW+D+n/yCuJ3hcM02LdHHpk3Dp/s6e+JQQz9kK6708IW9letTXQ FYV4cO1Njx5xh60DlvcQ1CHTBvhwWUMCY2kLBYUtZVP7WD2vFh0SV/R1xsZ3sg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734229290; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=aH+bWUHKPue+XSNoHNLFaz9usYU2+lkahRMR+4cGZ+g=; b=lsdAxIZ6E4qaopY1V2u1yVl3YiRXMe5hKhra+97KHo9ppToeu5uOtmjSaqnwdMQZoioJOx qCBtIkiXUxGn8fk8g/OMlou2qZwJdNBx8xuJ0hhTswPWJeta8MYoIHMhmRGSL1VscieXqS KyvzP6d0hiKXmsMv0HKnD2uUpfXmAwTrIdD1vJRc4dI+bLKxEJOcncJOWuwQ7e/w/HgkHD UJ06I/tMccelh5Zyr3CQWrxs1+XqmS/YMeRpKfcdlqcBHM/jJsRSjhKct4nWUzhEr/2cPm jt4LEFCLtvWmh3WvPQjoYoCUJukhRh7lVIvhVEerLMiEWg7tOKvkaZg5uKheSg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1734229290; a=rsa-sha256; cv=none; b=dVQAkQWB7romR5nbhg3nfytxfZrAWrsNS3C25Pz/MUy4JTdwgNddL5AwMuaoNTfgkoSfA5 5tyyXzCUjidLzGgPXOXjKWlcCiaddNSjzorsEWz80skW5WAPWWtRYBfDN9vDAOZoAAOV2S FC4ZFY5tMFZEvNg0p7g1QMoFcBHMbSBY6rroZSBW7C5/j/XkfvsNhNyHBTrhtEUGIdHLnN qj4GTaUBNWzkNLJ/acGUxu/+Ts3POK0LZit6pACmrpwKD4SIyfBKWBGJDm2siiog8YCfkR MHiS0YED/Vbz3GRwtS9jxB+E5zwFkaLIyssSnV7XUaHAxyDc2razJ4oMC28X+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 4Y9mzG0Cm2zpWR; Sun, 15 Dec 2024 02:21: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 4BF2LTEo081603; Sun, 15 Dec 2024 02:21:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BF2LTOt081600; Sun, 15 Dec 2024 02:21:29 GMT (envelope-from git) Date: Sun, 15 Dec 2024 02:21:29 GMT Message-Id: <202412150221.4BF2LTOt081600@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: 3021a0bcb042 - stable/14 - init_main: Fix logging of the SYSINIT process List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-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: 3021a0bcb0424a58011a9cda076e0696c9de2bf7 Auto-Submitted: auto-generated The branch stable/14 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=3021a0bcb0424a58011a9cda076e0696c9de2bf7 commit 3021a0bcb0424a58011a9cda076e0696c9de2bf7 Author: Zhenlei Huang AuthorDate: 2024-12-06 13:47:06 +0000 Commit: Zhenlei Huang CommitDate: 2024-12-15 02:20:53 +0000 init_main: Fix logging of the SYSINIT process The current subsystem, aka `sip->subsystem`, should be logged, rather than the last one. Reviewed by: mhorne Fixes: 5a8fceb3bd9f boottrace: trace annotations for startup and shutdown MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D47903 (cherry picked from commit 5997b1933142116041af7549eb2f450b4714b823) --- sys/kern/init_main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/kern/init_main.c b/sys/kern/init_main.c index 3c907da945b2..23a1eb944b7b 100644 --- a/sys/kern/init_main.c +++ b/sys/kern/init_main.c @@ -302,7 +302,7 @@ mi_startup(void) #if defined(VERBOSE_SYSINIT) if (sip->subsystem > last && verbose_sysinit != 0) { verbose = 1; - printf("subsystem %x\n", last); + printf("subsystem %x\n", sip->subsystem); } if (verbose) { #if defined(DDB) From nobody Sun Dec 15 02:21:31 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Y9mzH2rYkz5h7H6; Sun, 15 Dec 2024 02:21: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 4Y9mzH1fBQz4ncf; Sun, 15 Dec 2024 02:21:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734229291; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Gwce13+5e2BoYRspn4zfHume2sXJgeglveeD3JnXl7M=; b=iUa4N4TX4viMr41g5u4AF78epbRWqrE9MaEC/xNLXJgjfvXLli3/P8Wblwur6TVRmPD6wu 77Gaxqee+KW15v7zh0rerPfrrKRqK7i2jgRsYV8G4dVPoLC6m9bITET7oiJRYhXwj3RhQv bDO0sewuB2bmZSJkZeW/L9EXZ0sBLT7C1ruDHQpOTaUS79Iz1wtbTg52v1Zal1k3A/Sgi5 7vgN2xU9gz+NkCJpb6sFkt3EI44vDKJyoer9716kWGiUoK29wwWhLDhWg2wnsotqAVmG4y XvJv5brAEG+DnzaEi0os3s98vcS4QhnmiaoT9RSiyTN+o6yLMK+PUNXNyHy+Jg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734229291; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Gwce13+5e2BoYRspn4zfHume2sXJgeglveeD3JnXl7M=; b=axJqBisZHhidpgvz9gV2C7VKNMRQRcwIs5/Fa2I02it/jyvqW993uzeXIOiLcVR91vpgLF HL6XOia8JkeTG+2hxmuxR5mloeddqctYZaJCSgwqDuaLNg4u1dpmghoaeLHhtaJ3n8F3bn Zt/bt5glKDv5ggFnlndXgY8Pq/Jqem4q/Tk6wU5uEMlDeIEUhdbEbqMANwULVSeiY5KlqH xZMr1JO0S+04OAlHUJgXqd+0Bl+wZtfim+yoWF9j99yP8tGdc+mP/mkpDnHPENTJOnLVjP lt6fd0KvTKi+Wo3+iGsQQpCbYnT+6YyvVndSdKw8H1TIQcln0lqjF7UE0XFbWg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1734229291; a=rsa-sha256; cv=none; b=gpf1N+3gYAkSHYxQbBlAZ3tD9h/GpyitTpfzLGQIIix8wUZ3ZkY25KA5AkPG1VshGghdee be7cJ1RSpcYWmFAINV7Jjh/6Vb1Z0n+0FrmHh+C6BZPAAxRn4TEjK6pd1GAD8QW9ANAP23 WdvzMynZDwn6GYV8jg4vfDdCHH5proVzBZk6MtkiuGvKASTTutOQlkQmlvZ67Re9f2LJHL +e7zmG3UbymzNMz26OpnfclEl6h9znZ/DOqVNbNEAQF2z2mSfwUiEn7j3/ZUwX2O7lGjpq Jhy8Li2QDGaIY7L53wsYt8qWW7NbCpwE1zyWBF3CYTIdb2PN4wWC2xJ/oz3WEQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Y9mzH1FDbzpSQ; Sun, 15 Dec 2024 02:21: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 4BF2LVIZ081673; Sun, 15 Dec 2024 02:21:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BF2LVpY081670; Sun, 15 Dec 2024 02:21:31 GMT (envelope-from git) Date: Sun, 15 Dec 2024 02:21:31 GMT Message-Id: <202412150221.4BF2LVpY081670@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: 23c1619970ab - stable/14 - cuse: Use NULL for SYSUNINIT's last arg, which is a pointer 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: 23c1619970ab1082b8275ffb914463f1c62c2f84 Auto-Submitted: auto-generated The branch stable/14 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=23c1619970ab1082b8275ffb914463f1c62c2f84 commit 23c1619970ab1082b8275ffb914463f1c62c2f84 Author: Zhenlei Huang AuthorDate: 2024-12-09 17:14:07 +0000 Commit: Zhenlei Huang CommitDate: 2024-12-15 02:20:53 +0000 cuse: Use NULL for SYSUNINIT's last arg, which is a pointer type MFC after: 3 days (cherry picked from commit 6854a1488932cd043da940b87eb956d6df7d8522) --- sys/fs/cuse/cuse.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/fs/cuse/cuse.c b/sys/fs/cuse/cuse.c index e32154654386..d63a7d4691cf 100644 --- a/sys/fs/cuse/cuse.c +++ b/sys/fs/cuse/cuse.c @@ -332,7 +332,7 @@ cuse_kern_uninit(void *arg) mtx_destroy(&cuse_global_mtx); } -SYSUNINIT(cuse_kern_uninit, SI_SUB_DEVFS, SI_ORDER_ANY, cuse_kern_uninit, 0); +SYSUNINIT(cuse_kern_uninit, SI_SUB_DEVFS, SI_ORDER_ANY, cuse_kern_uninit, NULL); static int cuse_server_get(struct cuse_server **ppcs) From nobody Sun Dec 15 02:21:32 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Y9mzJ3gh3z5h70X; Sun, 15 Dec 2024 02:21:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Y9mzJ2SS9z4nxq; Sun, 15 Dec 2024 02:21:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734229292; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Mo8TbkcYyyTj48NTLXbha/8sChWxG2E1zdxvXMx31Cw=; b=iH+z02z9Xgqz5YAhFG3LevQ1gwz/mV4FHIMSjXXWnJNIu+bD5WurFRluk/oxAjl5GlJZbB TTNDy19eQZoLhhArlEZX22ALFS48PDxp3FXtlS3/C0uiuwdBSt4wOse7D+x0N9MKpB7Jhx nbPfU5Jl6M99iCllXYwl6xPahaTpt4GF2yy0j1U/Njxx1U4+9QxD2TWULvHq3KasE6gp6h 33ZvY2HNsC814WYXKFX6Iyvwycff1WTlmUDb/4T+SGd4dsVX9oKFzlI9IW2ebM1cnMtgRp I94cntV5iY62Qp5MI93c2ZpYIH/yuJY6Ga8sHadtpIZ8z8qTPNBFYGxa/eTPcQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734229292; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Mo8TbkcYyyTj48NTLXbha/8sChWxG2E1zdxvXMx31Cw=; b=UmWSVGUKsSZIkIDsK2AAMqddKvyoVuaXeZ5bLuSVDgIF0JrqE+20waicYpe21BYKiAY9HL 1/3NKm3MWRpmj3ZS57z8cicwgrx7wVNbVNH/goohyv2sMtzkiF1MMgqQP4hJAdeVf8VZMw h2XWo45Oi3cazjr0KZOUtmE0yQ9eEEaA9354V10V7cfcN7uEld8g2RPudoYSf33zqx5GmG L5p8V9+4uDhh63ud8RVIvE3sroiAKhcBpUOSEaW3kE+9L5RXyG4E3h89z2GODWyQ6EBQW2 Fltx5lN25/sYWHdUUqNaRlkUcwLgTPDPdnHY4Uzhmbx3m8fDxavLkpNQsyX3Xg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1734229292; a=rsa-sha256; cv=none; b=cPuots40GwhbF/hGPBc1e+2VxF/rJrB6Pq+H0Oxyk08QLt0q4pnzf7SGBAbT/HMy7hJZgw N1KUrT9M0b1e64fIMcQKpP8zHPOHVK1E8lAceNk2QGpETZQvSeeOjnZaWqxutCeuB2VbbQ y2ZVlNKaMc56cUsuCQrBv6EDMKSEsznZRVIH+AhjH7Q4vNQNB6ox3Abc5XAVzli7cSNMFT BpdGiVyCIMzNsmFZjjocElVge6g7vBIu1JD4IhlaBUlrIZ1knPz3ZGecbNGH4bmXTXwk1X V/RMHJw6cKGAWZ7h4NXMqrnrzo7RAQQC334HNqYQM8jkfVfk9iYiqd08CCjtLQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Y9mzJ22VJzpFX; Sun, 15 Dec 2024 02:21:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4BF2LWXX081736; Sun, 15 Dec 2024 02:21:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BF2LWPk081733; Sun, 15 Dec 2024 02:21:32 GMT (envelope-from git) Date: Sun, 15 Dec 2024 02:21:32 GMT Message-Id: <202412150221.4BF2LWPk081733@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: bca3a925b0bc - stable/14 - routing: Use NULL for VNET_SYS[UN]INIT's last arg, which is a pointer 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: bca3a925b0bcb57bc48480fbc92fef257aeb1a72 Auto-Submitted: auto-generated The branch stable/14 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=bca3a925b0bcb57bc48480fbc92fef257aeb1a72 commit bca3a925b0bcb57bc48480fbc92fef257aeb1a72 Author: Zhenlei Huang AuthorDate: 2024-12-09 17:14:08 +0000 Commit: Zhenlei Huang CommitDate: 2024-12-15 02:20:53 +0000 routing: Use NULL for VNET_SYS[UN]INIT's last arg, which is a pointer type MFC after: 3 days (cherry picked from commit 12b2d68bed37e379929cd9b5e0afe34c387be360) --- sys/net/route/route_tables.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/net/route/route_tables.c b/sys/net/route/route_tables.c index f1c96f813d91..1b1281c858da 100644 --- a/sys/net/route/route_tables.c +++ b/sys/net/route/route_tables.c @@ -322,7 +322,7 @@ vnet_rtables_init(const void *unused __unused) RTABLES_UNLOCK(); } VNET_SYSINIT(vnet_rtables_init, SI_SUB_PROTO_DOMAIN, SI_ORDER_FOURTH, - vnet_rtables_init, 0); + vnet_rtables_init, NULL); #ifdef VIMAGE static void @@ -361,7 +361,7 @@ rtables_destroy(const void *unused __unused) #endif } VNET_SYSUNINIT(rtables_destroy, SI_SUB_PROTO_DOMAIN, SI_ORDER_FIRST, - rtables_destroy, 0); + rtables_destroy, NULL); #endif static inline struct rib_head * From nobody Sun Dec 15 02:21:33 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Y9mzK6F3Pz5h70Z; Sun, 15 Dec 2024 02:21: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 4Y9mzK3ym4z4p3B; Sun, 15 Dec 2024 02:21:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734229293; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=LU78oR4VMCJRRh8ynwjqLCOQ2Ougp/zz2AWleKgujO8=; b=uCmA606ptdMZuBscasAv9SGqsR9moCG487bQri91Nq/TWnDC2lfuP4eNhPjRIJEiHMUr3H y/DqoFvqBZ9NbQjy9Ab0t7QyVYd2p7Cv2r4iSrPVERXbbAX291c6QR4py1DYGlM5WxGhoS rNxbg97IlpwYFedjtEGMs8r03lneM7ljDB6u6wqx4ecMhNIW3if52jUConyiKW08EwYn7f AUpzI7MFnOHtWHh7F0cvB2pfPaimHkeFCq2VTyPZ6IQpbJ/UyS2uvB2EvOGSEt//pmlmUg zrl35SaLmAGuvz7q5GswtssDNso/6n+j8zcWLqXsiyNLJFhSCadg5xgRcXQ6yQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734229293; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=LU78oR4VMCJRRh8ynwjqLCOQ2Ougp/zz2AWleKgujO8=; b=C0c5BSw5FptVtARh+nSIap1sruaA/GlC9IK7rSySedBWJzF2xfTIm8d6KmMs3Hdz9RxUVy CnS87R6ezaJl/Qz1CG8ZbV1OBerDPG/KeeN9MSTPXKtUPqDich0M67ByIHwGd7xCGuT0Iu HdeQrPnfAlxssVfRVfADGSgPeEc+n66yN2MIk18V1t8x2tkMyqpnb5XlURSIOC09hwV1wj w39k3xo7HokIjauSDnhRsz6bH0Aw7nGuYSJievna9IdkvypQ7n04yNFiOZXvzcV4i7ROdH sMweJbAsPXhrePwDaubnbdJV1l9GlSkTVqtBGy1skYfYqw1XlQeeYEOA+B74/g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1734229293; a=rsa-sha256; cv=none; b=nF8ICPd29ZU4hYXtIoPU0D9WYfUjMxKpur9BU1uia1i3KnvOunPEQtQSe26nJ5WlK6Lu4j bUs0ANp+1vP9E88cD1a0iljD/ltXs5NdvL6cCsWiukVHIybzlNdhm4BXCxbGUnnoXvghIj kg1IOUZqz4vzis3JcV9Jk6cpWIDk+pE3aKlaVAGg1NLiKSrtcdGs55HsPypqrijWd86k7h uDgoyKf4f/LyimPpyXrS0ToY76LGKuY/rSEQdu+armFFvPYixkfaWubEvFaHSwb2wNZjH5 B1iVksDnL+P3Ge/vmzPzZCPnar4jXL+qvy+/6Nloi/eJ9kQwA/oY9TWSlxqRlQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Y9mzK3Q9HzpWT; Sun, 15 Dec 2024 02:21: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 4BF2LXM2081799; Sun, 15 Dec 2024 02:21:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BF2LXVI081796; Sun, 15 Dec 2024 02:21:33 GMT (envelope-from git) Date: Sun, 15 Dec 2024 02:21:33 GMT Message-Id: <202412150221.4BF2LXVI081796@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: 8293bd628540 - stable/14 - rtsock: Use NULL for VNET_SYS[UN]INIT's last arg, which is a pointer 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: 8293bd6285401c3ef4310e4fc8bfb0e3cf132729 Auto-Submitted: auto-generated The branch stable/14 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=8293bd6285401c3ef4310e4fc8bfb0e3cf132729 commit 8293bd6285401c3ef4310e4fc8bfb0e3cf132729 Author: Zhenlei Huang AuthorDate: 2024-12-09 17:14:08 +0000 Commit: Zhenlei Huang CommitDate: 2024-12-15 02:20:53 +0000 rtsock: Use NULL for VNET_SYS[UN]INIT's last arg, which is a pointer type MFC after: 3 days (cherry picked from commit adc573c8e2179310777cef4d6bda19db2ae63dd5) --- sys/net/rtsock.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/net/rtsock.c b/sys/net/rtsock.c index 3905584e431d..4678edeb06d5 100644 --- a/sys/net/rtsock.c +++ b/sys/net/rtsock.c @@ -263,7 +263,7 @@ vnet_rts_init(void) #endif } VNET_SYSINIT(vnet_rtsock, SI_SUB_PROTO_DOMAIN, SI_ORDER_THIRD, - vnet_rts_init, 0); + vnet_rts_init, NULL); #ifdef VIMAGE static void @@ -273,7 +273,7 @@ vnet_rts_uninit(void) netisr_unregister_vnet(&rtsock_nh); } VNET_SYSUNINIT(vnet_rts_uninit, SI_SUB_PROTO_DOMAIN, SI_ORDER_THIRD, - vnet_rts_uninit, 0); + vnet_rts_uninit, NULL); #endif static void From nobody Sun Dec 15 02:21:34 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Y9mzL6kRQz5h6tX; Sun, 15 Dec 2024 02:21: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 4Y9mzL4bZnz4p3S; Sun, 15 Dec 2024 02:21:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734229294; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0Nr/YGUPAZ81HxOzQHdygWtFHCbkLrfGl7bGG0fLJdQ=; b=NTCHmBGFjAvYcX24fYYglJXJRgldxIYKnorYEWVRgjVsyxC0k0dNnCEaAa+u1pudLnoGP1 VOxra2aPTxsV9U6j9B+SBZ85u2R5uUvv/XJkZ48k6cKuVDrV96IzpYDNm+qxu4iLYcyIYT q9x5nvFYUxTsxhO+bVgI/nifwro1ma+2j0Kk2VGeJXGtQolitK/lLG3N62VwFEP7Elf+ea kOA6zvtp8it5RoYfsRUfW2ofKJYzAY9nyCQfUrtwXzzPROOaThmUomAjlYHnAVUv7XPZEn hvcorI6LubRtT/isBsKUCFdOmUKSXKSlsnF291fKTuJI/faAfzLxSIuiqI9Oqw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734229294; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0Nr/YGUPAZ81HxOzQHdygWtFHCbkLrfGl7bGG0fLJdQ=; b=pMGgCO2UarlR7OvgtYrwDGQXKChP5oJxB7NcJRPm8bTYDgp65FrD2wPY+ZglsPl60syDne 91VYivQSC6FA892yK7OkesZ04HaBz9/TuU8n1wsEoioMY1OuuSAo0KBMTPwUJ/ZEnEvDPL sRN49+BwgiI21y7UoCs+kqydGBKiyyI7EWqgQSz8V6gEV/SX7eW5FVhQl1MM66+ibqDdYz FbYgAVeXwztN15mDk+LvLlpCikebEhditeFsa1e8+jLMOpr3gvkV9PaexTJ/dTMW5grteb rp0PhDAugjwNbPyKPByNX80P1b6JJJjpbRB+69uDZjxCCpAKF9B3qNbejyOJYA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1734229294; a=rsa-sha256; cv=none; b=vcqCflcXri7PWLfqLmR9GlngZ+hlwioahZs4DQQ6dLv8myUY3/A31553Hpo2uaBJZtFuNC haf3L2uIN+05GstzaWKa46QfqWDa4PoL7HLcbIsvbpJvIzqzrLVvlCfM/HFbUT4Gctm6xc D8J/Hlf6B0lEDGf/i0CcJZlePeKOnxiMHQKrtK6oXtBlYBmvVLodoUomrVyf/H5A0lBl2L rn/gU3wCZGH/ywr4s6HewZdF48qEybqag6Kx8YrrMicC+OrSa1SPySzpLdec1Mixa59Jsx sYBL+942RXnWRAITxU40Eo+PNQiSVSBWHXUv/sXSPgcjFhMgZBnK5FiruVZcig== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Y9mzL49NGzpSR; Sun, 15 Dec 2024 02:21:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4BF2LYBP081862; Sun, 15 Dec 2024 02:21:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BF2LYEW081859; Sun, 15 Dec 2024 02:21:34 GMT (envelope-from git) Date: Sun, 15 Dec 2024 02:21:34 GMT Message-Id: <202412150221.4BF2LYEW081859@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: 3c3a622a7543 - stable/14 - inpcb: Use NULL for VNET_SYSINIT's last arg, which is a pointer 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: 3c3a622a75436bf3448bfa65346f9998ae4d21a5 Auto-Submitted: auto-generated The branch stable/14 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=3c3a622a75436bf3448bfa65346f9998ae4d21a5 commit 3c3a622a75436bf3448bfa65346f9998ae4d21a5 Author: Zhenlei Huang AuthorDate: 2024-12-09 17:14:08 +0000 Commit: Zhenlei Huang CommitDate: 2024-12-15 02:20:53 +0000 inpcb: Use NULL for VNET_SYSINIT's last arg, which is a pointer type MFC after: 3 days (cherry picked from commit ec6e7677a0dbfbcdb4b740b28a1105256f1fc93e) --- sys/netinet/in_pcb.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/netinet/in_pcb.c b/sys/netinet/in_pcb.c index 36454b9a18bf..ccd76d1c449e 100644 --- a/sys/netinet/in_pcb.c +++ b/sys/netinet/in_pcb.c @@ -234,7 +234,7 @@ in_pcbhashseed_init(void) V_in_pcbhashseed = arc4random(); } VNET_SYSINIT(in_pcbhashseed_init, SI_SUB_PROTO_DOMAIN, SI_ORDER_FIRST, - in_pcbhashseed_init, 0); + in_pcbhashseed_init, NULL); #ifdef INET VNET_DEFINE_STATIC(int, connect_inaddr_wild) = 1; From nobody Sun Dec 15 02:21:35 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Y9mzN0Zvtz5h6gY; Sun, 15 Dec 2024 02:21:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Y9mzM5hHHz4p5h; Sun, 15 Dec 2024 02:21:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734229295; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=wehUPHWEtfuG3M1uB71Avrh3nNhYWTF1cTsYnTVvbwQ=; b=wM+NP8XAkW4VceM5nOIub1vtFkuzMYWXNg7ub2L2KmktfjkXQ1+NpdiVH2nwDNuFESjYiJ VefuTtqz87UMC/D4EGVsLdfQueULPUwiHSYH9EmqM7Da/Ks6/CaZbDPCR1JFKKazeM61hi 1Up+kNGKR4xAfSizsfjNCg4EsyAdq/5vb+o8d+PWUkAluHQRvilI4qppkEJJ4wkO14o1A5 pn1ncb0mxk00T9vR9wxj/COVkoyG3H8on7Nalfo056qy052Is4G82cYskD3ovSygp221ZP sUmD7rLQnYrH38xP3RcbBPtjsI9LB72wpGnwAauKYEhLAE32tuadW7OBUFu5iA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734229295; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=wehUPHWEtfuG3M1uB71Avrh3nNhYWTF1cTsYnTVvbwQ=; b=djng5rWw6UuGgf02fwh8JpsjsWaGayfmMBiLDq5bV1jutAiiDVgWLYA60qzM4zcBZETFjN gQ6f+Rh3QpRvPzODgXmMRcmArgAvQKd9qrDJheVqdS5hhzRnvY6nbqqweACtA/PSF6hmdM k18ErqG1Dv93H/tzvcDRJhWKkW6JpSSEODmByOJ+LZll2fZq69wHSEFaO+TjCLLvzozJzW GTjpCektDtBLhMlOXgjYZ1tBJFBE2JpeCBiaIVCnHNnSkX68rlN129X3tUWD2t+Mg/SIFL 6LJH29Gg+g7s1nGlBNPsU0+2YMecXPyu2akYcfP7Gg/cdkct291/9l9wFcmgbg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1734229295; a=rsa-sha256; cv=none; b=w/kHF5P+Ma5pzhPVQGcPY3hS11u7Pqc0lKDc28F+X2NrZ+XJ9i8sJK/eQYwIldavTy0C10 5GqAA+4aBlZG3e0Brsp4f3qCV0vtiDTBMvXufR4cylj5PO/9J5o9RsM2aEn3Ac/SIg9+j0 8cV32Y3Iaersezp+hUBMdb+/jBzfcUYBFmz0IivPgzBPQOg7YappQVpbxqdAL8nuELQHbu YZJmiyf0BQJxiWvNv2qh0b9eiE04JehgE2HMC1yFpQTD1YYP/0sRqU0XJ4sIx7xSBNAhTY rDGXKu6CPIVKmK5cOCLfCohN7zyC02ew0E7ieRlb/yBJNrN6XLbBzHdSRj+Syw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Y9mzM5HW3zpFZ; Sun, 15 Dec 2024 02:21:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4BF2LZK7081925; Sun, 15 Dec 2024 02:21:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BF2LZot081922; Sun, 15 Dec 2024 02:21:35 GMT (envelope-from git) Date: Sun, 15 Dec 2024 02:21:35 GMT Message-Id: <202412150221.4BF2LZot081922@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: 005b6caf268c - stable/14 - netinet: Use NULL for VNET_SYSINIT's last arg, which is a pointer 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: 005b6caf268c959e90d838a318f384656923977d Auto-Submitted: auto-generated The branch stable/14 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=005b6caf268c959e90d838a318f384656923977d commit 005b6caf268c959e90d838a318f384656923977d Author: Zhenlei Huang AuthorDate: 2024-12-09 17:14:08 +0000 Commit: Zhenlei Huang CommitDate: 2024-12-15 02:20:54 +0000 netinet: Use NULL for VNET_SYSINIT's last arg, which is a pointer type MFC after: 3 days (cherry picked from commit ac51711cab6e55a99ee0a565fe0ae30c0305c854) --- sys/netinet/if_ether.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/netinet/if_ether.c b/sys/netinet/if_ether.c index a14671528f18..0e4f28a06342 100644 --- a/sys/netinet/if_ether.c +++ b/sys/netinet/if_ether.c @@ -1508,7 +1508,7 @@ vnet_arp_init(void) #endif } VNET_SYSINIT(vnet_arp_init, SI_SUB_PROTO_DOMAIN, SI_ORDER_SECOND, - vnet_arp_init, 0); + vnet_arp_init, NULL); #ifdef VIMAGE /* From nobody Sun Dec 15 15:44:28 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4YB6nn1w70z5gysy; Sun, 15 Dec 2024 15:44: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 4YB6nn03n4z42n9; Sun, 15 Dec 2024 15:44:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734277469; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=wdjpvIS6zSfLZaCTBPVowmor5dh6Xti4zLg7BXArNbU=; b=Fxjn0DtVBiy1vTRS3l8eK32YPcDI/Pa2yM45n5LwsbubD7jEe711GrZx5abLhdmo12pUmM jL4ApySfxExWy30BHa4NR/aIfwuk1dIS4chV6y8YXzoRCyQdtVYazDrYe2iJmWxB42bgy0 AvbfGJEepkt+/efeJrJhASV9Ipk2LW9CWegIJQXSuPOUympI/k7g/WHrg7cNGXmXDhEPHS /qT1wCBZeHCbGcD/eH2XwmgN3gdB2Mm5CKQddgfJdkIaiohcVYdoy3FDeRqGOhpzuhbQgt /9oxCCd477Ij2C3sxj+4PeMG5yUj31tJacynNNxXR5nLbC5jEHG35oVrZMOZfg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734277469; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=wdjpvIS6zSfLZaCTBPVowmor5dh6Xti4zLg7BXArNbU=; b=wL8TJvEJYHGF1NCcOwntxh9Lr4IRvyx2e34RIw2vKEIfauatufKXdyXiskD5bzPQZGcm29 DeeYGzkLdjCLPULS/NqFLjubFxuZVo7MhcpllHBsHb7CL0W9YYUuSEzCnjugOnt9j+bUXf dnqkSfkDcEqbrQD4nUzRtZZwRqRTTn2RZJiT1v609ZPsI9tX2E4tz1Nwz2jcqxq4Y6PJj+ 1tCFHWu7cMqDuh6RjaHaGyK9ot9yUUtx7lRRYWrxIgVfgBdIdvwaCBpK0nkRl9HyOy7YJi yZ/oWATwgUrRd5RrilDW7TM6oRKz1wDPprK6MMhScpQHbeGaGwtLsqcR3+JUZw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1734277469; a=rsa-sha256; cv=none; b=S/6FSCsl5aZKU1sFtFvwZQIyqBuwu/Wa+YXF96A3GavBuKgjtq+lj7RPVtDw3tXV/DuYUJ VACDNZrNtNDxSQNE/wwZ9jKAMptNtkLEnQ87a5sX5QpbdgOCueG7f8L9oqqOOTAWYiFRNM grTHaBgGGi7IFTPY7Qzk39d1nVVwdlTKHB1vkQ3tJ26ljWH5cBTJch57vCs6GiPYuWs6mL oA2EITkTn+8NCpf/26FhJNx3sHQ5AFRhVWY402oZs+siv19hbuxwbZ2T/RZM/TIT+SIgW1 wobZr/uY9VB1zgHfUzJi8ZcnQH+3gPgOZOf53pTNC65SKGcdgwloEDb9P/kQKA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4YB6nm6n5FzF2b; Sun, 15 Dec 2024 15:44: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 4BFFiSON077806; Sun, 15 Dec 2024 15:44:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BFFiSIS077803; Sun, 15 Dec 2024 15:44:28 GMT (envelope-from git) Date: Sun, 15 Dec 2024 15:44:28 GMT Message-Id: <202412151544.4BFFiSIS077803@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: f6e0690dc9f2 - stable/13 - init_main: Use TUNABLE_INT_FETCH to initialize verbose_sysinit List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-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: f6e0690dc9f2e8ba78ba74041eba4ff77091448a Auto-Submitted: auto-generated The branch stable/13 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=f6e0690dc9f2e8ba78ba74041eba4ff77091448a commit f6e0690dc9f2e8ba78ba74041eba4ff77091448a Author: Zhenlei Huang AuthorDate: 2024-12-06 13:46:55 +0000 Commit: Zhenlei Huang CommitDate: 2024-12-15 15:43:34 +0000 init_main: Use TUNABLE_INT_FETCH to initialize verbose_sysinit It is too late to initialize verbose_sysinit via TUNABLE_INT, as TUNABLE_INT runs at the order of SI_SUB_TUNABLES, thus any subsystems those have order prior or equal to SI_SUB_TUNABLES are not logged. Reviewed by: kevans Fixes: c7962400c9a7 Add debug.verbose_sysinit tunable for VERBOSE_SYSINIT MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D47907 (cherry picked from commit a7cfcb26451219d6f4e60c486c855adeea288397) (cherry picked from commit 9c6454fe7048ade86faa1a864b04c7b250a660ec) --- sys/kern/init_main.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/kern/init_main.c b/sys/kern/init_main.c index 2c5ba59b92f3..66db882ba4f3 100644 --- a/sys/kern/init_main.c +++ b/sys/kern/init_main.c @@ -138,7 +138,6 @@ SYSCTL_INT(_debug, OID_AUTO, bootverbose, CTLFLAG_RW, &bootverbose, 0, * - 1, 'compiled in but verbose by default' (default) */ int verbose_sysinit = VERBOSE_SYSINIT; -TUNABLE_INT("debug.verbose_sysinit", &verbose_sysinit); #endif #ifdef INVARIANTS @@ -265,7 +264,8 @@ restart: } #if defined(VERBOSE_SYSINIT) - last = SI_SUB_COPYRIGHT; + last = SI_SUB_DUMMY; + TUNABLE_INT_FETCH("debug.verbose_sysinit", &verbose_sysinit); verbose = 0; #if !defined(DDB) printf("VERBOSE_SYSINIT: DDB not enabled, symbol lookups disabled.\n"); From nobody Sun Dec 15 15:44:29 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4YB6np21vBz5gydv; Sun, 15 Dec 2024 15:44: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 4YB6np0rQLz42SL; Sun, 15 Dec 2024 15:44:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734277470; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3iW9JpuBGp7E3MgZoPrV9PhqHMHV35jWLqlDreLwM2E=; b=lYcgnHk1t35BsmOh2JlTPnP6JX0sF+WzjYXfNtE4zGFUn6tNHG3lPdYRiLAsiKujSrxj+W 1ifYpT+Meh2CRW7KWVWhoKsLy9i7ZV5KOS/pcS6DMOJZZ7Qnoi5iJQgwjD2dg/wJN7qFHa aE0rpfGqWQ+DXNwQc5IY2Sshmx0qimmV+PYcYv7Sb43T8lXni16gFpQpgRbmDg6yvDno+A tun80I9C9yniLqr019S5XEXzheComK9WOTfjaxf4cSsglNikeAmgy+AhZ7B6IZ/gmjL5jC OIAhVPhbWUeKwe/8J2lblzIvalMk/GOa/BhLeBT6fnjihWvOR6tjJQLi4MPfrg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734277470; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3iW9JpuBGp7E3MgZoPrV9PhqHMHV35jWLqlDreLwM2E=; b=limGs0BWU/r6ObU1eqTErvCf8K57m5M6QnVOJJ7z+QOl/clcmwvyVR17HCrBWGSFrptWXA 40ZKpPTB6xa/82m8Qqpxg5SSBbrlhXsbaNX8rZJCZk199Qx8lUeIgKNIrtg1zPderhfoFC GmQ0noaE4Xz9NveGAiJa8Xv3M830PlUiqhdEtwhslDYY1DIio7dRxRSzVhqQ/7QL/qkOZT MGbjVOTq045HtlYCYI+a8AdkpKquJiBptYj7H3rkpqaF4Fd/nk4eDDAyKLtpKOhPzV4wrh KCPeruMDre5s1j/NLMypBebrGyT/LU3INHksXYemn11k1EAO44ftk+nSTTQDjg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1734277470; a=rsa-sha256; cv=none; b=bAUKT/XPog1C9M8VIQutgn3oRhWv1FSZoQ2aMhxnp3DDW4O5nH8nfy23d13IwC0hwqH3Gp oki690SBiqBAj+TppoOl5iLW2oKdz3C8WtV6xDtn9yf9rOpPvye5cGfSI3NHnoQ2/jShPZ zFdDBi9/o0CcXe45iB4LbupOHCX22Nr2/znLfT3GHAPmT/6XGjT9Z//trB8LWCUat4U/t3 XScqsWmfgF1Yagk8NGgEIXDhCVW48NTeIeiQ186wJ++AuWAy02Q+ZJWKCZhH+HYLMsNVoQ i0o4I1uYnFzDf8YkxGa9r+t2cFiFEzE/2BqrVGX11ABtn387s8k72fX4XrJalA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4YB6np0Rz6zF0B; Sun, 15 Dec 2024 15:44: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 4BFFiU5C077872; Sun, 15 Dec 2024 15:44:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BFFiT1b077869; Sun, 15 Dec 2024 15:44:29 GMT (envelope-from git) Date: Sun, 15 Dec 2024 15:44:29 GMT Message-Id: <202412151544.4BFFiT1b077869@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: f9ee60cd21c2 - stable/13 - cuse: Use NULL for SYSUNINIT's last arg, which is a pointer 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: f9ee60cd21c25833f02ca5895c293e7a015602ba Auto-Submitted: auto-generated The branch stable/13 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=f9ee60cd21c25833f02ca5895c293e7a015602ba commit f9ee60cd21c25833f02ca5895c293e7a015602ba Author: Zhenlei Huang AuthorDate: 2024-12-09 17:14:07 +0000 Commit: Zhenlei Huang CommitDate: 2024-12-15 15:43:35 +0000 cuse: Use NULL for SYSUNINIT's last arg, which is a pointer type MFC after: 3 days (cherry picked from commit 6854a1488932cd043da940b87eb956d6df7d8522) (cherry picked from commit 23c1619970ab1082b8275ffb914463f1c62c2f84) --- sys/fs/cuse/cuse.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/fs/cuse/cuse.c b/sys/fs/cuse/cuse.c index 9ef234c35427..b5299ec0f1c0 100644 --- a/sys/fs/cuse/cuse.c +++ b/sys/fs/cuse/cuse.c @@ -332,7 +332,7 @@ cuse_kern_uninit(void *arg) mtx_destroy(&cuse_global_mtx); } -SYSUNINIT(cuse_kern_uninit, SI_SUB_DEVFS, SI_ORDER_ANY, cuse_kern_uninit, 0); +SYSUNINIT(cuse_kern_uninit, SI_SUB_DEVFS, SI_ORDER_ANY, cuse_kern_uninit, NULL); static int cuse_server_get(struct cuse_server **ppcs) From nobody Sun Dec 15 15:44:31 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4YB6nq2qG0z5gymx; Sun, 15 Dec 2024 15:44: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 4YB6nq233Pz42hl; Sun, 15 Dec 2024 15:44:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734277471; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=TfaNs+daD0tpCadIvm/0FuW+k+/2fPYKT4af3/6aGjY=; b=Cw8qhBn0LVCMrRqG8RYlZG6RI4QjPSeEkSlQevOsF44X0Ae5EP697DkZLpmw+OoA0SnHk1 CMjFppD8iAYyV+/YvGfQM9y+5w6QCTebAm/UiZ9EAOZgN0xdajuSeJUXMf72HIySplCJL9 UQ0kV90o4+yzZTNKtSxbNx943xPJ0D1JNvIuugDTcn7ti1uthhzveAwcU9zt0YchxrKizD TH9mX48dQAdifUohK4RkYFAAiV+BmffOSBh/gZLbcq+XAONbO6uxgu2C/eCqvLcYKlYIMY JDHHC1ikXH5jpt0oDuvhnaK9w+E2GY8M5JsBmSVcpN46Kji8qAsYD1l6MRwkMw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734277471; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=TfaNs+daD0tpCadIvm/0FuW+k+/2fPYKT4af3/6aGjY=; b=byds/YXwFy7xxy2yZGsCFDtnlOPoiZhWfesvsQlLK0SBj9Ipirz39PwFoKZS5+Be4kU/7s UkvuoSUgZsWuXNS15M5yQSu409s0bv6793m6fUPNWeuSMw5n86GcEMcDOxxlXGjrG9SrC8 QL2ckxWofcfNz9moNRbmxXbB+Hknco1TI4jUoLgbs5390Fe0fMiwbUhkYS894jRWE+QPkn HLNmcersHx3MGSpWnOwtjSuofB84iv50qK7PzyNbgd1ZPay6c+DaKLl47ei7ZCGd8YKI7o ICPlPPZK0njftwH7XPMvcuJAwCCS8UvlqXobI9P8YOoHEGp6UfF4yXg7v4rMOA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1734277471; a=rsa-sha256; cv=none; b=rbAKXW3nHCU0AaZ9dgD1su191FtMoKemO1TyGR9bOyfTcgeX3eCI+pUN1DNGN7WzSnFvkg 1X3u25vRKhNX2SDHPpOEQkzIQzvndEAEOC4aikPKyAAthdcF1XRrr4AcBDd5urDd5AbPZL /csEII5UK6LddIRz4i36FT3KRhvFeg4hDRIDqaZFq6gnEPaMeYHXqIL4w5Es9kb4Nsnjq2 4u80DiGrKirIdkzJGsCzNNbITCgLJNPT+3wLBY2jZ48nuNLOvcyRzM6TyBP0evOxkIJsRW 4aGuQtauTZjNkFkakfeb7Hd6ol4gGiFbqjoMVpFpgi62HV+OpGJurInjW/WHBg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4YB6nq1XsYzF9R; Sun, 15 Dec 2024 15:44:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4BFFiVWe077935; Sun, 15 Dec 2024 15:44:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BFFiVA8077932; Sun, 15 Dec 2024 15:44:31 GMT (envelope-from git) Date: Sun, 15 Dec 2024 15:44:31 GMT Message-Id: <202412151544.4BFFiVA8077932@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: 32ce6f3365f7 - stable/13 - routing: Use NULL for VNET_SYS[UN]INIT's last arg, which is a pointer 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: 32ce6f3365f7dbb787aa2c6cf1c9febd8489a4b1 Auto-Submitted: auto-generated The branch stable/13 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=32ce6f3365f7dbb787aa2c6cf1c9febd8489a4b1 commit 32ce6f3365f7dbb787aa2c6cf1c9febd8489a4b1 Author: Zhenlei Huang AuthorDate: 2024-12-09 17:14:08 +0000 Commit: Zhenlei Huang CommitDate: 2024-12-15 15:43:35 +0000 routing: Use NULL for VNET_SYS[UN]INIT's last arg, which is a pointer type MFC after: 3 days (cherry picked from commit 12b2d68bed37e379929cd9b5e0afe34c387be360) (cherry picked from commit bca3a925b0bcb57bc48480fbc92fef257aeb1a72) --- sys/net/route/route_tables.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/net/route/route_tables.c b/sys/net/route/route_tables.c index 47fe5cfae1dd..5bcf83e91494 100644 --- a/sys/net/route/route_tables.c +++ b/sys/net/route/route_tables.c @@ -321,7 +321,7 @@ vnet_rtables_init(const void *unused __unused) RTABLES_UNLOCK(); } VNET_SYSINIT(vnet_rtables_init, SI_SUB_PROTO_DOMAIN, SI_ORDER_FOURTH, - vnet_rtables_init, 0); + vnet_rtables_init, NULL); #ifdef VIMAGE static void @@ -360,7 +360,7 @@ rtables_destroy(const void *unused __unused) #endif } VNET_SYSUNINIT(rtables_destroy, SI_SUB_PROTO_DOMAIN, SI_ORDER_FIRST, - rtables_destroy, 0); + rtables_destroy, NULL); #endif static inline struct rib_head * From nobody Sun Dec 15 15:44:32 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4YB6nr5jqxz5gyt4; Sun, 15 Dec 2024 15:44:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YB6nr2r7Qz42t1; Sun, 15 Dec 2024 15:44:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734277472; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rpL6qxXCqXXBvYAIhkgSsluzIwJjeimIuCM7FlJpoLo=; b=lKfjEp1nrG7b1VYo+S7P5F5H+Px/vjw4LvFqXw2P/o3PjYrZ0RseOZWuPK9oFwkdbcXrkE /bcSIpaF/zi/uINgREQ22lldqxZsw/3QxCMAnNG94lHky4d8KxBCQgVeFhd2OBIY+IvVwZ TW3Dk/dAcKpXOr1wbFo0O3NTyy75LonM2Y5uQh5i+9me5NYKHGghAPn9OFsZPBkDOlpvmu tPoj79MW5jQIJYa1kvthR4j5REvZ9t57kcJYYSxTmmop7Ekfj0lTrd89pWFGRVkWbw5HsH n5q4CzVPH4GRdBq+mFcxqGs/CS7CnTQpF4t4+6lGNHTm0JprUH60Q0SDLENBgA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734277472; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rpL6qxXCqXXBvYAIhkgSsluzIwJjeimIuCM7FlJpoLo=; b=rjrwxsZ26FN7ihpDt1oPB0m1Z4IPRHMMjkQsg07XSig3y+lWvtB9b2NbgKFtm5IfIqbcQx VpmQ6i+5RNrYk5KEr1tSIUFbmKTIBWKfODV5NWVTmG6zo0i/8v3G11CmlEfd5S8rej/8rG 0kUiWXF5N3GEhQytqw58Fgdi2lvQgYixyE9Yo36upFQa9kR4aQwHeVtryKBjlckJOxe4G/ lXFaAM7AHvgW4xJDtbCVfeXsGlClwUTpJ2YETSaql1yzD3liz3jxzZRQrPkuGPo39766Yk 2AH3KX+LpZF0mySc4yxXuaaxaW8fRzjMjVgR14PuPRug6e2CgwuXyDkyq1ZN+w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1734277472; a=rsa-sha256; cv=none; b=nu5s3OmgAdpATU1UoE/IEne22Z4l1Vbqr4Vp0HdzLzyPC59Z0V4rJur20KQI02Gd1TogDQ x1ilYptrrgDrWpjxn4mNqtO2Mis1xqetUR3wRgJ+pl6JRlpon3/3avaZem6ar9/Zu16Rs9 gZulpxJMcN3kTom+AFOKcTVg3W3mKSVO+Q21Y90UCSSs98xpCeKDRPxbxdKtFO4T9jhfrK kZVdyPR/xbFpemZGD3adxUOFjULagQ8Qhu59WCrT6zrHuAtXtbciOSL9AxPW5NvFIpzGXt SvZv3R6cObTg3rMd0Aliev8qZMl792qxTzmx4E79gvl3LJS5v1UOAb6eIbCVHw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4YB6nr2SBkz1Cxf; Sun, 15 Dec 2024 15:44:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4BFFiWBf078006; Sun, 15 Dec 2024 15:44:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BFFiWwx078003; Sun, 15 Dec 2024 15:44:32 GMT (envelope-from git) Date: Sun, 15 Dec 2024 15:44:32 GMT Message-Id: <202412151544.4BFFiWwx078003@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: 1a584160e3f4 - stable/13 - rtsock: Use NULL for VNET_SYS[UN]INIT's last arg, which is a pointer 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: 1a584160e3f4e2c7db60b8a1ed7a4d0be2017216 Auto-Submitted: auto-generated The branch stable/13 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=1a584160e3f4e2c7db60b8a1ed7a4d0be2017216 commit 1a584160e3f4e2c7db60b8a1ed7a4d0be2017216 Author: Zhenlei Huang AuthorDate: 2024-12-09 17:14:08 +0000 Commit: Zhenlei Huang CommitDate: 2024-12-15 15:43:35 +0000 rtsock: Use NULL for VNET_SYS[UN]INIT's last arg, which is a pointer type MFC after: 3 days (cherry picked from commit adc573c8e2179310777cef4d6bda19db2ae63dd5) (cherry picked from commit 8293bd6285401c3ef4310e4fc8bfb0e3cf132729) --- sys/net/rtsock.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/net/rtsock.c b/sys/net/rtsock.c index 3d977cba4862..d78a60070615 100644 --- a/sys/net/rtsock.c +++ b/sys/net/rtsock.c @@ -251,7 +251,7 @@ vnet_rts_init(void) #endif } VNET_SYSINIT(vnet_rtsock, SI_SUB_PROTO_DOMAIN, SI_ORDER_THIRD, - vnet_rts_init, 0); + vnet_rts_init, NULL); #ifdef VIMAGE static void @@ -261,7 +261,7 @@ vnet_rts_uninit(void) netisr_unregister_vnet(&rtsock_nh); } VNET_SYSUNINIT(vnet_rts_uninit, SI_SUB_PROTO_DOMAIN, SI_ORDER_THIRD, - vnet_rts_uninit, 0); + vnet_rts_uninit, NULL); #endif static void From nobody Sun Dec 15 15:44:33 2024 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4YB6ns6kmrz5gyt6; Sun, 15 Dec 2024 15:44: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 4YB6ns3XKGz42WJ; Sun, 15 Dec 2024 15:44:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734277473; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bUiGaFE3DGybK2aiC2+kv6IBpSnJAu+KQQNsG8WfYXo=; b=inNgN2qSuK3grCmDulVtbL29FIhoOU2gVERVLpTX9nkmXh0F1/nVVJYsAn60PCp3bNBkOc jwWHQgEvbDB5OM9Fh8F3N7vUwfK9oWOsNVxYHVLaHmtRMStaRS76mfqGjUNcptVXYcrWeB E4NC9plfm+fFh+G0gZMTycITYSc4SA2GVLyvdeuPCzpkcUXHvNOT+TE2KSj0GO+RhPBSnx 3YCYh0MtkE2UfzrgINgltI3AWbYmgsFksWcX20uRCqTFtquKcEhcrJS1HV5cT+lxedWbWI lciy63Qf/6/Wfu+zA40ME1GpV3PsNaYZ93FGejVucvT9urDSyQ9qaFXQFKIzuA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1734277473; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bUiGaFE3DGybK2aiC2+kv6IBpSnJAu+KQQNsG8WfYXo=; b=yy3kipVwwPaa6u3Le3jOzNEu/frTwaqKqCcUGO4iHYLnvtbA9PNhCkAfvJqm0bxbWHx+NO FvKLRrVMGzztK3u66TOuxSo1P0YvzjHNytgtpRxwCEcSaB23EcJ/QyFP49ktIZ49R/0HxS W7MlqwMcM01wqW9UQDilYfVKupCGPyuZX7K2evk0dAqXcTZmUe9KS2K+cv3BfLztWiKcO8 er0O1HJrHqYgG1glpV2+RuyVyizIQCcT7lGrmMMBEVbFY3y4Xm5iiib6UGQUAhHrbQDG5G lzyQnEh6oqB1Yw6oWJNsNHnm4YYHTyt59TsrdSI99Eq1Xz3Wwf93Wh6zYNdtCA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1734277473; a=rsa-sha256; cv=none; b=Fuz5dH+7Uec2OlCk0YYrkQfE0kmxTLemawdeUWDUwkBdXqVSJzJp5Mtm35qbVEMAez/CPA cx8W3K8Mtb2adUqPh0MPX7+h4AmsQMv1D/8KE783C90PfEYEZ/Bzm8MvMHeE0ETYBkC37L 572jYeH0yqK8luHpbQ870OLu5fSYHCoglDAbaISt4PwOr0jkcIgMGHQda2qQyFtq7mmV8W jGhDzbrTVTgNnVDNIPXXqwFCysTD2OhcPQJ1dhVdHTJ/FOLLeQGsUP6VMOnOtwSblmm6cq RCeSUsBStUnitp8yPHGaeXoJFVjHY9FJjmDPYIHXOuTQTj3suEknBxd5r3+aJA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4YB6ns37wpzFDJ; Sun, 15 Dec 2024 15:44: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 4BFFiXt6078079; Sun, 15 Dec 2024 15:44:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BFFiX4U078073; Sun, 15 Dec 2024 15:44:33 GMT (envelope-from git) Date: Sun, 15 Dec 2024 15:44:33 GMT Message-Id: <202412151544.4BFFiX4U078073@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: 4d38c776eb09 - stable/13 - netinet: Use NULL for VNET_SYSINIT's last arg, which is a pointer 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: 4d38c776eb090adb955c6bdc7b0885b0fa9c9960 Auto-Submitted: auto-generated The branch stable/13 has been updated by zlei: URL: https://cgit.FreeBSD.org/src/commit/?id=4d38c776eb090adb955c6bdc7b0885b0fa9c9960 commit 4d38c776eb090adb955c6bdc7b0885b0fa9c9960 Author: Zhenlei Huang AuthorDate: 2024-12-09 17:14:08 +0000 Commit: Zhenlei Huang CommitDate: 2024-12-15 15:43:36 +0000 netinet: Use NULL for VNET_SYSINIT's last arg, which is a pointer type MFC after: 3 days (cherry picked from commit ac51711cab6e55a99ee0a565fe0ae30c0305c854) (cherry picked from commit 005b6caf268c959e90d838a318f384656923977d) --- sys/netinet/if_ether.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/netinet/if_ether.c b/sys/netinet/if_ether.c index 9c72f9268ae5..ac3dbfaa4a65 100644 --- a/sys/netinet/if_ether.c +++ b/sys/netinet/if_ether.c @@ -1515,7 +1515,7 @@ vnet_arp_init(void) #endif } VNET_SYSINIT(vnet_arp_init, SI_SUB_PROTO_DOMAIN, SI_ORDER_SECOND, - vnet_arp_init, 0); + vnet_arp_init, NULL); #ifdef VIMAGE /*