From nobody Sun Aug 13 04:37:54 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RNlBp3c9Jz4mSLx; Sun, 13 Aug 2023 04:37: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RNlBp2vqZz3YFP; Sun, 13 Aug 2023 04:37:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691901474; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zZa6kpdEXXNTDwhRl/XrzTLMn6ZU7Vdvq2C7TTQpWZY=; b=EjRsQmQqVP6Eqv7s8Oztk0C3oVm3luRhCMyhA6PgPBrzy79mUu3TrLoepGBSH4uh3nJr/A UudDlwe5TxEFJyF2eomxY+jTY+oksBAh9s3C6nBNs5/++UVX1YM+qqmlDFVxUfwc9HS2a6 4A/zqoKrVRpY3974lixhOvUUzdmfHMaocES0LgVC4hCWhVDKYcbS+QAnQOF+Ilo4rAlcKU 2UR8fEqPdR6t3K6kmjvtQReCgfkM3WER9Ai+8FU29LuuKScU8NAXoCHcGLAdZnaBcL1yhV jcMnwaObi1SP0x7qXI0alwKxAA3eZnlmCP3JOba+iSzTtsSoHn07/cbzcu02GA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691901474; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zZa6kpdEXXNTDwhRl/XrzTLMn6ZU7Vdvq2C7TTQpWZY=; b=R4vobahg6vAND5C1bJ4R0zv2aReizSWziG50y4SZFgIS5PZhPqk/Vos1Akqh0ehu4tVdET kvtsRBD8Muz8gPl0OvW068iU5LcfgmTNgyYnIclXfOM13zYjKXrgyNxXZX59OZ75bTpZxt wKBh7KMjImk6bKMIt8Gfta8Lux8zF9IqxRWy2qjjWM4VkuDHm705svnm03vCxMICARQtmo Do4GTrU0qxrONH8+/49+HR2vW4Ug630CBpB9UiPO9TZq10xQj+3kj74reIdkYGN1lFM4uH 08yEF60ein2Y24VuR0OeCf4HIup/uRG/m/XfvzJw+MXwZj2iZS8f65lGmXjsIQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691901474; a=rsa-sha256; cv=none; b=khPIdjE2cY0BVUTssbCaJB8o153JI6p/9eblq84+ehbzLJpbg1TH2iDpwydy52ek7LYadG pAHVxKH5VIMJIgCd+LHVQFoiPHrZ2P0pRWAk3Pa9SVuVbQLhomHc2FlVZihWoNHGQ4mZUB KO4AQ3fpNN7cK9LU7HQBN2+r3ENYX5w0p4ONgC1sVylc+CbM3iWXaJ67l4G+Hbi43pIt7K F5RtKf7y3lVIvgvrygngPXoxIruk6K6GBoyISGf8LGDwLwRe13I1SSIZFopKB0C1nPmdQ/ uud47wYubwDq4++yAh/jTCSCtOZrO6++E5BWD5ZdRq+d1qijskXI9INY2UtTyA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RNlBp1jlxzp7f; Sun, 13 Aug 2023 04:37:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37D4bsSa035874; Sun, 13 Aug 2023 04:37:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37D4bs0X035871; Sun, 13 Aug 2023 04:37:54 GMT (envelope-from git) Date: Sun, 13 Aug 2023 04:37:54 GMT Message-Id: <202308130437.37D4bs0X035871@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: 79757c0a33ca - stable/13 - Update comment describing struct vm_map List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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/13 X-Git-Reftype: branch X-Git-Commit: 79757c0a33ca0da0f079c7250b820c81520649d9 Auto-Submitted: auto-generated The branch stable/13 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=79757c0a33ca0da0f079c7250b820c81520649d9 commit 79757c0a33ca0da0f079c7250b820c81520649d9 Author: Konstantin Belousov AuthorDate: 2023-08-10 05:01:39 +0000 Commit: Konstantin Belousov CommitDate: 2023-08-13 04:35:41 +0000 Update comment describing struct vm_map (cherry picked from commit 9da33e8d10736c255bf63d408837c6942bd28e04) --- sys/vm/vm_map.h | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/sys/vm/vm_map.h b/sys/vm/vm_map.h index 7854a91f36a9..21f9b48e9b4e 100644 --- a/sys/vm/vm_map.h +++ b/sys/vm/vm_map.h @@ -179,12 +179,11 @@ vm_map_entry_system_wired_count(vm_map_entry_t entry) /* * A map is a set of map entries. These map entries are - * organized as a threaded binary search tree. Both structures - * are ordered based upon the start and end addresses contained + * organized as a threaded binary search tree. The tree is + * ordered based upon the start and end addresses contained * within each map entry. The largest gap between an entry in a * subtree and one of its neighbors is saved in the max_free - * field, and that field is updated when the tree is - * restructured. + * field, and that field is updated when the tree is restructured. * * Sleator and Tarjan's top-down splay algorithm is employed to * control height imbalance in the binary search tree. From nobody Sun Aug 13 04:37:55 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RNlBq3f2Dz4mSP5; Sun, 13 Aug 2023 04:37: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RNlBq2yWfz3YCY; Sun, 13 Aug 2023 04:37:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691901475; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=M9JfjTf5CgKSI9u9d3TUZk4LiUE4CSDrshf0lBn0rSQ=; b=rD/C6E6u/dNf1wCTRJeQqSlc/BilasNSOH4iTJmTnyi5rGISQha9bqMe2ApkM4sCys7ps2 cNN+BK9VXPggL+6Ige6KDsoscEhZfsj3TrLPUD1s4nbA23FOKe1Bqx7ypaxNE/xJKW153D munSDWF2eigU/th5/cqYwNiGlh7QgbOJHsHs4hMYRNJ4qGiVjkVmFCXP+BZtprbzsdjfa7 x6OiuPG6htmkdghRRKEaJ8XRIsUL2jlM4hVeJewG0piv22gUd8ITdAWFlJHmNrbNJCKZmP tXAYXuTYmYNKFhG44ifrzZuoZOZyiLeX15qgrCfvrzPPbZk5LSHtRcm2YR2KYg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691901475; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=M9JfjTf5CgKSI9u9d3TUZk4LiUE4CSDrshf0lBn0rSQ=; b=rxkwbKMtTa5a5M7Zo4Dk3bVgVarQPYzUaY679RMR42KXHP6BaoNjeNLSgsuUb8v4UGVbpQ U84DD5U+TeZ9m+AUIS50iSySYojZ+QncvOKwpOf/fXhjlMKhxUDOiLVahLsOkB8aB2hkSD ZEigrq8tDjLB5JQ6InFSx1poxbb0iSsVXfwolASjL4vHZLKnFAv1ZqCjAmnXaJbxqM2FFY 48owdR/ZGeos6s2UibQ/BBw+lBfx7mLOrV580EHYoicMh0hV8K0d+bx+AcVqkZ84XZ3v+8 Enk1RDyouGC/AQLgyz01RiLnPcB524ovGnuJAvZBqXTkK3rSzj9D568SX8ce8Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691901475; a=rsa-sha256; cv=none; b=ieve2oDYA79H5U6pP7qKSaS8dMxobF/pqIDRGcr0C6vVoOwmOKxSJ23LwWrwD5Wpv7IClt 1y9LyVeNnq117EDtMYtL7WKsGnIAAwXxyYnglIBIIIHhU6cwaNBm15HksoqWBEEVQcXTFw aTuGCj08OebNnZFiiRkqk/hDJl4AiYrqYf3LG/ceJJdhZ3DB/jbRkaaPwQ+4LCg2SkeV1I zAYtLdOLmX9NB8fcl0KnSc5FOZ1f3v9ZrjbRb03oTeOXA/FFt3qcyu1KGEgSmWNlpHYgMr cI1DtwVuyfNLRIDqwutLCJ4x06BqmHK6uS9tQ3zE4BHib1QgQ+LdbF4Kb7BVFg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RNlBq1s9KzncB; Sun, 13 Aug 2023 04:37:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37D4btgI035927; Sun, 13 Aug 2023 04:37:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37D4btvW035924; Sun, 13 Aug 2023 04:37:55 GMT (envelope-from git) Date: Sun, 13 Aug 2023 04:37:55 GMT Message-Id: <202308130437.37D4btvW035924@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: 4e94219d5582 - stable/13 - sys/cdefs.h: fix for use __restrict in C++ List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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/13 X-Git-Reftype: branch X-Git-Commit: 4e94219d55824b19693287052edd8a1da76e3541 Auto-Submitted: auto-generated The branch stable/13 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=4e94219d55824b19693287052edd8a1da76e3541 commit 4e94219d55824b19693287052edd8a1da76e3541 Author: Sebastian Huber AuthorDate: 2023-08-06 13:27:27 +0000 Commit: Konstantin Belousov CommitDate: 2023-08-13 04:35:41 +0000 sys/cdefs.h: fix for use __restrict in C++ PR: 272723 (cherry picked from commit 15876d9fd83fdfa7d541ea747eb40faeade975d2) --- sys/sys/cdefs.h | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/sys/sys/cdefs.h b/sys/sys/cdefs.h index 28e464122e58..3fde24f0b9e9 100644 --- a/sys/sys/cdefs.h +++ b/sys/sys/cdefs.h @@ -404,17 +404,15 @@ #endif /* - * GCC 2.95 provides `__restrict' as an extension to C90 to support the - * C99-specific `restrict' type qualifier. We happen to use `__restrict' as - * a way to define the `restrict' type qualifier without disturbing older - * software that is unaware of C99 keywords. + * We use `__restrict' as a way to define the `restrict' type qualifier + * without disturbing older software that is unaware of C99 keywords. + * GCC also provides `__restrict' as an extension to support C99-style + * restricted pointers in other language modes. */ -#if !(__GNUC__ == 2 && __GNUC_MINOR__ == 95) -#if !defined(__STDC_VERSION__) || __STDC_VERSION__ < 199901 -#define __restrict -#else +#if defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901 #define __restrict restrict -#endif +#elif !__GNUC_PREREQ__(2, 95) +#define __restrict #endif /* From nobody Sun Aug 13 04:37:56 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RNlBs0T6tz4mSP7; Sun, 13 Aug 2023 04:37: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RNlBr44bHz3YTZ; Sun, 13 Aug 2023 04:37:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691901476; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=hU3sv8Ea8PamUnLAvVkq3yhizqFyh3eVcVg7X6re4Uc=; b=b4kIA+MGObAvkWE6x0TG4DXpEUIxsy9JiCVYxFUX6TRmsnmvBkeJPK5OraS+xFTxR0sazM SuXok91WvVySFl7r3mid+bM6Ht0UK5Vtknv+Bd8NH8Z1GFKLmPJ2lHhPcgWl4Xdkm9p6as 3ahcKFND5I9+WSGerQb73Jup0/5JHpn1GlEaPepPNJTvvul6GLJcRYhSKa5bNq0MI3Ybkr QRzlM3paBqHcJA+QQwIYGxf5zVe8o0/hwkF/eCHy+Vt0GiVnQ9rmm6N4Vo6d92l/R/vtXm 2076OpJggHE4FEeqN3bbbaaT6dwacVhI0O83j85NTVsB2UHF0r/bDrG1PZeXsA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691901476; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=hU3sv8Ea8PamUnLAvVkq3yhizqFyh3eVcVg7X6re4Uc=; b=Tkyzwrv6MlVWzpIvAgC0eBtzZD4r551J2QKkjhHdRrM7GkWxL7vYTawkLYkXcdRwrQCp/Y kcBe9tCOLZFx71zgdrALekJ43ERp27AaUhEUY2+vA5GIXQTmbCVfY5r6SB3nBQoX4yBZ3y N8WEujCNkiiSfsApFn/eWLVf+YC+lNCk08ppTXRrhDRdhgKFvhrTQ4CvxUp3iNXmKn9qin 4FtPcD7AmLrE4YvaemSyyzAyG/pB7ws1ze6N2sWPPHQkg/ERaCsZtmXgWKmOg0u760DHtc li24gEj5z3zozTuCN5XAZxBMapV/JN0dqi1qADZ9/AIloGKQ1TRhEu81ib6xJA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691901476; a=rsa-sha256; cv=none; b=quaOhGNH9VJUT3mQx1H6e2q/5qXWDhKR2geX9WQZz//KtOg7E4PlGSiBMnG4HoQzYXgTeA XTp6/ouNIqCCrqbxN/Vva+Qy9E/TeLqNBUggkl+FycHfJjlFp5ml35z/e9o0jAyQdcQud8 0rcNZxFWqjmpuR6HTOjgDg1CJVTm/oqt07pqN8OS6Nc3omgk06JdVKS+jIj+fvzEaoZyyx 3MU0KZb0FGhYsb3BRkz5Z+FhhPKzJhnOWP5QtJtewroLkwmvwE3EY7M14Apo5yjXxZ8Ba1 Q1xsmzxRjoCB5V9Fe1WFe3kPFfl7S6NTAsc/vn6okEQlhh5aghkJxi3K/MHGYg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RNlBr2vhTzpM4; Sun, 13 Aug 2023 04:37:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37D4bu4d035978; Sun, 13 Aug 2023 04:37:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37D4buaH035975; Sun, 13 Aug 2023 04:37:56 GMT (envelope-from git) Date: Sun, 13 Aug 2023 04:37:56 GMT Message-Id: <202308130437.37D4buaH035975@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: b53ecd5cf63b - stable/13 - libc dlfcn.c: make dl_iterate_phdr() from libc more useful List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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/13 X-Git-Reftype: branch X-Git-Commit: b53ecd5cf63b90a72436642056733b686d881eb1 Auto-Submitted: auto-generated The branch stable/13 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=b53ecd5cf63b90a72436642056733b686d881eb1 commit b53ecd5cf63b90a72436642056733b686d881eb1 Author: Konstantin Belousov AuthorDate: 2023-08-09 05:07:05 +0000 Commit: Konstantin Belousov CommitDate: 2023-08-13 04:35:41 +0000 libc dlfcn.c: make dl_iterate_phdr() from libc more useful PR: 272992 (cherry picked from commit 21a52f99440c9bec7679f3b0c5c9d888901c3694) --- lib/libc/gen/dlfcn.c | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/lib/libc/gen/dlfcn.c b/lib/libc/gen/dlfcn.c index 61984e2fe86c..f1ee86ec1934 100644 --- a/lib/libc/gen/dlfcn.c +++ b/lib/libc/gen/dlfcn.c @@ -169,7 +169,9 @@ _rtld_thread_init(void *li __unused) #ifndef IN_LIBDL static pthread_once_t dl_phdr_info_once = PTHREAD_ONCE_INIT; static struct dl_phdr_info phdr_info; +#ifndef PIC static mutex_t dl_phdr_info_lock = MUTEX_INITIALIZER; +#endif static void dl_init_phdr_info(void) @@ -208,7 +210,16 @@ int dl_iterate_phdr(int (*callback)(struct dl_phdr_info *, size_t, void *) __unused, void *data __unused) { -#ifndef IN_LIBDL +#if defined IN_LIBDL + return (0); +#elif defined PIC + int (*r)(int (*)(struct dl_phdr_info *, size_t, void *), void *); + + r = dlsym(RTLD_DEFAULT, "dl_iterate_phdr"); + if (r == NULL) + return (0); + return (r(callback, data)); +#else tls_index ti; int ret; @@ -223,8 +234,6 @@ dl_iterate_phdr(int (*callback)(struct dl_phdr_info *, size_t, void *) __unused, ret = callback(&phdr_info, sizeof(phdr_info), data); mutex_unlock(&dl_phdr_info_lock); return (ret); -#else - return (0); #endif } From nobody Sun Aug 13 05:22:06 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RNm9p5nnXz4mWMJ for ; Sun, 13 Aug 2023 05:22: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RNm9p3JtKz3dN7; Sun, 13 Aug 2023 05:22:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691904126; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=PuEI7yaJP4cugInjbp4zPRMsZObzAlqiu/7hG3t1hm4=; b=WOVdY4Vy+VCt7i1uRLndyy8gv++IPcTemjhV/FMv/SPjT986UP10Z+NFEAVJMoOYTS2pZc cycB2U81goE6uWNe9HjzYGOKcvv9JLekA3odRrxVKWmbF3S9H9txgCL3FOnXKeQ+3yzqq0 WF6LVagMbxy1lSBeg1NMz/dw78gXfBaqDZpG4n99U/5XXpwuwwssfmmUSuLz6IfGqEzeu2 b0as6QbNDl8nX+Xz492VF9BI74eUjWn1FV4io04SvTsMKwLXmDtKvw3zPpyAZ+i7uSeICw niOUQT6KhfdWuQ04G3O5JJwLwZnohZxe8aLJB9dU01usXftDWVKgA3KRGm2oDQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691904126; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=PuEI7yaJP4cugInjbp4zPRMsZObzAlqiu/7hG3t1hm4=; b=M4SXheSCU6PG41hU673vw/+tIBHXnziuZdVbhBzT69bHGj6oyyc070HxHrUcyL9qAGP/Lw MvqfFqZOgXnhLJPmBpmRuGBqN7yEzk08EgMjVkCFkPX63dResyZNUl98RCfiTorNJjBmt0 zPcgE28k+5MEfVmv4Ga2/edfLXePKJLAbgZ6IiIkhzoUXRoqEQb6soZIxbEHahpYPM0aAX 9OYuCdclGGMDQSXty8VyxqoaGVSgWWdYatkpwXm71RGqvOvKxnTL/BOI32WmOZjnsYYPKN 3Fryj1u2daot0rRk9gdUstKn/WQdERQBkTq+amV7/EFuQHDQk4+diN54loduzw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691904126; a=rsa-sha256; cv=none; b=PKnoKNirXwl4gxvwFcOiKjmPanjMxJgh377juuUQqR4y5ngkQw2yR8e0XS2CeOjpDXzr9E IPvcTvi0i+DAdrOv/Ks0GGxVhIRDu52DyGzt4cek+TIq9ecCbCX0jzMKBIsgH/5NM0u3b6 wxEDY3Z2/7BID+hjkvFMvR+JJ2RGkf4GEQSKJC0h5XK2JuKzIYiPk4hVgD9GU97WRPeIB3 K835ClvoSNb1/MJxYiKw2wbQVkf9FSbiFjCbBv+WCX12fsQT8wzoFG33UtHl1sQg0bOnZz bz+hDL2Sw79iR0ilnGSpsZ9zS3aJEgTRSAXJDdK8JO/OIZdeLAavbb2WZEJNIg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RNm9p24smzqdM; Sun, 13 Aug 2023 05:22:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37D5M6ib016849; Sun, 13 Aug 2023 05:22:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37D5M6pO016848; Sun, 13 Aug 2023 05:22:06 GMT (envelope-from git) Date: Sun, 13 Aug 2023 05:22:06 GMT Message-Id: <202308130522.37D5M6pO016848@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org From: Kyle Evans Subject: git: 022fad7dfc1d..acb089b98317 - vendor/NetBSD/libc-vis - vendor branch updated List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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/vendor/NetBSD/libc-vis X-Git-Reftype: branch X-Git-Commit: acb089b983171667467adc66f56a723b609ed22e X-Git-Oldrev: 022fad7dfc1d1e367dc331524ae91c74688a3098 X-Git-Newrev: acb089b983171667467adc66f56a723b609ed22e Auto-Submitted: auto-generated The branch vendor/NetBSD/libc-vis has been updated by kevans: URL: https://cgit.FreeBSD.org/src/log/?id=022fad7dfc1d..acb089b98317 acb089b98317 Vendor import of NetBSD's (un)vis(3) at 2023-08-13 From nobody Sun Aug 13 05:22:06 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RNm9p5rmvz4mVxB for ; Sun, 13 Aug 2023 05:22: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RNm9p3V9bz3dDQ; Sun, 13 Aug 2023 05:22:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691904126; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=H4gJ+D570WIbC+Nt9KRAVsazDj2my2c4mBRuzN8M4hI=; b=b7VumqU6bfbME9L3M0q3pCF2WM+8Pr/VJiJq9vysKlAO99DlGFhY/dq5iSGqO2i5LKeNlu vtO5E3UzG3ayFGtQV/1wmJuSTpCZ/odNNop/N9XKfHZ3zXRqYQpUNtD4aW+HkgGkCwhT5c dJmXoCdPqq+CLJP89IxEgCD8P3EWkFwqTtiSMOJ7Q1cuJneUMcN6ijDdGNAWGSt9K93gIv 5+Oem4kkUxa/OBFViJZewiOGHZevaYEuhqIZe0kSSSHsit10ml0rP/Eu34pp9j1ohvJanl H2h4WxU0wNDeTlYsvu2mni/8kGIwi7NYMdK5puhjf7dl0Txhp1WJinJn9fLOZg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691904126; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=H4gJ+D570WIbC+Nt9KRAVsazDj2my2c4mBRuzN8M4hI=; b=N0+BsZ7AyQshvWKZYojTiVKbDD5m59/Fk2HV7v5LTs1r/iUVkDJJ2Pb5iz1zm3tJePhKJT /vkfBM41gZMmmVskPegY43xQp4aEpwf5KSXNH2AXGMMofHLMtZ+hAtqkyhusOREGbkUMck 0oyKC1k9xgZ8aB+KP0Xc2vHan0npsjQWAKGmzJ2cjzJ+8oKa4Z299udR4Tl/kP0GW/+y6k cu+pBSkMfxndmsSAyHRR9/igAvme9Nc/1nocbEAfjL2MYxYhzlET2tyO90yLeZndxcuMkh eC4TPSj73UOuQx2P9HUuk0frmke9LkmwSCiN3PZjL20ae1le8sapnZUM/9ayAA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691904126; a=rsa-sha256; cv=none; b=H+kP4V14j1VuIXj5NVUINq2ZwZfzFch+GASWvf2K6ogjXxw016EUkPAcxuJK5gCJoQFarY /tf9eygaMCRA/uVKgkTVxhUc2srd27E13Mk23x+XLwe0q97ajUGXl3KGlHhqd5A+UlSvEc OQxN+L4xY7CGw2eSp+CfVy3RCUiKrSVUtnGHwgz2g7x6iWmaOhQYtrw6BYW8cOg3tFI21C pu7fHKL6Kr4ktXJP7uzqdCMWSVIpxjz36MoeSggw/askprlzUeR86IneDcC7A8nhFqWe8y xhKBVUHa4VZRmZkWoiWdtB1r1oCYvVWffEUKgKvT6EpWdFUvQr8NQAYD20gwvQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RNm9p2XxkzqPZ; Sun, 13 Aug 2023 05:22:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37D5M6sO016868; Sun, 13 Aug 2023 05:22:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37D5M6sI016867; Sun, 13 Aug 2023 05:22:06 GMT (envelope-from git) Date: Sun, 13 Aug 2023 05:22:06 GMT Message-Id: <202308130522.37D5M6sI016867@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org From: Kyle Evans Subject: git: e13b131722f4 - Create tag vendor/NetBSD/libc-vis/20230813 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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/tags/vendor/NetBSD/libc-vis/20230813 X-Git-Reftype: annotated tag X-Git-Commit: e13b131722f471cd27e8824750d9303a105aa05f Auto-Submitted: auto-generated The annotated tag vendor/NetBSD/libc-vis/20230813 has been created by kevans: URL: https://cgit.FreeBSD.org/src/tag/?h=vendor/NetBSD/libc-vis/20230813 tag vendor/NetBSD/libc-vis/20230813 Tagger: Kyle Evans TaggerDate: 2023-08-13 05:21:21 +0000 Vendor import of NetBSD's (un)vis(3) at 2023-08-13 commit acb089b983171667467adc66f56a723b609ed22e Author: Kyle Evans AuthorDate: 2023-08-13 05:16:33 +0000 Commit: Kyle Evans CommitDate: 2023-08-13 05:16:33 +0000 Vendor import of NetBSD's (un)vis(3) at 2023-08-13 From nobody Sun Aug 13 05:29:01 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RNmKv5sBxz4mWhJ; Sun, 13 Aug 2023 05:29: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RNmKv4vKWz3dqT; Sun, 13 Aug 2023 05:29:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691904547; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=hsHkHapGnRMXHD/1Axbi+zwIVIiN2vZ3pS/KojUjk/s=; b=BuctThty8dFNuktNl2Lp8W0fCjNIOKesjcg2B6Rl821dV/uUD4kimp1/HjHW4qtRImuQ28 DtBzwwuRFKjaL3NOkXGB3DyxdhjgzHntbf8/OSMhYTLtvJhaXZ1Y2xkkJfXhP0PO5qNtfA rRZxvqKnzBrV7/BvqghYKIMTzqJqWFIx/ZhuvAFo0LxwYQWfJ4BHwTM6QNBqASU7vgLkUy zDrvwcwdOjyQVK42Po6DOFQ0qpDRYnL5WNbEnQMYFrOXKMCxXirywmQDXT67BSiBT2DENp uiRejToaJu1KrXRn25fJIYcL2I97n4WLwH+8jWGYdH5GWP16pznLe2fNtAMw0A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691904547; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=hsHkHapGnRMXHD/1Axbi+zwIVIiN2vZ3pS/KojUjk/s=; b=rOloZ32y9JOP0YW4VEVsX2LjAH+q2nQg95XpvQ+YcSZd+IbnWTP48TUZ2fJyRhNugNm1w4 ri9Niji9+dFk09jh1Mu7JOPVbpdzrxsWhE6o0HXeQGtwZXQSfWMElUNDPnVca4Zn6qd7Zl itRqP1lYJNNbpLOjKt5rJCyPws/f2rGIg+HHrKHUQ/Iwozy7zYjFpQTpOuJoiGzBYDI8QZ vdA9w24DedmjsfiIPkNOUSzKf+QHxi9MTz3uJCxu/Q3WPLdMZ5kEOuyyefHutUmQn5CD/T bgqCFq3j+KoV7gkRGVtuXwPMvS5BbvNrMKrzvhxZa6f2qX0/c5e0+/Lzg4xYfQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691904547; a=rsa-sha256; cv=none; b=slLg/5yqTmw4bfELHUhSE0YLR6eXzTQkt8QGT9Obh6AB6mG2aZbe6Bds3ntOKOQMoFbXSm ebrx+Qo7DB3tk/ZbPHV0Q/w8wyGep/SxOHBrE+gsRx3Ee+YqbuGNaNGIilsBzehnTBzPJJ lJe5p0YOBSwou07seFrv91xkRN2DTOsWq9Ryj4nbXxn5soviJR4kJxVjEGfsjxLRjkv4/B n7ENmAYe9kNe+Kv3lDvXhkyrisULs878bFGFSRkY3E1WgTt+nUdy06f8Ip+3eAKUohQlXj 2y1ih6+dFEx1Ar98XO1Q1Ul2VxCAES2DJSzEJE3NF8/CcLmr0k693OZmgGmv+A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RNmKv3Vn7zqRr; Sun, 13 Aug 2023 05:29:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37D5T7W0019772; Sun, 13 Aug 2023 05:29:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37D5T1Og019758; Sun, 13 Aug 2023 05:29:01 GMT (envelope-from git) Date: Sun, 13 Aug 2023 05:29:01 GMT Message-Id: <202308130529.37D5T1Og019758@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kyle Evans Subject: git: ea46e63863df - main - Merge commit 'acb089b983171667467adc66f56a723b609ed22e' into kbsd/vis List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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/main X-Git-Reftype: branch X-Git-Commit: ea46e63863df9bd36b65f7293092214f1937349e Auto-Submitted: auto-generated The branch main has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=ea46e63863df9bd36b65f7293092214f1937349e commit ea46e63863df9bd36b65f7293092214f1937349e Merge: 93626d543702 acb089b98317 Author: Kyle Evans AuthorDate: 2023-08-13 05:23:02 +0000 Commit: Kyle Evans CommitDate: 2023-08-13 05:23:02 +0000 Merge commit 'acb089b983171667467adc66f56a723b609ed22e' into kbsd/vis Highlights: - Some style fixes - Bumped mbbuf in istrsenvisx() to MB_LEN_MAX to avoid VLAs - mbslength cannot go negative, so make it unsigned - Further bounds checking & fix an additional overrun, with dlen == 0 - Avoid duplicate call to wcslen(start) contrib/libc-vis/unvis.3 | 25 +++++++++++-------- contrib/libc-vis/unvis.c | 6 ++--- contrib/libc-vis/vis.3 | 5 ++-- contrib/libc-vis/vis.c | 65 ++++++++++++++++++++++++++++++++++++++++-------- contrib/libc-vis/vis.h | 5 ++-- 5 files changed, 76 insertions(+), 30 deletions(-) diff --cc contrib/libc-vis/unvis.c index d96d231be96e,039fea5e93f9..f290d8db271a --- a/contrib/libc-vis/unvis.c +++ b/contrib/libc-vis/unvis.c @@@ -34,10 -34,9 +34,10 @@@ #if 0 static char sccsid[] = "@(#)unvis.c 8.1 (Berkeley) 6/4/93"; #else - __RCSID("$NetBSD: unvis.c,v 1.44 2014/09/26 15:43:36 roy Exp $"); + __RCSID("$NetBSD: unvis.c,v 1.45 2022/04/19 20:32:15 rillig Exp $"); #endif #endif /* LIBC_SCCS and not lint */ +__FBSDID("$FreeBSD$"); #include "namespace.h" #include From nobody Sun Aug 13 05:29:08 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RNmKx1Hqsz4mWhN; Sun, 13 Aug 2023 05:29: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RNmKw6vxYz3fDq; Sun, 13 Aug 2023 05:29:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691904549; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=YBm06DiL1/XDeAzGRQCPj1CBEzL4OYXml87lIcL04xQ=; b=L/tXOBps9PDIPG3JtBKH7Zv38ZE4v+DN43BCNDHflLKEKnjvLBo2kQQP3YjXX5Lm/l0kUp UBtXqsr4+eR4ssjyBl9csgcOp+3vMWra90CN4y9pOGdsFzOSbMQQiee71Pq8gOePrPSh6A baA1gvuZFr1tMxS29FQUBRevESV1TPMn7ePUwEKR75AJOgl4NkE9TxLo9+5T4QWT1FjJ2b V9R2t0fHWSvYy9OG+L3m36xQ5pgokqzBtrY68fW29/enc1N5mLyJItKWcBdMDC6mG2fWqq 3ZrREsSXTo7QZBBEXfn/X3cQArXDjl2mvuax/Qy+r/WdeTNiBFzmSjBIM6NavA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691904549; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=YBm06DiL1/XDeAzGRQCPj1CBEzL4OYXml87lIcL04xQ=; b=UjmJzeZSdwwDnNdOC5jIUpw7eBc0VzLGQhePe85UanMOEH55BFnDve3Qn+Z1+9XNKeEK35 THrLmErnvkjqylgyuje7NMgY9+lww/c48IuLK5md1cfp4dCoID/GL3yIf78ON8h/eYq1ZX 9Ar7eRST/oEHV1QfRNdfZ7TJTlo5GseWimSSqbHKXj0fe2K+Ku3QN5IRmPs4gJ9vhZydnJ elxkC0sb8orhDpK1sTc4Dl+orOLS8E/8v+AJT8Sq3IwwJqX27jwW9Hy9sY2xGe10niSvLK ZkRVQB4Ypp/Zot/lyXpX3F1r84EKEyn5bT3fEvNyNjEuT9v0txqsF54OR9JjzA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691904549; a=rsa-sha256; cv=none; b=Yw5pW9RNudnmbnDAgziqdR8vtVZ8OXp0X1X8Oy98xMyrPyl5CnqlKGgcrjmR4063qc6x4K 8zjNLWgFFzohE50ccQOWACt+ohEn1tarxns9CJ+LU3SCHdJNeuxF6R10k1XWZ2KW0YEbp5 icPCCpENcaEb8NIdxzHv5QzlfMMtGTUkMwkjImOlyBaYTRuAeKst7mwx9rDLA82kRoR/+u PLh/hDVlLJ1NKDJgsL5wF59TenTLww/J9IHmDXtLXVClIOsE8jJDtrHCX8jCCn/oUETBwt 30MC+iZ2nTFtw8IeVv/MQHvjyQroN6KVL1l1TxwHQYSoV3eyexTQ7NuZ0MS+jg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RNmKw4S40zqRs; Sun, 13 Aug 2023 05:29:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37D5T8CA019816; Sun, 13 Aug 2023 05:29:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37D5T8a7019813; Sun, 13 Aug 2023 05:29:08 GMT (envelope-from git) Date: Sun, 13 Aug 2023 05:29:08 GMT Message-Id: <202308130529.37D5T8a7019813@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kyle Evans Subject: git: 09078445fb94 - main - vis(3): need for SIZE_MAX List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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/main X-Git-Reftype: branch X-Git-Commit: 09078445fb94f84bea41361c2f372360289d86ee Auto-Submitted: auto-generated The branch main has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=09078445fb94f84bea41361c2f372360289d86ee commit 09078445fb94f84bea41361c2f372360289d86ee Author: Kyle Evans AuthorDate: 2023-08-13 05:28:12 +0000 Commit: Kyle Evans CommitDate: 2023-08-13 05:28:12 +0000 vis(3): need for SIZE_MAX --- contrib/libc-vis/vis.c | 1 + 1 file changed, 1 insertion(+) diff --git a/contrib/libc-vis/vis.c b/contrib/libc-vis/vis.c index a9f60c576277..fc3b50d6c7a5 100644 --- a/contrib/libc-vis/vis.c +++ b/contrib/libc-vis/vis.c @@ -71,6 +71,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include #include #include From nobody Sun Aug 13 05:37:40 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RNmWn0Rryz4mXCW for ; Sun, 13 Aug 2023 05:37: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RNmWm6xvfz3gGw; Sun, 13 Aug 2023 05:37:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691905061; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kkFPFARJvGcWHCSOdZ4d6sMzj2GffLh6CKUGrjmYB7A=; b=yGNnDR22SmBlvzO3eZH5AUEK/9sNtKAoNpSPf94NhL+V+FGWumEMdeOoe2Cuz+Nf+ikxH5 LI/gbMtJNoH8TvfH2Ma8ZyrbKQ/mvSejK7WuhwFB030N3iDDHWKIAQWVZ7bwiptvckF0hc qJGTnaRG8Y84cSMPLtwgyspi1xw60Gpr1HcQmkhRr0Rf2EwlA2TkMuU4BNzkbynaiFtyO0 H0M68fvcACxpkJW9DpIzR43NisnGY36TvAaN80AoAp6GJecmxP+mG5xWgci9fMbalY1vPU 4TPRf0mOi50N8uosGcUOrpQme8UWkrhGAikrh+ZAQkcynp9eA2YHsvaXBFz3Og== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691905061; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kkFPFARJvGcWHCSOdZ4d6sMzj2GffLh6CKUGrjmYB7A=; b=hzHqlPkDTVOz4I0ZcufD1/OfKwltmewagAC3sYnWhMVh7OWi0gV57cTXgGqEg71FJ6oPp3 gG7KtNlNPOX0OERID+tEooW740laekWo5YJqNYxFcpurdnY4soiIrSa9yWizZvQBqvlvIc wLxSLIbzLoWy+ETr6ytdIa5hB9ofdjF/xFnsnUnk+H5dayTaLxFBkOGcyMf2E6EZ8mjzLX OtUYPz7suftmIuVSzDTszz6/LjARe3h8Sp1KoQoXPmNJFJy4f1PQ+aPSm3pq4S3QVvzeCJ 6RbkEuMttslCZIgxDvCVVHbeutPn7pwkRK5AqRPXMJMOlSBQUbxTWKLmPUw2dg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691905061; a=rsa-sha256; cv=none; b=gAMxFVFe5AYOIn/4d2wnELUOJBraieEEAJ2bIkFOJ+ddT0UCF+wAHTb9YjNXx1ddeET0NA EVVDNPRR0zVqcENBeOUH6ElXQuhmNeZuO+ZazoEwESAXgrTMbWCnbPBDdHXuQH0V1k4iSK BlEtd1XQQ+/6VaKZ+e+qYB3ZdOJZA3crhaqQUHpBRUc5yiIhtrEbdj5ICHs0mn7QMlgdwI VaAXh/YOOL7WRnalTDXZEidHpeY78IH7J2NQxIJ+vM/oCa/mDCpgzJHz9O9Hj97rhFV98J ml+/yinarkLpelVPrPJ/Vzyx+WiKhFn0fcrT0jl7pcO7yIg/FHLK+wqiJa/lmg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RNmWm5jXDzqQR; Sun, 13 Aug 2023 05:37:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37D5be8E036285; Sun, 13 Aug 2023 05:37:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37D5behh036284; Sun, 13 Aug 2023 05:37:40 GMT (envelope-from git) Date: Sun, 13 Aug 2023 05:37:40 GMT Message-Id: <202308130537.37D5behh036284@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org From: Kyle Evans Subject: git: dc9c7dc6ec9e..954363ea213f - vendor/NetBSD/tests - vendor branch updated List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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/vendor/NetBSD/tests X-Git-Reftype: branch X-Git-Commit: 954363ea213f4f1731e69850d842ad433284ed66 X-Git-Oldrev: dc9c7dc6ec9ecb5449d71d79ae13f9782c866b73 X-Git-Newrev: 954363ea213f4f1731e69850d842ad433284ed66 Auto-Submitted: auto-generated The branch vendor/NetBSD/tests has been updated by kevans: URL: https://cgit.FreeBSD.org/src/log/?id=dc9c7dc6ec9e..954363ea213f 954363ea213f netbsd-tests: import newer vis(3) test from upstream From nobody Sun Aug 13 07:14:55 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RNph014xMz4q7R8 for ; Sun, 13 Aug 2023 07:14: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RNph00Grmz4Jq4; Sun, 13 Aug 2023 07:14:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691910896; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=iZE5SvUfJ3OxxL+CApH29Y8YnL3i4fBEI7PhR6a6VBM=; b=KK9GKV1SnxCE6ePDf0S9jjFzrtK2z1GXJG54BXKi0Il5Sb7EOjFda9bvkeWaX8QyEXnp+Z S5FxfmAzg50RwSwXe6fx2ag2HDHPADEPH3MTvtfMfOyZX07yvCf2l8oWxwN2/aTK5weNmv XIvjRBSC//e7YmoVpNeVJqVky4uSS9pIdx8rb0opr8eilT4hYwBpea49oYVEFpmVWe1ReH 47z5mGjS4q97aApYgx/R5/4LD4DZJfAwXAlThUX0DQ+eHrLEeICqja+IumyT+++UrQbTEh fEXilPMmXkEOtpzVrx6aeUnC2K2L0zM9zGcxcuxj50fbOO69gqm0SaNdsgCqQQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691910896; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=iZE5SvUfJ3OxxL+CApH29Y8YnL3i4fBEI7PhR6a6VBM=; b=Otuy24ptd5zBTtfKQsFxaUf3djyTkLGIC54J+cXlfMTpr6yWkXItDUdSldU9A7wXN7rJEH VfkOBNNzfJ6X3LCYC3iY6GZzCLd2Loy2JfpFzjxfKLy3G5/5de2cBYJMzTiW+ShROm1P7B 7zLCFPv05LsKO3ierDy8EyRIrr7btZQrRsMnQAoomw0E1pkDF3StBH6C5P/5mY5XT1l1UX gMUamfuWw85cMi+ZPPgM8Q/RsNyWa6eSsq0vL60rEJ3KdLt80AtHhDJiFGR/xAOdiaIpJw SV05168QO/1831tv/GcY7PSttlYey7oqQq7vHDmWYZ60nb6t1Ka4JGlQAcwhfw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691910896; a=rsa-sha256; cv=none; b=E0Yn15EU5FpkxeaOVizbQn7yQgn52NiA/iWaXuI3UOr96lhibnvOdYfxf5B5trcAfNOf6c z8CoQ5y7fLq7CggbrAqTXmKky2mvbxg+HmoZi57M+QFp1zZaXeQOK3rzzBIAIbkv6Lpspz JIA9tFR3EqJfTlBXzl7L+MN3CAGD84zVHczjnWsksm35hj3lZDBY4wOtiFn/xUxeCWlCf/ 97X4BhBpcI0RJ+uFUzG5wgPZO//tPbc9Fnvl4JAHTmcQ0GTJYtMxTUoMjvIEyOsJ0VvEK/ PK6WrPZryahjUl+fU+saAmtqv4xnsob+OSNGUiscZ4nUSBmEi7e5b9No0LShvg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RNpgz68B0zsmw; Sun, 13 Aug 2023 07:14:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37D7EtYD002201; Sun, 13 Aug 2023 07:14:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37D7EtOF002200; Sun, 13 Aug 2023 07:14:55 GMT (envelope-from git) Date: Sun, 13 Aug 2023 07:14:55 GMT Message-Id: <202308130714.37D7EtOF002200@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org From: Xin LI Subject: git: 159d764c1668..448d114b2515 - vendor/less - vendor branch updated List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: delphij X-Git-Repository: src X-Git-Refname: refs/heads/vendor/less X-Git-Reftype: branch X-Git-Commit: 448d114b25157a4bcc2463e584fae6bdae42fa37 X-Git-Oldrev: 159d764c16684166cab1428d7aebd0c0f3666cd3 X-Git-Newrev: 448d114b25157a4bcc2463e584fae6bdae42fa37 Auto-Submitted: auto-generated The branch vendor/less has been updated by delphij: URL: https://cgit.FreeBSD.org/src/log/?id=159d764c1668..448d114b2515 448d114b2515 Vendor import of less v643. From nobody Sun Aug 13 07:14:55 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RNph01YR4z4q7Sn for ; Sun, 13 Aug 2023 07:14: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RNph0101sz4K5f; Sun, 13 Aug 2023 07:14:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691910896; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2jp4vRxDY45uYyu5Mof6BjiBAGx06rK9KyoOOJ4wVfc=; b=lYD5embOFFl9fij9Ij05gfcW2x1ii1pWijTdazJsdMTolcAyASm6A2oSRfSHRWxhx3BisR /tYKht4kSxzuMD1Xh/9UiUGiEchRVypCRIsFi4+hrFWnZHGWrII8fuCVLZvmZM3FHSyUkw WUptMdF3ppzIOfin/PqF+HZWqzQ6+ni3N3bGGbUOK9EE5Lp8SEVz9PuRreP8ZNZHjrLhce 18HmwXrdrKL4P50ExOD6GI7kzh3nPP3qxPJEBqlAA5dmBJPYx0+fN03JiJDBkToRwwGNuH x9v6BpuK83fIVZILAiO5pcq3NGr5jVapDLHZxNgfSqSzyfBm1Jr8m1SfCYicUA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691910896; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2jp4vRxDY45uYyu5Mof6BjiBAGx06rK9KyoOOJ4wVfc=; b=hkANqaDO2AnakeaoBgfYLAV/Om1xyLPM8TpOuF099QstkukMgl28+YiHz8oDVZHIUSNRNF 6F4BYXaZP6UdlyApgaPoyWuMdLNXu4VWns9TOtwieC7qjkmEy89I6Sbm5o5UJybYnlvoxZ F8sqB0mfyuxYJopU30iDXZMuv3UOfQrmHVaH+1r/kYQcC7sIshndbzuBOPfrGBUc8vF/xS b8YhACjSvwXH+qseSXlqcrJ2lUmFoe92KmPbuCO3rFNSoBWT1f8JmuFmTfS6owUTem7FJm dqGgH2VwS7vqmIs0tD6QuCPcIfsuhTdNrO4qnfo4FtwU4wNqNyABTo4R6DiWlg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691910896; a=rsa-sha256; cv=none; b=xgqrs/GavCg8r2JVsuEyFO2KXq7IVKY6vSWYCS2xzfcdwuw+8TD8VWqaUziugWgs5XL+Mz D3Vwv21OVhrdkVGxh5AvRfD6zRhCZJjuNhHqBrdFA2DDOqQQwfxrZNzeEtLp5gIXjr73ec nalQck4jVMdM3iheV6yjSSDMosOJcjBqIoni21ntg98KYhTmyBKphnsceUbE5BbAIvn/mI 2bM+R7uZxbyfPRDzK9R1GOc7d5XEXu1q685Kj275w4gWTe4En2nzkRsw7JH/MBsN764Lf2 7LIdTkJmXClVapyqpw+C9lnXInqTEeThKffvl6rFmvjTxp0ZtQkX3F/bld6u1w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RNpgz6nTVztBs; Sun, 13 Aug 2023 07:14:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37D7EtpY002220; Sun, 13 Aug 2023 07:14:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37D7EtIN002219; Sun, 13 Aug 2023 07:14:55 GMT (envelope-from git) Date: Sun, 13 Aug 2023 07:14:55 GMT Message-Id: <202308130714.37D7EtIN002219@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org From: Xin LI Subject: git: 392c3aabf074 - Create tag vendor/less/v643 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: delphij X-Git-Repository: src X-Git-Refname: refs/tags/vendor/less/v643 X-Git-Reftype: annotated tag X-Git-Commit: 392c3aabf0747550dda902c9a6670aa764f2dc40 Auto-Submitted: auto-generated The annotated tag vendor/less/v643 has been created by delphij: URL: https://cgit.FreeBSD.org/src/tag/?h=vendor/less/v643 tag vendor/less/v643 Tagger: Xin LI TaggerDate: 2023-08-13 07:07:06 +0000 Tag less v643. commit 448d114b25157a4bcc2463e584fae6bdae42fa37 Author: Xin LI AuthorDate: 2023-08-13 07:06:29 +0000 Commit: Xin LI CommitDate: 2023-08-13 07:06:29 +0000 Vendor import of less v643. From nobody Sun Aug 13 07:15:20 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RNphT0Tynz4q715; Sun, 13 Aug 2023 07:15:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RNphS6y7mz4KDW; Sun, 13 Aug 2023 07:15:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691910920; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6rtfk+utj5qcgA5I+pLtyAGTQNhxUdrAaIF513U405o=; b=tEu39fYHb3NJQPFNTbUxas8H1kMkznHy51kjdztyGK3jRIGE5WGOaeVOwr4W59U/rDg3Y4 NcgjrOJDkGHbn+jhUGvEC+iisiUVOQBzErsgFkyYGbrL/GUGLUvWHVUX/25XjfO0vJB4Wu Go1c4Ay8Vu8fArhpvrCzUYk346qREuuKfQrWUpLS8g/OsBEUno2G77V4q994X+bAY//knv pz9v9dSCMpgHtSqIMTgEo9oJyrgmY5nBDZz2fcMpJokJyLa7npAfBC1IjsBooXJ2ySe2vn Zmllx8FVZdEOzu76A+8xSx7mCmzgP2ku7fzycmO/rAMZ/w42V5EPal49YDoezw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691910920; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6rtfk+utj5qcgA5I+pLtyAGTQNhxUdrAaIF513U405o=; b=fTluP6uS+YTRfXf3S0+DCd8/9CDrUcn2Dl0UABHeCNtq5PC4tyFUvAcNZcWQ4e9ZLxIBMV TLgYzk3aW6sLbjiLjeqr5f+rNku0bwoLKcNFHZAhxuBtk6pUmdEjJcKuDGho3x0J9Rl9W5 q7wJ8lkPE0cNbSiWwWY1cotNUQLs0Vo8NfCApndepXx7pXuQD5xPUvGAAwdzDZL0Ham9XO 6U4K1V2GIfL8i1gHQI0nGDhYbQPyQb20xjBavCtX3FtXRrjI4AvF0yrLDzs/RtlJHpfRBu LLp7f/36XnUJVnQVFu2qI9I48nEtwG8jlKzPauRxUK29uPNSYOcTHGQJkbdnYg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691910920; a=rsa-sha256; cv=none; b=b7uQE/8GnmdYMaFqzP2wNNcW69PM9gE5SBPx4qg8dgBXStsweE6ilTlIauA4QN7Sr8bNsh up/HCJBjz/8VO3hbLx2maqXpN6XWgjGKlpaHI1nsHnJoGhNFhV6D4j1VM7I0v2taNDd3Yq 9ErpxdcShSpYWhAOuhQqP60RF7KnimBJG1QH0mNWNrUVIitao0BnNT2w9ou2ahdvZGvUUt gc81yi3b4Z6QKhsxbx7hcsOETh2B+OmThP2bCbPcDvP1wO0QMz4PyIWXDsHKaIVFiGzXtV yDc6U1IVUTikGRJD4sPbMG8COkjWSLjpuIVbAyghMDUjm6B4AIzDanMvQNR4Vw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RNphS60ljzsxg; Sun, 13 Aug 2023 07:15:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37D7FKUC002439; Sun, 13 Aug 2023 07:15:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37D7FKY8002435; Sun, 13 Aug 2023 07:15:20 GMT (envelope-from git) Date: Sun, 13 Aug 2023 07:15:20 GMT Message-Id: <202308130715.37D7FKY8002435@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Xin LI Subject: git: f80a33ea416e - main - MFV: less v643. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: delphij X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f80a33ea416e408c490a1f1f031a6abbccbae085 Auto-Submitted: auto-generated The branch main has been updated by delphij: URL: https://cgit.FreeBSD.org/src/commit/?id=f80a33ea416e408c490a1f1f031a6abbccbae085 commit f80a33ea416e408c490a1f1f031a6abbccbae085 Merge: 09078445fb94 448d114b2515 Author: Xin LI AuthorDate: 2023-08-13 07:13:31 +0000 Commit: Xin LI CommitDate: 2023-08-13 07:13:31 +0000 MFV: less v643. MFC after: 2 weeks contrib/less/NEWS | 38 +++++++++++++++++++++++++++++++++ contrib/less/ch.c | 2 ++ contrib/less/command.c | 5 +++-- contrib/less/edit.c | 2 +- contrib/less/forwback.c | 8 +++---- contrib/less/funcs.h | 1 + contrib/less/help.c | 2 +- contrib/less/less.h | 9 ++++++++ contrib/less/less.nro | 15 ++++++++++---- contrib/less/lessecho.nro | 2 +- contrib/less/lesskey.nro | 15 ++++++++++---- contrib/less/optfunc.c | 8 +++---- contrib/less/os.c | 44 +++++++++++++++++++++++++++++++-------- contrib/less/screen.c | 53 +++++++++++++++++++++++++++++++++++++---------- contrib/less/search.c | 2 ++ contrib/less/version.c | 14 ++++++++++++- contrib/less/xbuf.c | 8 +++---- usr.bin/less/defines.h | 18 ++++++++-------- 18 files changed, 191 insertions(+), 55 deletions(-) diff --cc contrib/less/command.c index 88c0cb49ee77,000000000000..c1003d55fada mode 100644,000000..100644 --- a/contrib/less/command.c +++ b/contrib/less/command.c @@@ -1,2095 -1,0 +1,2096 @@@ +/* $FreeBSD$ */ +/* + * Copyright (C) 1984-2023 Mark Nudelman + * + * You may distribute under the terms of either the GNU General Public + * License or the Less License, as specified in the README file. + * + * For more information, see the README file. + */ + + +/* + * User-level command processor. + */ + +#include "less.h" +#if MSDOS_COMPILER==WIN32C +#include +#endif +#include "position.h" +#include "option.h" +#include "cmd.h" + +extern int erase_char, erase2_char, kill_char; +extern int sigs; +extern int quit_if_one_screen; +extern int one_screen; +extern int squished; +extern int sc_width; +extern int sc_height; +extern char *kent; +extern int swindow; +extern int jump_sline; +extern int quitting; +extern int wscroll; +extern int top_scroll; +extern int ignore_eoi; +extern int secure; +extern int hshift; +extern int bs_mode; +extern int proc_backspace; +extern int show_attn; +extern int less_is_more; +extern int status_col; +extern POSITION highest_hilite; +extern POSITION start_attnpos; +extern POSITION end_attnpos; +extern char *every_first_cmd; +extern char version[]; +extern struct scrpos initial_scrpos; +extern IFILE curr_ifile; +extern void *ml_search; +extern void *ml_examine; +extern int wheel_lines; +extern int header_lines; +extern int def_search_type; +extern int updown_match; +#if SHELL_ESCAPE || PIPEC +extern void *ml_shell; +#endif +#if EDITOR +extern char *editor; +extern char *editproto; +#endif +extern int screen_trashed; /* The screen has been overwritten */ +extern int shift_count; +extern int oldbot; +extern int forw_prompt; +extern int incr_search; +extern int full_screen; +#if MSDOS_COMPILER==WIN32C +extern int utf_mode; +#endif + +#if SHELL_ESCAPE +static char *shellcmd = NULL; /* For holding last shell command for "!!" */ +#endif +static int mca; /* The multicharacter command (action) */ +static int search_type; /* The previous type of search */ +static int last_search_type; /* Type of last executed search */ +static LINENUM number; /* The number typed by the user */ +static long fraction; /* The fractional part of the number */ +static struct loption *curropt; +static int opt_lower; +static int optflag; +static int optgetname; +static POSITION bottompos; +static int save_hshift; +static int save_bs_mode; +static int save_proc_backspace; +#if PIPEC +static char pipec; +#endif + +/* Stack of ungotten chars (via ungetcc) */ +struct ungot { + struct ungot *ug_next; + LWCHAR ug_char; +}; +static struct ungot* ungot = NULL; + +static void multi_search (char *pattern, int n, int silent); + +/* + * Move the cursor to start of prompt line before executing a command. + * This looks nicer if the command takes a long time before + * updating the screen. + */ +static void cmd_exec(void) +{ + clear_attn(); + clear_bot(); + flush(); +} + +/* + * Indicate we are reading a multi-character command. + */ +static void set_mca(int action) +{ + mca = action; + clear_bot(); + clear_cmd(); +} + +/* + * Indicate we are not reading a multi-character command. + */ +static void clear_mca(void) +{ + if (mca == 0) + return; + mca = 0; +} + +/* + * Set up the display to start a new multi-character command. + */ +static void start_mca(int action, constant char *prompt, void *mlist, int cmdflags) +{ + set_mca(action); + cmd_putstr(prompt); + set_mlist(mlist, cmdflags); +} + +public int in_mca(void) +{ + return (mca != 0 && mca != A_PREFIX); +} + +/* + * Set up the display to start a new search command. + */ +static void mca_search1(void) +{ + int i; + +#if HILITE_SEARCH + if (search_type & SRCH_FILTER) + set_mca(A_FILTER); + else +#endif + if (search_type & SRCH_FORW) + set_mca(A_F_SEARCH); + else + set_mca(A_B_SEARCH); + + if (search_type & SRCH_NO_MATCH) + cmd_putstr("Non-match "); + if (search_type & SRCH_FIRST_FILE) + cmd_putstr("First-file "); + if (search_type & SRCH_PAST_EOF) + cmd_putstr("EOF-ignore "); + if (search_type & SRCH_NO_MOVE) + cmd_putstr("Keep-pos "); + if (search_type & SRCH_NO_REGEX) + cmd_putstr("Regex-off "); + if (search_type & SRCH_WRAP) + cmd_putstr("Wrap "); + for (i = 1; i <= NUM_SEARCH_COLORS; i++) + { + if (search_type & SRCH_SUBSEARCH(i)) + { - char buf[8]; ++ char buf[INT_STRLEN_BOUND(int)+8]; + SNPRINTF1(buf, sizeof(buf), "Sub-%d ", i); + cmd_putstr(buf); + } + } + +#if HILITE_SEARCH + if (search_type & SRCH_FILTER) + cmd_putstr("&/"); + else +#endif + if (search_type & SRCH_FORW) + cmd_putstr("/"); + else + cmd_putstr("?"); + forw_prompt = 0; +} + +static void mca_search(void) +{ + mca_search1(); + set_mlist(ml_search, 0); +} + +/* + * Set up the display to start a new toggle-option command. + */ +static void mca_opt_toggle(void) +{ + int no_prompt; + int flag; + char *dash; + + no_prompt = (optflag & OPT_NO_PROMPT); + flag = (optflag & ~OPT_NO_PROMPT); + dash = (flag == OPT_NO_TOGGLE) ? "_" : "-"; + + set_mca(A_OPT_TOGGLE); + cmd_putstr(dash); + if (optgetname) + cmd_putstr(dash); + if (no_prompt) + cmd_putstr("(P)"); + switch (flag) + { + case OPT_UNSET: + cmd_putstr("+"); + break; + case OPT_SET: + cmd_putstr("!"); + break; + } + forw_prompt = 0; + set_mlist(NULL, 0); +} + +/* + * Execute a multicharacter command. + */ +static void exec_mca(void) +{ + char *cbuf; + + cmd_exec(); + cbuf = get_cmdbuf(); + if (cbuf == NULL) + return; + + switch (mca) + { + case A_F_SEARCH: + case A_B_SEARCH: + multi_search(cbuf, (int) number, 0); + break; +#if HILITE_SEARCH + case A_FILTER: + search_type ^= SRCH_NO_MATCH; + set_filter_pattern(cbuf, search_type); + break; +#endif + case A_FIRSTCMD: + /* + * Skip leading spaces or + signs in the string. + */ + while (*cbuf == '+' || *cbuf == ' ') + cbuf++; + if (every_first_cmd != NULL) + free(every_first_cmd); + if (*cbuf == '\0') + every_first_cmd = NULL; + else + every_first_cmd = save(cbuf); + break; + case A_OPT_TOGGLE: + toggle_option(curropt, opt_lower, cbuf, optflag); + curropt = NULL; + break; + case A_F_BRACKET: + match_brac(cbuf[0], cbuf[1], 1, (int) number); + break; + case A_B_BRACKET: + match_brac(cbuf[1], cbuf[0], 0, (int) number); + break; +#if EXAMINE + case A_EXAMINE: + if (secure) + break; + edit_list(cbuf); +#if TAGS + /* If tag structure is loaded then clean it up. */ + cleantags(); +#endif + break; +#endif +#if SHELL_ESCAPE + case A_SHELL: + /* + * !! just uses whatever is in shellcmd. + * Otherwise, copy cmdbuf to shellcmd, + * expanding any special characters ("%" or "#"). + */ + if (*cbuf != '!') + { + if (shellcmd != NULL) + free(shellcmd); + shellcmd = fexpand(cbuf); + } + + if (secure) + break; + if (shellcmd == NULL) + lsystem("", "!done"); + else + lsystem(shellcmd, "!done"); + break; + case A_PSHELL: + if (secure) + break; + lsystem(pr_expand(cbuf), "#done"); + break; +#endif +#if PIPEC + case A_PIPE: + if (secure) + break; + (void) pipe_mark(pipec, cbuf); + error("|done", NULL_PARG); + break; +#endif + } +} + +/* + * Is a character an erase or kill char? + */ +static int is_erase_char(int c) +{ + return (c == erase_char || c == erase2_char || c == kill_char); +} + +/* + * Is a character a carriage return or newline? + */ +static int is_newline_char(int c) +{ + return (c == '\n' || c == '\r'); +} + +/* + * Handle the first char of an option (after the initial dash). + */ +static int mca_opt_first_char(int c) +{ + int no_prompt = (optflag & OPT_NO_PROMPT); + int flag = (optflag & ~OPT_NO_PROMPT); + if (flag == OPT_NO_TOGGLE) + { + switch (c) + { + case '_': + /* "__" = long option name. */ + optgetname = TRUE; + mca_opt_toggle(); + return (MCA_MORE); + } + } else + { + switch (c) + { + case '+': + /* "-+" = UNSET. */ + optflag = no_prompt | ((flag == OPT_UNSET) ? + OPT_TOGGLE : OPT_UNSET); + mca_opt_toggle(); + return (MCA_MORE); + case '!': + /* "-!" = SET */ + optflag = no_prompt | ((flag == OPT_SET) ? + OPT_TOGGLE : OPT_SET); + mca_opt_toggle(); + return (MCA_MORE); + case CONTROL('P'): + optflag ^= OPT_NO_PROMPT; + mca_opt_toggle(); + return (MCA_MORE); + case '-': + /* "--" = long option name. */ + optgetname = TRUE; + mca_opt_toggle(); + return (MCA_MORE); + } + } + /* Char was not handled here. */ + return (NO_MCA); +} + +/* + * Add a char to a long option name. + * See if we've got a match for an option name yet. + * If so, display the complete name and stop + * accepting chars until user hits RETURN. + */ +static int mca_opt_nonfirst_char(int c) +{ + char *p; + char *oname; + int err; + + if (curropt != NULL) + { + /* + * Already have a match for the name. + * Don't accept anything but erase/kill. + */ + if (is_erase_char(c)) + return (MCA_DONE); + return (MCA_MORE); + } + /* + * Add char to cmd buffer and try to match + * the option name. + */ + if (cmd_char(c) == CC_QUIT) + return (MCA_DONE); + p = get_cmdbuf(); + if (p == NULL) + return (MCA_MORE); + opt_lower = ASCII_IS_LOWER(p[0]); + err = 0; + curropt = findopt_name(&p, &oname, &err); + if (curropt != NULL) + { + /* + * Got a match. + * Remember the option and + * display the full option name. + */ + cmd_reset(); + mca_opt_toggle(); + for (p = oname; *p != '\0'; p++) + { + c = *p; + if (!opt_lower && ASCII_IS_LOWER(c)) + c = ASCII_TO_UPPER(c); + if (cmd_char(c) != CC_OK) + return (MCA_DONE); + } + } else if (err != OPT_AMBIG) + { + bell(); + } + return (MCA_MORE); +} + +/* + * Handle a char of an option toggle command. + */ +static int mca_opt_char(int c) +{ + PARG parg; + + /* + * This may be a short option (single char), + * or one char of a long option name, + * or one char of the option parameter. + */ + if (curropt == NULL && len_cmdbuf() == 0) + { + int ret = mca_opt_first_char(c); + if (ret != NO_MCA) + return (ret); + } + if (optgetname) + { + /* We're getting a long option name. */ + if (!is_newline_char(c) && c != '=') + return (mca_opt_nonfirst_char(c)); + if (curropt == NULL) + { + parg.p_string = get_cmdbuf(); + if (parg.p_string == NULL) + return (MCA_MORE); + error("There is no --%s option", &parg); + return (MCA_DONE); + } + optgetname = FALSE; + cmd_reset(); + } else + { + if (is_erase_char(c)) + return (NO_MCA); + if (curropt != NULL) + /* We're getting the option parameter. */ + return (NO_MCA); + curropt = findopt(c); + if (curropt == NULL) + { + parg.p_string = propt(c); + error("There is no %s option", &parg); + return (MCA_DONE); + } + opt_lower = ASCII_IS_LOWER(c); + } + /* + * If the option which was entered does not take a + * parameter, toggle the option immediately, + * so user doesn't have to hit RETURN. + */ + if ((optflag & ~OPT_NO_PROMPT) != OPT_TOGGLE || + !opt_has_param(curropt)) + { + toggle_option(curropt, opt_lower, "", optflag); + return (MCA_DONE); + } + /* + * Display a prompt appropriate for the option parameter. + */ + start_mca(A_OPT_TOGGLE, opt_prompt(curropt), (void*)NULL, 0); + return (MCA_MORE); +} + +/* + * Normalize search type. + */ +public int norm_search_type(int st) +{ + /* WRAP and PAST_EOF are mutually exclusive. */ + if ((st & (SRCH_PAST_EOF|SRCH_WRAP)) == (SRCH_PAST_EOF|SRCH_WRAP)) + st ^= SRCH_PAST_EOF; + return st; +} + +/* + * Handle a char of a search command. + */ +static int mca_search_char(int c) +{ + int flag = 0; + + /* + * Certain characters as the first char of + * the pattern have special meaning: + * ! Toggle the NO_MATCH flag + * * Toggle the PAST_EOF flag + * @ Toggle the FIRST_FILE flag + */ + if (len_cmdbuf() > 0) + return (NO_MCA); + + switch (c) + { + case '*': + if (less_is_more) + break; + case CONTROL('E'): /* ignore END of file */ + if (mca != A_FILTER) + flag = SRCH_PAST_EOF; ++ search_type &= ~SRCH_WRAP; + break; + case '@': + if (less_is_more) + break; + case CONTROL('F'): /* FIRST file */ + if (mca != A_FILTER) + flag = SRCH_FIRST_FILE; + break; + case CONTROL('K'): /* KEEP position */ + if (mca != A_FILTER) + flag = SRCH_NO_MOVE; + break; + case CONTROL('S'): { /* SUBSEARCH */ - char buf[32]; ++ char buf[INT_STRLEN_BOUND(int)+24]; + SNPRINTF1(buf, sizeof(buf), "Sub-pattern (1-%d):", NUM_SEARCH_COLORS); + clear_bot(); + cmd_putstr(buf); + flush(); + c = getcc(); + if (c >= '1' && c <= '0'+NUM_SEARCH_COLORS) + flag = SRCH_SUBSEARCH(c-'0'); + else + flag = -1; /* calls mca_search() below to repaint */ + break; } + case CONTROL('W'): /* WRAP around */ + if (mca != A_FILTER) + flag = SRCH_WRAP; + break; + case CONTROL('R'): /* Don't use REGULAR EXPRESSIONS */ + flag = SRCH_NO_REGEX; + break; + case CONTROL('N'): /* NOT match */ + case '!': + flag = SRCH_NO_MATCH; + break; + } + + if (flag != 0) + { + if (flag != -1) + search_type = norm_search_type(search_type ^ flag); + mca_search(); + return (MCA_MORE); + } + return (NO_MCA); +} + +/* + * Handle a character of a multi-character command. + */ +static int mca_char(int c) +{ + int ret; + + switch (mca) + { + case 0: + /* + * We're not in a multicharacter command. + */ + return (NO_MCA); + + case A_PREFIX: + /* + * In the prefix of a command. + * This not considered a multichar command + * (even tho it uses cmdbuf, etc.). + * It is handled in the commands() switch. + */ + return (NO_MCA); + + case A_DIGIT: + /* + * Entering digits of a number. + * Terminated by a non-digit. + */ + if ((c >= '0' && c <= '9') || c == '.') + break; + switch (editchar(c, ECF_PEEK|ECF_NOHISTORY|ECF_NOCOMPLETE|ECF_NORIGHTLEFT)) + { + case A_NOACTION: + /* + * Ignore this char and get another one. + */ + return (MCA_MORE); + case A_INVALID: + /* + * Not part of the number. + * End the number and treat this char + * as a normal command character. + */ + number = cmd_int(&fraction); + clear_mca(); + cmd_accept(); + return (NO_MCA); + } + break; + + case A_OPT_TOGGLE: + ret = mca_opt_char(c); + if (ret != NO_MCA) + return (ret); + break; + + case A_F_SEARCH: + case A_B_SEARCH: + case A_FILTER: + ret = mca_search_char(c); + if (ret != NO_MCA) + return (ret); + break; + + default: + /* Other multicharacter command. */ + break; + } + + /* + * The multichar command is terminated by a newline. + */ + if (is_newline_char(c)) + { + /* + * Execute the command. + */ + exec_mca(); + return (MCA_DONE); + } + + /* + * Append the char to the command buffer. + */ + if (cmd_char(c) == CC_QUIT) + /* + * Abort the multi-char command. + */ + return (MCA_DONE); + + switch (mca) + { + case A_F_BRACKET: + case A_B_BRACKET: + if (len_cmdbuf() >= 2) + { + /* + * Special case for the bracket-matching commands. + * Execute the command after getting exactly two + * characters from the user. + */ + exec_mca(); + return (MCA_DONE); + } + break; + case A_F_SEARCH: + case A_B_SEARCH: + if (incr_search) + { + /* Incremental search: do a search after every input char. */ + int st = (search_type & (SRCH_FORW|SRCH_BACK|SRCH_NO_MATCH|SRCH_NO_REGEX|SRCH_NO_MOVE|SRCH_WRAP|SRCH_SUBSEARCH_ALL)); + char *pattern = get_cmdbuf(); + if (pattern == NULL) + return (MCA_MORE); + /* + * Must save updown_match because mca_search + * reinits it. That breaks history scrolling. + * {{ This is ugly. mca_search probably shouldn't call set_mlist. }} + */ + int save_updown_match = updown_match; + cmd_exec(); + if (*pattern == '\0') + { + /* User has backspaced to an empty pattern. */ + undo_search(1); + } else + { + if (search(st | SRCH_INCR, pattern, 1) != 0) + /* No match, invalid pattern, etc. */ + undo_search(1); + } + /* Redraw the search prompt and search string. */ + if (!full_screen) + { + clear(); + repaint(); + } + mca_search1(); + updown_match = save_updown_match; + cmd_repaint(NULL); + } + break; + } + + /* + * Need another character. + */ + return (MCA_MORE); +} + +/* + * Discard any buffered file data. + */ +static void clear_buffers(void) +{ + if (!(ch_getflags() & CH_CANSEEK)) + return; + ch_flush(); + clr_linenum(); +#if HILITE_SEARCH + clr_hilite(); +#endif +} + +/* + * Make sure the screen is displayed. + */ +static void make_display(void) +{ + /* + * If not full_screen, we can't rely on scrolling to fill the screen. + * We need to clear and repaint screen before any change. + */ + if (!full_screen && !(quit_if_one_screen && one_screen)) + clear(); + /* + * If nothing is displayed yet, display starting from initial_scrpos. + */ + if (empty_screen()) + { + if (initial_scrpos.pos == NULL_POSITION) + jump_loc(ch_zero(), 1); + else + jump_loc(initial_scrpos.pos, initial_scrpos.ln); + } else if (screen_trashed || !full_screen) + { + int save_top_scroll = top_scroll; + int save_ignore_eoi = ignore_eoi; + top_scroll = 1; + ignore_eoi = 0; + if (screen_trashed == 2) + { + /* Special case used by ignore_eoi: re-open the input file + * and jump to the end of the file. */ + reopen_curr_ifile(); + jump_forw(); + } + repaint(); + top_scroll = save_top_scroll; + ignore_eoi = save_ignore_eoi; + } +} + +/* + * Display the appropriate prompt. + */ +static void prompt(void) +{ + constant char *p; + + if (ungot != NULL && ungot->ug_char != CHAR_END_COMMAND) + { + /* + * No prompt necessary if commands are from + * ungotten chars rather than from the user. + */ + return; + } + + /* + * Make sure the screen is displayed. + */ + make_display(); + bottompos = position(BOTTOM_PLUS_ONE); + + /* + * If we've hit EOF on the last file and the -E flag is set, quit. + */ + if (get_quit_at_eof() == OPT_ONPLUS && + eof_displayed() && !(ch_getflags() & CH_HELPFILE) && + next_ifile(curr_ifile) == NULL_IFILE) + quit(QUIT_OK); + + /* + * If the entire file is displayed and the -F flag is set, quit. + */ + if (quit_if_one_screen && + entire_file_displayed() && !(ch_getflags() & CH_HELPFILE) && + next_ifile(curr_ifile) == NULL_IFILE) + quit(QUIT_OK); + quit_if_one_screen = FALSE; /* only get one chance at this */ + +#if MSDOS_COMPILER==WIN32C + /* + * In Win32, display the file name in the window title. + */ + if (!(ch_getflags() & CH_HELPFILE)) + { + WCHAR w[MAX_PATH+16]; + p = pr_expand("Less?f - %f."); + MultiByteToWideChar(CP_ACP, 0, p, -1, w, sizeof(w)/sizeof(*w)); + SetConsoleTitleW(w); + } +#endif + + /* + * Select the proper prompt and display it. + */ + /* + * If the previous action was a forward movement, + * don't clear the bottom line of the display; + * just print the prompt since the forward movement guarantees + * that we're in the right position to display the prompt. + * Clearing the line could cause a problem: for example, if the last + * line displayed ended at the right screen edge without a newline, + * then clearing would clear the last displayed line rather than + * the prompt line. + */ + if (!forw_prompt) + clear_bot(); + clear_cmd(); + forw_prompt = 0; + p = pr_string(); +#if HILITE_SEARCH + if (is_filtering()) + putstr("& "); +#endif + if (p == NULL || *p == '\0') + { + at_enter(AT_NORMAL|AT_COLOR_PROMPT); + putchr(':'); + at_exit(); + } else + { +#if MSDOS_COMPILER==WIN32C + WCHAR w[MAX_PATH*2]; + char a[MAX_PATH*2]; + MultiByteToWideChar(CP_ACP, 0, p, -1, w, sizeof(w)/sizeof(*w)); + WideCharToMultiByte(utf_mode ? CP_UTF8 : GetConsoleOutputCP(), + 0, w, -1, a, sizeof(a), NULL, NULL); + p = a; +#endif + load_line(p); + put_line(); + } + clear_eol(); +} + +/* + * Display the less version message. + */ +public void dispversion(void) +{ + PARG parg; + + parg.p_string = version; + error("less %s", &parg); +} + +/* + * Return a character to complete a partial command, if possible. + */ +static LWCHAR getcc_end_command(void) +{ + switch (mca) + { + case A_DIGIT: + /* We have a number but no command. Treat as #g. */ + return ('g'); + case A_F_SEARCH: + case A_B_SEARCH: + case A_FILTER: + /* We have "/string" but no newline. Add the \n. */ + return ('\n'); + default: + /* Some other incomplete command. Let user complete it. */ + return ((ungot == NULL) ? getchr() : 0); + } +} + +/* + * Get command character. + * The character normally comes from the keyboard, + * but may come from ungotten characters + * (characters previously given to ungetcc or ungetsc). *** 2666 LINES SKIPPED *** From nobody Sun Aug 13 07:35:58 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RNq8H0Scwz4q8lg; Sun, 13 Aug 2023 07:35: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RNq8G45THz4Mkq; Sun, 13 Aug 2023 07:35:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691912158; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8DiAG6wNECxB1vM+1B6F/lz34hoRQklPylL/+WljlVw=; b=tQB51IszcnM+H9RYthptpOxMz59VdFpL8ZYuq8L9ecsj/qrtcz5G0K7S8NqHToVQTgqn35 U+mDRU9YD3ZiodVolD+mny0rAHoKyskl6c7KCjMAzXy+c0oQVD+7teXbVmzVJT50DxMFgb Wn9uRnHGY5SNrSYF5lISBYkqWzAkvg8BVoCnRLWZr1jxXcYctaoIO/zLzV0Krx4pgKyl+V 7eXLDjXlpNetXUNDpUDpDIUpLlyX4dtFvOoTAZLBhcVXJl2gY/Dw9tDpMV2Adv100FcM/D rEiC/Xg/9klmyBMuyo+VrB1gYtSvm/APvBcJ3qWy/ky5Zio25nVTiDxS5mMDrg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691912158; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8DiAG6wNECxB1vM+1B6F/lz34hoRQklPylL/+WljlVw=; b=HOI60SwamjM5FDSpK7uEb1kMM8qh0xvF+jKvdmsVC5NHcEOgjBS8YKvpV548sPXCAxRmz6 JOLmuPwuIYnM1h56M1kRN+jInQxqlII1mW0J14687gTIOoR1KAqVtU8rBYAnsyFdNXgiCW P83ijCWl5rtqjayDZv77EsLidxHq3JRl9YWPk4btEBiTQ1eRizY0LmLI85zZsS0xwrTE/m RLti34HH/ok3e/KCwudAmtj7tu+AKDW3DkAi62Hv86xZjQXzFqM2sxWUm/Etqo/zZgmYPX Muxcw7iRRhvKwJQigcKeh0YA2GiLQPMLXEEj02V2e5NVOxcGA5MeRLJ7EOtZyQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691912158; a=rsa-sha256; cv=none; b=eeYh/I8hWZNiJ+yd3kFm3kffm2b6jRagCd9fj3u6n0GxfLw6evGO+NTKQFCvhjJBIDvn6U wdq1v0nfCulYlD2rLHIgIjzNu67oiUOBmksOHCs7FIuYz6NTv+EeeAilbQAgwCVyzY6EHi sK4de1VgBEtt2PvYSyIEHpBxiwxy7PR6yy9+46xkLqHedgyc3l6/QgLwsOdKXcuOh/KF2F e1GfSjZKypLE7UC14g6caIpuFsExWpSlHRwCjdzlES+/nhI2ZK3K7t2W8xeiLvZ5yqR9+b nMAAErO/b6cPmtxU1Vvu18dcVZ9ALnp59DbTQqWPLlYVq/bGd7hbT4JJmNiPcg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RNq8G3BWRztDd; Sun, 13 Aug 2023 07:35:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37D7ZwPu035397; Sun, 13 Aug 2023 07:35:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37D7Zwa9035394; Sun, 13 Aug 2023 07:35:58 GMT (envelope-from git) Date: Sun, 13 Aug 2023 07:35:58 GMT Message-Id: <202308130735.37D7Zwa9035394@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Michal Meloun Subject: git: e59b6e48f4c8 - main - gdtoa: Regenerate configuration headers for 32-bit arm. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mmel X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e59b6e48f4c8bbfee43a1bc6d9fd47691d3bd603 Auto-Submitted: auto-generated The branch main has been updated by mmel: URL: https://cgit.FreeBSD.org/src/commit/?id=e59b6e48f4c8bbfee43a1bc6d9fd47691d3bd603 commit e59b6e48f4c8bbfee43a1bc6d9fd47691d3bd603 Author: Michal Meloun AuthorDate: 2023-08-13 05:51:56 +0000 Commit: Michal Meloun CommitDate: 2023-08-13 07:35:48 +0000 gdtoa: Regenerate configuration headers for 32-bit arm. These configuration headers were only guessed, but unfortunately not exactly correctly. Therefore, re-generate them on real HW. Generated on CA15, verified on CA9, CA7(with VFP lite) and on 32-bit ARMv9. PR: 272229 Reported by: Robert Clausecker MFC after: 2 weeks --- lib/libc/arm/arith.h | 9 ++++----- lib/libc/arm/gd_qnan.h | 11 +++++------ 2 files changed, 9 insertions(+), 11 deletions(-) diff --git a/lib/libc/arm/arith.h b/lib/libc/arm/arith.h index 86121bf9a80c..418f83f64ccb 100644 --- a/lib/libc/arm/arith.h +++ b/lib/libc/arm/arith.h @@ -1,16 +1,15 @@ /* * MD header for contrib/gdtoa * - * $FreeBSD$ - */ - -/* * NOTE: The definitions in this file must be correct or strtod(3) and * floating point formats in printf(3) will break! The file can be * generated by running contrib/gdtoa/arithchk.c on the target * architecture. See contrib/gdtoa/gdtoaimp.h for details. + * + * Generated on CA15, verified on CA9, CA7(with VFP lite) and on 32-bit ARMv9. + * */ #define IEEE_8087 #define Arith_Kind_ASL 1 -#define Sudden_Underflow +#define Double_Align diff --git a/lib/libc/arm/gd_qnan.h b/lib/libc/arm/gd_qnan.h index 8fa9edd83415..acf13d0b7852 100644 --- a/lib/libc/arm/gd_qnan.h +++ b/lib/libc/arm/gd_qnan.h @@ -4,20 +4,19 @@ * This file can be generated by compiling and running contrib/gdtoa/qnan.c * on the target architecture after arith.h has been generated. * - * XXX I don't have ARM hardware, so I just guessed. --das + * Generated on CA15, verified on CA9, CA7(with VFP lite) and on 32-bit ARMv9. * - * $FreeBSD$ */ #define f_QNAN 0x7fc00000 #define d_QNAN0 0x0 #define d_QNAN1 0x7ff80000 #define ld_QNAN0 0x0 -#define ld_QNAN1 0xc0000000 -#define ld_QNAN2 0x7fff +#define ld_QNAN1 0x7ff80000 +#define ld_QNAN2 0x0 #define ld_QNAN3 0x0 #define ldus_QNAN0 0x0 #define ldus_QNAN1 0x0 #define ldus_QNAN2 0x0 -#define ldus_QNAN3 0xc000 -#define ldus_QNAN4 0x7fff +#define ldus_QNAN3 0x7ff8 +#define ldus_QNAN4 0x0 From nobody Sun Aug 13 08:42:57 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RNrdY2WYrz4qDtj; Sun, 13 Aug 2023 08:42: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RNrdY262tz4ShF; Sun, 13 Aug 2023 08:42:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691916177; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pfYklILFDdwvaKcTz//Z823APliB6Rtdnb0NJlfTOsE=; b=UV90RGJvg/KZ0n9jd32ec0k0qX8rX5D0LhlsaUfE1NNwOP8kYnt3KQuRWhKUtVxl50EmJq WZ9aYFpcCmpL5Dug9NzrKuTdDgUcNhQO3xS9NEDNQRW/pgjyU6avDae7d+GOEWQqACWq+H Y68SdQjs2PDBE3aNmwu7qTpnraFtrmwymxREwo5Bhp9hTZBXfU7iTADpJrbPOioiVKO3gr wVw1AQVTUaEDb9Qbgl4lpcStjBRsg8kxpldm22LBKjU0v5VBJYgkjn6TvJd5OSWRYkhabg JyAgEfLNiw8O5OVQ6u6iKw/ButJyyYlKpCBE/KzePdCv5CeHcDLBYjGBoi8tfg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691916177; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pfYklILFDdwvaKcTz//Z823APliB6Rtdnb0NJlfTOsE=; b=jFEhDa7fVDUxUm8VDgiDhzVl7dTosc7/YlSKW1LC1muI95/fyDdar0TN5xEe2dYQYW6b0E V76goHUxATFgAGeuj2JCuBEzNu+WtRDhSnFSc/v0gIHxJc59PKsdUAaVoMtVC72aPIhQFB +HcEh4J8QCcbKpRMc2vT2qZ+3z09sdckiKvJ1nXIyxuZf24NlmZfsAPo5mqzyABluxmKG1 ALutZzfYp6HAcvLrIsEiBc2OT8VURZX8sYzhkVItAucNAbWdx8YQqBun8TAS5irFQYiUfv 8P60y+jYRq1SEwFu6yogujezAfG3GaED8nwv/A8zqt4TlXSYsb0MfzFeNkuy+w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691916177; a=rsa-sha256; cv=none; b=xo9o1o5zRw+U7VvcB6HA1QQcILevKe3NBo9QVd5zS5UIm77yyd3WFrZQdkJfTMyieYjFpU PMrgXxWmxY6Rt806Q7ZQByzqSldlR4UET0yUQmI5tNiSnN6my/xgRzckLG2G9eG6EeZ7Wi 0aNfgoq05s1qzjwTb0pBrSu8PKi2933mUmJUIrnpi18ORLvzx6LtHXv+XT6x3ecSo0k5SZ zpDM1A2zwSa3DI6ADUUXDUdIDniePzVeA54BmH3RscBp1gMFXnpSRfePftG81GfVOFvB+7 b7ZmSPg9VTJafq/LMLG2V7vC+zeGezyoKMn4fCTAuv9JV9EjBq+PosgwV71PoQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RNrdY190jzvlJ; Sun, 13 Aug 2023 08:42:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37D8gvu5051321; Sun, 13 Aug 2023 08:42:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37D8gvfD051319; Sun, 13 Aug 2023 08:42:57 GMT (envelope-from git) Date: Sun, 13 Aug 2023 08:42:57 GMT Message-Id: <202308130842.37D8gvfD051319@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: e0a003552650 - stable/13 - Clean up libm use of the __ieee754_ prefix List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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: e0a00355265097ac916398bdc58cbe94fa2fbc10 Auto-Submitted: auto-generated The branch stable/13 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=e0a00355265097ac916398bdc58cbe94fa2fbc10 commit e0a00355265097ac916398bdc58cbe94fa2fbc10 Author: Steve Kargl AuthorDate: 2023-08-03 19:51:17 +0000 Commit: Dimitry Andric CommitDate: 2023-08-13 08:38:17 +0000 Clean up libm use of the __ieee754_ prefix This removes the __ieee754_ prefix from a number of the math functions. msun/src/math_private.h contains the statement that /* * ieee style elementary functions * * We rename functions here to improve other sources' diffability * against fdlibm. */ #define __ieee754_sqrt sqrt ... Here, fdlibm refers to https://netlib.org/fdlibm. It is seen from https://netlib.org/fdlibm/readme that this prefix was used to differentiate between different standards: Wrapper functions will twist the result of the ieee754 function to comply to the standard specified by the value of _LIB_VERSION if _LIB_VERSION = _IEEE_, return the ieee754 result; if _LIB_VERSION = _SVID_, return SVID result; if _LIB_VERSION = _XOPEN_, return XOPEN result; if _LIB_VERSION = _POSIX_, return POSIX/ANSI result. (These are macros, see fdlibm.h for their definition.) AFAICT, FreeBSD has never supported these wrappers. In addition, as C99, principally the long double, functions were added to libm, this convention was not maintained. Given that only 148 of 324 files under lib/msun contain a "Copyright (C) 1993 by Sun Microsystems" statement, the removal of the __ieee754_ prefix provides consistency across all source files. The last time someone compared lib/msun to fdlibm appears to be commit 3f70824172feb82ea3dcdb3866b54fe0eb7cd890 Author: David Schultz Date: Fri Feb 4 18:26:06 2005 +0000 Reduce diffs against vendor source (Sun fdlibm 5.3). The most recent fdlibm RCS string that appears in a Sun Microsystem copyrighted file is date "95/01/18". With Oracle Corporation's acquisition of Sun Microsystems in 2009, it is unlikely that fdlibm will ever be updated. A search for fdlibm at https://opensource.oracle.com/ yields no hits. Finally, OpenBSD removed the use of this prefix over 21 years ago. pSee revision 1.6 of OpenBSD's math_private.h. Note: this does not drop the __ieee754_ prefix from the trigonometric argument reduction functions, e.g., __ieee754_rem_pio2. These functions are internal to the libm and exported through Symbol.map; and thus, reserved for the implementation. PR: 272783 MFC after: 1 week (cherry picked from commit 99843eb89954dac76afe7cf18d962eddfe7a7987) --- lib/msun/src/e_acos.c | 4 +-- lib/msun/src/e_acosf.c | 2 +- lib/msun/src/e_acosh.c | 8 +++--- lib/msun/src/e_acoshf.c | 8 +++--- lib/msun/src/e_asin.c | 4 +-- lib/msun/src/e_asinf.c | 2 +- lib/msun/src/e_atan2.c | 4 +-- lib/msun/src/e_atan2f.c | 2 +- lib/msun/src/e_atanh.c | 4 +-- lib/msun/src/e_atanhf.c | 2 +- lib/msun/src/e_cosh.c | 8 +++--- lib/msun/src/e_coshf.c | 6 ++--- lib/msun/src/e_exp.c | 4 +-- lib/msun/src/e_expf.c | 2 +- lib/msun/src/e_fmod.c | 4 +-- lib/msun/src/e_fmodf.c | 4 +-- lib/msun/src/e_gamma.c | 8 +++--- lib/msun/src/e_gamma_r.c | 8 +++--- lib/msun/src/e_gammaf.c | 8 +++--- lib/msun/src/e_gammaf_r.c | 8 +++--- lib/msun/src/e_hypot.c | 4 +-- lib/msun/src/e_hypotf.c | 6 ++--- lib/msun/src/e_j0.c | 10 +++---- lib/msun/src/e_j0f.c | 8 +++--- lib/msun/src/e_j1.c | 8 +++--- lib/msun/src/e_j1f.c | 6 ++--- lib/msun/src/e_jn.c | 28 ++++++++++---------- lib/msun/src/e_jnf.c | 26 +++++++++--------- lib/msun/src/e_lgamma.c | 8 +++--- lib/msun/src/e_lgamma_r.c | 16 ++++++------ lib/msun/src/e_lgammaf.c | 8 +++--- lib/msun/src/e_lgammaf_r.c | 14 +++++----- lib/msun/src/e_log.c | 4 +-- lib/msun/src/e_log10.c | 2 +- lib/msun/src/e_log10f.c | 2 +- lib/msun/src/e_log2.c | 2 +- lib/msun/src/e_log2f.c | 2 +- lib/msun/src/e_logf.c | 2 +- lib/msun/src/e_pow.c | 4 +-- lib/msun/src/e_powf.c | 4 +-- lib/msun/src/e_remainder.c | 6 ++--- lib/msun/src/e_remainderf.c | 4 +-- lib/msun/src/e_scalb.c | 6 ++--- lib/msun/src/e_scalbf.c | 4 +-- lib/msun/src/e_sinh.c | 6 ++--- lib/msun/src/e_sinhf.c | 4 +-- lib/msun/src/e_sqrt.c | 6 ++--- lib/msun/src/e_sqrtf.c | 4 +-- lib/msun/src/math_private.h | 61 ------------------------------------------- lib/msun/src/s_asinh.c | 6 ++--- lib/msun/src/s_asinhf.c | 6 ++--- lib/msun/src/s_erf.c | 4 +-- lib/msun/src/s_significand.c | 2 +- lib/msun/src/s_significandf.c | 2 +- 54 files changed, 162 insertions(+), 223 deletions(-) diff --git a/lib/msun/src/e_acos.c b/lib/msun/src/e_acos.c index 1f6dca5bb5cb..6623355baa7c 100644 --- a/lib/msun/src/e_acos.c +++ b/lib/msun/src/e_acos.c @@ -14,7 +14,7 @@ #include __FBSDID("$FreeBSD$"); -/* __ieee754_acos(x) +/* acos(x) * Method : * acos(x) = pi/2 - asin(x) * acos(-x) = pi/2 + asin(x) @@ -62,7 +62,7 @@ qS3 = -6.88283971605453293030e-01, /* 0xBFE6066C, 0x1B8D0159 */ qS4 = 7.70381505559019352791e-02; /* 0x3FB3B8C5, 0xB12E9282 */ double -__ieee754_acos(double x) +acos(double x) { double z,p,q,r,w,s,c,df; int32_t hx,ix; diff --git a/lib/msun/src/e_acosf.c b/lib/msun/src/e_acosf.c index c9f62cc40f5c..64f1c5afb182 100644 --- a/lib/msun/src/e_acosf.c +++ b/lib/msun/src/e_acosf.c @@ -32,7 +32,7 @@ pS2 = -8.6563630030e-03, qS1 = -7.0662963390e-01; float -__ieee754_acosf(float x) +acosf(float x) { float z,p,q,r,w,s,c,df; int32_t hx,ix; diff --git a/lib/msun/src/e_acosh.c b/lib/msun/src/e_acosh.c index 358c8bd6a636..7947995820d0 100644 --- a/lib/msun/src/e_acosh.c +++ b/lib/msun/src/e_acosh.c @@ -15,7 +15,7 @@ #include __FBSDID("$FreeBSD$"); -/* __ieee754_acosh(x) +/* acosh(x) * Method : * Based on * acosh(x) = log [ x + sqrt(x*x-1) ] @@ -39,7 +39,7 @@ one = 1.0, ln2 = 6.93147180559945286227e-01; /* 0x3FE62E42, 0xFEFA39EF */ double -__ieee754_acosh(double x) +acosh(double x) { double t; int32_t hx; @@ -51,12 +51,12 @@ __ieee754_acosh(double x) if(hx >=0x7ff00000) { /* x is inf of NaN */ return x+x; } else - return __ieee754_log(x)+ln2; /* acosh(huge)=log(2x) */ + return log(x)+ln2; /* acosh(huge)=log(2x) */ } else if(((hx-0x3ff00000)|lx)==0) { return 0.0; /* acosh(1) = 0 */ } else if (hx > 0x40000000) { /* 2**28 > x > 2 */ t=x*x; - return __ieee754_log(2.0*x-one/(x+sqrt(t-one))); + return log(2.0*x-one/(x+sqrt(t-one))); } else { /* 1=0x7f800000) { /* x is inf of NaN */ return x+x; } else - return __ieee754_logf(x)+ln2; /* acosh(huge)=log(2x) */ + return logf(x)+ln2; /* acosh(huge)=log(2x) */ } else if (hx==0x3f800000) { return 0.0; /* acosh(1) = 0 */ } else if (hx > 0x40000000) { /* 2**28 > x > 2 */ t=x*x; - return __ieee754_logf((float)2.0*x-one/(x+__ieee754_sqrtf(t-one))); + return logf((float)2.0*x-one/(x+sqrtf(t-one))); } else { /* 1 __FBSDID("$FreeBSD$"); -/* __ieee754_asin(x) +/* asin(x) * Method : * Since asin(x) = x + x^3/6 + x^5*3/40 + x^7*15/336 + ... * we approximate asin(x) on [0,0.5] by @@ -68,7 +68,7 @@ qS3 = -6.88283971605453293030e-01, /* 0xBFE6066C, 0x1B8D0159 */ qS4 = 7.70381505559019352791e-02; /* 0x3FB3B8C5, 0xB12E9282 */ double -__ieee754_asin(double x) +asin(double x) { double t=0.0,w,p,q,c,r,s; int32_t hx,ix; diff --git a/lib/msun/src/e_asinf.c b/lib/msun/src/e_asinf.c index deaabb6a326e..db4b9b6034f7 100644 --- a/lib/msun/src/e_asinf.c +++ b/lib/msun/src/e_asinf.c @@ -32,7 +32,7 @@ static const double pio2 = 1.570796326794896558e+00; float -__ieee754_asinf(float x) +asinf(float x) { double s; float t,w,p,q; diff --git a/lib/msun/src/e_atan2.c b/lib/msun/src/e_atan2.c index 231a1611ee12..0b2e72102edb 100644 --- a/lib/msun/src/e_atan2.c +++ b/lib/msun/src/e_atan2.c @@ -15,7 +15,7 @@ #include __FBSDID("$FreeBSD$"); -/* __ieee754_atan2(y,x) +/* atan2(y,x) * Method : * 1. Reduce y to positive by atan2(y,x)=-atan2(-y,x). * 2. Reduce x to positive by (if x and y are unexceptional): @@ -58,7 +58,7 @@ static volatile double pi_lo = 1.2246467991473531772E-16; /* 0x3CA1A626, 0x33145C07 */ double -__ieee754_atan2(double y, double x) +atan2(double y, double x) { double z; int32_t k,m,hx,hy,ix,iy; diff --git a/lib/msun/src/e_atan2f.c b/lib/msun/src/e_atan2f.c index 346d76746c05..4ea001df974a 100644 --- a/lib/msun/src/e_atan2f.c +++ b/lib/msun/src/e_atan2f.c @@ -30,7 +30,7 @@ static volatile float pi_lo = -8.7422776573e-08; /* 0xb3bbbd2e */ float -__ieee754_atan2f(float y, float x) +atan2f(float y, float x) { float z; int32_t k,m,hx,hy,ix,iy; diff --git a/lib/msun/src/e_atanh.c b/lib/msun/src/e_atanh.c index 422ff2698067..41f3bcaca26d 100644 --- a/lib/msun/src/e_atanh.c +++ b/lib/msun/src/e_atanh.c @@ -15,7 +15,7 @@ #include __FBSDID("$FreeBSD$"); -/* __ieee754_atanh(x) +/* atanh(x) * Method : * 1.Reduced x to positive by atanh(-x) = -atanh(x) * 2.For x>=0.5 @@ -42,7 +42,7 @@ static const double one = 1.0, huge = 1e300; static const double zero = 0.0; double -__ieee754_atanh(double x) +atanh(double x) { double t; int32_t hx,ix; diff --git a/lib/msun/src/e_atanhf.c b/lib/msun/src/e_atanhf.c index 4bd6a8f9b9c6..46643beb5ab0 100644 --- a/lib/msun/src/e_atanhf.c +++ b/lib/msun/src/e_atanhf.c @@ -24,7 +24,7 @@ static const float one = 1.0, huge = 1e30; static const float zero = 0.0; float -__ieee754_atanhf(float x) +atanhf(float x) { float t; int32_t hx,ix; diff --git a/lib/msun/src/e_cosh.c b/lib/msun/src/e_cosh.c index 246b5fbec860..071663eb4e15 100644 --- a/lib/msun/src/e_cosh.c +++ b/lib/msun/src/e_cosh.c @@ -14,7 +14,7 @@ #include __FBSDID("$FreeBSD$"); -/* __ieee754_cosh(x) +/* cosh(x) * Method : * mathematically cosh(x) if defined to be (exp(x)+exp(-x))/2 * 1. Replace x by |x| (cosh(x) = cosh(-x)). @@ -43,7 +43,7 @@ __FBSDID("$FreeBSD$"); static const double one = 1.0, half=0.5, huge = 1.0e300; double -__ieee754_cosh(double x) +cosh(double x) { double t,w; int32_t ix; @@ -65,12 +65,12 @@ __ieee754_cosh(double x) /* |x| in [0.5*ln2,22], return (exp(|x|)+1/exp(|x|)/2; */ if (ix < 0x40360000) { - t = __ieee754_exp(fabs(x)); + t = exp(fabs(x)); return half*t+half/t; } /* |x| in [22, log(maxdouble)] return half*exp(|x|) */ - if (ix < 0x40862E42) return half*__ieee754_exp(fabs(x)); + if (ix < 0x40862E42) return half*exp(fabs(x)); /* |x| in [log(maxdouble), overflowthresold] */ if (ix<=0x408633CE) diff --git a/lib/msun/src/e_coshf.c b/lib/msun/src/e_coshf.c index 95a0d6ee68ba..1673315d7b31 100644 --- a/lib/msun/src/e_coshf.c +++ b/lib/msun/src/e_coshf.c @@ -22,7 +22,7 @@ __FBSDID("$FreeBSD$"); static const float one = 1.0, half=0.5, huge = 1.0e30; float -__ieee754_coshf(float x) +coshf(float x) { float t,w; int32_t ix; @@ -43,12 +43,12 @@ __ieee754_coshf(float x) /* |x| in [0.5*ln2,9], return (exp(|x|)+1/exp(|x|))/2; */ if (ix < 0x41100000) { - t = __ieee754_expf(fabsf(x)); + t = expf(fabsf(x)); return half*t+half/t; } /* |x| in [9, log(maxfloat)] return half*exp(|x|) */ - if (ix < 0x42b17217) return half*__ieee754_expf(fabsf(x)); + if (ix < 0x42b17217) return half*expf(fabsf(x)); /* |x| in [log(maxfloat), overflowthresold] */ if (ix<=0x42b2d4fc) diff --git a/lib/msun/src/e_exp.c b/lib/msun/src/e_exp.c index dd04d8e839d5..59da39217391 100644 --- a/lib/msun/src/e_exp.c +++ b/lib/msun/src/e_exp.c @@ -13,7 +13,7 @@ #include __FBSDID("$FreeBSD$"); -/* __ieee754_exp(x) +/* exp(x) * Returns the exponential of x. * * Method @@ -102,7 +102,7 @@ huge = 1.0e+300, twom1000= 9.33263618503218878990e-302; /* 2**-1000=0x01700000,0*/ double -__ieee754_exp(double x) /* default IEEE double exp */ +exp(double x) /* default IEEE double exp */ { double y,hi=0.0,lo=0.0,c,t,twopk; int32_t k=0,xsb; diff --git a/lib/msun/src/e_expf.c b/lib/msun/src/e_expf.c index 4903d55c5ab3..620d341be274 100644 --- a/lib/msun/src/e_expf.c +++ b/lib/msun/src/e_expf.c @@ -43,7 +43,7 @@ huge = 1.0e+30, twom100 = 7.8886090522e-31; /* 2**-100=0x0d800000 */ float -__ieee754_expf(float x) +expf(float x) { float y,hi=0.0,lo=0.0,c,t,twopk; int32_t k=0,xsb; diff --git a/lib/msun/src/e_fmod.c b/lib/msun/src/e_fmod.c index 3a28dc4ff1f3..6d5f5332cb85 100644 --- a/lib/msun/src/e_fmod.c +++ b/lib/msun/src/e_fmod.c @@ -15,7 +15,7 @@ __FBSDID("$FreeBSD$"); /* - * __ieee754_fmod(x,y) + * fmod(x,y) * Return x mod y in exact arithmetic * Method: shift and subtract */ @@ -28,7 +28,7 @@ __FBSDID("$FreeBSD$"); static const double one = 1.0, Zero[] = {0.0, -0.0,}; double -__ieee754_fmod(double x, double y) +fmod(double x, double y) { int32_t n,hx,hy,hz,ix,iy,sx,i; u_int32_t lx,ly,lz; diff --git a/lib/msun/src/e_fmodf.c b/lib/msun/src/e_fmodf.c index 1b6bf36f9cba..3cef9213c1e5 100644 --- a/lib/msun/src/e_fmodf.c +++ b/lib/msun/src/e_fmodf.c @@ -17,7 +17,7 @@ __FBSDID("$FreeBSD$"); /* - * __ieee754_fmodf(x,y) + * fmodf(x,y) * Return x mod y in exact arithmetic * Method: shift and subtract */ @@ -28,7 +28,7 @@ __FBSDID("$FreeBSD$"); static const float one = 1.0, Zero[] = {0.0, -0.0,}; float -__ieee754_fmodf(float x, float y) +fmodf(float x, float y) { int32_t n,hx,hy,hz,ix,iy,sx,i; diff --git a/lib/msun/src/e_gamma.c b/lib/msun/src/e_gamma.c index 28fb5ccba6d6..a13f3e22c08b 100644 --- a/lib/msun/src/e_gamma.c +++ b/lib/msun/src/e_gamma.c @@ -15,10 +15,10 @@ #include __FBSDID("$FreeBSD$"); -/* __ieee754_gamma(x) +/* gamma(x) * Return the logarithm of the Gamma function of x. * - * Method: call __ieee754_gamma_r + * Method: call gamma_r */ #include "math.h" @@ -27,7 +27,7 @@ __FBSDID("$FreeBSD$"); extern int signgam; double -__ieee754_gamma(double x) +gamma(double x) { - return __ieee754_gamma_r(x,&signgam); + return gamma_r(x,&signgam); } diff --git a/lib/msun/src/e_gamma_r.c b/lib/msun/src/e_gamma_r.c index 2c423dce8558..2d996cabca20 100644 --- a/lib/msun/src/e_gamma_r.c +++ b/lib/msun/src/e_gamma_r.c @@ -15,18 +15,18 @@ #include __FBSDID("$FreeBSD$"); -/* __ieee754_gamma_r(x, signgamp) +/* gamma_r(x, signgamp) * Reentrant version of the logarithm of the Gamma function * with user provide pointer for the sign of Gamma(x). * - * Method: See __ieee754_lgamma_r + * Method: See lgamma_r */ #include "math.h" #include "math_private.h" double -__ieee754_gamma_r(double x, int *signgamp) +gamma_r(double x, int *signgamp) { - return __ieee754_lgamma_r(x,signgamp); + return lgamma_r(x,signgamp); } diff --git a/lib/msun/src/e_gammaf.c b/lib/msun/src/e_gammaf.c index c1b1668df975..563c1482282d 100644 --- a/lib/msun/src/e_gammaf.c +++ b/lib/msun/src/e_gammaf.c @@ -16,10 +16,10 @@ #include __FBSDID("$FreeBSD$"); -/* __ieee754_gammaf(x) +/* gammaf(x) * Return the logarithm of the Gamma function of x. * - * Method: call __ieee754_gammaf_r + * Method: call gammaf_r */ #include "math.h" @@ -28,7 +28,7 @@ __FBSDID("$FreeBSD$"); extern int signgam; float -__ieee754_gammaf(float x) +gammaf(float x) { - return __ieee754_gammaf_r(x,&signgam); + return gammaf_r(x,&signgam); } diff --git a/lib/msun/src/e_gammaf_r.c b/lib/msun/src/e_gammaf_r.c index 9d7831b5501b..d7fc2db1e96c 100644 --- a/lib/msun/src/e_gammaf_r.c +++ b/lib/msun/src/e_gammaf_r.c @@ -16,18 +16,18 @@ #include __FBSDID("$FreeBSD$"); -/* __ieee754_gammaf_r(x, signgamp) +/* gammaf_r(x, signgamp) * Reentrant version of the logarithm of the Gamma function * with user provide pointer for the sign of Gamma(x). * - * Method: See __ieee754_lgammaf_r + * Method: See lgammaf_r */ #include "math.h" #include "math_private.h" float -__ieee754_gammaf_r(float x, int *signgamp) +gammaf_r(float x, int *signgamp) { - return __ieee754_lgammaf_r(x,signgamp); + return lgammaf_r(x,signgamp); } diff --git a/lib/msun/src/e_hypot.c b/lib/msun/src/e_hypot.c index 7c455bb6652f..8e3f9317b3a6 100644 --- a/lib/msun/src/e_hypot.c +++ b/lib/msun/src/e_hypot.c @@ -14,7 +14,7 @@ #include __FBSDID("$FreeBSD$"); -/* __ieee754_hypot(x,y) +/* hypot(x,y) * * Method : * If (assume round-to-nearest) z=x*x+y*y @@ -52,7 +52,7 @@ __FBSDID("$FreeBSD$"); #include "math_private.h" double -__ieee754_hypot(double x, double y) +hypot(double x, double y) { double a,b,t1,t2,y1,y2,w; int32_t j,k,ha,hb; diff --git a/lib/msun/src/e_hypotf.c b/lib/msun/src/e_hypotf.c index 00610268fafb..a3b8c866697b 100644 --- a/lib/msun/src/e_hypotf.c +++ b/lib/msun/src/e_hypotf.c @@ -20,7 +20,7 @@ __FBSDID("$FreeBSD$"); #include "math_private.h" float -__ieee754_hypotf(float x, float y) +hypotf(float x, float y) { float a,b,t1,t2,y1,y2,w; int32_t j,k,ha,hb; @@ -67,14 +67,14 @@ __ieee754_hypotf(float x, float y) if (w>b) { SET_FLOAT_WORD(t1,ha&0xfffff000); t2 = a-t1; - w = __ieee754_sqrtf(t1*t1-(b*(-b)-t2*(a+t1))); + w = sqrtf(t1*t1-(b*(-b)-t2*(a+t1))); } else { a = a+a; SET_FLOAT_WORD(y1,hb&0xfffff000); y2 = b - y1; SET_FLOAT_WORD(t1,(ha+0x00800000)&0xfffff000); t2 = a - t1; - w = __ieee754_sqrtf(t1*y1-(w*(-w)-(t1*y2+t2*b))); + w = sqrtf(t1*y1-(w*(-w)-(t1*y2+t2*b))); } if(k!=0) { SET_FLOAT_WORD(t1,(127+k)<<23); diff --git a/lib/msun/src/e_j0.c b/lib/msun/src/e_j0.c index 5d862b6f834d..c43ab6996b4a 100644 --- a/lib/msun/src/e_j0.c +++ b/lib/msun/src/e_j0.c @@ -13,7 +13,7 @@ #include __FBSDID("$FreeBSD$"); -/* __ieee754_j0(x), __ieee754_y0(x) +/* j0(x), y0(x) * Bessel function of the first and second kinds of order zero. * Method -- j0(x): * 1. For tiny x, we use j0(x) = 1 - x^2/4 + x^4/64 - ... @@ -83,7 +83,7 @@ S04 = 1.16614003333790000205e-09; /* 0x3E1408BC, 0xF4745D8F */ static const double zero = 0, qrtr = 0.25; double -__ieee754_j0(double x) +j0(double x) { double z, s,c,ss,cc,r,u,v; int32_t hx,ix; @@ -143,7 +143,7 @@ v03 = 2.59150851840457805467e-07, /* 0x3E91642D, 0x7FF202FD */ v04 = 4.41110311332675467403e-10; /* 0x3DFE5018, 0x3BD6D9EF */ double -__ieee754_y0(double x) +y0(double x) { double z, s,c,ss,cc,u,v; int32_t hx,ix,lx; @@ -192,12 +192,12 @@ __ieee754_y0(double x) return z; } if(ix<=0x3e400000) { /* x < 2**-27 */ - return(u00 + tpi*__ieee754_log(x)); + return(u00 + tpi*log(x)); } z = x*x; u = u00+z*(u01+z*(u02+z*(u03+z*(u04+z*(u05+z*u06))))); v = one+z*(v01+z*(v02+z*(v03+z*v04))); - return(u/v + tpi*(__ieee754_j0(x)*__ieee754_log(x))); + return(u/v + tpi*(j0(x)*log(x))); } /* The asymptotic expansions of pzero is diff --git a/lib/msun/src/e_j0f.c b/lib/msun/src/e_j0f.c index 1c5ef4da1b49..290be04fc900 100644 --- a/lib/msun/src/e_j0f.c +++ b/lib/msun/src/e_j0f.c @@ -45,7 +45,7 @@ S04 = 1.1661400734e-09; /* 0x30a045e8 */ static const float zero = 0, qrtr = 0.25; float -__ieee754_j0f(float x) +j0f(float x) { float z, s,c,ss,cc,r,u,v; int32_t hx,ix; @@ -105,7 +105,7 @@ v03 = 2.5915085189e-07, /* 0x348b216c */ v04 = 4.4111031494e-10; /* 0x2ff280c2 */ float -__ieee754_y0f(float x) +y0f(float x) { float z, s,c,ss,cc,u,v; int32_t hx,ix; @@ -147,12 +147,12 @@ __ieee754_y0f(float x) return z; } if(ix<=0x39000000) { /* x < 2**-13 */ - return(u00 + tpi*__ieee754_logf(x)); + return(u00 + tpi*logf(x)); } z = x*x; u = u00+z*(u01+z*(u02+z*(u03+z*(u04+z*(u05+z*u06))))); v = one+z*(v01+z*(v02+z*(v03+z*v04))); - return(u/v + tpi*(__ieee754_j0f(x)*__ieee754_logf(x))); + return(u/v + tpi*(j0f(x)*logf(x))); } /* The asymptotic expansions of pzero is diff --git a/lib/msun/src/e_j1.c b/lib/msun/src/e_j1.c index fb4462738368..ee3f6fcc69d4 100644 --- a/lib/msun/src/e_j1.c +++ b/lib/msun/src/e_j1.c @@ -13,7 +13,7 @@ #include __FBSDID("$FreeBSD$"); -/* __ieee754_j1(x), __ieee754_y1(x) +/* j1(x), y1(x) * Bessel function of the first and second kinds of order zero. * Method -- j1(x): * 1. For tiny x, we use j1(x) = x/2 - x^3/16 + x^5/384 - ... @@ -84,7 +84,7 @@ s05 = 1.23542274426137913908e-11; /* 0x3DAB2ACF, 0xCFB97ED8 */ static const double zero = 0.0; double -__ieee754_j1(double x) +j1(double x) { double z, s,c,ss,cc,r,u,v,y; int32_t hx,ix; @@ -140,7 +140,7 @@ static const double V0[5] = { }; double -__ieee754_y1(double x) +y1(double x) { double z, s,c,ss,cc,u,v; int32_t hx,ix,lx; @@ -190,7 +190,7 @@ __ieee754_y1(double x) z = x*x; u = U0[0]+z*(U0[1]+z*(U0[2]+z*(U0[3]+z*U0[4]))); v = one+z*(V0[0]+z*(V0[1]+z*(V0[2]+z*(V0[3]+z*V0[4])))); - return(x*(u/v) + tpi*(__ieee754_j1(x)*__ieee754_log(x)-one/x)); + return(x*(u/v) + tpi*(j1(x)*log(x)-one/x)); } /* For x >= 8, the asymptotic expansions of pone is diff --git a/lib/msun/src/e_j1f.c b/lib/msun/src/e_j1f.c index c6c45c107afa..e1f4498b71af 100644 --- a/lib/msun/src/e_j1f.c +++ b/lib/msun/src/e_j1f.c @@ -46,7 +46,7 @@ s05 = 1.2354227016e-11; /* 0x2d59567e */ static const float zero = 0.0; float -__ieee754_j1f(float x) +j1f(float x) { float z, s,c,ss,cc,r,u,v,y; int32_t hx,ix; @@ -102,7 +102,7 @@ static const float V0[5] = { }; float -__ieee754_y1f(float x) +y1f(float x) { float z, s,c,ss,cc,u,v; int32_t hx,ix; @@ -145,7 +145,7 @@ __ieee754_y1f(float x) z = x*x; u = U0[0]+z*(U0[1]+z*(U0[2]+z*(U0[3]+z*U0[4]))); v = one+z*(V0[0]+z*(V0[1]+z*(V0[2]+z*(V0[3]+z*V0[4])))); - return(x*(u/v) + tpi*(__ieee754_j1f(x)*__ieee754_logf(x)-one/x)); + return(x*(u/v) + tpi*(j1f(x)*logf(x)-one/x)); } /* For x >= 8, the asymptotic expansions of pone is diff --git a/lib/msun/src/e_jn.c b/lib/msun/src/e_jn.c index 5aaebd400065..6b876ce69554 100644 --- a/lib/msun/src/e_jn.c +++ b/lib/msun/src/e_jn.c @@ -14,7 +14,7 @@ __FBSDID("$FreeBSD$"); /* - * __ieee754_jn(n, x), __ieee754_yn(n, x) + * jn(n, x), yn(n, x) * floating point Bessel's function of the 1st and 2nd kind * of order n * @@ -51,7 +51,7 @@ one = 1.00000000000000000000e+00; /* 0x3FF00000, 0x00000000 */ static const double zero = 0.00000000000000000000e+00; double -__ieee754_jn(int n, double x) +jn(int n, double x) { int32_t i,hx,ix,lx, sgn; double a, b, c, s, temp, di; @@ -69,8 +69,8 @@ __ieee754_jn(int n, double x) x = -x; hx ^= 0x80000000; } - if(n==0) return(__ieee754_j0(x)); - if(n==1) return(__ieee754_j1(x)); + if(n==0) return(j0(x)); + if(n==1) return(j1(x)); sgn = (n&1)&(hx>>31); /* even n -- 0, odd n -- sign(x) */ x = fabs(x); if((ix|lx)==0||ix>=0x7ff00000) /* if x is 0 or inf */ @@ -100,8 +100,8 @@ __ieee754_jn(int n, double x) } b = invsqrtpi*temp/sqrt(x); } else { - a = __ieee754_j0(x); - b = __ieee754_j1(x); + a = j0(x); + b = j1(x); for(i=1;i0;i--){ temp = b; @@ -201,8 +201,8 @@ __ieee754_jn(int n, double x) } } } - z = __ieee754_j0(x); - w = __ieee754_j1(x); + z = j0(x); + w = j1(x); if (fabs(z) >= fabs(w)) b = (t*z/b); else @@ -213,7 +213,7 @@ __ieee754_jn(int n, double x) } double -__ieee754_yn(int n, double x) +yn(int n, double x) { int32_t i,hx,ix,lx; int32_t sign; @@ -232,8 +232,8 @@ __ieee754_yn(int n, double x) n = -n; sign = 1 - ((n&1)<<1); } - if(n==0) return(__ieee754_y0(x)); - if(n==1) return(sign*__ieee754_y1(x)); + if(n==0) return(y0(x)); + if(n==1) return(sign*y1(x)); if(ix==0x7ff00000) return zero; if(ix>=0x52D00000) { /* x > 2**302 */ /* (x >> n**2) @@ -259,8 +259,8 @@ __ieee754_yn(int n, double x) b = invsqrtpi*temp/sqrt(x); } else { u_int32_t high; - a = __ieee754_y0(x); - b = __ieee754_y1(x); + a = y0(x); + b = y1(x); /* quit if b is -inf */ GET_HIGH_WORD(high,b); for(i=1;i>31); /* even n -- 0, odd n -- sign(x) */ x = fabsf(x); if(ix==0||ix>=0x7f800000) /* if x is 0 or inf */ b = zero; else if((float)n<=x) { /* Safe to use J(n+1,x)=2n/x *J(n,x)-J(n-1,x) */ - a = __ieee754_j0f(x); - b = __ieee754_j1f(x); + a = j0f(x); + b = j1f(x); for(i=1;i0;i--){ temp = b; @@ -158,8 +158,8 @@ __ieee754_jnf(int n, float x) } } } - z = __ieee754_j0f(x); - w = __ieee754_j1f(x); + z = j0f(x); + w = j1f(x); if (fabsf(z) >= fabsf(w)) b = (t*z/b); else @@ -170,7 +170,7 @@ __ieee754_jnf(int n, float x) } float -__ieee754_ynf(int n, float x) +ynf(int n, float x) { int32_t i,hx,ix,ib; int32_t sign; @@ -186,12 +186,12 @@ __ieee754_ynf(int n, float x) n = -n; sign = 1 - ((n&1)<<1); } - if(n==0) return(__ieee754_y0f(x)); - if(n==1) return(sign*__ieee754_y1f(x)); + if(n==0) return(y0f(x)); + if(n==1) return(sign*y1f(x)); if(ix==0x7f800000) return zero; - a = __ieee754_y0f(x); - b = __ieee754_y1f(x); + a = y0f(x); + b = y1f(x); /* quit if b is -inf */ GET_FLOAT_WORD(ib,b); for(i=1;i __FBSDID("$FreeBSD$"); -/* __ieee754_lgamma(x) +/* lgamma(x) * Return the logarithm of the Gamma function of x. * - * Method: call __ieee754_lgamma_r + * Method: call lgamma_r */ #include @@ -29,9 +29,9 @@ __FBSDID("$FreeBSD$"); *** 659 LINES SKIPPED *** From nobody Sun Aug 13 08:43:32 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RNrfD2YgWz4qDlb; Sun, 13 Aug 2023 08:43: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RNrfD1kymz4T9r; Sun, 13 Aug 2023 08:43:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691916212; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1AvTTIuyx6hlFHe8kw0wseGmtPqT/sbi2hvb8w6anEY=; b=eH9TDdu6VPmsRjJ2vMWhO/cUNoUNnr86lCduJvY5uc7TOEYmEoPhXYe5JC2Ri4J/H0h3Nl ApwFGWHqxMubzoF2rzaj41Oc+sTsguxQ038qYVT7LMrIc+ijP+aNO1QdCw/mj2VUJKG0cK 6ZIqbJDACFpmn4jt93IY2og2qjOgfAYpfFjs4oMR/GKCV2W+RGZMbcDGDsG9tabJp2lABA 6RISjRt1ZXXOoxEllRKaOqG8HswrmcbyjtzkY+wQ+KoJXeSGGyPp/3Wt+hBvFQ4yiebKkz G3t6+aXUccrv0wTaO4X4f65sLSl08xxuD13wqrsQEO/i/JYYROjI4+e7CrHmYw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691916212; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1AvTTIuyx6hlFHe8kw0wseGmtPqT/sbi2hvb8w6anEY=; b=whXKNSzVYyktdxpCdm7bdJqTOvkc+jtenBxwTrMOVyOEFxjIniXw8jYrEb6uHP2mjSvaO7 Kgoq7h+c3P3BXmeDKdZSq76V0y/A/xRK7z9sFxdONZF6XyAbaIaft+lwchnnNxRDeFAUX9 H//DrUzpmFGC59BgvMQlWrTUxhdRWvYlWS9eJOKjMUzzTHAeSLM0iN3tNCCHHNj3fsKTmT 8H6TITfwBGBBBR4qpEtEzyG/8MMFMkYPLej3OTkriWSi+j4Rhe3SqwlxGmdjftpJ/P9WvH Jp3KKBOLd2F1JWogy4zud5ngjgqPRTP1eiOpeelulNIF9qDmGMS+L3FmIQPJgA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691916212; a=rsa-sha256; cv=none; b=iySbvloMfcIZvJlTjbrvy2WMPNu7nuWCqosjrIvvCk7N1PCtuT33FQVGSHQ6K0ypIaphUD ft1OWkvN85bne9vHtB521Nqjic+AFhpplrsgmWb7zsB8cjoQSJ+C+AWObExZspEhPYDuh8 8XM+nvKgZDUcSiNCMCVC/MUzJiV4j6DPO0WfF5mYgplw7hydfUfoPnUULVUflkhtP0PsAk lySAQ79wsr64W8vlM7M5NNtO7RCkWa636ug+47xehoeXZ2n3Y7zsjJcycTmcTMx/9JHw8b PkMi35N3pBmfvXbn+uJYU1o+3+SF0ITVo3mcew5EioY4Q5OS6jKObu0yZ1Xn0w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RNrfD0pHBzwHQ; Sun, 13 Aug 2023 08:43:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37D8hWbO051548; Sun, 13 Aug 2023 08:43:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37D8hWER051545; Sun, 13 Aug 2023 08:43:32 GMT (envelope-from git) Date: Sun, 13 Aug 2023 08:43:32 GMT Message-Id: <202308130843.37D8hWER051545@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: dd565d99901a - stable/12 - Use a builtin where possible in msun List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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/12 X-Git-Reftype: branch X-Git-Commit: dd565d99901a891192e0b821cab5f9523c603f38 Auto-Submitted: auto-generated The branch stable/12 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=dd565d99901a891192e0b821cab5f9523c603f38 commit dd565d99901a891192e0b821cab5f9523c603f38 Author: Andrew Turner AuthorDate: 2021-11-02 11:31:17 +0000 Commit: Dimitry Andric CommitDate: 2023-08-13 08:39:08 +0000 Use a builtin where possible in msun Some of the functions in msun can be implemented using a compiler builtin function to generate a small number of instructions. Implement this support in fma, fmax, fmin, and sqrt on arm64. Care must be taken as the builtin can be implemented as a function call on some architectures that lack direct support. In these cases we need to use the original code path. As we don't set errno on failure build with -fno-math-errno so the toolchain doesn't convert a builtin into a function call when it detects a failure, e.g. gcc will add a call to sqrt when the input is negative leading to an infinite loop. Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D32801 (cherry picked from commit b2e843161dc3b79777e873183447c92ed9c3703a) --- lib/msun/Makefile | 5 +++++ lib/msun/aarch64/Makefile.inc | 12 ++++++++++++ lib/msun/src/e_sqrt.c | 18 +++++++++++++----- lib/msun/src/e_sqrtf.c | 8 ++++++++ lib/msun/src/s_fma.c | 8 ++++++++ lib/msun/src/s_fmaf.c | 8 ++++++++ lib/msun/src/s_fmax.c | 8 ++++++++ lib/msun/src/s_fmaxf.c | 8 ++++++++ lib/msun/src/s_fmin.c | 8 ++++++++ lib/msun/src/s_fminf.c | 8 ++++++++ 10 files changed, 86 insertions(+), 5 deletions(-) diff --git a/lib/msun/Makefile b/lib/msun/Makefile index ae8b42bebe40..4771de91c561 100644 --- a/lib/msun/Makefile +++ b/lib/msun/Makefile @@ -45,6 +45,11 @@ CFLAGS+= -I${.CURDIR}/${ARCH_SUBDIR} CFLAGS+= -ffp-exception-behavior=maytrap .endif +# Tell the compiler we don't set errno in any of the math functions. This +# stops gcc from trying to generate a function call to set errno when using +# a builtin in the implementation +CFLAGS+= -fno-math-errno + .PATH: ${.CURDIR}/bsdsrc .PATH: ${.CURDIR}/src .PATH: ${.CURDIR}/man diff --git a/lib/msun/aarch64/Makefile.inc b/lib/msun/aarch64/Makefile.inc index 286a60859591..b0e01488b0bb 100644 --- a/lib/msun/aarch64/Makefile.inc +++ b/lib/msun/aarch64/Makefile.inc @@ -2,3 +2,15 @@ LDBL_PREC = 113 +# Use a builtin when it generates the needed instruction +CFLAGS+=-DUSE_BUILTIN_FMAF +CFLAGS+=-DUSE_BUILTIN_FMA + +CFLAGS+=-DUSE_BUILTIN_FMAXF +CFLAGS+=-DUSE_BUILTIN_FMAX + +CFLAGS+=-DUSE_BUILTIN_FMINF +CFLAGS+=-DUSE_BUILTIN_FMIN + +CFLAGS+=-DUSE_BUILTIN_SQRTF +CFLAGS+=-DUSE_BUILTIN_SQRT diff --git a/lib/msun/src/e_sqrt.c b/lib/msun/src/e_sqrt.c index 12fb56e1340b..37351a425ce4 100644 --- a/lib/msun/src/e_sqrt.c +++ b/lib/msun/src/e_sqrt.c @@ -14,6 +14,18 @@ #include __FBSDID("$FreeBSD$"); +#include + +#include "math.h" +#include "math_private.h" + +#ifdef USE_BUILTIN_SQRT +double +__ieee754_sqrt(double x) +{ + return (__builtin_sqrt(x)); +} +#else /* __ieee754_sqrt(x) * Return correctly rounded sqrt. * ------------------------------------------ @@ -84,11 +96,6 @@ __FBSDID("$FreeBSD$"); *--------------- */ -#include - -#include "math.h" -#include "math_private.h" - static const double one = 1.0, tiny=1.0e-300; double @@ -187,6 +194,7 @@ __ieee754_sqrt(double x) INSERT_WORDS(z,ix0,ix1); return z; } +#endif #if (LDBL_MANT_DIG == 53) __weak_reference(sqrt, sqrtl); diff --git a/lib/msun/src/e_sqrtf.c b/lib/msun/src/e_sqrtf.c index 7eba4d07f92c..06e5d62fa5f9 100644 --- a/lib/msun/src/e_sqrtf.c +++ b/lib/msun/src/e_sqrtf.c @@ -20,6 +20,13 @@ static char rcsid[] = "$FreeBSD$"; #include "math.h" #include "math_private.h" +#ifdef USE_BUILTIN_SQRTF +float +__ieee754_sqrtf(float x) +{ + return (__builtin_sqrtf(x)); +} +#else static const float one = 1.0, tiny=1.0e-30; float @@ -87,3 +94,4 @@ __ieee754_sqrtf(float x) SET_FLOAT_WORD(z,ix); return z; } +#endif diff --git a/lib/msun/src/s_fma.c b/lib/msun/src/s_fma.c index 41a6424fdf7f..95cffd0ba36d 100644 --- a/lib/msun/src/s_fma.c +++ b/lib/msun/src/s_fma.c @@ -35,6 +35,13 @@ __FBSDID("$FreeBSD$"); #include "math_private.h" +#ifdef USE_BUILTIN_FMA +double +fma(double x, double y, double z) +{ + return (__builtin_fma(x, y, z)); +} +#else /* * A struct dd represents a floating-point number with twice the precision * of a double. We maintain the invariant that "hi" stores the 53 high-order @@ -284,6 +291,7 @@ fma(double x, double y, double z) else return (add_and_denormalize(r.hi, adj, spread)); } +#endif /* !USE_BUILTIN_FMA */ #if (LDBL_MANT_DIG == 53) __weak_reference(fma, fmal); diff --git a/lib/msun/src/s_fmaf.c b/lib/msun/src/s_fmaf.c index 389cf1b11bee..4591cc219bbb 100644 --- a/lib/msun/src/s_fmaf.c +++ b/lib/msun/src/s_fmaf.c @@ -34,6 +34,13 @@ __FBSDID("$FreeBSD$"); #include "math.h" #include "math_private.h" +#ifdef USE_BUILTIN_FMAF +float +fmaf(float x, float y, float z) +{ + return (__builtin_fmaf(x, y, z)); +} +#else /* * Fused multiply-add: Compute x * y + z with a single rounding error. * @@ -69,3 +76,4 @@ fmaf(float x, float y, float z) SET_LOW_WORD(adjusted_result, lr + 1); return (adjusted_result); } +#endif /* !USE_BUILTIN_FMAF */ diff --git a/lib/msun/src/s_fmax.c b/lib/msun/src/s_fmax.c index 0c234bcc5f7f..b53b1e64da04 100644 --- a/lib/msun/src/s_fmax.c +++ b/lib/msun/src/s_fmax.c @@ -34,6 +34,13 @@ __FBSDID("$FreeBSD$"); #include "fpmath.h" +#ifdef USE_BUILTIN_FMAX +double +fmax(double x, double y) +{ + return (__builtin_fmax(x, y)); +} +#else double fmax(double x, double y) { @@ -54,6 +61,7 @@ fmax(double x, double y) return (x > y ? x : y); } +#endif #if (LDBL_MANT_DIG == 53) __weak_reference(fmax, fmaxl); diff --git a/lib/msun/src/s_fmaxf.c b/lib/msun/src/s_fmaxf.c index 8e9d1baf3e8e..8d3d14f4b52a 100644 --- a/lib/msun/src/s_fmaxf.c +++ b/lib/msun/src/s_fmaxf.c @@ -33,6 +33,13 @@ __FBSDID("$FreeBSD$"); #include "fpmath.h" +#ifdef USE_BUILTIN_FMAXF +float +fmaxf(float x, float y) +{ + return (__builtin_fmaxf(x, y)); +} +#else float fmaxf(float x, float y) { @@ -53,3 +60,4 @@ fmaxf(float x, float y) return (x > y ? x : y); } +#endif diff --git a/lib/msun/src/s_fmin.c b/lib/msun/src/s_fmin.c index d7f24c121fb2..53f36c1c2d3d 100644 --- a/lib/msun/src/s_fmin.c +++ b/lib/msun/src/s_fmin.c @@ -34,6 +34,13 @@ __FBSDID("$FreeBSD$"); #include "fpmath.h" +#ifdef USE_BUILTIN_FMIN +double +fmin(double x, double y) +{ + return (__builtin_fmin(x, y)); +} +#else double fmin(double x, double y) { @@ -54,6 +61,7 @@ fmin(double x, double y) return (x < y ? x : y); } +#endif #if (LDBL_MANT_DIG == 53) __weak_reference(fmin, fminl); diff --git a/lib/msun/src/s_fminf.c b/lib/msun/src/s_fminf.c index 258316725ddd..58b6a489b820 100644 --- a/lib/msun/src/s_fminf.c +++ b/lib/msun/src/s_fminf.c @@ -33,6 +33,13 @@ __FBSDID("$FreeBSD$"); #include "fpmath.h" +#ifdef USE_BUILTIN_FMINF +float +fminf(float x, float y) +{ + return (__builtin_fminf(x, y)); +} +#else float fminf(float x, float y) { @@ -53,3 +60,4 @@ fminf(float x, float y) return (x < y ? x : y); } +#endif From nobody Sun Aug 13 08:43:33 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RNrfF3MhYz4qDgH; Sun, 13 Aug 2023 08:43:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RNrfF36cKz4T5V; Sun, 13 Aug 2023 08:43:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691916213; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=L4GAy3kkgWlr4LIQWGcPUg+al9ge6GZozmbkvvSs9+k=; b=YahTjOuIJgTAcsQ69CMIJyE9DQEhnJZAFX+v8HpUVIbOF2ysayhJZn/vxxjK55eLkwe2ru FK86xw5QzSYft28dlHQIZ5QqXgi0qA1Lm4Y2ZmwnpY7ActLQ2fvXfz980cCUSh0fkXOyu3 Sf2x05RP+oWt8MZ3o82fPGJU2698o+KQiLvQnqTi8+MGeadfOCdkCYq7Ix3rChfowPNVTa wctKIM5dyvuUN+0zBb6WlhLTeFyKET+yfTerIYNeUnN6MPGpBqpIs1SSHrF77u303UtzpO SWYEKyeJW8fDsiyXZXkc2S0y+UfvUUNrd7GZWH69jDG4eVi7y7W6f25CtOkqVA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691916213; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=L4GAy3kkgWlr4LIQWGcPUg+al9ge6GZozmbkvvSs9+k=; b=Sh1zAS70UyZV6/hiZnLF4oi1wJKBFe0czzFMF+RhrkQybWxyJUHiZt/3gmoqvAep/SuEzI XB/LPB19Xj6kHO82xM/yJg+CVWPCNhvoqLeOEUA623ffz4Njnwnjf8vBBrtpb4aoWiCTIy b5ML2K1lBIoABzk0iAsVibRFsfGo4lLVBl81GJrcDeZjWKIWoHRZuru4Yc0Dd5xwXP3UkR jK6UQqed0Gnn1N+cDZnFrdYompHOwPNnIPBYVXdDmrsa4xdtUN4Y9x4cBn/ZdmxOXFOARM IlG/RqwXQeQPqtD/0nhOz9+55SZNokJqERItkAicTY8ebvRxN9YKql3MmJdHYA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691916213; a=rsa-sha256; cv=none; b=qJVD9MO8WiNL2C463I8pR19TlV3FBc+1vPFE9npK8p7WscPcYjAZAFsNwxwi3hE5y3u4P0 M1Mrcd8Cz3lSrWos327Ul5HllKPb8TKyBHP3i9QsCehfNJKGDsijXsNDNpLRHfWoXaiPgs 2K0t7KZvY8kJIw0UlSXVNczhpkGGKIsk3rsCcKZSHViTRu54vsPHW7LrSaxLhN8BozMnd1 JQbEP2D11fSClWdJbjqeLAKgz0nOXgxMDmw58kRaB01XCgRo0RJtK7G2RWqKLuHJyr5FZJ 1bBP+mqgQtuDQMMmlwtMeyFHlqz5naSTLLem3s/adiQTrWT/ypQbrbAIlfhP8w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RNrfF1dWpzw7T; Sun, 13 Aug 2023 08:43:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37D8hXta051599; Sun, 13 Aug 2023 08:43:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37D8hXZQ051596; Sun, 13 Aug 2023 08:43:33 GMT (envelope-from git) Date: Sun, 13 Aug 2023 08:43:33 GMT Message-Id: <202308130843.37D8hXZQ051596@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: afa7546359d3 - stable/12 - Clean up libm use of the __ieee754_ prefix List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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/12 X-Git-Reftype: branch X-Git-Commit: afa7546359d3ad1c82d46a5a99f3cef36229ea71 Auto-Submitted: auto-generated The branch stable/12 has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=afa7546359d3ad1c82d46a5a99f3cef36229ea71 commit afa7546359d3ad1c82d46a5a99f3cef36229ea71 Author: Steve Kargl AuthorDate: 2023-08-03 19:51:17 +0000 Commit: Dimitry Andric CommitDate: 2023-08-13 08:39:13 +0000 Clean up libm use of the __ieee754_ prefix This removes the __ieee754_ prefix from a number of the math functions. msun/src/math_private.h contains the statement that /* * ieee style elementary functions * * We rename functions here to improve other sources' diffability * against fdlibm. */ #define __ieee754_sqrt sqrt ... Here, fdlibm refers to https://netlib.org/fdlibm. It is seen from https://netlib.org/fdlibm/readme that this prefix was used to differentiate between different standards: Wrapper functions will twist the result of the ieee754 function to comply to the standard specified by the value of _LIB_VERSION if _LIB_VERSION = _IEEE_, return the ieee754 result; if _LIB_VERSION = _SVID_, return SVID result; if _LIB_VERSION = _XOPEN_, return XOPEN result; if _LIB_VERSION = _POSIX_, return POSIX/ANSI result. (These are macros, see fdlibm.h for their definition.) AFAICT, FreeBSD has never supported these wrappers. In addition, as C99, principally the long double, functions were added to libm, this convention was not maintained. Given that only 148 of 324 files under lib/msun contain a "Copyright (C) 1993 by Sun Microsystems" statement, the removal of the __ieee754_ prefix provides consistency across all source files. The last time someone compared lib/msun to fdlibm appears to be commit 3f70824172feb82ea3dcdb3866b54fe0eb7cd890 Author: David Schultz Date: Fri Feb 4 18:26:06 2005 +0000 Reduce diffs against vendor source (Sun fdlibm 5.3). The most recent fdlibm RCS string that appears in a Sun Microsystem copyrighted file is date "95/01/18". With Oracle Corporation's acquisition of Sun Microsystems in 2009, it is unlikely that fdlibm will ever be updated. A search for fdlibm at https://opensource.oracle.com/ yields no hits. Finally, OpenBSD removed the use of this prefix over 21 years ago. pSee revision 1.6 of OpenBSD's math_private.h. Note: this does not drop the __ieee754_ prefix from the trigonometric argument reduction functions, e.g., __ieee754_rem_pio2. These functions are internal to the libm and exported through Symbol.map; and thus, reserved for the implementation. PR: 272783 MFC after: 1 week (cherry picked from commit 99843eb89954dac76afe7cf18d962eddfe7a7987) --- lib/msun/src/e_acos.c | 4 +-- lib/msun/src/e_acosf.c | 2 +- lib/msun/src/e_acosh.c | 8 +++--- lib/msun/src/e_acoshf.c | 8 +++--- lib/msun/src/e_asin.c | 4 +-- lib/msun/src/e_asinf.c | 2 +- lib/msun/src/e_atan2.c | 4 +-- lib/msun/src/e_atan2f.c | 2 +- lib/msun/src/e_atanh.c | 4 +-- lib/msun/src/e_atanhf.c | 2 +- lib/msun/src/e_cosh.c | 8 +++--- lib/msun/src/e_coshf.c | 6 ++--- lib/msun/src/e_exp.c | 4 +-- lib/msun/src/e_expf.c | 2 +- lib/msun/src/e_fmod.c | 4 +-- lib/msun/src/e_fmodf.c | 4 +-- lib/msun/src/e_gamma.c | 8 +++--- lib/msun/src/e_gamma_r.c | 8 +++--- lib/msun/src/e_gammaf.c | 8 +++--- lib/msun/src/e_gammaf_r.c | 8 +++--- lib/msun/src/e_hypot.c | 4 +-- lib/msun/src/e_hypotf.c | 6 ++--- lib/msun/src/e_j0.c | 10 +++---- lib/msun/src/e_j0f.c | 8 +++--- lib/msun/src/e_j1.c | 8 +++--- lib/msun/src/e_j1f.c | 6 ++--- lib/msun/src/e_jn.c | 28 ++++++++++---------- lib/msun/src/e_jnf.c | 26 +++++++++--------- lib/msun/src/e_lgamma.c | 8 +++--- lib/msun/src/e_lgamma_r.c | 16 ++++++------ lib/msun/src/e_lgammaf.c | 8 +++--- lib/msun/src/e_lgammaf_r.c | 14 +++++----- lib/msun/src/e_log.c | 4 +-- lib/msun/src/e_log10.c | 2 +- lib/msun/src/e_log10f.c | 2 +- lib/msun/src/e_log2.c | 2 +- lib/msun/src/e_log2f.c | 2 +- lib/msun/src/e_logf.c | 2 +- lib/msun/src/e_pow.c | 4 +-- lib/msun/src/e_powf.c | 4 +-- lib/msun/src/e_remainder.c | 6 ++--- lib/msun/src/e_remainderf.c | 4 +-- lib/msun/src/e_scalb.c | 6 ++--- lib/msun/src/e_scalbf.c | 4 +-- lib/msun/src/e_sinh.c | 6 ++--- lib/msun/src/e_sinhf.c | 4 +-- lib/msun/src/e_sqrt.c | 6 ++--- lib/msun/src/e_sqrtf.c | 4 +-- lib/msun/src/math_private.h | 61 ------------------------------------------- lib/msun/src/s_asinh.c | 6 ++--- lib/msun/src/s_asinhf.c | 6 ++--- lib/msun/src/s_erf.c | 4 +-- lib/msun/src/s_significand.c | 2 +- lib/msun/src/s_significandf.c | 2 +- 54 files changed, 162 insertions(+), 223 deletions(-) diff --git a/lib/msun/src/e_acos.c b/lib/msun/src/e_acos.c index 1f6dca5bb5cb..6623355baa7c 100644 --- a/lib/msun/src/e_acos.c +++ b/lib/msun/src/e_acos.c @@ -14,7 +14,7 @@ #include __FBSDID("$FreeBSD$"); -/* __ieee754_acos(x) +/* acos(x) * Method : * acos(x) = pi/2 - asin(x) * acos(-x) = pi/2 + asin(x) @@ -62,7 +62,7 @@ qS3 = -6.88283971605453293030e-01, /* 0xBFE6066C, 0x1B8D0159 */ qS4 = 7.70381505559019352791e-02; /* 0x3FB3B8C5, 0xB12E9282 */ double -__ieee754_acos(double x) +acos(double x) { double z,p,q,r,w,s,c,df; int32_t hx,ix; diff --git a/lib/msun/src/e_acosf.c b/lib/msun/src/e_acosf.c index c9f62cc40f5c..64f1c5afb182 100644 --- a/lib/msun/src/e_acosf.c +++ b/lib/msun/src/e_acosf.c @@ -32,7 +32,7 @@ pS2 = -8.6563630030e-03, qS1 = -7.0662963390e-01; float -__ieee754_acosf(float x) +acosf(float x) { float z,p,q,r,w,s,c,df; int32_t hx,ix; diff --git a/lib/msun/src/e_acosh.c b/lib/msun/src/e_acosh.c index 358c8bd6a636..7947995820d0 100644 --- a/lib/msun/src/e_acosh.c +++ b/lib/msun/src/e_acosh.c @@ -15,7 +15,7 @@ #include __FBSDID("$FreeBSD$"); -/* __ieee754_acosh(x) +/* acosh(x) * Method : * Based on * acosh(x) = log [ x + sqrt(x*x-1) ] @@ -39,7 +39,7 @@ one = 1.0, ln2 = 6.93147180559945286227e-01; /* 0x3FE62E42, 0xFEFA39EF */ double -__ieee754_acosh(double x) +acosh(double x) { double t; int32_t hx; @@ -51,12 +51,12 @@ __ieee754_acosh(double x) if(hx >=0x7ff00000) { /* x is inf of NaN */ return x+x; } else - return __ieee754_log(x)+ln2; /* acosh(huge)=log(2x) */ + return log(x)+ln2; /* acosh(huge)=log(2x) */ } else if(((hx-0x3ff00000)|lx)==0) { return 0.0; /* acosh(1) = 0 */ } else if (hx > 0x40000000) { /* 2**28 > x > 2 */ t=x*x; - return __ieee754_log(2.0*x-one/(x+sqrt(t-one))); + return log(2.0*x-one/(x+sqrt(t-one))); } else { /* 1=0x7f800000) { /* x is inf of NaN */ return x+x; } else - return __ieee754_logf(x)+ln2; /* acosh(huge)=log(2x) */ + return logf(x)+ln2; /* acosh(huge)=log(2x) */ } else if (hx==0x3f800000) { return 0.0; /* acosh(1) = 0 */ } else if (hx > 0x40000000) { /* 2**28 > x > 2 */ t=x*x; - return __ieee754_logf((float)2.0*x-one/(x+__ieee754_sqrtf(t-one))); + return logf((float)2.0*x-one/(x+sqrtf(t-one))); } else { /* 1 __FBSDID("$FreeBSD$"); -/* __ieee754_asin(x) +/* asin(x) * Method : * Since asin(x) = x + x^3/6 + x^5*3/40 + x^7*15/336 + ... * we approximate asin(x) on [0,0.5] by @@ -68,7 +68,7 @@ qS3 = -6.88283971605453293030e-01, /* 0xBFE6066C, 0x1B8D0159 */ qS4 = 7.70381505559019352791e-02; /* 0x3FB3B8C5, 0xB12E9282 */ double -__ieee754_asin(double x) +asin(double x) { double t=0.0,w,p,q,c,r,s; int32_t hx,ix; diff --git a/lib/msun/src/e_asinf.c b/lib/msun/src/e_asinf.c index deaabb6a326e..db4b9b6034f7 100644 --- a/lib/msun/src/e_asinf.c +++ b/lib/msun/src/e_asinf.c @@ -32,7 +32,7 @@ static const double pio2 = 1.570796326794896558e+00; float -__ieee754_asinf(float x) +asinf(float x) { double s; float t,w,p,q; diff --git a/lib/msun/src/e_atan2.c b/lib/msun/src/e_atan2.c index 231a1611ee12..0b2e72102edb 100644 --- a/lib/msun/src/e_atan2.c +++ b/lib/msun/src/e_atan2.c @@ -15,7 +15,7 @@ #include __FBSDID("$FreeBSD$"); -/* __ieee754_atan2(y,x) +/* atan2(y,x) * Method : * 1. Reduce y to positive by atan2(y,x)=-atan2(-y,x). * 2. Reduce x to positive by (if x and y are unexceptional): @@ -58,7 +58,7 @@ static volatile double pi_lo = 1.2246467991473531772E-16; /* 0x3CA1A626, 0x33145C07 */ double -__ieee754_atan2(double y, double x) +atan2(double y, double x) { double z; int32_t k,m,hx,hy,ix,iy; diff --git a/lib/msun/src/e_atan2f.c b/lib/msun/src/e_atan2f.c index 346d76746c05..4ea001df974a 100644 --- a/lib/msun/src/e_atan2f.c +++ b/lib/msun/src/e_atan2f.c @@ -30,7 +30,7 @@ static volatile float pi_lo = -8.7422776573e-08; /* 0xb3bbbd2e */ float -__ieee754_atan2f(float y, float x) +atan2f(float y, float x) { float z; int32_t k,m,hx,hy,ix,iy; diff --git a/lib/msun/src/e_atanh.c b/lib/msun/src/e_atanh.c index 422ff2698067..41f3bcaca26d 100644 --- a/lib/msun/src/e_atanh.c +++ b/lib/msun/src/e_atanh.c @@ -15,7 +15,7 @@ #include __FBSDID("$FreeBSD$"); -/* __ieee754_atanh(x) +/* atanh(x) * Method : * 1.Reduced x to positive by atanh(-x) = -atanh(x) * 2.For x>=0.5 @@ -42,7 +42,7 @@ static const double one = 1.0, huge = 1e300; static const double zero = 0.0; double -__ieee754_atanh(double x) +atanh(double x) { double t; int32_t hx,ix; diff --git a/lib/msun/src/e_atanhf.c b/lib/msun/src/e_atanhf.c index 4bd6a8f9b9c6..46643beb5ab0 100644 --- a/lib/msun/src/e_atanhf.c +++ b/lib/msun/src/e_atanhf.c @@ -24,7 +24,7 @@ static const float one = 1.0, huge = 1e30; static const float zero = 0.0; float -__ieee754_atanhf(float x) +atanhf(float x) { float t; int32_t hx,ix; diff --git a/lib/msun/src/e_cosh.c b/lib/msun/src/e_cosh.c index 246b5fbec860..071663eb4e15 100644 --- a/lib/msun/src/e_cosh.c +++ b/lib/msun/src/e_cosh.c @@ -14,7 +14,7 @@ #include __FBSDID("$FreeBSD$"); -/* __ieee754_cosh(x) +/* cosh(x) * Method : * mathematically cosh(x) if defined to be (exp(x)+exp(-x))/2 * 1. Replace x by |x| (cosh(x) = cosh(-x)). @@ -43,7 +43,7 @@ __FBSDID("$FreeBSD$"); static const double one = 1.0, half=0.5, huge = 1.0e300; double -__ieee754_cosh(double x) +cosh(double x) { double t,w; int32_t ix; @@ -65,12 +65,12 @@ __ieee754_cosh(double x) /* |x| in [0.5*ln2,22], return (exp(|x|)+1/exp(|x|)/2; */ if (ix < 0x40360000) { - t = __ieee754_exp(fabs(x)); + t = exp(fabs(x)); return half*t+half/t; } /* |x| in [22, log(maxdouble)] return half*exp(|x|) */ - if (ix < 0x40862E42) return half*__ieee754_exp(fabs(x)); + if (ix < 0x40862E42) return half*exp(fabs(x)); /* |x| in [log(maxdouble), overflowthresold] */ if (ix<=0x408633CE) diff --git a/lib/msun/src/e_coshf.c b/lib/msun/src/e_coshf.c index 95a0d6ee68ba..1673315d7b31 100644 --- a/lib/msun/src/e_coshf.c +++ b/lib/msun/src/e_coshf.c @@ -22,7 +22,7 @@ __FBSDID("$FreeBSD$"); static const float one = 1.0, half=0.5, huge = 1.0e30; float -__ieee754_coshf(float x) +coshf(float x) { float t,w; int32_t ix; @@ -43,12 +43,12 @@ __ieee754_coshf(float x) /* |x| in [0.5*ln2,9], return (exp(|x|)+1/exp(|x|))/2; */ if (ix < 0x41100000) { - t = __ieee754_expf(fabsf(x)); + t = expf(fabsf(x)); return half*t+half/t; } /* |x| in [9, log(maxfloat)] return half*exp(|x|) */ - if (ix < 0x42b17217) return half*__ieee754_expf(fabsf(x)); + if (ix < 0x42b17217) return half*expf(fabsf(x)); /* |x| in [log(maxfloat), overflowthresold] */ if (ix<=0x42b2d4fc) diff --git a/lib/msun/src/e_exp.c b/lib/msun/src/e_exp.c index dd04d8e839d5..59da39217391 100644 --- a/lib/msun/src/e_exp.c +++ b/lib/msun/src/e_exp.c @@ -13,7 +13,7 @@ #include __FBSDID("$FreeBSD$"); -/* __ieee754_exp(x) +/* exp(x) * Returns the exponential of x. * * Method @@ -102,7 +102,7 @@ huge = 1.0e+300, twom1000= 9.33263618503218878990e-302; /* 2**-1000=0x01700000,0*/ double -__ieee754_exp(double x) /* default IEEE double exp */ +exp(double x) /* default IEEE double exp */ { double y,hi=0.0,lo=0.0,c,t,twopk; int32_t k=0,xsb; diff --git a/lib/msun/src/e_expf.c b/lib/msun/src/e_expf.c index 4903d55c5ab3..620d341be274 100644 --- a/lib/msun/src/e_expf.c +++ b/lib/msun/src/e_expf.c @@ -43,7 +43,7 @@ huge = 1.0e+30, twom100 = 7.8886090522e-31; /* 2**-100=0x0d800000 */ float -__ieee754_expf(float x) +expf(float x) { float y,hi=0.0,lo=0.0,c,t,twopk; int32_t k=0,xsb; diff --git a/lib/msun/src/e_fmod.c b/lib/msun/src/e_fmod.c index 3a28dc4ff1f3..6d5f5332cb85 100644 --- a/lib/msun/src/e_fmod.c +++ b/lib/msun/src/e_fmod.c @@ -15,7 +15,7 @@ __FBSDID("$FreeBSD$"); /* - * __ieee754_fmod(x,y) + * fmod(x,y) * Return x mod y in exact arithmetic * Method: shift and subtract */ @@ -28,7 +28,7 @@ __FBSDID("$FreeBSD$"); static const double one = 1.0, Zero[] = {0.0, -0.0,}; double -__ieee754_fmod(double x, double y) +fmod(double x, double y) { int32_t n,hx,hy,hz,ix,iy,sx,i; u_int32_t lx,ly,lz; diff --git a/lib/msun/src/e_fmodf.c b/lib/msun/src/e_fmodf.c index 1b6bf36f9cba..3cef9213c1e5 100644 --- a/lib/msun/src/e_fmodf.c +++ b/lib/msun/src/e_fmodf.c @@ -17,7 +17,7 @@ __FBSDID("$FreeBSD$"); /* - * __ieee754_fmodf(x,y) + * fmodf(x,y) * Return x mod y in exact arithmetic * Method: shift and subtract */ @@ -28,7 +28,7 @@ __FBSDID("$FreeBSD$"); static const float one = 1.0, Zero[] = {0.0, -0.0,}; float -__ieee754_fmodf(float x, float y) +fmodf(float x, float y) { int32_t n,hx,hy,hz,ix,iy,sx,i; diff --git a/lib/msun/src/e_gamma.c b/lib/msun/src/e_gamma.c index 28fb5ccba6d6..a13f3e22c08b 100644 --- a/lib/msun/src/e_gamma.c +++ b/lib/msun/src/e_gamma.c @@ -15,10 +15,10 @@ #include __FBSDID("$FreeBSD$"); -/* __ieee754_gamma(x) +/* gamma(x) * Return the logarithm of the Gamma function of x. * - * Method: call __ieee754_gamma_r + * Method: call gamma_r */ #include "math.h" @@ -27,7 +27,7 @@ __FBSDID("$FreeBSD$"); extern int signgam; double -__ieee754_gamma(double x) +gamma(double x) { - return __ieee754_gamma_r(x,&signgam); + return gamma_r(x,&signgam); } diff --git a/lib/msun/src/e_gamma_r.c b/lib/msun/src/e_gamma_r.c index 2c423dce8558..2d996cabca20 100644 --- a/lib/msun/src/e_gamma_r.c +++ b/lib/msun/src/e_gamma_r.c @@ -15,18 +15,18 @@ #include __FBSDID("$FreeBSD$"); -/* __ieee754_gamma_r(x, signgamp) +/* gamma_r(x, signgamp) * Reentrant version of the logarithm of the Gamma function * with user provide pointer for the sign of Gamma(x). * - * Method: See __ieee754_lgamma_r + * Method: See lgamma_r */ #include "math.h" #include "math_private.h" double -__ieee754_gamma_r(double x, int *signgamp) +gamma_r(double x, int *signgamp) { - return __ieee754_lgamma_r(x,signgamp); + return lgamma_r(x,signgamp); } diff --git a/lib/msun/src/e_gammaf.c b/lib/msun/src/e_gammaf.c index c1b1668df975..563c1482282d 100644 --- a/lib/msun/src/e_gammaf.c +++ b/lib/msun/src/e_gammaf.c @@ -16,10 +16,10 @@ #include __FBSDID("$FreeBSD$"); -/* __ieee754_gammaf(x) +/* gammaf(x) * Return the logarithm of the Gamma function of x. * - * Method: call __ieee754_gammaf_r + * Method: call gammaf_r */ #include "math.h" @@ -28,7 +28,7 @@ __FBSDID("$FreeBSD$"); extern int signgam; float -__ieee754_gammaf(float x) +gammaf(float x) { - return __ieee754_gammaf_r(x,&signgam); + return gammaf_r(x,&signgam); } diff --git a/lib/msun/src/e_gammaf_r.c b/lib/msun/src/e_gammaf_r.c index 9d7831b5501b..d7fc2db1e96c 100644 --- a/lib/msun/src/e_gammaf_r.c +++ b/lib/msun/src/e_gammaf_r.c @@ -16,18 +16,18 @@ #include __FBSDID("$FreeBSD$"); -/* __ieee754_gammaf_r(x, signgamp) +/* gammaf_r(x, signgamp) * Reentrant version of the logarithm of the Gamma function * with user provide pointer for the sign of Gamma(x). * - * Method: See __ieee754_lgammaf_r + * Method: See lgammaf_r */ #include "math.h" #include "math_private.h" float -__ieee754_gammaf_r(float x, int *signgamp) +gammaf_r(float x, int *signgamp) { - return __ieee754_lgammaf_r(x,signgamp); + return lgammaf_r(x,signgamp); } diff --git a/lib/msun/src/e_hypot.c b/lib/msun/src/e_hypot.c index 7c455bb6652f..8e3f9317b3a6 100644 --- a/lib/msun/src/e_hypot.c +++ b/lib/msun/src/e_hypot.c @@ -14,7 +14,7 @@ #include __FBSDID("$FreeBSD$"); -/* __ieee754_hypot(x,y) +/* hypot(x,y) * * Method : * If (assume round-to-nearest) z=x*x+y*y @@ -52,7 +52,7 @@ __FBSDID("$FreeBSD$"); #include "math_private.h" double -__ieee754_hypot(double x, double y) +hypot(double x, double y) { double a,b,t1,t2,y1,y2,w; int32_t j,k,ha,hb; diff --git a/lib/msun/src/e_hypotf.c b/lib/msun/src/e_hypotf.c index 00610268fafb..a3b8c866697b 100644 --- a/lib/msun/src/e_hypotf.c +++ b/lib/msun/src/e_hypotf.c @@ -20,7 +20,7 @@ __FBSDID("$FreeBSD$"); #include "math_private.h" float -__ieee754_hypotf(float x, float y) +hypotf(float x, float y) { float a,b,t1,t2,y1,y2,w; int32_t j,k,ha,hb; @@ -67,14 +67,14 @@ __ieee754_hypotf(float x, float y) if (w>b) { SET_FLOAT_WORD(t1,ha&0xfffff000); t2 = a-t1; - w = __ieee754_sqrtf(t1*t1-(b*(-b)-t2*(a+t1))); + w = sqrtf(t1*t1-(b*(-b)-t2*(a+t1))); } else { a = a+a; SET_FLOAT_WORD(y1,hb&0xfffff000); y2 = b - y1; SET_FLOAT_WORD(t1,(ha+0x00800000)&0xfffff000); t2 = a - t1; - w = __ieee754_sqrtf(t1*y1-(w*(-w)-(t1*y2+t2*b))); + w = sqrtf(t1*y1-(w*(-w)-(t1*y2+t2*b))); } if(k!=0) { SET_FLOAT_WORD(t1,(127+k)<<23); diff --git a/lib/msun/src/e_j0.c b/lib/msun/src/e_j0.c index 5d862b6f834d..c43ab6996b4a 100644 --- a/lib/msun/src/e_j0.c +++ b/lib/msun/src/e_j0.c @@ -13,7 +13,7 @@ #include __FBSDID("$FreeBSD$"); -/* __ieee754_j0(x), __ieee754_y0(x) +/* j0(x), y0(x) * Bessel function of the first and second kinds of order zero. * Method -- j0(x): * 1. For tiny x, we use j0(x) = 1 - x^2/4 + x^4/64 - ... @@ -83,7 +83,7 @@ S04 = 1.16614003333790000205e-09; /* 0x3E1408BC, 0xF4745D8F */ static const double zero = 0, qrtr = 0.25; double -__ieee754_j0(double x) +j0(double x) { double z, s,c,ss,cc,r,u,v; int32_t hx,ix; @@ -143,7 +143,7 @@ v03 = 2.59150851840457805467e-07, /* 0x3E91642D, 0x7FF202FD */ v04 = 4.41110311332675467403e-10; /* 0x3DFE5018, 0x3BD6D9EF */ double -__ieee754_y0(double x) +y0(double x) { double z, s,c,ss,cc,u,v; int32_t hx,ix,lx; @@ -192,12 +192,12 @@ __ieee754_y0(double x) return z; } if(ix<=0x3e400000) { /* x < 2**-27 */ - return(u00 + tpi*__ieee754_log(x)); + return(u00 + tpi*log(x)); } z = x*x; u = u00+z*(u01+z*(u02+z*(u03+z*(u04+z*(u05+z*u06))))); v = one+z*(v01+z*(v02+z*(v03+z*v04))); - return(u/v + tpi*(__ieee754_j0(x)*__ieee754_log(x))); + return(u/v + tpi*(j0(x)*log(x))); } /* The asymptotic expansions of pzero is diff --git a/lib/msun/src/e_j0f.c b/lib/msun/src/e_j0f.c index 1c5ef4da1b49..290be04fc900 100644 --- a/lib/msun/src/e_j0f.c +++ b/lib/msun/src/e_j0f.c @@ -45,7 +45,7 @@ S04 = 1.1661400734e-09; /* 0x30a045e8 */ static const float zero = 0, qrtr = 0.25; float -__ieee754_j0f(float x) +j0f(float x) { float z, s,c,ss,cc,r,u,v; int32_t hx,ix; @@ -105,7 +105,7 @@ v03 = 2.5915085189e-07, /* 0x348b216c */ v04 = 4.4111031494e-10; /* 0x2ff280c2 */ float -__ieee754_y0f(float x) +y0f(float x) { float z, s,c,ss,cc,u,v; int32_t hx,ix; @@ -147,12 +147,12 @@ __ieee754_y0f(float x) return z; } if(ix<=0x39000000) { /* x < 2**-13 */ - return(u00 + tpi*__ieee754_logf(x)); + return(u00 + tpi*logf(x)); } z = x*x; u = u00+z*(u01+z*(u02+z*(u03+z*(u04+z*(u05+z*u06))))); v = one+z*(v01+z*(v02+z*(v03+z*v04))); - return(u/v + tpi*(__ieee754_j0f(x)*__ieee754_logf(x))); + return(u/v + tpi*(j0f(x)*logf(x))); } /* The asymptotic expansions of pzero is diff --git a/lib/msun/src/e_j1.c b/lib/msun/src/e_j1.c index fb4462738368..ee3f6fcc69d4 100644 --- a/lib/msun/src/e_j1.c +++ b/lib/msun/src/e_j1.c @@ -13,7 +13,7 @@ #include __FBSDID("$FreeBSD$"); -/* __ieee754_j1(x), __ieee754_y1(x) +/* j1(x), y1(x) * Bessel function of the first and second kinds of order zero. * Method -- j1(x): * 1. For tiny x, we use j1(x) = x/2 - x^3/16 + x^5/384 - ... @@ -84,7 +84,7 @@ s05 = 1.23542274426137913908e-11; /* 0x3DAB2ACF, 0xCFB97ED8 */ static const double zero = 0.0; double -__ieee754_j1(double x) +j1(double x) { double z, s,c,ss,cc,r,u,v,y; int32_t hx,ix; @@ -140,7 +140,7 @@ static const double V0[5] = { }; double -__ieee754_y1(double x) +y1(double x) { double z, s,c,ss,cc,u,v; int32_t hx,ix,lx; @@ -190,7 +190,7 @@ __ieee754_y1(double x) z = x*x; u = U0[0]+z*(U0[1]+z*(U0[2]+z*(U0[3]+z*U0[4]))); v = one+z*(V0[0]+z*(V0[1]+z*(V0[2]+z*(V0[3]+z*V0[4])))); - return(x*(u/v) + tpi*(__ieee754_j1(x)*__ieee754_log(x)-one/x)); + return(x*(u/v) + tpi*(j1(x)*log(x)-one/x)); } /* For x >= 8, the asymptotic expansions of pone is diff --git a/lib/msun/src/e_j1f.c b/lib/msun/src/e_j1f.c index c6c45c107afa..e1f4498b71af 100644 --- a/lib/msun/src/e_j1f.c +++ b/lib/msun/src/e_j1f.c @@ -46,7 +46,7 @@ s05 = 1.2354227016e-11; /* 0x2d59567e */ static const float zero = 0.0; float -__ieee754_j1f(float x) +j1f(float x) { float z, s,c,ss,cc,r,u,v,y; int32_t hx,ix; @@ -102,7 +102,7 @@ static const float V0[5] = { }; float -__ieee754_y1f(float x) +y1f(float x) { float z, s,c,ss,cc,u,v; int32_t hx,ix; @@ -145,7 +145,7 @@ __ieee754_y1f(float x) z = x*x; u = U0[0]+z*(U0[1]+z*(U0[2]+z*(U0[3]+z*U0[4]))); v = one+z*(V0[0]+z*(V0[1]+z*(V0[2]+z*(V0[3]+z*V0[4])))); - return(x*(u/v) + tpi*(__ieee754_j1f(x)*__ieee754_logf(x)-one/x)); + return(x*(u/v) + tpi*(j1f(x)*logf(x)-one/x)); } /* For x >= 8, the asymptotic expansions of pone is diff --git a/lib/msun/src/e_jn.c b/lib/msun/src/e_jn.c index c7ba7da6567b..b70c496e6735 100644 --- a/lib/msun/src/e_jn.c +++ b/lib/msun/src/e_jn.c @@ -14,7 +14,7 @@ __FBSDID("$FreeBSD$"); /* - * __ieee754_jn(n, x), __ieee754_yn(n, x) + * jn(n, x), yn(n, x) * floating point Bessel's function of the 1st and 2nd kind * of order n * @@ -51,7 +51,7 @@ one = 1.00000000000000000000e+00; /* 0x3FF00000, 0x00000000 */ static const double zero = 0.00000000000000000000e+00; double -__ieee754_jn(int n, double x) +jn(int n, double x) { int32_t i,hx,ix,lx, sgn; double a, b, c, s, temp, di; @@ -69,8 +69,8 @@ __ieee754_jn(int n, double x) x = -x; hx ^= 0x80000000; } - if(n==0) return(__ieee754_j0(x)); - if(n==1) return(__ieee754_j1(x)); + if(n==0) return(j0(x)); + if(n==1) return(j1(x)); sgn = (n&1)&(hx>>31); /* even n -- 0, odd n -- sign(x) */ x = fabs(x); if((ix|lx)==0||ix>=0x7ff00000) /* if x is 0 or inf */ @@ -100,8 +100,8 @@ __ieee754_jn(int n, double x) } b = invsqrtpi*temp/sqrt(x); } else { - a = __ieee754_j0(x); - b = __ieee754_j1(x); + a = j0(x); + b = j1(x); for(i=1;i0;i--){ temp = b; @@ -201,8 +201,8 @@ __ieee754_jn(int n, double x) } } } - z = __ieee754_j0(x); - w = __ieee754_j1(x); + z = j0(x); + w = j1(x); if (fabs(z) >= fabs(w)) b = (t*z/b); else @@ -213,7 +213,7 @@ __ieee754_jn(int n, double x) } double -__ieee754_yn(int n, double x) +yn(int n, double x) { int32_t i,hx,ix,lx; int32_t sign; @@ -232,8 +232,8 @@ __ieee754_yn(int n, double x) n = -n; sign = 1 - ((n&1)<<1); } - if(n==0) return(__ieee754_y0(x)); - if(n==1) return(sign*__ieee754_y1(x)); + if(n==0) return(y0(x)); + if(n==1) return(sign*y1(x)); if(ix==0x7ff00000) return zero; if(ix>=0x52D00000) { /* x > 2**302 */ /* (x >> n**2) @@ -259,8 +259,8 @@ __ieee754_yn(int n, double x) b = invsqrtpi*temp/sqrt(x); } else { u_int32_t high; - a = __ieee754_y0(x); - b = __ieee754_y1(x); + a = y0(x); + b = y1(x); /* quit if b is -inf */ GET_HIGH_WORD(high,b); for(i=1;i>31); /* even n -- 0, odd n -- sign(x) */ x = fabsf(x); if(ix==0||ix>=0x7f800000) /* if x is 0 or inf */ b = zero; else if((float)n<=x) { /* Safe to use J(n+1,x)=2n/x *J(n,x)-J(n-1,x) */ - a = __ieee754_j0f(x); - b = __ieee754_j1f(x); + a = j0f(x); + b = j1f(x); for(i=1;i0;i--){ temp = b; @@ -158,8 +158,8 @@ __ieee754_jnf(int n, float x) } } } - z = __ieee754_j0f(x); - w = __ieee754_j1f(x); + z = j0f(x); + w = j1f(x); if (fabsf(z) >= fabsf(w)) b = (t*z/b); else @@ -170,7 +170,7 @@ __ieee754_jnf(int n, float x) } float -__ieee754_ynf(int n, float x) +ynf(int n, float x) { int32_t i,hx,ix,ib; int32_t sign; @@ -186,12 +186,12 @@ __ieee754_ynf(int n, float x) n = -n; sign = 1 - ((n&1)<<1); } - if(n==0) return(__ieee754_y0f(x)); - if(n==1) return(sign*__ieee754_y1f(x)); + if(n==0) return(y0f(x)); + if(n==1) return(sign*y1f(x)); if(ix==0x7f800000) return zero; - a = __ieee754_y0f(x); - b = __ieee754_y1f(x); + a = y0f(x); + b = y1f(x); /* quit if b is -inf */ GET_FLOAT_WORD(ib,b); for(i=1;i __FBSDID("$FreeBSD$"); -/* __ieee754_lgamma(x) +/* lgamma(x) * Return the logarithm of the Gamma function of x. * - * Method: call __ieee754_lgamma_r + * Method: call lgamma_r */ #include @@ -29,9 +29,9 @@ __FBSDID("$FreeBSD$"); *** 659 LINES SKIPPED *** From nobody Sun Aug 13 09:10:49 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RNsFk0R34z4qGbn; Sun, 13 Aug 2023 09:10: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RNsFj6lNNz4W3g; Sun, 13 Aug 2023 09:10:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691917849; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=CWl5p/57Vcue4YGL1peHNsGNRFUCaTbgPBx8QT6MFgk=; b=cxpsP3aBkh77tbe7+IWGdWF4Mjrz5yx3mp5wJsGU2Glp82xxrWz3qk1j3nhnXpYpynMYBy K6Ec/+X/I3NZ2kVSCibqBqUWfmZvqXIcz8N/OP5Or2pkuC5/YfQZLv3ZSVTRsawG/JzEMd sqCRU8LZcNRd8o3JTdgF5Xs0NAueN5xwErJ2W7UsLv+OYpO71iVOx33TGwcjVPlY6snej0 wftQZJyGDBCLOxudTwO8cssdeduEzV60MqLl8tSkSk0d9Mpl5ovzv1ciiIUdLI2F4suvms klTyDpFN0KokaipuYEEuTBK7j8PQFEm4wLqxVxWGIrpz3wpnytc1MlxaXjAVNw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691917849; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=CWl5p/57Vcue4YGL1peHNsGNRFUCaTbgPBx8QT6MFgk=; b=OyWN9ABnPDCyiybW6vJXUPo2NJF5mIdNCv1KqHkqPD8+pti034tX0DhA8GYvYUhzfY4uF0 lpiIUYSu/wwsj+IS14MXwiT5Njl0YbFtAH4y0BdSFOj8HQgiGM3F20vFyIKp31QTEiLH7b IOzH2Dbmyorb5l8xcSQeuF6GHQ2bI9VljyikPUCK0i04dhCFINyjWVXgHjmLbX0C4AH+3w bqmD7dzmSmavUpskoFv8IfC+NJ0cm6d7m8sVU8fWtXlvC5X4JTcE8rbGStI2/skvdXAXe9 h6d4F2hN9IkH6DhdnsOYI7h6uffqeRZ9YSlhEIDgregN4MccPG9y1M16uj4vow== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691917849; a=rsa-sha256; cv=none; b=CY80zpba4rJXH+0nC2Dl4fF9r5W8qxtspY3dSTsYGFB5W8hTCm3WecpWS1Gnzi0VMvN5/I cPNyOeiZqEyKE5yvZxKSOid24E41L+6pHjSzr1wQMNeFQaYpc0cn51s31Ozy8QeSDgCJ9b 7othXZGqhQZNu9x2zotF8PmBZAToHm4bCZ1VKtB7iwO6Nvy7iKATgXg7O61JLCavc7YRUP FNui0vE0+diYUbCelsugzFE75lstB2iodcIA9i53ic/VgKNnDWalWydQOWmC+7UmtBUFfr UbybvX5bCB9Bwy6Q7L3ERFXuMkzWPeWzt9P9FEn5HtmkvdXJxDKCPbosBEzPbw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RNsFj5rfGzwTh; Sun, 13 Aug 2023 09:10:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37D9Ansj095305; Sun, 13 Aug 2023 09:10:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37D9Ania095302; Sun, 13 Aug 2023 09:10:49 GMT (envelope-from git) Date: Sun, 13 Aug 2023 09:10:49 GMT Message-Id: <202308130910.37D9Ania095302@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Peter Holm Subject: git: a953ac19dbc8 - main - stress2: Added a 'fsck_ffs -B' regression test List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: pho X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a953ac19dbc890a08b6b267f9572dc5974dbc8ad Auto-Submitted: auto-generated The branch main has been updated by pho: URL: https://cgit.FreeBSD.org/src/commit/?id=a953ac19dbc890a08b6b267f9572dc5974dbc8ad commit a953ac19dbc890a08b6b267f9572dc5974dbc8ad Author: Peter Holm AuthorDate: 2023-08-13 09:09:39 +0000 Commit: Peter Holm CommitDate: 2023-08-13 09:09:39 +0000 stress2: Added a 'fsck_ffs -B' regression test --- tools/test/stress2/misc/fsck14.sh | 119 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 119 insertions(+) diff --git a/tools/test/stress2/misc/fsck14.sh b/tools/test/stress2/misc/fsck14.sh new file mode 100755 index 000000000000..ddeb45a83e96 --- /dev/null +++ b/tools/test/stress2/misc/fsck14.sh @@ -0,0 +1,119 @@ +#!/bin/sh + +# +# SPDX-License-Identifier: BSD-2-Clause +# +# Copyright (c) 2023 Peter Holm +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# 1. Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# 2. Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in the +# documentation and/or other materials provided with the distribution. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND +# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +# ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE +# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS +# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) +# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY +# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF +# SUCH DAMAGE. +# + +# fsck -B test scenario with SUJ. -B implies "preen mode". + +# 'panic: ffs_blkfree_cg: bad size' seen: +# https://people.freebsd.org/~pho/stress/log/log0465.txt +# Fixed by: 220427da0e9b - Set UFS/FFS file type to snapshot before changing +# its block pointers. + +[ `id -u ` -ne 0 ] && echo "Must be root!" && exit 1 +. ../default.cfg +mycc -o /tmp/flip -Wall -Wextra ../tools/flip.c || exit 2 + +set -e +md=/dev/md$mdstart +prog=$(basename "$0" .sh) +backup=/tmp/$prog.sh.diskimage.`date +%Y%m%dT%H%M%S`.gz +log=/tmp/$prog.sh.log +[ -c $md ] && mdconfig -d -u $mdstart +dd if=/dev/zero of=$diskimage bs=128m count=1 status=none +mdconfig -a -t vnode -f $diskimage -u $mdstart +backups=`newfs -N $j $md | grep -A1 "super-block backups" | \ + tail -1 | sed 's/,//g'` +newfs -j $md > /dev/null 2>&1 +mount $md $mntpoint +set +e + +jot 5000 | xargs -P0 -I% touch $mntpoint/a% +while ! umount $mntpoint; do :; done +/tmp/flip -n 10 $diskimage +gzip < $diskimage > $backup +fsync $diskimage $backup + +mount -f $md $mntpoint + +if ! fsck_ffs -B $md > $log 2>&1; then + grep MANUALLY $log + umount $mntpoint + fsck_ffs -fy $md > $log 2>&1; s=$? + grep -Eq "IS CLEAN|MARKED CLEAN" $log || { + cat $log + echo "fsck_ffs -f failed with exit code $s" + umount $mntpoint; mdconfig -d -u $mdstart + rm -f $log /tmp/flip $diskimage $backup + exit 1 + } + mount $md $mntpoint +fi + +jot 5000 | xargs -P0 -I% rm $mntpoint/a% +jot 5000 | xargs -P0 -I% touch $mntpoint/b% + +ls -lR $mntpoint > /dev/null || { + echo "ls -lR $mntpoint failed after fsck -B" + umount $mntpoint; mdconfig -d -u $mdstart + rm -f $log /tmp/flip $diskimage $backup + exit 0 # For now, ignore non fatal errors +} + +jot 5000 | xargs -P0 -I% rm $mntpoint/b% || { + echo "clean failed" + umount $mntpoint; mdconfig -d -u $mdstart + rm -f $log /tmp/flip $diskimage $backup + exit 0 # For now, ignore non fatal errors +} +umount $mntpoint + +r=0 +for i in `jot 4`; do + fsck_ffs -fy $diskimage > $log 2>&1; r=$? + if grep -qiE "super-?block.*failed" $log; then + for b in $backups; do + echo "fsck_ffs -b $b -fy $diskimage" + fsck_ffs -b $b -fy $diskimage > $log 2>&1 + r=$? + grep -qiE "super-?block.*failed" $log || + break + echo "Checking next SB" + done + fi + [ $r -ne 0 ] && continue + grep -Eq "WAS MODIFIED" $log && continue + grep -Eq "CLEAN" $log && break +done +mount $md $mntpoint || exit 3 +ls -lR $mntpoint > /dev/null || { umount $mntpoint; mdconfig -d -u mdstart; echo "exit 4"; exit 4; } +umount $mntpoint +fsck_ffs -fy $md > $log 2>&1 +grep -Eq 'IS CLEAN|MARKED CLEAN' $log && s=0 || { s=1; cat $log; } +mdconfig -d -u $mdstart +rm -f $log /tmp/flip $diskimage $backup +exit $s From nobody Sun Aug 13 09:19:55 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RNsSC5cc1z4qGtM; Sun, 13 Aug 2023 09:19: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RNsSC4zmGz4Wnx; Sun, 13 Aug 2023 09:19:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691918395; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9wIkO6ix3wKMX8i7QJ7iH96PgCd1WRz0ycidXXT0rzY=; b=LuVyotGSNkthzduvkabh0NlD9lvilWUQJe3fv6XGIbOSpSvTMqiW4XiZmSA/1aJvpIlJJV 9776fIXPJ7Xv9gWYSNcX3xnKzPjsKwN17QcFk3NA+Dv5UDr74sjjmRogvroxmekmnhEpIT IWD1Dv+u7uC/maqQ6C7W9zbcYr/6wU+AerdpWmx8b4quIN5dZFDSFNM45WUBtzS3u5yhrr BmALsHrNwJVcUwxS4mymVCSvSfAVJG4//fF+v1a+dUP5NDDajgMiIS1aqGUGk5S7C2ZCjm EfPZJfUnHfLfbyYh5gOabiOpG7MNcX+d7o7ds/N6kZ6sbDjOg0PoytAMOmYeYQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691918395; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9wIkO6ix3wKMX8i7QJ7iH96PgCd1WRz0ycidXXT0rzY=; b=tztN9NUq6fZXJbiVor8VEqI9P4ijmsde62apFF6M4BiUatOBDsrymAjQ+t+mEedT/7cl0p LVia6CfQn1n8fWBUDSsY/ICvj44iMRd8BCkFZXE+wH5mThyvy0Um2zzgMJKahqRtEF8nOm 8LG54GVzy2hUiQ3qyGbJ5gyTHIO88X2/Kxw7YrHhWTWvz7iEtxU0g9sNHPlp7Yo2RUgyEu iYHVeMT/nUhhGsmIuhR14CD0uO8YHu7LJV2HZnukRLHLPHGEmNirvGZWLKGY0JCYJ76nU4 tsgL6KfIRoE6ac5kVIQnevCFTqWxuMBqOGo/WGAw1KylD7zfzYhAWAWgsal0lg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691918395; a=rsa-sha256; cv=none; b=HQRzyLIQy7OzWL0xk8j5Ii3P/tSC8CEjqfP7ibzpzdeBNtsVDuFfImT1Ngs2oNCX35kYTb MVQDv53snjP1gIxUwH+XhEtbQa7VgpkUrmqVB+H6lZsdqs4MrwsAN2tJfD7tD9qKP7z5sR J9EL+MoOtF2/vMJIHAhyaNk24PxF3S9xWY4DCKWMiHEuxTAz6jdoVf/PaQxHTer3Swg495 LbrjFb0p/X3XXV0jgHXuAfdSJcB/9wN0zAmIuORFNudegHZwGw59rN6vPwS5VnDl6WuNtX 5FvBYA8FsBMZ8DHo0TO2X64N1krJKesEhlBoRbv+0JqL8BDbmpdzy52uaJml0w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RNsSC3pFNzwZc; Sun, 13 Aug 2023 09:19:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37D9Jt1L003151; Sun, 13 Aug 2023 09:19:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37D9JtjW003148; Sun, 13 Aug 2023 09:19:55 GMT (envelope-from git) Date: Sun, 13 Aug 2023 09:19:55 GMT Message-Id: <202308130919.37D9JtjW003148@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Emmanuel Vadot Subject: git: 69f8cc60aa1e - main - ofw_firmware: Only match if there is no compatible List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: manu X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 69f8cc60aa1e3140f41a75c859333a3d56c947fb Auto-Submitted: auto-generated The branch main has been updated by manu: URL: https://cgit.FreeBSD.org/src/commit/?id=69f8cc60aa1e3140f41a75c859333a3d56c947fb commit 69f8cc60aa1e3140f41a75c859333a3d56c947fb Author: Emmanuel Vadot AuthorDate: 2023-08-13 06:28:13 +0000 Commit: Emmanuel Vadot CommitDate: 2023-08-13 09:19:44 +0000 ofw_firmware: Only match if there is no compatible If there is a compatible string it likely means that the firmware needs a dedicated driver (like on RPI*). PR: 273087 Tested-by: Mark Millard Sponsored by: Beckhoff Automation GmbH & Co. KG Fixes: fdfd3a90b6ce ("ofw: Add a ofw_firmware driver") --- sys/dev/ofw/ofw_firmware.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sys/dev/ofw/ofw_firmware.c b/sys/dev/ofw/ofw_firmware.c index faba123c3e09..7d62fc317c1d 100644 --- a/sys/dev/ofw/ofw_firmware.c +++ b/sys/dev/ofw/ofw_firmware.c @@ -100,11 +100,14 @@ ofw_firmware_add_device(device_t dev, phandle_t node, u_int order, static int ofw_firmware_probe(device_t dev) { - const char *name; + const char *name, *compat; name = ofw_bus_get_name(dev); if (name == NULL || strcmp(name, "firmware") != 0) return (ENXIO); + compat = ofw_bus_get_compat(dev); + if (compat != NULL) + return (ENXIO); device_set_desc(dev, "OFW Firmware Group"); return (0); From nobody Mon Aug 14 01:55:51 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RPHYN0LBzz4TmS5; Mon, 14 Aug 2023 01:55: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RPHYM6QXzz4nRX; Mon, 14 Aug 2023 01:55:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691978151; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=D7gfLOju1g4djnICi6fA/jXTh6uBGDijK5E95Tolq48=; b=os7ZZwhojy40IRCM3MyI0URJWs1qOb5JWt5NhLNKZSGH/d1zJMwC2kUwBMi/1arbYnCs8q XetgSM845TiAPI5d/habSBgazoqKRFUptp7ruxEkYPxlMd2d8xx8TfBifgAagh+/xG5Jsv ibEfvIb+MU3Kb5rhsE2wzrkknT41UgMkKgEFytOKCQMZkx88Nqqqipsx/h5apIYC2MnV1P tEmJ2KAnrT2XCCb35QQga/wDNvPnTAjZizpTv5koxUvaGt2C8tuQp4w36bZ/zBrdCPqR1A b9lQIIeJarCHFIt+hAno2zbdSNws4U7DPD0l06MVqtgTf7v2htg0OERKvcAY+Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691978151; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=D7gfLOju1g4djnICi6fA/jXTh6uBGDijK5E95Tolq48=; b=G65h8hBWBRpr8d0QeCtrvH4RQGknrmkXguXKIvX6VD/QoJ0eD0Gu/2dyFC4Tv6xPYaiIv1 NsQLgUf7x6qlEVa4Shw+/FO0/1gNFQbx3fOWJTqsc+uUVOFI4JxC9UxvKGUW/5aZeYkNhK c1sKpXHOsQ6aEBj5f5SpH/zuvOFTMTSUkX4Yq0rmjOdxtWbiMko4i9mhtK7zck/ZWjPpcK k2APleUhROjQSpSfTpjqMYSrIQ7K5bQaEoim0jNc7DPMGCZZ1KAhtQi9nZvdNf13wEN9Z5 82eYRSK7AEchI6NaEBviR5n5vuCufYMT/jo5WHsPw9VKFR2dsAVl7/eRgI5pUg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691978151; a=rsa-sha256; cv=none; b=rItL88wTC6Z+JNQG8Lrd4xqEcW+AeX0w/zXQMIkWWdhGgS/JET5zsf9B9MNa+Nzd8jbhf8 P4SwVP0BWEFE/tZvFCkbEsEmIayGrDcgJeT0e33FaQYNS4+ulbyKiuAu8x026+4xpd1GAm xKCsz8hr8yeiLLLtJ6fPA8vYxY5CYZ92H2Zcnl6Yd2MuNHFblIcwKBnRUXo47BtX4kXqZo 3DlFSt5QGkbE3oRkyKkbtmWVlRbVVH3Iw7UHuYyVo8btXYP7A+QjnrOJfG+4zQRHxbOgpK SrxbbnoISAHsJkZ9/1dOGkOecWEyJArzTdLnpnDyMN6qn44PQFGFQ6MtpmCj7A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RPHYM5NMCz1PHg; Mon, 14 Aug 2023 01:55:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37E1tpuI062948; Mon, 14 Aug 2023 01:55:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37E1tpQF062945; Mon, 14 Aug 2023 01:55:51 GMT (envelope-from git) Date: Mon, 14 Aug 2023 01:55:51 GMT Message-Id: <202308140155.37E1tpQF062945@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kevin Bowling Subject: git: bef7d49101cd - main - ixgbe: define IXGBE_LE32_TO_CPUS List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kbowling X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: bef7d49101cdf28830a648f63ff00998fbe54715 Auto-Submitted: auto-generated The branch main has been updated by kbowling: URL: https://cgit.FreeBSD.org/src/commit/?id=bef7d49101cdf28830a648f63ff00998fbe54715 commit bef7d49101cdf28830a648f63ff00998fbe54715 Author: Kevin Bowling AuthorDate: 2023-08-14 01:47:09 +0000 Commit: Kevin Bowling CommitDate: 2023-08-14 01:55:39 +0000 ixgbe: define IXGBE_LE32_TO_CPUS Richard Lowe notes in PR 170267 IXGBE_LE32_TO_CPUS was previously directly defined as le32dec() which is a pure function but the shared code is expecting an in place conversion. In SVN r282289 its assignment was removed altogether. There was some deliberation in the PR on what to define this as, we just need to do the update in place which is easy enough. The uintptr_t casts in the shared code were from a DPDK sync and are unwanted with our new ixgbe_osdep.h implementation. PR: 170267 Reported by: Richard Lowe MFC after: 1 week --- sys/dev/ixgbe/ixgbe_common.c | 4 ++-- sys/dev/ixgbe/ixgbe_osdep.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/sys/dev/ixgbe/ixgbe_common.c b/sys/dev/ixgbe/ixgbe_common.c index 9c13b1b2663d..923879acae4b 100644 --- a/sys/dev/ixgbe/ixgbe_common.c +++ b/sys/dev/ixgbe/ixgbe_common.c @@ -4641,7 +4641,7 @@ s32 ixgbe_host_interface_command(struct ixgbe_hw *hw, u32 *buffer, /* first pull in the header so we know the buffer length */ for (bi = 0; bi < dword_len; bi++) { buffer[bi] = IXGBE_READ_REG_ARRAY(hw, IXGBE_FLEX_MNG, bi); - IXGBE_LE32_TO_CPUS((uintptr_t)&buffer[bi]); + IXGBE_LE32_TO_CPUS(&buffer[bi]); } /* @@ -4677,7 +4677,7 @@ s32 ixgbe_host_interface_command(struct ixgbe_hw *hw, u32 *buffer, /* Pull in the rest of the buffer (bi is where we left off) */ for (; bi <= dword_len; bi++) { buffer[bi] = IXGBE_READ_REG_ARRAY(hw, IXGBE_FLEX_MNG, bi); - IXGBE_LE32_TO_CPUS((uintptr_t)&buffer[bi]); + IXGBE_LE32_TO_CPUS(&buffer[bi]); } rel_out: diff --git a/sys/dev/ixgbe/ixgbe_osdep.h b/sys/dev/ixgbe/ixgbe_osdep.h index 5e211e6283e3..48210e448c68 100644 --- a/sys/dev/ixgbe/ixgbe_osdep.h +++ b/sys/dev/ixgbe/ixgbe_osdep.h @@ -135,7 +135,7 @@ enum { #define IXGBE_CPU_TO_LE16 htole16 #define IXGBE_CPU_TO_LE32 htole32 #define IXGBE_LE32_TO_CPU le32toh -#define IXGBE_LE32_TO_CPUS(x) +#define IXGBE_LE32_TO_CPUS(x) *(x) = le32dec(x) #define IXGBE_CPU_TO_BE16 htobe16 #define IXGBE_CPU_TO_BE32 htobe32 #define IXGBE_BE32_TO_CPU be32toh From nobody Mon Aug 14 03:11:15 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RPKDQ1WsGz4TsSj; Mon, 14 Aug 2023 03:11:18 +0000 (UTC) (envelope-from des@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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RPKDQ10VTz4tXF; Mon, 14 Aug 2023 03:11:18 +0000 (UTC) (envelope-from des@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691982678; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=1eAOdTCFJ3sOtkkW3yGeAznORJIIPOPeiMgb78bWPt8=; b=c3uBfteI2bd2wjk0diSUgSpLajQoUWKbyUsuuiKDm8V4ivJ2TiWn4iUXhhoY/5NFo3wUb7 T/oY7v2jSnDAecrUIrMXLr+dprxayo8DM8i8VxObt2VlqWKGlJqOiqrdvdpNyx93XHTnhd +QapcAsziEpS9Y+xvdyMosp1yD88Zs6E1CHytkvn9qGg1vy5KWNpo2xfaeX2XqitCN3JDa nrAwaOJRZ0kMQZaJPOj/bRTElZ6XDoCPHvqzkKcqP7SNPSLZS5U/ngY7bbxZ3Vl5BPb0ES 4mHS90P89JvKcIyk9Q7APsWWnqbfj7f1QrXRQgc4oauLZDSGC2PY+bMNGe8L8g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691982678; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=1eAOdTCFJ3sOtkkW3yGeAznORJIIPOPeiMgb78bWPt8=; b=ivOqgQrvnnOy2r8+lWY7oMy6ptx+6qicnOSPRIMtQFuMaNVJ08ddbYZUzwsT+XsluLM7J+ btwbcmQRgxyblhy0zTtnFSIC3lQsjKfQ/9n+LpCtfEGMebJYxCPSXdLsULDp4fNChtlNHY 8KMWRxsp0cPEQLSK1/h6af/2Nhsfs7T2y5n9ptkypeZNBcGMTi+NpRxHFOceBhg1kAjiNy E9hoBKlgENYPFy+FvdJVm/kkIEP/DmJzwKKFxOllHZXxLUAvQHHJcqYj0pddfbnFybDvEo +B6yWLusGgVbEizW8iQo0A1d8lW5FDJR4UfT8eFzpcOk7AdOwAluvs40NFrTXg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691982678; a=rsa-sha256; cv=none; b=rW2e0xmCaKBmVGc8hazCiG4iu1KyzUiwCw/RDs4dZmaSf3MO8HV8UmMwsXU4lIgbW21oEo RnWwLGfdcGl/D1onRKMZ1zRj56uevnXxNxaIyPJJqHX/JE6o4AOu6aAGFUxTVCykPvWP93 5XoGYQ2c1GqVtNGEQsqTVhKeo03DeA6R3mf5jUPSzGBa8Dcb3CXPUIB3ioQtqkVWu5BJ9/ XtagPLAm218vmaVaRm7TL5BMLkjscEZIfWPeARQ0aARxajBhtHZ/Mpv88nlwCKNrona2Sa VTvEzG09bkTTGWIC+HKA1sKffUSOMhBynM/NjaRil3um/Yynp1bMmbDmUTcYsA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from ltc.des.no (ti0187a400-1976.bb.online.no [85.166.95.197]) (using TLSv1.3 with cipher TLS_AES_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: des) by smtp.freebsd.org (Postfix) with ESMTPSA id 4RPKDP58sZz19Pd; Mon, 14 Aug 2023 03:11:17 +0000 (UTC) (envelope-from des@freebsd.org) Received: by ltc.des.no (Postfix, from userid 1001) id 45E6418241; Mon, 14 Aug 2023 05:11:15 +0200 (CEST) From: =?utf-8?Q?Dag-Erling_Sm=C3=B8rgrav?= To: Enji Cooper Cc: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: Re: git: 28f6c2f29280 - main - Import GoogleTest 1.14.0 In-Reply-To: <202308100232.37A2Wdaw040438@gitrepo.freebsd.org> (Enji Cooper's message of "Thu, 10 Aug 2023 02:32:39 GMT") References: <202308100232.37A2Wdaw040438@gitrepo.freebsd.org> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.2 (berkeley-unix) Date: Mon, 14 Aug 2023 05:11:15 +0200 Message-ID: <86edk6qpws.fsf@ltc.des.no> List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Enji Cooper writes: > commit 28f6c2f292806bf31230a959bc4b19d7081669a7 > Author: Enji Cooper > AuthorDate: 2023-08-08 06:17:32 +0000 > Commit: Enji Cooper > CommitDate: 2023-08-10 09:32:33 +0000 > > Import GoogleTest 1.14.0 I haven't been able to build world since this went in. =3D=3D=3D> tests/sys/fs/fusefs (all) (cd /usr/src/tests/sys/fs/fusefs && DEPENDFILE=3D.depend.access NO_SUBDIR= =3D1 make -f /usr/src/tests/sys/fs/fusefs/Makefile _RECURSING_PROGS=3Dt PR= OG=3Daccess PROG_CXX=3Daccess) c++ -target x86_64-unknown-freebsd14.0 --sysroot=3D/usr/obj/usr/src/amd64.a= md64/tmp -B/usr/obj/usr/src/amd64.amd64/tmp/usr/bin -O2 -pipe -fno-common -= fPIE -g -gz=3Dzlib -Wno-format-zero-length -fstack-protector-strong -Wsyste= m-headers -Werror -Wall -Wno-format-y2k -W -Wno-unused-parameter -Wpointer-= arith -Wreturn-type -Wcast-qual -Wwrite-strings -Wswitch -Wshadow -Wunused-= parameter -Wcast-align -Wchar-subscripts -Wdate-time -Wmissing-variable-dec= larations -Wno-empty-body -Wno-string-plus-int -Wno-unused-const-variable -= Wno-error=3Dunused-but-set-parameter -Qunused-arguments -I/usr/src/tests -I= /usr/src/sys/fs/fuse -I/usr/src/sbin/mount -I/usr/obj/usr/src/amd64.amd64/t= mp/usr/include/private -DGTEST_HAS_POSIX_RE=3D1 -DGTEST_HAS_PTHREAD=3D1 -DG= TEST_HAS_STREAM_REDIRECTION=3D1 -frtti -Wno-deprecated-copy -Wno-signed-uns= igned-wchar -fPIE -std=3Dc++14 -Wno-deprecated-copy -Wno-c++11-extensions = -Wl,-zrelro -pie -o access.full access.o getmntopts.o mockfs.o utils.o -= lprivategmock -lprivategtest -lprivategtest -lutil -lpthread ld: error: undefined symbol: testing::internal::g_linked_ptr_mutex >>> referenced by gtest-port.h:2137 (/usr/obj/usr/src/amd64.amd64/tmp/usr/i= nclude/private/gtest/internal/gtest-port.h:2137) >>> mockfs.o:(testing::internal::linked_ptr_internal::depart(= )) >>> referenced by gtest-port.h:2139 (/usr/obj/usr/src/amd64.amd64/tmp/usr/i= nclude/private/gtest/internal/gtest-port.h:2139) >>> mockfs.o:(testing::internal::linked_ptr_internal::depart(= )) >>> referenced by gtest-port.h:2139 (/usr/obj/usr/src/amd64.amd64/tmp/usr/i= nclude/private/gtest/internal/gtest-port.h:2139) >>> mockfs.o:(testing::internal::linked_ptr_internal::depart(= )) >>> referenced 3 more times ld: error: undefined symbol: testing::internal2::PrintBytesInObjectTo(unsig= ned char const*, unsigned long, std::__1::basic_ostream>*) >>> referenced by gtest-printers.h:155 (/usr/obj/usr/src/amd64.amd64/tmp/us= r/include/private/gtest/gtest-printers.h:155) >>> mockfs.o:(void testing::internal::TuplePrefixPrinter<2ul>= ::PrintPrefixTo>,= std::__1::allocator>>>&>>(std::__1::tuple>, std::__1::allocator>>>&>=20 const&, std::__1::basic_ostream>*)) >>> referenced by gtest-printers.h:155 (/usr/obj/usr/src/amd64.amd64/tmp/us= r/include/private/gtest/gtest-printers.h:155) >>> mockfs.o:(void testing::internal::TuplePrefix<1ul>::Expla= inMatchFailuresTo, t= esting::Matcher>, std::__1::allocator>>>&>>, std::__1::tuple>, std::_= _1::allocator>>>&>>(std::__1::tuple, testing::Matcher>, std::__1::alloca= tor>>>&>> const&, std::__1::tuple>, std::__1::allocator>>>&> const&, s td::__1::basic_ostream>*)) ld: error: undefined symbol: testing::internal::UntypedFunctionMockerBase::= UntypedInvokeWith(void*) >>> referenced by gmock-spec-builders.h:1603 (/usr/obj/usr/src/amd64.amd64/= tmp/usr/include/private/gmock/gmock-spec-builders.h:1603) >>> mockfs.o:(testing::internal::FunctionMockerBase>, std::__1::allocator>>>&)>::InvokeWith(std= ::__1::tuple>, std::__1::allocato= r>>>&>&&)) ld: error: undefined symbol: testing::Expectation::Expectation(testing::int= ernal::linked_ptr const&) >>> referenced by gmock-spec-builders.h:1634 (/usr/obj/usr/src/amd64.amd64/= tmp/usr/include/private/gmock/gmock-spec-builders.h:1634) >>> utils.o:(testing::internal::FunctionMockerBase>, std::__1::allocator>>>&)>::AddNe= wExpectation(char const*, int, std::__1::basic_string, std::__1::allocator> const&, std::__1::tuple, testing::Matcher>, std::_= _1::allocator>>>&>> const&)) c++: error: linker command failed with exit code 1 (use -v to see invocatio= n) *** Error code 1 Stop. DES --=20 Dag-Erling Sm=C3=B8rgrav - des@FreeBSD.org From nobody Mon Aug 14 06:42:48 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RPPwT3Ltzz4mVk0; Mon, 14 Aug 2023 06:42: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RPPwT0Vszz3YL5; Mon, 14 Aug 2023 06:42:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691995369; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+ZIIZIFX4zPUF5VLu/Dg1Pfa7QZXPcbYu6FSRAJ7h4k=; b=RkL2P7atsXacBCzzfidIfDxLtZlRF9aHbhwSS7CJGifXumIpWR1YbtztIxGfhDWn6W7+Lc NPe3tYoWn+ebN4OlaGcqnyfdvwp6aQy2HColzEyKS8tfzE1ULjypSRkc9yZreL1U6wmV9o dpRmE7ZVpmqps+hAMw9ed3fM9Jlx9zgTCwDq4gA3lXpx093ZiIxXz/we8aD59DHpVp50h6 zkUHvijMgsjprY0tMRULvKGUqmGQxR+1RYRzY+wGai8UOU6UmBoc4n6g5Jm4cCcXJrL9rh v+h9Xxu6fjVz+yfs9NYOzRyJ+3+7M5TfdbP/XTXdwFdB3P7ato3ySIT2nunANQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691995369; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+ZIIZIFX4zPUF5VLu/Dg1Pfa7QZXPcbYu6FSRAJ7h4k=; b=PrIw+xsYKnU+oguPUZbQmBirXPWeopJxNNaAEKfvy6vmfsriXAIlD00wZfLkhDN4R51V1i p3gXud0R7DMGTS9XSElJpTmnJ7oq2zj4sZS+MOsQ25a7IaP1yvz6m57jrRHHXcjGogyXNK OT8meDW3D4ZVRsrqGxndfTBhGjOe8Hi/9ksNe1raBdNlPTDzD1hWkXTDyIh3RoNFGFomHw GLFWDuLo7zD4RcFNFtH7VwvnqA96uQjVDx2i5n9wuWN0Y4+gYQ4SjhAwfUSYG3EOa1ZgG1 H1wuGjLVORAHCk3tYSnM7Onfjs6Ilfh5hCyo1uAuYgJ8TRiqLGi8WIj/lgDJZA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691995369; a=rsa-sha256; cv=none; b=Lsh3rzLQSED//zpXVi9Y1b/sbVVTM85OnJPyIXo0mtWUmnMjoOp4fPhoW/wcFIil4ZClax 9n0Vz1FrsPAzPBVC4CtvVcCSL+wRAEF1pF0C3cx347cj+16UwlXp4gJy+fid0Rc3db1/OZ 6IIyAm/DTP3krrAq8gBPUz+iAs9IqsGjwngPWU66FF3IOWzBRCstuHt9yRjvQOOnZtpkEf g4qtwZLmI+O0RQZ8xc4kg4yh8HVV+WGEdu9tmPOfiJ1kvTlQLUSi2bRS7CEBCFnl8SVGTY gNFT4MwGDGfVprmWnyMTQm9hJeVtDZOhGy4ANvvY84mvDFF+rwHHaHBsDHWLhg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RPPwS6j2Tz3yc; Mon, 14 Aug 2023 06:42:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37E6gmS2045056; Mon, 14 Aug 2023 06:42:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37E6gmrn045053; Mon, 14 Aug 2023 06:42:48 GMT (envelope-from git) Date: Mon, 14 Aug 2023 06:42:48 GMT Message-Id: <202308140642.37E6gmrn045053@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Michael Tuexen Subject: git: 6cb8b3b5cde1 - main - sctp: use consistent names for locking macros List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: tuexen X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6cb8b3b5cde18ac5465f1cf1df3fbac359cb09e9 Auto-Submitted: auto-generated The branch main has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=6cb8b3b5cde18ac5465f1cf1df3fbac359cb09e9 commit 6cb8b3b5cde18ac5465f1cf1df3fbac359cb09e9 Author: Michael Tuexen AuthorDate: 2023-08-13 20:32:54 +0000 Commit: Michael Tuexen CommitDate: 2023-08-13 20:35:53 +0000 sctp: use consistent names for locking macros While there, add also a macro for an assert. Will be used shortly. No functional change intended. MFC after: 1 week --- sys/netinet/sctp_lock_bsd.h | 9 +++++++-- sys/netinet/sctp_pcb.c | 4 ++-- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/sys/netinet/sctp_lock_bsd.h b/sys/netinet/sctp_lock_bsd.h index 2087db337a37..a0cff81e706e 100644 --- a/sys/netinet/sctp_lock_bsd.h +++ b/sys/netinet/sctp_lock_bsd.h @@ -234,12 +234,12 @@ __FBSDID("$FreeBSD$"); * or cookie secrets we lock the INP level. */ -#define SCTP_INP_READ_INIT(_inp) do { \ +#define SCTP_INP_READ_LOCK_INIT(_inp) do { \ mtx_init(&(_inp)->inp_rdata_mtx, "sctp-read", "inpr", \ MTX_DEF | MTX_DUPOK); \ } while (0) -#define SCTP_INP_READ_DESTROY(_inp) do { \ +#define SCTP_INP_READ_LOCK_DESTROY(_inp) do { \ mtx_destroy(&(_inp)->inp_rdata_mtx); \ } while (0) @@ -251,6 +251,11 @@ __FBSDID("$FreeBSD$"); mtx_unlock(&(_inp)->inp_rdata_mtx); \ } while (0) +#define SCTP_INP_READ_LOCK_ASSERT(_inp) do { \ + KASSERT(mtx_owned(&(_inp)->inp_rdata_mtx), \ + ("Don't own INP read queue lock")); \ +} while (0) + #define SCTP_INP_LOCK_INIT(_inp) do { \ mtx_init(&(_inp)->inp_mtx, "sctp-inp", "inp", \ MTX_DEF | MTX_DUPOK); \ diff --git a/sys/netinet/sctp_pcb.c b/sys/netinet/sctp_pcb.c index 220d8b72667d..aad5879afe63 100644 --- a/sys/netinet/sctp_pcb.c +++ b/sys/netinet/sctp_pcb.c @@ -2501,7 +2501,7 @@ sctp_inpcb_alloc(struct socket *so, uint32_t vrf_id) SCTP_INP_LOCK_INIT(inp); rw_init_flags(&inp->ip_inp.inp.inp_lock, "sctpinp", RW_RECURSE | RW_DUPOK); - SCTP_INP_READ_INIT(inp); + SCTP_INP_READ_LOCK_INIT(inp); SCTP_ASOC_CREATE_LOCK_INIT(inp); /* lock the new ep */ SCTP_INP_WLOCK(inp); @@ -3678,7 +3678,7 @@ sctp_inpcb_free(struct sctp_inpcb *inp, int immediate, int from) crfree(inp->ip_inp.inp.inp_cred); INP_LOCK_DESTROY(&inp->ip_inp.inp); SCTP_INP_LOCK_DESTROY(inp); - SCTP_INP_READ_DESTROY(inp); + SCTP_INP_READ_LOCK_DESTROY(inp); SCTP_ASOC_CREATE_LOCK_DESTROY(inp); SCTP_ZONE_FREE(SCTP_BASE_INFO(ipi_zone_ep), inp); SCTP_DECR_EP_COUNT(); From nobody Mon Aug 14 06:55:28 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RPQC465Qwz4mX5J; Mon, 14 Aug 2023 06:55: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RPQC459hFz3bCl; Mon, 14 Aug 2023 06:55:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691996128; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=br/gX7EkQvJTA6MtT3coAZyAdpcsGFHiI8GQ64mi8LI=; b=GYl+I5AuwK9MHECEmQlYGmzoCDJd8oT6f+v1s1sWDqxxVt2YSvH6WablGKp+rNzDFZle7P iRbGXxKlh4ALdmNMBe4o0piXzaBoSVFELPmzAF4K7STba8jswnoOZiTTq2dKqqSAUFszA0 kz62K5vpH0I2gWnxjiyNi2gnR4GJFQFG7yy+sKRNtKejfnw3QAGGTZpaJRaGCd57D8pUhy DLwqc2R4BjGvq8QPjmJ2dlyGzTXKw0kD/pvw0T8nXLUUOni9y8BytfgqeOyxFQMuDe3Z8A RXfek6WhNxNqa8Y+mvsmwRFTruLOcYnm3R90pGZ0EOE0oysZ37Hh+hzspOvCYQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1691996128; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=br/gX7EkQvJTA6MtT3coAZyAdpcsGFHiI8GQ64mi8LI=; b=U79+unJ20Sqju/G+8v+u+RXMuqKorkrCj1YuUSjE8KFiTbxjxPDeDlmkhz86YMK8hzqbor GOyGFrzb4+bX6SzRZrI4nySqbf7ibkLKfCX7QeucI/wsstojsageQklPTHZ6zzTrt6qU0N zpTiEIjQVlxpGGMUVme0usMHPqIVFrMyYeXE48jeYjDEmz6VAJ63uasOIxLXbkrK6SE13v c1kFyUeoAb/CjqOG+M8nEt5dXbUUa2B9XhRIWDCLUGK4h9aw48MKCNugx+bBQUgD1E/72d E9I5bOhI3GvZBGrR5xxhl1AwWnheTMGjM+3M8/QK6vTiuXttagwhfqi9s0XMVA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1691996128; a=rsa-sha256; cv=none; b=IzWn++oGt5jBfG09PCB+/Ejcp2WgqjZFLq64S6ph/hAo3u3Bfulkwymz8+BD0l++Jqxtb5 Y5MyBAkhD52JB9/bDCLsY5YKOFuGI+1Ln/BIpL3wkSEySObflbu0kLzuL2urpAAyLIkdkA 4UEHvVnwr8TSaCE1z0NbD96R2auPV6Q2kXA0bpn7eqIIqiZoirNE1/bhiNOjGfdm+THoHQ PS/XCq9n9nV9qYH8SlKUlrjzsastdqMOEP9vhfJSdkrgv+xxgnhQBLeUbM0dswsxDsxIdV ehIsj+l3y4hSCNRczmXrGRr1Z83MlJxpir8W2NI0ubndRyiRlVDT0ZgBZoGa3w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RPQC44Cygz43N; Mon, 14 Aug 2023 06:55:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37E6tS6F061760; Mon, 14 Aug 2023 06:55:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37E6tS4C061757; Mon, 14 Aug 2023 06:55:28 GMT (envelope-from git) Date: Mon, 14 Aug 2023 06:55:28 GMT Message-Id: <202308140655.37E6tS4C061757@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Michael Tuexen Subject: git: e8eb0b713426 - main - sctp: add an assert List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: tuexen X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e8eb0b713426fe9edbf56719351850fa9469286a Auto-Submitted: auto-generated The branch main has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=e8eb0b713426fe9edbf56719351850fa9469286a commit e8eb0b713426fe9edbf56719351850fa9469286a Author: Michael Tuexen AuthorDate: 2023-08-13 20:47:43 +0000 Commit: Michael Tuexen CommitDate: 2023-08-13 20:47:43 +0000 sctp: add an assert This enforces a condition mentioned in a comment. MFC after: 1 week --- sys/netinet/sctputil.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sys/netinet/sctputil.c b/sys/netinet/sctputil.c index 136a2285c6d7..f85cf99a43fe 100644 --- a/sys/netinet/sctputil.c +++ b/sys/netinet/sctputil.c @@ -3640,7 +3640,6 @@ sctp_notify_adaptation_layer(struct sctp_tcb *stcb) &stcb->sctp_socket->so_rcv, 1, SCTP_READ_LOCK_NOT_HELD, SCTP_SO_NOT_LOCKED); } -/* This always must be called with the read-queue LOCKED in the INP */ static void sctp_notify_partial_delivery_indication(struct sctp_tcb *stcb, uint32_t error, uint32_t val, int so_locked) @@ -3656,6 +3655,8 @@ sctp_notify_partial_delivery_indication(struct sctp_tcb *stcb, uint32_t error, return; } + SCTP_INP_READ_LOCK_ASSERT(stcb->sctp_ep); + m_notify = sctp_get_mbuf_for_msg(sizeof(struct sctp_pdapi_event), 0, M_NOWAIT, 1, MT_DATA); if (m_notify == NULL) /* no space left */ From nobody Mon Aug 14 08:17:40 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RPS1x1T8gz4q7FL; Mon, 14 Aug 2023 08:17: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RPS1x1CVcz4FMR; Mon, 14 Aug 2023 08:17:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692001061; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=JrtYeO2NCRo1wtwQ3jhm9w/DXD9GmIVvtrY+FAHitLo=; b=YdCb5SA/e5EMoYn1G7sLXuVtAUDg+yvDmz5G1rxM+p0B062YBVs8S0C1loiNdkwsM9aKbe Z/0uT+hBfHEJRyKDWxksSqJ/f5uNBYUjssN5eXzMHjeqF9UjsaK7BgSpYP1jx51X6b6QHc vusbD3USgqs5shOb8rWBJnzArXCg8St6FP66jv4OAiTyUrGejopiMoBBsOhu/HBKwy5qKw GJ1Ee7fC5+YaVyv+Bxl+qI59kdXsWZ0uzvfT6gf8opoaIosfxntixuu7oLdp2dnvKQ48F4 9vAmXx8aSFq2zhZ9K2HZCkVAX5C1s53LZkwEePSuhnjRnUDqjA/Qm5j31ZJPYQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692001061; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=JrtYeO2NCRo1wtwQ3jhm9w/DXD9GmIVvtrY+FAHitLo=; b=qyxnoCKMcpAdWMmOBGIMjIPHkjMWc0Eo1llA0ZyWgjE/BjRXTm1NlyqSN9chqcEE81nYuS D7Ela7fwY6QUekLi+qpNXzK4N2Dq4pZeQE9JzmppPCV2EJb/xjRptLBfpBNv66qtO/WLCQ nGoHP9zksT6Ef3GrYrg+wNHu4Fnny86Rrf8cCThqRzl2h+kHRaCwhoLRiSsn/veJdksEUP JplnJgybflxNFpuCOxs63vMv5nXPPlGM5BmEoDkS+Jc48BSbs0RZVAc2q/pqI2lb07zExr xpYHuxpSMdiPOi/31e73ETDIBSOPDPkihsXNvH2FiQIetDbQM9fB3IIt7mDrTg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692001061; a=rsa-sha256; cv=none; b=Oje7BN5xASVULFjvBTEjVtlAVoBh8u6dUSU95CV7HvTJdmdwuMCoExDNkQa+BJBBu835ZY c02YgCvJYIF5vCk/5Fioy2c2XQPZwm6gqtsb9F03RL2I9cbPG/1FYTzTQa9VktqY6W9eLB 7pLy4mbc/1mCANx6Ver59eEtTSgA1qaxwUYIQNJDcXHymd9yA8VeYxcd8HOnucm6kPQDsf 6/GGzwfM6iJdd9+/0wWKw0SUfgCK6BEmHclBxxxPi+xHM+5evwtWPBa59RboEJlskzAS9s JCNGPp0nybOpzLNZdsjbkkgPIZ01Z5lF3mbCZeIypOfQF6ZDViBCRo8K1OobPg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RPS1x0HlTz5ZY; Mon, 14 Aug 2023 08:17:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37E8HeUq095767; Mon, 14 Aug 2023 08:17:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37E8Hex6095764; Mon, 14 Aug 2023 08:17:40 GMT (envelope-from git) Date: Mon, 14 Aug 2023 08:17:40 GMT Message-Id: <202308140817.37E8Hex6095764@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Corvin =?utf-8?Q?K=C3=B6hne?= Subject: git: 85a775e61b98 - main - bhyve: add Qemu PPI emulation for TPM devices List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: corvink X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 85a775e61b98f4c49abe437fb66b205a39f7581f Auto-Submitted: auto-generated The branch main has been updated by corvink: URL: https://cgit.FreeBSD.org/src/commit/?id=85a775e61b98f4c49abe437fb66b205a39f7581f commit 85a775e61b98f4c49abe437fb66b205a39f7581f Author: Corvin Köhne AuthorDate: 2022-08-29 10:10:47 +0000 Commit: Corvin Köhne CommitDate: 2023-08-14 08:17:36 +0000 bhyve: add Qemu PPI emulation for TPM devices Windows requires a physical presence interface to recognize the TPM device. Qemu's OVMF has an implementation for the PPI which can be reused. Using the Qemu PPI makes it very easy because we don't have to implement new PPI functionality into our OVMF. The Qemu implementation is already there. Reviewed by: markj MFC after: 1 week Sponsored by: Beckhoff Automation GmbH & Co. KG Differential Revision: https://reviews.freebsd.org/D40462 --- usr.sbin/bhyve/Makefile | 1 + usr.sbin/bhyve/tpm_device.c | 76 +++++++ usr.sbin/bhyve/tpm_ppi.h | 20 ++ usr.sbin/bhyve/tpm_ppi_qemu.c | 476 ++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 573 insertions(+) diff --git a/usr.sbin/bhyve/Makefile b/usr.sbin/bhyve/Makefile index 9b8a7274d793..ef7bc01f83ee 100644 --- a/usr.sbin/bhyve/Makefile +++ b/usr.sbin/bhyve/Makefile @@ -78,6 +78,7 @@ SRCS= \ tpm_device.c \ tpm_emul_passthru.c \ tpm_intf_crb.c \ + tpm_ppi_qemu.c \ uart_emul.c \ usb_emul.c \ usb_mouse.c \ diff --git a/usr.sbin/bhyve/tpm_device.c b/usr.sbin/bhyve/tpm_device.c index 421d10dafb75..4c40db419380 100644 --- a/usr.sbin/bhyve/tpm_device.c +++ b/usr.sbin/bhyve/tpm_device.c @@ -14,17 +14,20 @@ #include #include +#include "acpi.h" #include "acpi_device.h" #include "config.h" #include "tpm_device.h" #include "tpm_emul.h" #include "tpm_intf.h" +#include "tpm_ppi.h" #define TPM_ACPI_DEVICE_NAME "TPM" #define TPM_ACPI_HARDWARE_ID "MSFT0101" SET_DECLARE(tpm_emul_set, struct tpm_emul); SET_DECLARE(tpm_intf_set, struct tpm_intf); +SET_DECLARE(tpm_ppi_set, struct tpm_ppi); struct tpm_device { struct vmctx *vm_ctx; @@ -33,6 +36,8 @@ struct tpm_device { void *emul_sc; struct tpm_intf *intf; void *intf_sc; + struct tpm_ppi *ppi; + void *ppi_sc; }; static int @@ -47,10 +52,57 @@ tpm_build_acpi_table(const struct acpi_device *const dev) return (tpm->intf->build_acpi_table(tpm->intf_sc, tpm->vm_ctx)); } +static int +tpm_write_dsdt(const struct acpi_device *const dev) +{ + int error; + + const struct tpm_device *const tpm = acpi_device_get_softc(dev); + const struct tpm_ppi *const ppi = tpm->ppi; + + /* + * packages for returns + */ + dsdt_line("Name(TPM2, Package(2) {0, 0})"); + dsdt_line("Name(TPM3, Package(3) {0, 0, 0})"); + + if (ppi->write_dsdt_regions) { + error = ppi->write_dsdt_regions(tpm->ppi_sc); + if (error) { + warnx("%s: failed to write ppi dsdt regions\n", + __func__); + return (error); + } + } + + /* + * Device Specific Method + * Arg0: UUID + * Arg1: Revision ID + * Arg2: Function Index + * Arg3: Arguments + */ + dsdt_line("Method(_DSM, 4, Serialized)"); + dsdt_line("{"); + dsdt_indent(1); + if (ppi->write_dsdt_dsm) { + error = ppi->write_dsdt_dsm(tpm->ppi_sc); + if (error) { + warnx("%s: failed to write ppi dsdt dsm\n", __func__); + return (error); + } + } + dsdt_unindent(1); + dsdt_line("}"); + + return (0); +} + static const struct acpi_device_emul tpm_acpi_device_emul = { .name = TPM_ACPI_DEVICE_NAME, .hid = TPM_ACPI_HARDWARE_ID, .build_table = tpm_build_acpi_table, + .write_dsdt = tpm_write_dsdt, }; void @@ -59,6 +111,8 @@ tpm_device_destroy(struct tpm_device *const dev) if (dev == NULL) return; + if (dev->ppi != NULL && dev->ppi->deinit != NULL) + dev->ppi->deinit(dev->ppi_sc); if (dev->intf != NULL && dev->intf->deinit != NULL) dev->intf->deinit(dev->intf_sc); if (dev->emul != NULL && dev->emul->deinit != NULL) @@ -75,6 +129,7 @@ tpm_device_create(struct tpm_device **const new_dev, struct vmctx *const vm_ctx, struct tpm_device *dev = NULL; struct tpm_emul **ppemul; struct tpm_intf **ppintf; + struct tpm_ppi **pp_ppi; const char *value; int error; @@ -84,6 +139,7 @@ tpm_device_create(struct tpm_device **const new_dev, struct vmctx *const vm_ctx, } set_config_value_node_if_unset(nvl, "intf", "crb"); + set_config_value_node_if_unset(nvl, "ppi", "qemu"); value = get_config_value_node(nvl, "version"); assert(value != NULL); @@ -147,6 +203,26 @@ tpm_device_create(struct tpm_device **const new_dev, struct vmctx *const vm_ctx, goto err_out; } + value = get_config_value_node(nvl, "ppi"); + SET_FOREACH(pp_ppi, tpm_ppi_set) { + if (strcmp(value, (*pp_ppi)->name)) { + continue; + } + dev->ppi = *pp_ppi; + break; + } + if (dev->ppi == NULL) { + warnx("TPM PPI \"%s\" not found\n", value); + error = EINVAL; + goto err_out; + } + + if (dev->ppi->init) { + error = dev->ppi->init(&dev->ppi_sc); + if (error) + goto err_out; + } + *new_dev = dev; return (0); diff --git a/usr.sbin/bhyve/tpm_ppi.h b/usr.sbin/bhyve/tpm_ppi.h new file mode 100644 index 000000000000..3c54c2f6c223 --- /dev/null +++ b/usr.sbin/bhyve/tpm_ppi.h @@ -0,0 +1,20 @@ +/*- + * SPDX-License-Identifier: BSD-2-Clause-FreeBSD + * + * Copyright (c) 2022 Beckhoff Automation GmbH & Co. KG + * Author: Corvin Köhne + */ + +#pragma once + +#include "config.h" + +struct tpm_ppi { + const char *name; + + int (*init)(void **sc); + void (*deinit)(void *sc); + int (*write_dsdt_regions)(void *sc); + int (*write_dsdt_dsm)(void *sc); +}; +#define TPM_PPI_SET(x) DATA_SET(tpm_ppi_set, x) diff --git a/usr.sbin/bhyve/tpm_ppi_qemu.c b/usr.sbin/bhyve/tpm_ppi_qemu.c new file mode 100644 index 000000000000..8bea45ea3208 --- /dev/null +++ b/usr.sbin/bhyve/tpm_ppi_qemu.c @@ -0,0 +1,476 @@ +/*- + * SPDX-License-Identifier: BSD-2-Clause-FreeBSD + * + * Copyright (c) 2022 Beckhoff Automation GmbH & Co. KG + * Author: Corvin Köhne + */ + +#include +#include +#include +#include +#include + +#include + +#include +#include +#include +#include + +#include "acpi.h" +#include "acpi_device.h" +#include "config.h" +#include "mem.h" +#include "qemu_fwcfg.h" +#include "tpm_ppi.h" + +#define TPM_PPI_ADDRESS 0xFED45000 +#define TPM_PPI_SIZE 0x1000 + +#define TPM_PPI_FWCFG_FILE "etc/tpm/config" + +#define TPM_PPI_QEMU_NAME "qemu" + +struct tpm_ppi_qemu { + uint8_t func[256]; // FUNC + uint8_t in; // PPIN + uint32_t ip; // PPIP + uint32_t response; // PPRP + uint32_t request; // PPRQ + uint32_t request_parameter; // PPRM + uint32_t last_request; // LPPR + uint32_t func_ret; // FRET + uint8_t _reserved1[0x40]; // RES1 + uint8_t next_step; // next_step +} __packed; +static_assert(sizeof(struct tpm_ppi_qemu) <= TPM_PPI_SIZE, + "Wrong size of tpm_ppi_qemu"); + +struct tpm_ppi_fwcfg { + uint32_t ppi_address; + uint8_t tpm_version; + uint8_t ppi_version; +} __packed; + +static int +tpm_ppi_mem_handler(struct vcpu *const vcpu __unused, const int dir, + const uint64_t addr, const int size, uint64_t *const val, void *const arg1, + const long arg2 __unused) +{ + struct tpm_ppi_qemu *ppi; + uint8_t *ptr; + uint64_t off; + + if ((addr & (size - 1)) != 0) { + warnx("%s: unaligned %s access @ %16lx [size = %x]", __func__, + (dir == MEM_F_READ) ? "read" : "write", addr, size); + } + + ppi = arg1; + + off = addr - TPM_PPI_ADDRESS; + ptr = (uint8_t *)ppi + off; + + if (off > TPM_PPI_SIZE || off + size > TPM_PPI_SIZE) { + return (EINVAL); + } + + assert(size == 1 || size == 2 || size == 4 || size == 8); + if (dir == MEM_F_READ) { + memcpy(val, ptr, size); + } else { + memcpy(ptr, val, size); + } + + return (0); +} + +static struct mem_range ppi_mmio = { + .name = "ppi-mmio", + .base = TPM_PPI_ADDRESS, + .size = TPM_PPI_SIZE, + .flags = MEM_F_RW, + .handler = tpm_ppi_mem_handler, +}; + +static int +tpm_ppi_init(void **sc) +{ + struct tpm_ppi_qemu *ppi = NULL; + struct tpm_ppi_fwcfg *fwcfg = NULL; + int error; + + ppi = calloc(1, sizeof(*ppi)); + if (ppi == NULL) { + warnx("%s: failed to allocate acpi region for ppi", __func__); + error = ENOMEM; + goto err_out; + } + + fwcfg = calloc(1, sizeof(struct tpm_ppi_fwcfg)); + if (fwcfg == NULL) { + warnx("%s: failed to allocate fwcfg item", __func__); + error = ENOMEM; + goto err_out; + } + + fwcfg->ppi_address = htole32(TPM_PPI_ADDRESS); + fwcfg->tpm_version = 2; + fwcfg->ppi_version = 1; + + error = qemu_fwcfg_add_file(TPM_PPI_FWCFG_FILE, + sizeof(struct tpm_ppi_fwcfg), fwcfg); + if (error) { + warnx("%s: failed to add fwcfg file", __func__); + goto err_out; + } + + /* + * We would just need to create some guest memory for the PPI region. + * Sadly, bhyve has a strange memory interface. We can't just add more + * memory to the VM. So, create a trap instead which reads and writes to + * the ppi region. It's very slow but ppi shouldn't be used frequently. + */ + ppi_mmio.arg1 = ppi; + error = register_mem(&ppi_mmio); + if (error) { + warnx("%s: failed to create trap for ppi accesses", __func__); + goto err_out; + } + + *sc = ppi; + + return (0); + +err_out: + free(fwcfg); + free(ppi); + + return (error); +} + +static void +tpm_ppi_deinit(void *sc) +{ + struct tpm_ppi_qemu *ppi; + int error; + + if (sc == NULL) + return; + + ppi = sc; + + error = unregister_mem(&ppi_mmio); + assert(error = 0); + + free(ppi); +} + +static int +tpm_ppi_write_dsdt_regions(void *sc __unused) +{ + /* + * struct tpm_ppi_qemu + */ + /* + * According to qemu the Windows ACPI parser has a bug that DerefOf is + * broken for SYSTEM_MEMORY. Due to that bug, qemu uses a dynamic + * operation region inside a method. + */ + dsdt_line("Method(TPFN, 1, Serialized)"); + dsdt_line("{"); + dsdt_line(" If(LGreaterEqual(Arg0, 0x100))"); + dsdt_line(" {"); + dsdt_line(" Return(Zero)"); + dsdt_line(" }"); + dsdt_line( + " OperationRegion(TPP1, SystemMemory, Add(0x%8x, Arg0), One)", + TPM_PPI_ADDRESS); + dsdt_line(" Field(TPP1, ByteAcc, NoLock, Preserve)"); + dsdt_line(" {"); + dsdt_line(" TPPF, 8,"); + dsdt_line(" }"); + dsdt_line(" Return(TPPF)"); + dsdt_line("}"); + dsdt_line("OperationRegion(TPP2, SystemMemory, 0x%8x, 0x%x)", + TPM_PPI_ADDRESS + 0x100, 0x5A); + dsdt_line("Field(TPP2, AnyAcc, NoLock, Preserve)"); + dsdt_line("{"); + dsdt_line(" PPIN, 8,"); + dsdt_line(" PPIP, 32,"); + dsdt_line(" PPRP, 32,"); + dsdt_line(" PPRQ, 32,"); + dsdt_line(" PPRM, 32,"); + dsdt_line(" LPPR, 32,"); + dsdt_line("}"); + /* + * Used for TCG Platform Reset Attack Mitigation + */ + dsdt_line("OperationRegion(TPP3, SystemMemory, 0x%8x, 1)", + TPM_PPI_ADDRESS + sizeof(struct tpm_ppi_qemu)); + dsdt_line("Field(TPP3, ByteAcc, NoLock, Preserve)"); + dsdt_line("{"); + dsdt_line(" MOVV, 8,"); + dsdt_line("}"); + + return (0); +} + +static int +tpm_ppi_write_dsdt_dsm(void *sc __unused) +{ + /* + * Physical Presence Interface + */ + dsdt_line( + "If(LEqual(Arg0, ToUUID(\"3DDDFAA6-361B-4EB4-A424-8D10089D1653\"))) /* UUID */"); + dsdt_line("{"); + /* + * Function 0 - _DSM Query Function + * Arguments: + * Empty Package + * Return: + * Buffer - Index field of supported functions + */ + dsdt_line(" If(LEqual(Arg2, 0)) /* Function */"); + dsdt_line(" {"); + dsdt_line(" Return(Buffer(0x02)"); + dsdt_line(" {"); + dsdt_line(" 0xFF, 0x01"); + dsdt_line(" })"); + dsdt_line(" }"); + /* + * Function 1 - Get Physical Presence Interface Version + * Arguments: + * Empty Package + * Return: + * String - Supported Physical Presence Interface revision + */ + dsdt_line(" If(LEqual(Arg2, 1)) /* Function */"); + dsdt_line(" {"); + dsdt_line(" Return(\"1.3\")"); + dsdt_line(" }"); + /* + * Function 2 - Submit TPM Operation Request to Pre-OS Environment + * !!!DEPRECATED BUT MANDATORY!!! + * Arguments: + * Integer - Operation Value of the Request + * Return: + * Integer - Function Return Code + * 0 - Success + * 1 - Operation Value of the Request Not Supported + * 2 - General Failure + */ + dsdt_line(" If(LEqual(Arg2, 2)) /* Function */"); + dsdt_line(" {"); + dsdt_line(" Store(DerefOf(Index(Arg3, 0)), Local0)"); + dsdt_line(" Store(TPFN(Local0), Local1)"); + dsdt_line(" If (LEqual(And(Local1, 7), 0))"); + dsdt_line(" {"); + dsdt_line(" Return(1)"); + dsdt_line(" }"); + dsdt_line(" Store(Local0, PPRQ)"); + dsdt_line(" Store(0, PPRM)"); + dsdt_line(" Return(0)"); + dsdt_line(" }"); + /* + * Function 3 - Get Pending TPM Operation Request By the OS + * Arguments: + * Empty Package + * Return: + * Package + * Integer 1 - Function Return Code + * 0 - Success + * 1 - General Failure + * Integer 2 - Pending operation requested by the OS + * 0 - None + * >0 - Operation Value of the Pending Request + * Integer 3 - Optional argument to pending operation requested by + * the OS + * 0 - None + * >0 - Argument of the Pending Request + */ + dsdt_line(" If(LEqual(Arg2, 3)) /* Function */"); + dsdt_line(" {"); + dsdt_line(" If(LEqual(Arg1, 1)) /* Revision */"); + dsdt_line(" {"); + dsdt_line(" Store(PPRQ, Index(TPM2, 1))"); + dsdt_line(" Return(TPM2)"); + dsdt_line(" }"); + dsdt_line(" If(LEqual(Arg1, 2)) /* Revision */"); + dsdt_line(" {"); + dsdt_line(" Store(PPRQ, Index(TPM3, 1))"); + dsdt_line(" Store(PPRM, Index(TPM3, 2))"); + dsdt_line(" Return(TPM3)"); + dsdt_line(" }"); + dsdt_line(" }"); + /* + * Function 4 - Get Platform-Specific Action to Transition to Pre-OS + * Environment + * Arguments: + * Empty Package + * Return: + * Integer - Action that the OS should take to transition to the + * pre-OS environment for execution of a requested operation + * 0 - None + * 1 - Shutdown + * 2 - Reboot + * 3 - OS Vendor-specific + */ + dsdt_line(" If(LEqual(Arg2, 4)) /* Function */"); + dsdt_line(" {"); + dsdt_line(" Return(2)"); + dsdt_line(" }"); + /* + * Function 5 - Return TPM Operation Response to OS Environment + * Arguments: + * Empty Package + * Return: + * Package + * Integer 1 - Function Return Code + * 0 - Success + * 1 - General Failure + * Integer 2 - Most recent operation request + * 0 - None + * >0 - Operation value of the most recent request + * Integer 3 - Response to the most recent operation request + * 0 - Success + * 0x00000001..0x000000FF - Corresponding TPM error code + * 0xFFFFFFF0 - User Abort or timeout of dialog + * 0xFFFFFFF1 - firmware failure + */ + dsdt_line(" If(LEqual(Arg2, 5)) /* Function */"); + dsdt_line(" {"); + dsdt_line(" Store(LPPR, Index(TPM3, 1))"); + dsdt_line(" Store(PPRP, Index(TPM3, 2))"); + dsdt_line(" Return(TPM3)"); + dsdt_line(" }"); + /* + * Function 6 - Submit preferred user language + * !!!DEPRECATED BUT MANDATORY!!! + * Arguments: + * Package + * String - Preferred language code + * Return: + * Integer + * 3 - Not implemented + */ + dsdt_line(" If(LEqual(Arg2, 6)) /* Function */"); + dsdt_line(" {"); + dsdt_line(" Return(3)"); + dsdt_line(" }"); + /* + * Function 7 - Submit TPM Operation Request to Pre-OS Environment 2 + * Arguments: + * Package + * Integer 1 - Operation Value of the Request + * Integer 2 - Argument for Operation + * Return: + * Integer - Function Return Code + * 0 - Success + * 1 - Not Implemented + * 2 - General Failure + * 3 - Operation blocked by current firmware settings + */ + dsdt_line(" If(LEqual(Arg2, 7)) /* Function */"); + dsdt_line(" {"); + dsdt_line(" Store(DerefOf(Index(Arg3, 0)), Local0)"); + dsdt_line(" Store(TPFN(Local0), Local1)"); + dsdt_line(" If (LEqual(And(Local1, 7), 0)) /* Not Implemented */"); + dsdt_line(" {"); + dsdt_line(" Return(1)"); + dsdt_line(" }"); + dsdt_line(" If (LEqual(And(Local1, 7), 2)) /* Blocked */ "); + dsdt_line(" {"); + dsdt_line(" Return(3)"); + dsdt_line(" }"); + dsdt_line(" If(LEqual(Arg1, 1)) /* Revision */"); + dsdt_line(" {"); + dsdt_line(" Store(Local0, PPRQ)"); + dsdt_line(" Store(0, PPRM)"); + dsdt_line(" }"); + dsdt_line(" If(LEqual(Arg1, 2)) /* Revision */"); + dsdt_line(" {"); + dsdt_line(" Store(Local0, PPRQ)"); + dsdt_line(" Store(DerefOf(Index(Arg3, 1)), PPRM)"); + dsdt_line(" }"); + dsdt_line(" Return(0)"); + dsdt_line(" }"); + /* + * Function 8 - Get User Confirmation Status for Operation + * Arguments: + * Package + * Integer - Operation Value that may need user confirmation + * Return: + * Integer - Function Return Code + * 0 - Not implemented + * 1 - Firmware only + * 2 - Blocked for OS by firmware configuration + * 3 - Allowed and physically present user required + * 4 - Allowed and physically present user not required + */ + dsdt_line(" If(LEqual(Arg2, 8)) /* Function */"); + dsdt_line(" {"); + dsdt_line(" Store(DerefOf(Index(Arg3, 0)), Local0)"); + dsdt_line(" Store(TPFN(Local0), Local1)"); + dsdt_line(" Return(And(Local1, 7))"); + dsdt_line(" }"); + /* + * Unknown function + */ + dsdt_line(" Return(Buffer(1)"); + dsdt_line(" {"); + dsdt_line(" 0x00"); + dsdt_line(" })"); + dsdt_line("}"); + + /* + * TCG Platform Reset Attack Mitigation + */ + dsdt_line( + "If(LEqual(Arg0, ToUUID(\"376054ED-CC13-4675-901C-4756D7F2D45D\"))) /* UUID */"); + dsdt_line("{"); + /* + * Function 0 - _DSM Query Function + * Arguments: + * Empty Package + * Return: + * Buffer - Index field of supported functions + */ + dsdt_line(" If(LEqual(Arg2, 0)) /* Function */"); + dsdt_line(" {"); + dsdt_line(" Return(Buffer(1)"); + dsdt_line(" {"); + dsdt_line(" 0x03"); + dsdt_line(" })"); + dsdt_line(" }"); + /* + * Function 1 - Memory Clear + * Arguments: + * Package + * Integer - Operation Value of the Request + * Return: + * Integer - Function Return Code + * 0 - Success + * 1 - General Failure + */ + dsdt_line(" If(LEqual(Arg2, 1)) /* Function */"); + dsdt_line(" {"); + dsdt_line(" Store(DerefOf(Index(Arg3, 0)), Local0)"); + dsdt_line(" Store(Local0, MOVV)"); + dsdt_line(" Return(0)"); + dsdt_line(" }"); + dsdt_line("}"); + + return (0); +} + +static struct tpm_ppi tpm_ppi_qemu = { + .name = TPM_PPI_QEMU_NAME, + .init = tpm_ppi_init, + .deinit = tpm_ppi_deinit, + .write_dsdt_regions = tpm_ppi_write_dsdt_regions, + .write_dsdt_dsm = tpm_ppi_write_dsdt_dsm, +}; +TPM_PPI_SET(tpm_ppi_qemu); From nobody Mon Aug 14 09:35:23 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RPTlb4dgsz4qD02; Mon, 14 Aug 2023 09:35:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RPTlb3v1Qz4My4; Mon, 14 Aug 2023 09:35:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692005723; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Q2jqxhYpL9UqU3SS/FHH1mSBrx7dSEeJRyJuKEGE14o=; b=QAwakrhGKq51MIzVpNOkEfz22hxY8DHpxFrEjRHv4wiG1XwTW/6lltpuhy37yudxeuNDYt 6FlX7zgImoBXYRVYl7gmV3Y5lTNGcSpahNrYunlxa6yuamy8UF65otYNA4H3Vt2zQ0wr0a wOzC1Rc69MwN74sd9Ao7eQdh6vmUUwy7QcachIoAf3UozMFVA+i9nkGxXB/FSEU0soQGT0 L20u5TRK3KizJ2/YGFyhuVT/cX10urn94Y1bPnbPwknOwP8b1yGnZpf7+8qoE3+BFAQo9j qgUdyPAPfo+KH33U5eVz/w2PPnLPMYokfXMWLw5NPA0rVUnXtS6pevU8tWbDkQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692005723; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Q2jqxhYpL9UqU3SS/FHH1mSBrx7dSEeJRyJuKEGE14o=; b=Nw7n0SOxs6gSKbfkAVlWKypiJVpHlT0ZfEIFg4YzYZIV56gOJcJo7y0qF3pcJvY3DMXMxf DRM+9VcM2K7AsMvwsE8RRd34DL11XzLH+TEl4g6M3pzhrKpjJWm6ZiigUJh0eS/tD+Uuvz sQp4r8R4+M+Z56k5OYXmQo7K1WJc/aRSIPk5Q1Y+LjDtWHRxwJQSieJwPj/R48kR+oC+Oi xhpXEgiRKGpssKhgh7/As+FXVrSC5+wCH78KsTMTqAWTvk5BSnW7cH5cgwOtSow9bI6mES VjWjHgQR0FnErw2FlPkwX/ey+nxJKCMowabwP5FSjJP1XNdTTeFed2CPRNrVIg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692005723; a=rsa-sha256; cv=none; b=lsHFrkeRNjE0GJ3vgp/nHAKlSJYlO7dX7QNFvvXC3d5AJyqOTaea5qp27wMWnHsmNklBsa 6H85x7Odve641mjyd0c3NtAPT4DoU66SNA7JRitvMnMi0PYR+ycuwjPBqV+TiIJv6+5Ky+ 1xkk8t5KRRoqVtR42qpGMRpvUEk9sQXNGm3v9zaiHEiL6f2+YlOYBZ7y2NSphYNJkrB4LR 0xM0+pCazByBBroPCGq8Pbr5q8mxaUMbIoWlBXCVlMcRVUA00vjeL/3mhj+pBfhYKSDOeN +G8p6pAMhno/2TaBhb0YGw6iAOSpHYbO89HK6orySV7cgrP2mESbJMzd3mURJw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RPTlb2wwJz7rD; Mon, 14 Aug 2023 09:35:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37E9ZNP2028730; Mon, 14 Aug 2023 09:35:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37E9ZN6X028727; Mon, 14 Aug 2023 09:35:23 GMT (envelope-from git) Date: Mon, 14 Aug 2023 09:35:23 GMT Message-Id: <202308140935.37E9ZN6X028727@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Richard Scheffenegger Subject: git: 110b2f4d47dd - stable/13 - tcp: Handle in SYN-RCVD List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rscheff X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 110b2f4d47dddadebd71ed327bd9a10f9acbbbfe Auto-Submitted: auto-generated The branch stable/13 has been updated by rscheff: URL: https://cgit.FreeBSD.org/src/commit/?id=110b2f4d47dddadebd71ed327bd9a10f9acbbbfe commit 110b2f4d47dddadebd71ed327bd9a10f9acbbbfe Author: Richard Scheffenegger AuthorDate: 2023-07-26 22:41:25 +0000 Commit: Richard Scheffenegger CommitDate: 2023-08-14 08:48:52 +0000 tcp: Handle in SYN-RCVD Patch base stack to correctly handle the RST bit independently of other header flags per TCP RFC. MFC after: 1 week Reviewed By: tuexen, #transport Sponsored by: NetApp, Inc. Differential Revision: https://reviews.freebsd.org/D40982 (cherry picked from commit b352ef58c29b1f2967e358c147e0f7faf8cfbef3) --- sys/netinet/tcp_input.c | 4 ++++ sys/netinet/tcp_syncache.c | 12 ------------ 2 files changed, 4 insertions(+), 12 deletions(-) diff --git a/sys/netinet/tcp_input.c b/sys/netinet/tcp_input.c index bb2a0e497dcf..f2890dff7290 100644 --- a/sys/netinet/tcp_input.c +++ b/sys/netinet/tcp_input.c @@ -2021,6 +2021,10 @@ tcp_do_segment(struct mbuf *m, struct tcphdr *th, struct socket *so, * if seg contains an ACK, but not for our SYN/ACK, send a RST. */ case TCPS_SYN_RECEIVED: + if (thflags & TH_RST) { + /* Handle RST segments later. */ + break; + } if ((thflags & TH_ACK) && (SEQ_LEQ(th->th_ack, tp->snd_una) || SEQ_GT(th->th_ack, tp->snd_max))) { diff --git a/sys/netinet/tcp_syncache.c b/sys/netinet/tcp_syncache.c index b3c2fbeb927e..59a8df134f80 100644 --- a/sys/netinet/tcp_syncache.c +++ b/sys/netinet/tcp_syncache.c @@ -619,18 +619,6 @@ syncache_chkrst(struct in_conninfo *inc, struct tcphdr *th, struct mbuf *m, sc = syncache_lookup(inc, &sch); /* returns locked sch */ SCH_LOCK_ASSERT(sch); - /* - * Any RST to our SYN|ACK must not carry ACK, SYN or FIN flags. - * See RFC 793 page 65, section SEGMENT ARRIVES. - */ - if (th->th_flags & (TH_ACK|TH_SYN|TH_FIN)) { - if ((s = tcp_log_addrs(inc, th, NULL, NULL))) - log(LOG_DEBUG, "%s; %s: Spurious RST with ACK, SYN or " - "FIN flag set, segment ignored\n", s, __func__); - TCPSTAT_INC(tcps_badrst); - goto done; - } - /* * No corresponding connection was found in syncache. * If syncookies are enabled and possibly exclusively From nobody Mon Aug 14 09:39:30 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RPTrM14QLz4qDdt; Mon, 14 Aug 2023 09:39: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RPTrM0Zstz4Njt; Mon, 14 Aug 2023 09:39:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692005971; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3UvcGgW4tIctWg23J9Zdk5yrZELKFmSkHnYx/NtfN0I=; b=rd+yikvwNnXKN1XqKkNjXJPBL44Sp64lsOJ4BsrW5w/ep1TrUQsS4BEicuf5ngHdarC8i3 75FYbXhoy0lFmbfGu45/+mDLBDIRV5ON9rTqNoyYPkv2PpKPYqLJTb+6GRPCzuA6zSCSY2 Cg8pbSPzlZs+HUVrSP0qpfUayaweu7aqUx4gcr6NcTUBPtxERLqEWhP04cFKlluD1VRTgD QoWsel8XPr17O4Yf2+orbZGN9ElfIVdXEgJ+2pg+vLAr//n65KPHJIP1VzWTALVUNS/NMB yHDuv8EzQEnRg54aTwQfdUd4qV9YfwW2XIZvimQEBmcHqnYiEighQFrXG1O1Xg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692005971; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3UvcGgW4tIctWg23J9Zdk5yrZELKFmSkHnYx/NtfN0I=; b=im8vkTj14Avziq56wkag8QPSdfQIsG5AFrCSD+O8z+J9fWjv4acz4duwKDwegLZZClWnxU Yl7W09yFHLhEVn6zqOFQg7m/iOUSJaJv4A35PqqedgkFFBxoqm4Br3FbVJxDqyBnmdWzfr YQYxgx9hRGvyuLQcbj1JHWeeQxim/RcPrNlbChOfHfcmcN9NDTg7uECikc2myRDndxa2Jw skr974llLXfjXvRywLC1dY+seG85zIN7/CdOFUszTcMwU9wiNmnqqDCnEdaZ4iKepSmWdA MjUJpmV9d7B52+e4a/xXX0H5qAQBIT+ePUZtbWTTlo9erdOYw2Fv673HXvrSpQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692005971; a=rsa-sha256; cv=none; b=VChcj/wOKy8uCI051e6EKqLNt0wQ+vyrABNKPHBPLI1SzFFpy1NGx70KpEGQfDWOC51KLR 5TLP/x9uhXgv0b2aS5aA9yvvk9CMw44n6HeBxFOuh479XAB5PFp4HFvsjlmLSLheR8dEZR ie6MwJ2rC2oAswsyOWmEHh6lHS/VSw6dDIdD+/WZQmMRZNWPLI68mijzh0E5kvy+xppsvE Zpzc5robbdzTCaEliK8mqpX7q00mpcx7urG6AFEDTbSq3zpORt5UilgvWQ6dHmziAaaVmL 8ewTDy8ha+5KmerKqnhbgOvoW0T57GOv/ITgdAi9mALmopvf9NdgPssIuryRGQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RPTrL6g08z8M4; Mon, 14 Aug 2023 09:39:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37E9dUxQ029447; Mon, 14 Aug 2023 09:39:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37E9dUfL029444; Mon, 14 Aug 2023 09:39:30 GMT (envelope-from git) Date: Mon, 14 Aug 2023 09:39:30 GMT Message-Id: <202308140939.37E9dUfL029444@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Richard Scheffenegger Subject: git: b2d895f70ded - stable/12 - tcp: Handle in SYN-RCVD List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rscheff X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: b2d895f70ded2c7c179d6380efb1423fabad5564 Auto-Submitted: auto-generated The branch stable/12 has been updated by rscheff: URL: https://cgit.FreeBSD.org/src/commit/?id=b2d895f70ded2c7c179d6380efb1423fabad5564 commit b2d895f70ded2c7c179d6380efb1423fabad5564 Author: Richard Scheffenegger AuthorDate: 2023-07-26 22:41:25 +0000 Commit: Richard Scheffenegger CommitDate: 2023-08-14 09:38:03 +0000 tcp: Handle in SYN-RCVD Patch base stack to correctly handle the RST bit independently of other header flags per TCP RFC. MFC after: 1 week Reviewed By: tuexen, #transport Sponsored by: NetApp, Inc. Differential Revision: https://reviews.freebsd.org/D40982 (cherry picked from commit b352ef58c29b1f2967e358c147e0f7faf8cfbef3) --- sys/netinet/tcp_input.c | 4 ++++ sys/netinet/tcp_syncache.c | 12 ------------ 2 files changed, 4 insertions(+), 12 deletions(-) diff --git a/sys/netinet/tcp_input.c b/sys/netinet/tcp_input.c index fd55a5a09369..0fa2c7ac6562 100644 --- a/sys/netinet/tcp_input.c +++ b/sys/netinet/tcp_input.c @@ -1966,6 +1966,10 @@ tcp_do_segment(struct mbuf *m, struct tcphdr *th, struct socket *so, * if seg contains an ACK, but not for our SYN/ACK, send a RST. */ case TCPS_SYN_RECEIVED: + if (thflags & TH_RST) { + /* Handle RST segments later. */ + break; + } if ((thflags & TH_ACK) && (SEQ_LEQ(th->th_ack, tp->snd_una) || SEQ_GT(th->th_ack, tp->snd_max))) { diff --git a/sys/netinet/tcp_syncache.c b/sys/netinet/tcp_syncache.c index d06b54cffc1c..a530bbbabb2a 100644 --- a/sys/netinet/tcp_syncache.c +++ b/sys/netinet/tcp_syncache.c @@ -558,18 +558,6 @@ syncache_chkrst(struct in_conninfo *inc, struct tcphdr *th, struct mbuf *m) sc = syncache_lookup(inc, &sch); /* returns locked sch */ SCH_LOCK_ASSERT(sch); - /* - * Any RST to our SYN|ACK must not carry ACK, SYN or FIN flags. - * See RFC 793 page 65, section SEGMENT ARRIVES. - */ - if (th->th_flags & (TH_ACK|TH_SYN|TH_FIN)) { - if ((s = tcp_log_addrs(inc, th, NULL, NULL))) - log(LOG_DEBUG, "%s; %s: Spurious RST with ACK, SYN or " - "FIN flag set, segment ignored\n", s, __func__); - TCPSTAT_INC(tcps_badrst); - goto done; - } - /* * No corresponding connection was found in syncache. * If syncookies are enabled and possibly exclusively From nobody Mon Aug 14 10:30:29 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RPVz96762z4qHpG; Mon, 14 Aug 2023 10:30: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RPVz95bxNz4S3K; Mon, 14 Aug 2023 10:30:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692009029; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=UmBzim2SZh5yNW87yP+f+KJaQlpw2bqO6ekbpB2WYds=; b=rH1IPSbCQF7Bf4VqGOsAzTY88vSL36t0u29b18KlhMdFYUolNObhq1WDLIYjAK5JJfGdci xc7CD92Yw2aQobsmL7E4Q061jaZl93rAiSFLj2mXuK168H+z5orVS2K4aPuVQkHeTPDxEA qbUVnm2Hq/IGFn6xszG/yjitKbqIaluxeJMjaVYGT6aO9YXMreKXHAhOpatCebJryRNE4S CHwp8cjjaSHbPeKjmmKNzeKLu7FORG7DGcC9DGsANcp/gC3NVqwW1t/ffnyCFfTi3sh1Aw TC9ZSqcRlsNSdgSrHXH7wLzz+hr6SPmipgaCS6T8wZyAyf+F0GDKI5aY/zAvLw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692009029; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=UmBzim2SZh5yNW87yP+f+KJaQlpw2bqO6ekbpB2WYds=; b=OeOafukr59f6WhpuWhXr4LhVU//pRMpF8wQCihCf9PTJ5+oQIpLALIh7/cpr5dfcBp8KO1 kIwf45VVH//MFMLr/pYpAtpd5o5NZvzpi68KUetXkV1pNjlvWLQ/DDxUJupxdtJLvXmuQy eaYF2VORB5RTGh8AsPN/veLjhHVO9wu7/u1x3ob0DILvetgAwv+AGSZ2TjykQ9LOHYdjEE DsILtyJwSNDDF82W6B4bkKwxneKy3d13nIrju0SQWhshlwPAcpFR8m2OtaIsE4F/4hr5U7 z2hCKAUyl0QkMfjapxioJuSo+7T1ipoEjL1prgJs1ys6TfutEjgRFLoV0Lsu+A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692009029; a=rsa-sha256; cv=none; b=Jmx5mXEm7KZ+jjmLqYLtGmYWKVjIFNxQ1nB2hSDCPUJonZPWOQGZQ/q5F/1Naiyt9AWOtE k3mKN5lJYUzBRGlyWZPbLZRO3+ScdyGkFi7sMOeLYkAHdaMt7GlTKrMwt4igXlJOXb5iFx dpYN0NSyBo+z5jGbZWKlrZ0TziYNRGTYLJqU++2P/qDSpnglWYuOKs+N/TNJufvNDHTm+k iWuWHcqAyqRhKnkoCnnXa11uOs4ANjwEzYGupCDz02UGijp/cWBdwQkyIAYjVXJtg3gyaE F0LIVQMSdng0LxqOtrODBFzfm+FtDxpy6C5iKvQsKQNezU1UQDdzRk16DRWC4g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RPVz94Ltyz9XL; Mon, 14 Aug 2023 10:30:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37EAUTBH020477; Mon, 14 Aug 2023 10:30:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37EAUTk8020474; Mon, 14 Aug 2023 10:30:29 GMT (envelope-from git) Date: Mon, 14 Aug 2023 10:30:29 GMT Message-Id: <202308141030.37EAUTk8020474@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Michael Tuexen Subject: git: 749a7fb588c4 - main - sctp: cleanup List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: tuexen X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 749a7fb588c4a872a4f1ce3ee92be86bab1b1f17 Auto-Submitted: auto-generated The branch main has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=749a7fb588c4a872a4f1ce3ee92be86bab1b1f17 commit 749a7fb588c4a872a4f1ce3ee92be86bab1b1f17 Author: Michael Tuexen AuthorDate: 2023-08-14 10:27:39 +0000 Commit: Michael Tuexen CommitDate: 2023-08-14 10:27:39 +0000 sctp: cleanup Do not put a variable in the stcb for passing it to a function. Just use a parameter of the function. No functional change intended. MFC after: 1 week --- sys/netinet/sctp_indata.c | 9 ++------- sys/netinet/sctp_pcb.c | 11 +++-------- sys/netinet/sctputil.c | 27 ++++++++++----------------- 3 files changed, 15 insertions(+), 32 deletions(-) diff --git a/sys/netinet/sctp_indata.c b/sys/netinet/sctp_indata.c index b8bfaf164904..ba2504d0fea8 100644 --- a/sys/netinet/sctp_indata.c +++ b/sys/netinet/sctp_indata.c @@ -5491,9 +5491,8 @@ sctp_handle_forward_tsn(struct sctp_tcb *stcb, struct sctp_association *asoc; uint32_t new_cum_tsn, gap; unsigned int i, fwd_sz, m_size; - uint32_t str_seq; struct sctp_stream_in *strm; - struct sctp_queued_to_read *control, *ncontrol, *sv; + struct sctp_queued_to_read *control, *ncontrol; asoc = &stcb->asoc; if ((fwd_sz = ntohs(fwd->ch.chunk_length)) < sizeof(struct sctp_forward_tsn_chunk)) { @@ -5674,9 +5673,7 @@ sctp_handle_forward_tsn(struct sctp_tcb *stcb, TAILQ_FOREACH(control, &stcb->sctp_ep->read_queue, next) { if ((control->sinfo_stream == sid) && (SCTP_MID_EQ(asoc->idata_supported, control->mid, mid))) { - str_seq = (sid << 16) | (0x0000ffff & mid); control->pdapi_aborted = 1; - sv = stcb->asoc.control_pdapi; control->end_added = 1; if (control->on_strm_q == SCTP_ON_ORDERED) { TAILQ_REMOVE(&strm->inqueue, control, next_instrm); @@ -5699,13 +5696,11 @@ sctp_handle_forward_tsn(struct sctp_tcb *stcb, #endif } control->on_strm_q = 0; - stcb->asoc.control_pdapi = control; sctp_ulp_notify(SCTP_NOTIFY_PARTIAL_DELVIERY_INDICATION, stcb, SCTP_PARTIAL_DELIVERY_ABORTED, - (void *)&str_seq, + (void *)control, SCTP_SO_NOT_LOCKED); - stcb->asoc.control_pdapi = sv; break; } else if ((control->sinfo_stream == sid) && SCTP_MID_GT(asoc->idata_supported, control->mid, mid)) { diff --git a/sys/netinet/sctp_pcb.c b/sys/netinet/sctp_pcb.c index aad5879afe63..0f1d2291a819 100644 --- a/sys/netinet/sctp_pcb.c +++ b/sys/netinet/sctp_pcb.c @@ -4777,20 +4777,15 @@ sctp_free_assoc(struct sctp_inpcb *inp, struct sctp_tcb *stcb, int from_inpcbfre * added right after this * msg. */ - uint32_t strseq; - - stcb->asoc.control_pdapi = sq; - strseq = (sq->sinfo_stream << 16) | (sq->mid & 0x0000ffff); sctp_ulp_notify(SCTP_NOTIFY_PARTIAL_DELVIERY_INDICATION, stcb, SCTP_PARTIAL_DELIVERY_ABORTED, - (void *)&strseq, + (void *)sq, SCTP_SO_LOCKED); - stcb->asoc.control_pdapi = NULL; } + /* Add an end to wake them */ + sq->end_added = 1; } - /* Add an end to wake them */ - sq->end_added = 1; } } SCTP_INP_READ_UNLOCK(inp); diff --git a/sys/netinet/sctputil.c b/sys/netinet/sctputil.c index f85cf99a43fe..3a952a452289 100644 --- a/sys/netinet/sctputil.c +++ b/sys/netinet/sctputil.c @@ -3642,7 +3642,8 @@ sctp_notify_adaptation_layer(struct sctp_tcb *stcb) static void sctp_notify_partial_delivery_indication(struct sctp_tcb *stcb, uint32_t error, - uint32_t val, int so_locked) + struct sctp_queued_to_read *aborted_control, + int so_locked) { struct mbuf *m_notify; struct sctp_pdapi_event *pdapi; @@ -3655,6 +3656,7 @@ sctp_notify_partial_delivery_indication(struct sctp_tcb *stcb, uint32_t error, return; } + KASSERT(aborted_control != NULL, ("aborted_control is NULL")); SCTP_INP_READ_LOCK_ASSERT(stcb->sctp_ep); m_notify = sctp_get_mbuf_for_msg(sizeof(struct sctp_pdapi_event), 0, M_NOWAIT, 1, MT_DATA); @@ -3668,8 +3670,8 @@ sctp_notify_partial_delivery_indication(struct sctp_tcb *stcb, uint32_t error, pdapi->pdapi_flags = 0; pdapi->pdapi_length = sizeof(struct sctp_pdapi_event); pdapi->pdapi_indication = error; - pdapi->pdapi_stream = (val >> 16); - pdapi->pdapi_seq = (val & 0x0000ffff); + pdapi->pdapi_stream = aborted_control->sinfo_stream; + pdapi->pdapi_seq = (uint16_t)aborted_control->mid; pdapi->pdapi_assoc_id = sctp_get_associd(stcb); SCTP_BUF_LEN(m_notify) = sizeof(struct sctp_pdapi_event); @@ -3695,12 +3697,7 @@ sctp_notify_partial_delivery_indication(struct sctp_tcb *stcb, uint32_t error, sctp_sblog(sb, control->do_not_ref_stcb ? NULL : stcb, SCTP_LOG_SBRESULT, 0); } control->end_added = 1; - if (stcb->asoc.control_pdapi) - TAILQ_INSERT_AFTER(&stcb->sctp_ep->read_queue, stcb->asoc.control_pdapi, control, next); - else { - /* we really should not see this case */ - TAILQ_INSERT_TAIL(&stcb->sctp_ep->read_queue, control, next); - } + TAILQ_INSERT_AFTER(&stcb->sctp_ep->read_queue, aborted_control, control, next); if (stcb->sctp_ep && stcb->sctp_socket) { /* This should always be the case */ sctp_sorwakeup(stcb->sctp_ep, stcb->sctp_socket); @@ -4136,14 +4133,10 @@ sctp_ulp_notify(uint32_t notification, struct sctp_tcb *stcb, (struct sctp_tmit_chunk *)data, so_locked); break; case SCTP_NOTIFY_PARTIAL_DELVIERY_INDICATION: - { - uint32_t val; - - val = *((uint32_t *)data); - - sctp_notify_partial_delivery_indication(stcb, error, val, so_locked); - break; - } + sctp_notify_partial_delivery_indication(stcb, error, + (struct sctp_queued_to_read *)data, + so_locked); + break; case SCTP_NOTIFY_ASSOC_LOC_ABORTED: if ((SCTP_GET_STATE(stcb) == SCTP_STATE_COOKIE_WAIT) || (SCTP_GET_STATE(stcb) == SCTP_STATE_COOKIE_ECHOED)) { From nobody Mon Aug 14 12:47:14 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RPZ0y4gZPz4qRxp; Mon, 14 Aug 2023 12:47:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RPZ0y49Hnz3C03; Mon, 14 Aug 2023 12:47:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692017234; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=V2dXETOlNXPGiECpnpmlnjZX995gsGX5w5SuMzVvcLA=; b=Afj16ckU7eHaYYJYAXlnHtsiFyxB6Xs7q1G0TUBlP2J14rtXkaufrWsM0ThXDYyV1dlOwP 6Gniq3v1e4VG0DfT1aqkAHWyABqXBPEiDv1jwkSio+CmsxRiyJx2I1Dxz/NCMBsfy5EKXx EVkDF0er7sQBKyDlkBAllwZCtPOzMZJxUhoDkB8bJ8eFq4bB0yHkvQ0TGJvc5Q5dDZTzwr 0wtZYnWjCMtQaoLe2AqlWZy3tmYI1E9qXnznjD5nhbyO2vMcuPl28rmBy5IaO/DvCT5e/Y eaW8qFz5uuj81I9Y/0pfjdY3XLy0lKGYnFJb1sJ36/EsJbpePHWF04d0G/NqTA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692017234; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=V2dXETOlNXPGiECpnpmlnjZX995gsGX5w5SuMzVvcLA=; b=oKVPZOC5YISTQbOfEcKrc7H3MhWsOPiAg37V2jGUHSnozYsKipidtFtq6PDKRFj4vxlsmZ D3FNhcPmaXzH+Vrl7tbQYX9NzKQ/n5i2+ubwcR1Ev2Io7pCvh0ZQDsqIj5AJN6qGQDll8u X3iyBJmKMYBVjo57hOr8GcOoK63yH3w04msvqc0CRRY/KLfMGugUizrguHy78muS4cUJi7 CsPN5mX+iSYMBvKBbxGpQ1W91XilDz2ZiUjdlkjnlmWVnVysNkJ5cwAxsW25XCF9P8jK0O fmzWQpfbSLf2N46/bUxjByDNbGKAr9HEOIvaJfGRJEYArBy51koyQ1ZnWf0QqQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692017234; a=rsa-sha256; cv=none; b=bFTlr/RCFBiNfrslGKOHU5OqJmV73s/timKfJJIMimAwKihsoNUEo2/XRGAWwViVs2fNyB yw8maSvmM4+DRPXVhvd2wGkhkc6zfaS4nzDVffLegouCUyO+Ajv84lh3Z7F522uV1NGr8/ RXtQk1RL6U3VguAd2pgVJ117/3kTtGPH7TfpyptfihtNeyfeyJKHVPdRDIVo2CjFuvlmQp aft1MRTo751GqALKtgtvTj/0HhTFbnM8AL41dGLrmF7P4azSHKXHAlt4q8MNurkIFKoh6S cG5t7iQwluD7gCQ/rNw/6LZxr1JkAtlaXpdXKl9sGfaT80PqHgZdFx4ernDlfA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RPZ0y33XSzTJY; Mon, 14 Aug 2023 12:47:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37EClE9B044172; Mon, 14 Aug 2023 12:47:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37EClEj0044169; Mon, 14 Aug 2023 12:47:14 GMT (envelope-from git) Date: Mon, 14 Aug 2023 12:47:14 GMT Message-Id: <202308141247.37EClEj0044169@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dmitry Chagin Subject: git: 7d561928e65a - main - linux(4): Fix control message size calculation again List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dchagin X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7d561928e65af6fe90ff9e316b2d50668c53b464 Auto-Submitted: auto-generated The branch main has been updated by dchagin: URL: https://cgit.FreeBSD.org/src/commit/?id=7d561928e65af6fe90ff9e316b2d50668c53b464 commit 7d561928e65af6fe90ff9e316b2d50668c53b464 Author: Dmitry Chagin AuthorDate: 2023-08-14 12:46:11 +0000 Commit: Dmitry Chagin CommitDate: 2023-08-14 12:46:11 +0000 linux(4): Fix control message size calculation again It looks Linux recvmsg allows msg_controllen size less then CMSG_SPACE buffer, at least for case with one cmsghdr. Glibc misc/tst-scm_rights test succed on Ubuntu 23.04 Fixes: 67116c69 "linux(4): Fix control message size calculation" MFC after: 1 week --- sys/compat/linux/linux_socket.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/compat/linux/linux_socket.c b/sys/compat/linux/linux_socket.c index ac411aae1cb3..4c8276b64afd 100644 --- a/sys/compat/linux/linux_socket.c +++ b/sys/compat/linux/linux_socket.c @@ -1852,7 +1852,7 @@ cont: if (error != 0) goto bad; - if (outlen + LINUX_CMSG_SPACE(datalen) > maxlen) { + if (outlen + LINUX_CMSG_LEN(datalen) > maxlen) { if (outlen == 0) { error = EMSGSIZE; goto err; From nobody Mon Aug 14 12:47:15 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RPZ101Mbvz4qRtJ; Mon, 14 Aug 2023 12:47:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RPZ0z4yl1z3C56; Mon, 14 Aug 2023 12:47:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692017235; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=snUk0uZIiVB8jEL0jlyz6hUFA/LRcr/jN8VxPSct96o=; b=dqhnNpUeQcerdxIAS3uePJz7rUhCLpRC+wvvsl/5asACD9jaiVcD/KpJDfcgXSaASr2mKZ svL4xEw8keh3rgM7eEqB2IoQOxA8iXB8Rs8CYVZpt3STXA+1X5o2frBzAMtlfnfFuPWvX7 lMSAtyPkriHgaUT2QtSHmL0TUDDAWwZW4T8HOnmWN1tEQSyVBO8Wq+lJGsO58QOnDuDR+Z uPC3K3wx/C3vtsBdckkdNmp4IWL5uBnMYLU8YE6+pQQhDLRmwur8DDShAftUcGSRgJ1xjp 7QLEMPvcvjtcT6VDb6QQXd5KGgNvkvQVBwPhpZLdH6FXeS7UiyFaMQKKqrvetg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692017235; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=snUk0uZIiVB8jEL0jlyz6hUFA/LRcr/jN8VxPSct96o=; b=EZCMnCmklz4kLWCpG/NzUPTXOh+pQrhZWkW+RTcC3YmzvhhZNh7F+3lf9lQJNaoP02HMRT Eq+IfosVzx0F1lgWmd66+pOhxn+WzwrmUOrBTKLvnFEQOcps+Cy9i/kqdwvdOnOo0m3QL0 ZwM9bDPHVVdeGsLjKuLzzkwl9SoWKNLPkFB1VIZh0EmGZW8pfNaAK3YXbM/YbYb6wqYWdS LcqGeFhfS3NOnBfxmUGRmdiMDNHgx87DY1h/YeMkIyoetqZXQwmOh/PgzKhhEK7+V/067w 2VWOeZBmHnvmq+OI8NnAnmEkqpaBQYOxya3mz8m0ZPHoVp1NAGsqv6OiFIHvpQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692017235; a=rsa-sha256; cv=none; b=Y5dzpjAP/3/nt2qU+2AJoFX/ykGg66SRU3lyJBJaHg2qXHr9CJgB6ROXgikF3LLvA03MeM Hmbp010el4FxmJVgcn5IVBQo+f3K29G1oW3zB6tbUwIiZng0DQhY84KjHfX0bJvgKare2+ SMnfLnJ06LN0ucXspImoeWf5dEG0i1ChGO2AzP4A/N6WzgTV2DKJswO/XF6pAssJUb3CQk QsytG5BGIPXhjn8KGB4Qf7j+VY9/+A2rU8L75MvCIq7RI/jwxVRsjxgdn2xb9/Ter0DQ9m laACPntlKNdrFBJTstRktJ+gx6q9i0Xp1tzlK319XgZ8IVrhq9xFaD1lsd5Cqw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RPZ0z3ql3zDCp; Mon, 14 Aug 2023 12:47:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37EClFL4044220; Mon, 14 Aug 2023 12:47:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37EClFL8044217; Mon, 14 Aug 2023 12:47:15 GMT (envelope-from git) Date: Mon, 14 Aug 2023 12:47:15 GMT Message-Id: <202308141247.37EClFL8044217@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dmitry Chagin Subject: git: 43c3beb7414e - main - linux(4): Drop bogus empty line in linux_socket.c List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dchagin X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 43c3beb7414e1cf031fe8e32e7ec1876a5b20610 Auto-Submitted: auto-generated The branch main has been updated by dchagin: URL: https://cgit.FreeBSD.org/src/commit/?id=43c3beb7414e1cf031fe8e32e7ec1876a5b20610 commit 43c3beb7414e1cf031fe8e32e7ec1876a5b20610 Author: Dmitry Chagin AuthorDate: 2023-08-14 12:46:12 +0000 Commit: Dmitry Chagin CommitDate: 2023-08-14 12:46:12 +0000 linux(4): Drop bogus empty line in linux_socket.c MFC after: 1 week --- sys/compat/linux/linux_socket.c | 1 - 1 file changed, 1 deletion(-) diff --git a/sys/compat/linux/linux_socket.c b/sys/compat/linux/linux_socket.c index 4c8276b64afd..791f59aaf552 100644 --- a/sys/compat/linux/linux_socket.c +++ b/sys/compat/linux/linux_socket.c @@ -1822,7 +1822,6 @@ linux_recvmsg_common(struct thread *td, l_int s, struct l_msghdr *msghdr, goto bad; } - switch (cm->cmsg_type) { case SCM_RIGHTS: error = recvmsg_scm_rights(td, flags, From nobody Mon Aug 14 12:47:16 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RPZ112MPDz4qS1G; Mon, 14 Aug 2023 12:47: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RPZ105c1Qz3Br6; Mon, 14 Aug 2023 12:47:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692017236; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2YXxs8w1c3wvg0sYKeJQ0ZJ7oxzxEJ5Z91hYU7DY/zQ=; b=p+xRWnLPZbQw8BrCSTcSMGeWAFuA6lStKqxJs4T1o1CTXLuPeQC40SVP5ReSrQpQ4TcYT4 d4HEjawpvdbMYtS9HyjpPgf8CtHYjD/GvulZxjcJOj64JVeMu2Jr6NyHqjoe7ZOLH+pBPf K8TJeeCIMe2bChRUaju87vWdLU1pylnNHZYJ+fBPD7pn2TANhZVU7crFq8NvbUo/l3LBm2 u4l40BWbDZpAlMpDAS0ATTViAFDr6I7ubkVDj0jbBTlfl1Rmpyd8Ou/KS8O2QlujNq8YZs RYAl6b1I1w7dNOIsAYpRGhMOfpiyQRgYPtvf6k4QZTzjZYYecOwBSbOSXQ1CXQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692017236; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2YXxs8w1c3wvg0sYKeJQ0ZJ7oxzxEJ5Z91hYU7DY/zQ=; b=Hkq9bgzP8mN7ucuBwL+WN8byuxLmySw3ZiQYPLzC/0CpYdRGYuC/QkpHZ4kWC4iF7ZJ8tq GHEtgRVGUYUC8oj8aAGB51ltidbq3nXHTv4yMXcND3LI9/+nfsYCGvivGqPzt+Qer7yPTJ 2UHbXGU2xZ2QyqbrLlvT7YT6s04YForxNymtbrcNA81WMSxLmsKVYL7Gs0Xu29yaZnb/Xi vd1R2Ak2amVs6KAjEtwlKxc4o4s10F7cQoHkS8T8QgQ+r43kLPprpZ2ycv1gmLn4JKdOTt p5kD8/k7XnA+sSXMLx5F8GgFyIVRSD7NO70GpD6EaihEUO/SR9/pfXNaiYvKLg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692017236; a=rsa-sha256; cv=none; b=IRFeuRzrpYA8zOrps20GgKEkowVovNmC+9ERumB6YDpSMHucS3I5pa1p8/E6PSWkrXQoGN RydtiwTiRQAa7mPEJkVdmNW3b8nr4KelIpNK6p8DUHa9eRMyQqSJ0CncUOvnv3h/aziDMm np1HoR90KU3+MNvLXajFwarOitck9TMlLS0dN+3k/CUsk5UmKLNN3SD1LbnMteADf4Hc1S /vb7vxj4Q3fhzkYhi3MDj8QwuOW6EZJyDOavStsnA3Z+6mQhJllkhII69JxQ3EIjENU+Si K4QaZetrF6nDWhktiSyF8I5jIO4uJC8Ufx/Q0q2rtLkxQFyJPMTJoZxuaYp3Xw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RPZ104c3VzTjy; Mon, 14 Aug 2023 12:47:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37EClGf7044277; Mon, 14 Aug 2023 12:47:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37EClGCP044274; Mon, 14 Aug 2023 12:47:16 GMT (envelope-from git) Date: Mon, 14 Aug 2023 12:47:16 GMT Message-Id: <202308141247.37EClGCP044274@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dmitry Chagin Subject: git: a21238d843eb - main - linux(4): Improve readability of recvmsg control buffer copyout code List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dchagin X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a21238d843ebe02e696cdc30b008382dfca5612e Auto-Submitted: auto-generated The branch main has been updated by dchagin: URL: https://cgit.FreeBSD.org/src/commit/?id=a21238d843ebe02e696cdc30b008382dfca5612e commit a21238d843ebe02e696cdc30b008382dfca5612e Author: Dmitry Chagin AuthorDate: 2023-08-14 12:46:12 +0000 Commit: Dmitry Chagin CommitDate: 2023-08-14 12:46:12 +0000 linux(4): Improve readability of recvmsg control buffer copyout code MFC after: 1 week --- sys/compat/linux/linux_socket.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/sys/compat/linux/linux_socket.c b/sys/compat/linux/linux_socket.c index 791f59aaf552..1acd93122b8f 100644 --- a/sys/compat/linux/linux_socket.c +++ b/sys/compat/linux/linux_socket.c @@ -1866,10 +1866,9 @@ cont: lcm->cmsg_len = LINUX_CMSG_LEN(datalen); error = copyout(lcm, outbuf, L_CMSG_HDRSZ); if (error == 0) { - outbuf += L_CMSG_HDRSZ; - error = copyout(data, outbuf, datalen); + error = copyout(data, LINUX_CMSG_DATA(outbuf), datalen); if (error == 0) { - outbuf += LINUX_CMSG_ALIGN(datalen); + outbuf += LINUX_CMSG_SPACE(datalen); outlen += LINUX_CMSG_SPACE(datalen); } } From nobody Mon Aug 14 12:47:17 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RPZ120F61z4qS8Z; Mon, 14 Aug 2023 12:47: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RPZ116khBz3CD7; Mon, 14 Aug 2023 12:47:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692017237; h=from:from:reply-to:subject:subject: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+3nEzO+Wmst7nG1EDX9QgCYPAp5VmjOf21KalwHg7I=; b=O16/L1jHPu3m/oaH0Rc69oWFa1x71HhGJ5y+NcufDeGn3F8wdu9lKY7d7FDp/9qxzQwupc IfpE0mLqKlxAlsjTD7fZNK/x9y7hG2Xd5efYDyw7qeVn6jzxmcXU2ELSVgpGwK0Mj8FocC f7XwKt3YHhIHR+673lpzPnS6qskpysqQVXHEl+ZJ6InBbyNn0pa6azd87Y5siQYiexuLaY C+yQhgcetLF85Ld9OIoZ6AhSRxp7DyaJ4xGhCyToscGqlW076OS9rztRF8pF9sWQpOdHI2 Qq9ePkSBuZVukoDNrKXvvQByhvbckNYrAc1t1a9D/nLBixz8QcSR/dEJdfV14w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692017237; h=from:from:reply-to:subject:subject: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+3nEzO+Wmst7nG1EDX9QgCYPAp5VmjOf21KalwHg7I=; b=D88BemuChxJzLODQzur3mFl83/1+0vO/5V4VhZzG7rgITDMuLW6LyEU7fYIodNmuZKNYDp U0eIphAylRHYI2TvZiTAIUY/esdH6V2eQ/erM8q6kSjv4tb/L6yWpPj2FlG2dfMVKQNfEC m1Q/A0JDKJ09sAKzs1WQYGM2RhaXFlM9EQHqqr/uVsUB1mPCiofGRznOJXRumsE5OFNJ9c cLJnOH8iMFQTxCtzWzsGl6tX1nEfpuDCrqoKj3xzddYTkK4EMwmk4NU0j1IrD46wtlxNq4 /OaTg500FkvbdwouKKngW0thlyHZvJpV2Qu8XmbL1RNxUtRbq+EzkyYOeW5UBA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692017237; a=rsa-sha256; cv=none; b=gp0pAEUxhx15Vaof3dN4/3puJC0FxACT5Y7iBfaVgd7E2+SzosRpcerzs10D04r+uV6bge DOd3waYCTCWX2aAF/zKJnbHbd+hYIzfxGgvGNK7NEO/bTTYpngzDMlhwArhWcCSN4xpoGj La2BWVu9AMUH85mjwhUM2rbHeDYUXlF32PARptjZG1XzeXKLDRLTzOty4vFNSXyzZuDJFT A12KKdm52sKBzaTnC81YaqQBbQdyhFDPefNL0OWfvw+FsEL/C5zNg0DkFCS33LNQxtgefM dK4umW3TFtaBbReut+jyMm9YKbrwcmsye3RDaJRFRQIEFWMuXVF6SmUAmwmSew== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RPZ115rH3zTgS; Mon, 14 Aug 2023 12:47:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37EClHLY044319; Mon, 14 Aug 2023 12:47:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37EClHe1044316; Mon, 14 Aug 2023 12:47:17 GMT (envelope-from git) Date: Mon, 14 Aug 2023 12:47:17 GMT Message-Id: <202308141247.37EClHe1044316@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dmitry Chagin Subject: git: bbaa5523c01a - main - linux(4): Skip unsupported anxiliary message List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dchagin X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: bbaa5523c01a11e1e322928639522b9ccfd19978 Auto-Submitted: auto-generated The branch main has been updated by dchagin: URL: https://cgit.FreeBSD.org/src/commit/?id=bbaa5523c01a11e1e322928639522b9ccfd19978 commit bbaa5523c01a11e1e322928639522b9ccfd19978 Author: Dmitry Chagin AuthorDate: 2023-08-14 12:46:12 +0000 Commit: Dmitry Chagin CommitDate: 2023-08-14 12:46:12 +0000 linux(4): Skip unsupported anxiliary message Instead of returning error, skip unsupported anxiliary messages and fail if no one handled. MFC after: 1 week --- sys/compat/linux/linux_socket.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/sys/compat/linux/linux_socket.c b/sys/compat/linux/linux_socket.c index 1acd93122b8f..90dc25f2e653 100644 --- a/sys/compat/linux/linux_socket.c +++ b/sys/compat/linux/linux_socket.c @@ -1728,7 +1728,7 @@ linux_recvmsg_common(struct thread *td, l_int s, struct l_msghdr *msghdr, struct sockaddr *sa; caddr_t outbuf; void *data, *udata; - int error; + int error, skiped; error = copyin(msghdr, &l_msghdr, sizeof(l_msghdr)); if (error != 0) @@ -1794,7 +1794,7 @@ linux_recvmsg_common(struct thread *td, l_int s, struct l_msghdr *msghdr, msg->msg_control = mtod(control, struct cmsghdr *); msg->msg_controllen = control->m_len; outbuf = PTRIN(l_msghdr.msg_control); - outlen = 0; + skiped = outlen = 0; for (m = control; m != NULL; m = m->m_next) { cm = mtod(m, struct cmsghdr *); lcm->cmsg_type = bsd_to_linux_cmsg_type(p, cm->cmsg_type, @@ -1814,12 +1814,13 @@ linux_recvmsg_common(struct thread *td, l_int s, struct l_msghdr *msghdr, } if (lcm->cmsg_type == -1 || - cm->cmsg_level != SOL_SOCKET) { + cm->cmsg_level == -1) { LINUX_RATELIMIT_MSG_OPT2( "unsupported recvmsg cmsg level %d type %d", cm->cmsg_level, cm->cmsg_type); - error = EINVAL; - goto bad; + /* Skip unsupported messages */ + skiped++; + continue; } switch (cm->cmsg_type) { @@ -1877,6 +1878,10 @@ err: if (error != 0) goto bad; } + if (outlen == 0 && skiped > 0) { + error = EINVAL; + goto bad; + } l_msghdr.msg_controllen = outlen; out: From nobody Mon Aug 14 12:47:18 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RPZ130qndz4qRwg; Mon, 14 Aug 2023 12:47: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RPZ130LZ0z3CPG; Mon, 14 Aug 2023 12:47:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692017239; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=EqilIjwKzpyqxieuOJekGmssYUglV+ONsEvql5pjS5M=; b=BJk9XJ2bg/tmaEEYnhMa5Us7CiKZFOs5jm5PQf60JTKTDJfSJDYcwZji/NTDqHKMLCLWwB Erj6qVzPcV8TEyLaxsSUg69l1a2S5gafj8olvgPQIJfpeIbm4Sr88n7qPGfAGULzjvLHw6 6IDL+V/pb0lYXMd0qtYfN8iVyy2BNzIuDwCqddHwMEgSt8tAKmgt2MWz75Q3oZjkPNkvns eXTnwQlxEM9ypdEKXJFNKjcVJ+Wu7cVSzYkLs8zJcLZcbHLi7GS4HLgzN9TfiL8W3vJsyD /Eh4nDPBndaUyRFvfO8ZXA2RjUaN9pmgi3gK4Bvg7G2t9tHdwK5Y3v4OmcL3Kw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692017239; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=EqilIjwKzpyqxieuOJekGmssYUglV+ONsEvql5pjS5M=; b=IHOXsyv2gtknrPLB1jOC1gONGGQ8zcKey7UXN/tC5uGc/4yeU0wb5qdIkBbQA7D/kFiFP+ TnOoTts3DmzeajQZ+JN3A0dK4msyaYPi0rAC0FP1WtrWeWt1iht8uyXICIfI4nipuIitXu CYWUlgKIrAomDP0Y9Ggg5gMx15lo/S9xFI2cv+kcjPIoQjpB37hdK1671MqvgaEf0d2hJR arnPuYKefk6DPmTz7RIte5hHtngb693TwqLhk2ofTv8lxMrIE04/yW1a1r/enfmb1wQFSP F/2UH8IkejPm4S0M7KCB8vqenfJs21HR/psBAx6WlzkNZj3Sx2cvniCmSRXwxw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692017239; a=rsa-sha256; cv=none; b=PpCEQmrHm3P5Ff8Z8Jn7C3xK2rx/d2xewsHhJiFsf9unMIYpcU5pij4Pu8wY7qMKlj3MOO E4YFb4sLrlTVZu1Jt8x2BxD5FULcqDdvjiXlNnTmg93Sk/dAWoQgDyZjvcylkF5r8sqREN mrDSMl3msmJ3gnB2yvPkJPzjUT8GxQNtIBY9BGt+yPg5KM2lN7uYGSzCsNnOnjeqwqCWhT K0CM518DxH8eiDEou8qmO1uJJg4rMIQVezSC6aO/4Bu+C7nNyFv3qIQ76zgpRBaUXhJ5VN BDRwI6lGrkRMknBSGU7D/hWF9xkpLZ7bC010nJ0HrihZW1SJGUY+PHnWkQCHIA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RPZ126YF9zTcp; Mon, 14 Aug 2023 12:47:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37EClIk7044365; Mon, 14 Aug 2023 12:47:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37EClIb5044362; Mon, 14 Aug 2023 12:47:18 GMT (envelope-from git) Date: Mon, 14 Aug 2023 12:47:18 GMT Message-Id: <202308141247.37EClIb5044362@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dmitry Chagin Subject: git: de20eb26d014 - main - linux(4): Refactor recvmsg List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dchagin X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: de20eb26d014f7d9ba81fd1f84636609c8efa8e1 Auto-Submitted: auto-generated The branch main has been updated by dchagin: URL: https://cgit.FreeBSD.org/src/commit/?id=de20eb26d014f7d9ba81fd1f84636609c8efa8e1 commit de20eb26d014f7d9ba81fd1f84636609c8efa8e1 Author: Dmitry Chagin AuthorDate: 2023-08-14 12:46:12 +0000 Commit: Dmitry Chagin CommitDate: 2023-08-14 12:46:12 +0000 linux(4): Refactor recvmsg As the amount of handled anxiliary messages grows move they handlers into a separate functions. MFC after: 1 week --- sys/compat/linux/linux_socket.c | 101 +++++++++++++++++++++++++--------------- 1 file changed, 64 insertions(+), 37 deletions(-) diff --git a/sys/compat/linux/linux_socket.c b/sys/compat/linux/linux_socket.c index 90dc25f2e653..90a1cf879517 100644 --- a/sys/compat/linux/linux_socket.c +++ b/sys/compat/linux/linux_socket.c @@ -1699,6 +1699,39 @@ _Static_assert(sizeof(struct bintime) >= sizeof(struct timespec), "scm_timestampns sizeof timespec"); #endif /* __i386__ || (__amd64__ && COMPAT_LINUX32) */ +static int +recvmsg_scm_sol_socket(struct thread *td, l_int msg_type, l_int lmsg_type, + l_uint flags, socklen_t *datalen, void **data, void **udata) +{ + int error; + + error = 0; + switch (msg_type) { + case SCM_RIGHTS: + error = recvmsg_scm_rights(td, flags, datalen, + data, udata); + break; + case SCM_CREDS: + error = recvmsg_scm_creds(datalen, data, udata); + break; + case SCM_CREDS2: + error = recvmsg_scm_creds2(datalen, data, udata); + break; + case SCM_TIMESTAMP: +#if defined(__i386__) || (defined(__amd64__) && defined(COMPAT_LINUX32)) + error = recvmsg_scm_timestamp(lmsg_type, datalen, + data, udata); +#endif + break; + case SCM_BINTIME: + error = recvmsg_scm_timestampns(lmsg_type, datalen, + data, udata); + break; + } + + return (error); +} + static int recvmsg_scm_ip_origdstaddr(socklen_t *datalen, void **data, void **udata) { @@ -1713,6 +1746,23 @@ recvmsg_scm_ip_origdstaddr(socklen_t *datalen, void **data, void **udata) return (error); } +static int +recvmsg_scm_ipproto_ip(l_int msg_type, l_int lmsg_type, socklen_t *datalen, + void **data, void **udata) +{ + int error; + + error = 0; + switch (msg_type) { + case IP_ORIGDSTADDR: + error = recvmsg_scm_ip_origdstaddr(datalen, data, + udata); + break; + } + + return (error); +} + static int linux_recvmsg_common(struct thread *td, l_int s, struct l_msghdr *msghdr, l_uint flags, struct msghdr *msg) @@ -1801,18 +1851,6 @@ linux_recvmsg_common(struct thread *td, l_int s, struct l_msghdr *msghdr, cm->cmsg_level); lcm->cmsg_level = bsd_to_linux_sockopt_level(cm->cmsg_level); - data = CMSG_DATA(cm); - datalen = (caddr_t)cm + cm->cmsg_len - (caddr_t)data; - udata = NULL; - error = 0; - - /* Process non SOL_SOCKET types. */ - if (cm->cmsg_level == IPPROTO_IP && - lcm->cmsg_type == LINUX_IP_ORIGDSTADDR) { - error = recvmsg_scm_ip_origdstaddr(&datalen, &data, &udata); - goto cont; - } - if (lcm->cmsg_type == -1 || cm->cmsg_level == -1) { LINUX_RATELIMIT_MSG_OPT2( @@ -1822,33 +1860,22 @@ linux_recvmsg_common(struct thread *td, l_int s, struct l_msghdr *msghdr, skiped++; continue; } + data = CMSG_DATA(cm); + datalen = (caddr_t)cm + cm->cmsg_len - (caddr_t)data; + udata = NULL; + error = 0; - switch (cm->cmsg_type) { - case SCM_RIGHTS: - error = recvmsg_scm_rights(td, flags, - &datalen, &data, &udata); - break; - case SCM_CREDS: - error = recvmsg_scm_creds(&datalen, - &data, &udata); - break; - case SCM_CREDS2: - error = recvmsg_scm_creds2(&datalen, - &data, &udata); - break; - case SCM_TIMESTAMP: -#if defined(__i386__) || (defined(__amd64__) && defined(COMPAT_LINUX32)) - error = recvmsg_scm_timestamp(lcm->cmsg_type, - &datalen, &data, &udata); -#endif - break; - case SCM_BINTIME: - error = recvmsg_scm_timestampns(lcm->cmsg_type, - &datalen, &data, &udata); - break; - } + switch (cm->cmsg_level) { + case IPPROTO_IP: + error = recvmsg_scm_ipproto_ip(cm->cmsg_type, + lcm->cmsg_type, &datalen, &data, &udata); + break; + case SOL_SOCKET: + error = recvmsg_scm_sol_socket(td, cm->cmsg_type, + lcm->cmsg_type, flags, &datalen, &data, &udata); + break; + } -cont: if (error != 0) goto bad; From nobody Mon Aug 14 12:47:20 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RPZ142C7kz4qRqs; Mon, 14 Aug 2023 12:47:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RPZ141d99z3CVr; Mon, 14 Aug 2023 12:47:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692017240; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=SJSkxUed4P0A0pFXyynfGMWcPVzndUXd0ocxlGuoEA4=; b=BACGKsb3Yfmw8wG5CyYgHOqMvELAQ9UtNZQgBw3CroTTMJqqsn3bVIcRVHuNIpuIgSTZbq bjMwsakU8A2CopFaoLQsbpFwhy7BKfgvydy2RNuhBlBRQFDcQgsdwrjA02Lg4flw+ZDliz FgeblWZOtU+P+jnmyQOwvGdUhlshYQGn6MpCYvFSKFcai+YYUHAg1nKmsgWhMd5l2J12qa 0oW1GvyKEx9upv1UXSswT0DN05u1UPHGj3qa0hD3iRCcZINrFdZ1Tg2VPuWFD4lcV/oYyw D2mzcclx2xUl8SylC4rLl5iU/Zu0jabdUEwWvYlXiSvWh7TcQBVCYpx/qwZgfg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692017240; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=SJSkxUed4P0A0pFXyynfGMWcPVzndUXd0ocxlGuoEA4=; b=iEgduj0Kt01+kdglUCrgrP/2qaIoRwBzGQ6GXX30dx20yVOJjc4owgmanLa4Kx1M1CayW2 ouWKn5qDwLVqfWvo/aPMRUDLHte5F4L8DImrt0+pwjQIpXsZ47eNc+cyAuGn/ogIRFREhL bK/aYPbmwMidJ7q9bUI0TKjsz5e5YmVHgmTF47RPYeZWF1qsPWtxveKSYnk/yqv3Rb9Xei mUepSiMPYY6SQtSvMFzgFQOhiNhyD0RaTFLMld2+I+JFW/7MoPZpQDum5m71DItARZidr7 CBMXoNbawkbrBXWQcmt+A9oazsKxnnVW/jyxCoM5aGyFxOqiTyL9omL5yxD73Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692017240; a=rsa-sha256; cv=none; b=SW06L/hIcrUmtZ+MdT6qT/4J5qReupcAcz3lHyLU7q0zl18WQYyfcU4tgn6UUCPFnwJxlV sYib2pak/R1FJlIqKjG17Un7Jf68Bls4ZAw04KUdHE4qVt7wWjpSJEykC/V/uyC0xRyntx Kwjjj+mp1qLEuP4t0G09JMncQpw2NFKSLojcT+Adfnyh7i4q7wcoIN17wZjrTMoMhFkkdi piRh0UYIdvcGMc1H+ZyMCbxaNt/j/oNIgOc+XLok109RobMbSvRxLmk7J7RXOhhUEr3YL+ ROv30U4RPxIBjm+ms5vwR6+7XEyphuQCyjmxQIbWydrZO6NHqUnincP0oDOruQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RPZ140kTyzTgT; Mon, 14 Aug 2023 12:47:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37EClKeX044419; Mon, 14 Aug 2023 12:47:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37EClK31044416; Mon, 14 Aug 2023 12:47:20 GMT (envelope-from git) Date: Mon, 14 Aug 2023 12:47:20 GMT Message-Id: <202308141247.37EClK31044416@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dmitry Chagin Subject: git: 9d0c9b6d6a6a - main - linux(4): Add a comment explaining udata freeing on error List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dchagin X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9d0c9b6d6a6a90f626088308dfb895221bf6d36f Auto-Submitted: auto-generated The branch main has been updated by dchagin: URL: https://cgit.FreeBSD.org/src/commit/?id=9d0c9b6d6a6a90f626088308dfb895221bf6d36f commit 9d0c9b6d6a6a90f626088308dfb895221bf6d36f Author: Dmitry Chagin AuthorDate: 2023-08-14 12:46:12 +0000 Commit: Dmitry Chagin CommitDate: 2023-08-14 12:46:12 +0000 linux(4): Add a comment explaining udata freeing on error MFC after: 1 week --- sys/compat/linux/linux_socket.c | 1 + 1 file changed, 1 insertion(+) diff --git a/sys/compat/linux/linux_socket.c b/sys/compat/linux/linux_socket.c index 90a1cf879517..bd4b536e13d0 100644 --- a/sys/compat/linux/linux_socket.c +++ b/sys/compat/linux/linux_socket.c @@ -1876,6 +1876,7 @@ linux_recvmsg_common(struct thread *td, l_int s, struct l_msghdr *msghdr, break; } + /* The recvmsg_scm_ is responsible to free udata on error. */ if (error != 0) goto bad; From nobody Mon Aug 14 12:47:21 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RPZ1570Xrz4qS64; Mon, 14 Aug 2023 12:47:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RPZ152rz1z3CYC; Mon, 14 Aug 2023 12:47:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692017241; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=sFeNlQPWQeSOBlYMBGvFPPDNiJrg6Q3VURITiRavmCg=; b=a+KZAOdTBGLHnEu0/PG84GaANxtPrYLam/cRB+lGSw5QmWUEzAPg2/VvfFeY5MswbElhju 15RbH+io7wz/wj17HSA+rbU/vDjTWEHPYvpiP+rz1joCb72CClV5cHuDqh61oLbnNIZUe+ gbNWZSfagmJSHVWqyCcrWxkqVw506anyyE5rsDX543U7cppE8V3rsxYwq3dEsqo0O2BRQY /xHo+DkffgQKcTK5iECn3q7vrQ1n9p/3q35JlUPfhF90bVY2/LVJ0Zb44igiPRWkxvIgRZ c/LbmpfkPBPjDaLWMWXtl93k16jsaIB7FCl4mAaSeGu6GgOoxDwRdaRIctUvTA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692017241; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=sFeNlQPWQeSOBlYMBGvFPPDNiJrg6Q3VURITiRavmCg=; b=viNq+QWsm8aOVuhdW5aRO0tIia8iNSpFyZXokF7apFgLuMduTRuM2UFPlH0P9PObSPk/w4 Rpesh/MzQGPEoCljN58P7zHtCEh0ZRoT1PY/+8Uq2rSRpMzeeWVE3q0an5+wt3HXqMxyFT izR9hrQhndI0Ja7q/iG9JWSCMFB6NPcOYEgn4rXjgWQYWZ5l3fMBhe/aVh/szRbOe501qZ aM3vQw6wDI+YgnsK3HYFY4A9th3DrxQ8+AxYiQn8u4044IjOkUR3AGlRkFRFy4mlZ3vp5i 355DKzihM8JXpmDmwjm7/Vyorg8VYuqPYKBk4yyrF2PKU6Uht+ZTzrmTFMdkoA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692017241; a=rsa-sha256; cv=none; b=yMiflLF0jA1im3e64Jw0s3YrJaI03sWiQAXmi6l/pf3t5dDQJA+YnKCCv8k0nUH0If0kvw OpWHdTXZJERsjn3z3Uu3l8BpZ9RhggEkQefpYVMZn5drNQ7KH1o99KsFeHKc041Hp3piAo yd8h9Pb60IlaZBpQyeveiUUe21eyPb4rld1IlXsSFN7sRhCQMyhDliKL048ewTVBsxV2+v hn2v87uReK7rpqf42f8CXnTUaq/g3WG0xkYWMZfAassmcPz5oB55u+tv4xH0lyN+3Ws0hV UJb9G9B4NiF66sAPCmioQRyw9PaC6L2jpZHd6bKSwzPNqpTFpFj6QYUdYt5mFA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RPZ151XG1zTk0; Mon, 14 Aug 2023 12:47:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37EClLjC044467; Mon, 14 Aug 2023 12:47:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37EClLOo044464; Mon, 14 Aug 2023 12:47:21 GMT (envelope-from git) Date: Mon, 14 Aug 2023 12:47:21 GMT Message-Id: <202308141247.37EClLOo044464@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dmitry Chagin Subject: git: 2467ccddc0e0 - main - linux(4): Fix MSG_CTRUNC handling in recvmsg() List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dchagin X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2467ccddc0e0f5c719eddaece69a7aa0589b6449 Auto-Submitted: auto-generated The branch main has been updated by dchagin: URL: https://cgit.FreeBSD.org/src/commit/?id=2467ccddc0e0f5c719eddaece69a7aa0589b6449 commit 2467ccddc0e0f5c719eddaece69a7aa0589b6449 Author: Dmitry Chagin AuthorDate: 2023-08-14 12:46:12 +0000 Commit: Dmitry Chagin CommitDate: 2023-08-14 12:46:12 +0000 linux(4): Fix MSG_CTRUNC handling in recvmsg() The MSG_CTRUNC flag of the msg_flags member of the message header is set uppon successful completition if the control data was truncated. Upon return from a successful call msg_controllen should contain the length of the control message sequence. Fixes: 0eda2cea MFC after: 1 week --- sys/compat/linux/linux_socket.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/sys/compat/linux/linux_socket.c b/sys/compat/linux/linux_socket.c index bd4b536e13d0..7acae92777f8 100644 --- a/sys/compat/linux/linux_socket.c +++ b/sys/compat/linux/linux_socket.c @@ -1835,8 +1835,8 @@ linux_recvmsg_common(struct thread *td, l_int s, struct l_msghdr *msghdr, if (error != 0) goto bad; + skiped = outlen = 0; maxlen = l_msghdr.msg_controllen; - l_msghdr.msg_controllen = 0; if (control == NULL) goto out; @@ -1844,7 +1844,6 @@ linux_recvmsg_common(struct thread *td, l_int s, struct l_msghdr *msghdr, msg->msg_control = mtod(control, struct cmsghdr *); msg->msg_controllen = control->m_len; outbuf = PTRIN(l_msghdr.msg_control); - skiped = outlen = 0; for (m = control; m != NULL; m = m->m_next) { cm = mtod(m, struct cmsghdr *); lcm->cmsg_type = bsd_to_linux_cmsg_type(p, cm->cmsg_type, @@ -1910,9 +1909,9 @@ err: error = EINVAL; goto bad; } - l_msghdr.msg_controllen = outlen; out: + l_msghdr.msg_controllen = outlen; error = copyout(&l_msghdr, msghdr, sizeof(l_msghdr)); bad: From nobody Mon Aug 14 14:15:40 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RPbz66hZkz4qYGD for ; Mon, 14 Aug 2023 14:15:46 +0000 (UTC) (envelope-from isabella.lee@techtrade-visitors.org) Received: from IND01-BMX-obe.outbound.protection.outlook.com (mail-bmxind01on2130.outbound.protection.outlook.com [40.107.239.130]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mail.protection.outlook.com", Issuer "DigiCert Cloud Services CA-1" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RPbz53y3bz3M5F for ; Mon, 14 Aug 2023 14:15:45 +0000 (UTC) (envelope-from isabella.lee@techtrade-visitors.org) Authentication-Results: mx1.freebsd.org; dkim=none; spf=pass (mx1.freebsd.org: domain of isabella.lee@techtrade-visitors.org designates 40.107.239.130 as permitted sender) smtp.mailfrom=isabella.lee@techtrade-visitors.org; dmarc=none; arc=pass ("microsoft.com:s=arcselector9901:i=1") ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=P+dQME5CQ4d9yUncV9yNiiRytXDBpxa6jQ3Ta/zUh8lu63FSPRtcakk7c39sh5Hw0HR9unxuVQ2IhsQFbOPIEsgTw7PsC66YzumonmadSmlgOdHqfNr/QGlkv0e9Y3LrLCW2F2ixA2uDvPcJ+NhKjdQHk4rIZ0FN7FJsPqHjPFLk2vv6lHwaQWQm3vmPKhBXCJeBfmhrN+K24RbODgaawyRJqveGzffi0JqBEUtMX4WhpOtPWONDJ2FJZfyXQ5w5Gg8Llvc/eUxlJ/R1/Gla7LMX+AHnesIvAZCERvkpogaT/C9LtJYSU5GC2ZjkEdRolyFgecNENxAVFu2ZpyPBPg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=onfQU37LUAlt8zM8wBTps2uAtoMG+u4Io7VNyg28uAQ=; b=g//V2AcqK9h7YEEaXEom67PEJVbW75vrLVEWz3a1AoxafnMAgT+UXimzsct6cqtRW8CiKpA0sQ4zax0FweMkHU5ReMKIvvgT4Io1TRmbkQIyqltdptorWLlu/JaSiwHCum77/wc2E2k6g2XNxPCFEPeCEcXBE9bh9K45Nj0YJ1c8qjg1bcF5W5hWo3+c9K7sco+h033ELhiwbwbF0+LQBibsSnYBjx2eqzMAdsSasZs3CK+3lwv1U23mHboweWEKkyJs6lFlNjEfwN8xmasabxaSjSVWkJXGlixPPdr9iT0hger1TulfVosyVS5FAVZnXvCxclP/KM6UkK4/JmwQUA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=techtrade-visitors.org; dmarc=pass action=none header.from=techtrade-visitors.org; dkim=pass header.d=techtrade-visitors.org; arc=none Received: from PN0P287MB0574.INDP287.PROD.OUTLOOK.COM (2603:1096:c01:162::8) by PN3P287MB1447.INDP287.PROD.OUTLOOK.COM (2603:1096:c01:193::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6678.24; Mon, 14 Aug 2023 14:15:40 +0000 Received: from PN0P287MB0574.INDP287.PROD.OUTLOOK.COM ([fe80::44b8:e5cc:f9d:557b]) by PN0P287MB0574.INDP287.PROD.OUTLOOK.COM ([fe80::44b8:e5cc:f9d:557b%5]) with mapi id 15.20.6678.022; Mon, 14 Aug 2023 14:15:40 +0000 From: Isabella Lee To: FLASH MEMORY SUMMIT 2023 Subject: Freebsd - FLASH MEMORY SUMMIT 2023 Thread-Topic: Freebsd - FLASH MEMORY SUMMIT 2023 Thread-Index: AdnOuiRzpQL5OrZhTQ6fL/ylkUQvOg== Return-Receipt-To: Date: Mon, 14 Aug 2023 14:15:40 +0000 Message-ID: Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-ms-publictraffictype: Email x-ms-traffictypediagnostic: PN0P287MB0574:EE_|PN3P287MB1447:EE_ x-ms-office365-filtering-correlation-id: 283cf23e-9b3f-4192-34d6-08db9cd0f0a8 x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: zBSm9kUxUFjo7yyDu7GQGsf6AVwBTc/ljcUw2koZPjice+gD4svBJKPgybw8LN2Ei2KCtcl3loOJSeogK+Vn8b+A3Wh73nCqyu6B9X7yuaefun7yQ+sDJrDLxNVPMoHXyUU/NurcPzqKqNeyqMcT4PGVu/7WyFiKGmVTkYUBgEXg5FcU2qdRzvYCzCBmt2zl8guQfRwoZxVHqh2day3QCwLLI7rMyqn+5Bx6/3bpSa1LzEcjQPZtgyspZa8epQMYRnJBslLI4hPQDe4zGPGTNBIGr/lteUpONqzHzG/Vt9Sg7eN+m3Mxa9Y6xOysbjqBySNOZRjax8jzcJbQsJ+Hl/35l9MO8Xp0o2PD0EoOts3hIZvpALwBXF7wftSfpeMhBdlGhJKnPAuT8SbTpF+UxevCSTVsb4KhFvOyUjS2GKaKI9bwEae6kp7iAtbwIl8QjxJxflxIra/7/JB8tEYz16JwXHNLsGo2rc4jKC6+7DzjrYBcsVDcNq2fBGCobVGz7iHxhyZrjm5Vwt5Su4Xz8ZNznJS2W0bBTsvC2hD3fZI52ecgu6l2eMz2nGK0H4zey6OJmSn+lM6bpBBdqs/Zb9+XCYGObLIZ7emuKakm84J0KhhY+VaeVX2yir7YcHBF0aMpQZfNUnwe3YBIiSN3OQ== x-forefront-antispam-report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:PN0P287MB0574.INDP287.PROD.OUTLOOK.COM;PTR:;CAT:NONE;SFS:(13230028)(39850400004)(366004)(346002)(396003)(376002)(136003)(451199021)(1800799006)(186006)(71200400001)(76116006)(6506007)(7696005)(478600001)(33656002)(86362001)(83380400001)(55016003)(26005)(4744005)(66946007)(2906002)(9686003)(38070700005)(38100700002)(122000001)(316002)(52536014)(66556008)(64756008)(66476007)(8676002)(66446008)(44832011)(5660300002)(8936002)(6916009)(41300700001)(9326002)(130860200001);DIR:OUT;SFP:1102; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?us-ascii?Q?TmY4sWrm71DvclAt6mf8F6y097jcca8gOTE9hcDW0R0ZpfhzKL/o/fEnZ/fj?= =?us-ascii?Q?jdJGIOyi2KQzK8JHJZ0V9+Br5ChqzJS+zAbBUeOWYs4X6JMdTYJZSPs7tJwq?= =?us-ascii?Q?nuDcSVhjP4pTPMN9j36TiggssjnWWnClyXEHYwBfSO3A8k7omzqOO+XYGTTP?= =?us-ascii?Q?7EjcdspiyKCHEfNkv/su/vdsShrfN7hKrUV1eZvTsR2CP/kb/EDFgqdKOLOq?= =?us-ascii?Q?pnuqX4NsLi7M3jD9diA96oJccEpIhCo73cGJZcl1Bw07aq5+mavWXe5iOTrt?= =?us-ascii?Q?FnU7sr9y2WlWKk4QxWILwb2xoDQCM43ND9kNzskpsOiOv+Bl7nVsfNwFw/0Y?= =?us-ascii?Q?Gg6m/JROJOq4zxXWgaq+Er6dd3CvcNUs8iEynte71EQNoOzXy2mM98Cr3RGf?= =?us-ascii?Q?/GrM0qE6nQNFoKu8Dh+MAYWkLnxA7E5Gk5BfH/etMFSoGTc+8T0O+GwWMvnB?= =?us-ascii?Q?sE+ulyakoART7gLCWIgBiphd8Qsb9FnJc7o6ST8YlD9TtIwIRgCqYzRd/ACp?= =?us-ascii?Q?1//5czg/k7vezjEFBLe39sXQFTJGMfFwIDETDGWT2HW64rd2rRalFjanfp05?= =?us-ascii?Q?CFbFMmIX8cF8wtPCeQm2MwxVgTveGENx3SDOlQo4Ytb7ODm7PiC+jiEiKU8N?= =?us-ascii?Q?6THo2uFbJvzN956e6A5NNPkZ3FFMR6OrkOiMmALggnsZ9hzK/5fJj+WLDu5U?= =?us-ascii?Q?dSIXysZYhj57xSDuYGbtKtQ864CzsPlDepYgpQkaTu4iLggX5OGl4sdoTWLJ?= =?us-ascii?Q?2a4Q9odcM9SKD5bXLIMl9n41LF1rhI0IAjQE9WRwYlvrkcopAwu0jHRmcOLY?= =?us-ascii?Q?TBV1MlRPj1XMa0x4ioiuDYkrmPhmAjSSUY4dNiel+MZG4RkRqsuhxr5+h/YQ?= =?us-ascii?Q?iPGmEMcw8uaYq1ENeUwMocJgFNNNwYHjVkcGYXC2eq4iuyxNI2Z4qBJq7ZLN?= =?us-ascii?Q?iBDLgse0cM8TpzlURzW3h8M1G1rTDy7zduWgXIBgTQgz7Ugjt2S1qUuFWwVG?= =?us-ascii?Q?WTiouhKYiMI8seEvVYvnUTOsRDsDoheVJwVdXlPhRaq5aCJ87/tCdZ7FAfVn?= =?us-ascii?Q?YcNW0Aqo4ur+/G2NDteF/z4SP/Ka6yzXfKRH0SuHXtjOFGO7Hafn+aOySyfw?= =?us-ascii?Q?ZOBhj5EApwKQVa218OTUlrr70PnHjFDpB6tDys4aHDzVaQsnOZvozsbpkcOr?= =?us-ascii?Q?Cpa4ujwpbuWammlZ6MDQUNQCtxEfveVm1Bl051wCSvZvYH9gv9bpsdbti3iJ?= =?us-ascii?Q?dMB8445Sa23gpJH97JQKsYf3vz40SIsqQ3y89DR9ffJvLmwDlb/WPhUkwFZa?= =?us-ascii?Q?V7/Uae0+7KNSL3KZwwEvll0mKig2jE2diaIU2pVOfAQqZ5kpmuGanIduh8TV?= =?us-ascii?Q?tz8SA7JZMRiwv9iaclTqQ5c8upDChhl7vqnsEfx9wyVPUJkjIP/+496jyWBk?= =?us-ascii?Q?Uc2LMT5Whahm8MPearR5DUSgkbROQZKg+WTPy3dCVqiLV/m15FgXZCSDV1Zm?= =?us-ascii?Q?rZdHtfiZRZNJ/OjhRQlQUB16ti6EvEX+FEA+YUCE9u5yRKBhBrcTHP9Wam8G?= =?us-ascii?Q?9QlI0Hnanv3X7zMl6Tx8SVmN/DLj/9x2kC2WkgVEamn1sqf9qpJVlS7CwvmY?= =?us-ascii?Q?+q2FwNaj83OXcB41v3r6F5M=3D?= Content-Type: multipart/alternative; boundary="_000_PN0P287MB0574E26FCF78E5CE20C32FEABF17APN0P287MB0574INDP_" List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 X-OriginatorOrg: techtrade-visitors.org X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: PN0P287MB0574.INDP287.PROD.OUTLOOK.COM X-MS-Exchange-CrossTenant-Network-Message-Id: 283cf23e-9b3f-4192-34d6-08db9cd0f0a8 X-MS-Exchange-CrossTenant-originalarrivaltime: 14 Aug 2023 14:15:40.7254 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: c406966b-913c-4edf-8d98-c8a35a212ff7 X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: MMioeljMXRZ5vwYs4xvG+C+Z5Ci8+l3V7GMtxS3kji5i070FfDX6ibya2xQRTAtvh6UYEZeU3QfdsaAEkcczn25XJumb7oPPgCvlRjeVJfCZu4i7uCK1f9qPe5MUZGlq X-MS-Exchange-Transport-CrossTenantHeadersStamped: PN3P287MB1447 X-Spamd-Result: default: False [-0.86 / 15.00]; RBL_SENDERSCORE(2.00)[40.107.239.130:from]; NEURAL_HAM_LONG(-1.00)[-1.000]; NEURAL_HAM_MEDIUM(-1.00)[-0.997]; NEURAL_HAM_SHORT(-0.86)[-0.860]; MIME_GOOD(-0.10)[multipart/alternative,text/plain]; BAD_REP_POLICIES(0.10)[]; RCVD_IN_DNSWL_NONE(0.00)[40.107.239.130:from]; MLMMJ_DEST(0.00)[dev-commits-src-all@freebsd.org]; FROM_EQ_ENVFROM(0.00)[]; MIME_TRACE(0.00)[0:+,1:+,2:~]; R_DKIM_NA(0.00)[]; ASN(0.00)[asn:8075, ipnet:40.104.0.0/14, country:US]; RCVD_TLS_LAST(0.00)[]; RCPT_COUNT_ONE(0.00)[1]; RCVD_COUNT_TWO(0.00)[2]; FROM_HAS_DN(0.00)[]; ARC_ALLOW(0.00)[microsoft.com:s=arcselector9901:i=1]; TO_DN_ALL(0.00)[]; TO_MATCH_ENVRCPT_ALL(0.00)[]; DMARC_NA(0.00)[techtrade-visitors.org]; R_SPF_ALLOW(0.00)[+ip4:40.107.0.0/16]; RWL_MAILSPIKE_POSSIBLE(0.00)[40.107.239.130:from] X-Spamd-Bar: / X-Rspamd-Queue-Id: 4RPbz53y3bz3M5F --_000_PN0P287MB0574E26FCF78E5CE20C32FEABF17APN0P287MB0574INDP_ Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Hello, Reach your target audience and invite them to your booth at FLASH MEMORY SU= MMIT 2023 with our high-quality attendees contact database. If interested I= can share the counts and pricing. Looking forward for your reply. Kind Regards, Isabella Lee - Marketing Assistant If you do not wish to receive these messages, reply back with remove and we= will make sure you don't receive any more emails from our end. --_000_PN0P287MB0574E26FCF78E5CE20C32FEABF17APN0P287MB0574INDP_ Content-Type: text/html; charset="us-ascii" Content-Transfer-Encoding: quoted-printable

Hello,

 

Reach your target audience and invite them to y= our booth at FLASH MEMORY SUMM= IT 2023 with our high-quality attendees contact database. If int= erested I can share the counts and pricing.

 

Looking forward for your reply.

 

Kind Regards,

Isabella Lee - Marketing Assistant

If you do not wish to rece= ive these messages, reply back with remove and we will make sure you don= 217;t receive any more emails from our end.

 

--_000_PN0P287MB0574E26FCF78E5CE20C32FEABF17APN0P287MB0574INDP_-- From nobody Mon Aug 14 15:53:51 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RPf8H6FGQz4qgQH; Mon, 14 Aug 2023 15:53: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RPf8H5Q7qz3VKV; Mon, 14 Aug 2023 15:53:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692028431; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=p9QPryqCZDun89WVP7UscEcng2LzLYsZ1rM1Biwj6EA=; b=hBwHdLJHPDYFiQp9/pca5rbo9mu+1Y1+o1sy0kKpuHz0T1faIcfC7KQtpL0XT/wDC9+75j Fp+IG8KJXJhQgkvfWOSwyyzWtqg/k1R+1h7ozK6F/Vxd5dhPBUwDHrMuwQT17yE35q6D/f maGqGMRO+atloPpCWg4Obf5u1WU295d/Mg7VGalrBPzVUDkaV0GZ8U0nF4YO2EZsxsSs6V yui13iMcddF6DFT4UgoHeMdbHzvVqTD47uKOhQAwbbsSjJDzQ4TgigNG+wdX+Yew5JfHpm lO8h5VJ1kbH/tT591AWTFWVxpouAhlLJAjB/9+GKpBzklf6v5z3o6r+p3PJn+A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692028431; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=p9QPryqCZDun89WVP7UscEcng2LzLYsZ1rM1Biwj6EA=; b=mcnBP/X690wEqjUX6u5T+AfeODAyW3PQWpw7X8l3Mp/sYvwI3on13t0AFpu1zUrmYyaFPk lTqIWy4vOEwcKwodXF5YMgzGVxvf1U3KMWi+X5roRMsEZgCcymR4Wf4mP7VkZ9S5v/T2ZU iZFrxciBvFgM++gwb0OHDiTZC+z5Uzo3MTbORiIHeMO0/e+P0AMuozJqxknCaFY3bQsVXg SIreOAxdnHOLSwQwFMK94ukGUrj4HK33zRuk06W155c9ezkfe8CnbmOBabe429bOc0sXb7 wFgVxhMe9g1zM4OBcacDmiEILtlNVHcKwREppFWa0RspekQWtrqGqDF9PsRdwQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692028431; a=rsa-sha256; cv=none; b=blpFTacNWL9MOEFgs0yMeb2B4RyzgzoHT6JdUikLShWv+uQrJiFPQT2QUU4DVsxVm68Wip r90JJCllAlMNJre3xHxHcrRf+U/3mFswDFhbJR63HChrLjBp1qPgIERb6pb6dVPEBqrWXh +SpUnSjWFDnq79w/VK13HvyztII2qs8PcetR2t5nU44Gis9XnmL3YyK9uWhTy7r6aHUpqG UQDGRdna/4TDzjfUytZeHQ43IQE4GXRgVPFSjc9NEB0nebkR2owzrOMpzyCTmH+kn1jJxQ Ljr71UNSW7MbVU+ui7EYfnqfxcaxFPBD9f3JA3KLMq2Zvl2vhdTeUn9saczE8g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RPf8H4SbyzYwk; Mon, 14 Aug 2023 15:53:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37EFrpem060105; Mon, 14 Aug 2023 15:53:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37EFrpOU060103; Mon, 14 Aug 2023 15:53:51 GMT (envelope-from git) Date: Mon, 14 Aug 2023 15:53:51 GMT Message-Id: <202308141553.37EFrpOU060103@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Eric Joyner Subject: git: 8e6654a6a551 - main - ofed: fix roce gid insertion for vlan interfaces List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: erj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8e6654a6a5511da87de03a91c527e1d7ad006c21 Auto-Submitted: auto-generated The branch main has been updated by erj: URL: https://cgit.FreeBSD.org/src/commit/?id=8e6654a6a5511da87de03a91c527e1d7ad006c21 commit 8e6654a6a5511da87de03a91c527e1d7ad006c21 Author: Bartosz Sobczak AuthorDate: 2023-08-14 15:49:26 +0000 Commit: Eric Joyner CommitDate: 2023-08-14 15:53:43 +0000 ofed: fix roce gid insertion for vlan interfaces When attempting to use vlan interface the correct GID wasn't created due to incorrect ifp validation. The problem was introduced in 3e142e07675b ('ofed: Mechanically convert to IfAPI) Signed-off-by: Bartosz Sobczak bartosz.sobczak@intel.com Signed-off-by: Eric Joyner PR: 273043 Sponsored by: Intel Corporation Reviewed by: jhibbits@, erj@ MFC after: 3 days Differential Revision: https://reviews.freebsd.org/D41426 --- sys/ofed/drivers/infiniband/core/ib_roce_gid_mgmt.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/ofed/drivers/infiniband/core/ib_roce_gid_mgmt.c b/sys/ofed/drivers/infiniband/core/ib_roce_gid_mgmt.c index 1396a4aacf3a..0acb16935986 100644 --- a/sys/ofed/drivers/infiniband/core/ib_roce_gid_mgmt.c +++ b/sys/ofed/drivers/infiniband/core/ib_roce_gid_mgmt.c @@ -239,7 +239,7 @@ roce_gid_update_addr_callback(struct ib_device *device, u8 port, if (ifp != ndev) { if (if_gettype(ifp) != IFT_L2VLAN) continue; - if (ifp != rdma_vlan_dev_real_dev(ifp)) + if (ndev != rdma_vlan_dev_real_dev(ifp)) continue; } From nobody Mon Aug 14 17:20:39 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RPh4R4Xkxz4Tl49; Mon, 14 Aug 2023 17:20:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RPh4R454Sz3ckS; Mon, 14 Aug 2023 17:20:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692033639; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=w5HOuklIe3VqBsHbTe97rqBma2wk6DX7GxTV4fPUe4s=; b=PsiETIyrfprSHLQwNL2kizEEtJds5cPAyFwnbeZ8NUsF8vmlWl53wApoXBZt+7KFT0anNU np5+714sGdf5ytaTQk4w049XM6mkgQlg+KFJYYAZcw8wDABcnUwTdUy1zhf2O/2nRP8L22 t85z6R1Ol7VBuBWZ70vHSd/yVaXJ9wSanle6ABTmUsmPkV3I3pBLwfz1cLqOUWSe/O/XNI Sw76Zg0humJT7Ouulao0/EiWDdG6PwzKOg2QHTImcGSHwZQ7DbJDQfLtNN9BDsurw+LDw5 y69iSrkCiWowdyBSctLN4u8nfbVWGKJKH/yusRtMJdLYIxJVj4y0JK2nxitGeQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692033639; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=w5HOuklIe3VqBsHbTe97rqBma2wk6DX7GxTV4fPUe4s=; b=vngoFRPWZLGdIIK5w4fWbeRqnZ1nAqwa+EzVeYnt9JiRFpt1QYSVHPCy3y6y1GJf8s0OgC Y8F9WCcOtcPxStrRznGEBk1EpvWAicqoWM31k5On6/hWjq647ZfImujTlRzOVtIWKn4tMd xM3kJVN/hE00rndF4+wkfHtB6m2mjrmTiH9rp0FCoTYE74N+8A4AKetvVhsDXXrSFT1jgY G06S6RZ9g2qc0sZ0pVyaB2yLWyYy/YGhipkO72KDXWd69JLOSIZCYBeUBUA2DZk732QPRk 5mJrqWoMDD3aMVY3nxBPT8DKnzr7hm7sc2ZOhysMwwMIYF9/WcqIh4CBReR2Ag== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692033639; a=rsa-sha256; cv=none; b=BtXbMibtorJX09XT2LpB95qRAvIvewN4J0zL6JkCD5TtdX3Dqb11n2+HvivsuQ/XUYy0dx FOPRoZSPhcbMtz3qOVIUw9/nDqmcYSaXZy9rViTBg2y3LBkd2bdr0zu4oVAOTFLuszYcou QjGZ9X0K6E1To6DuQ22WDDgdIzUN8TxPmdnDfRUdYxNLrI/1SPQalKIrIZJstrpVDaZp0P x9/5JPEZN1o/SamzgdfnajyDfW4RH+ZzpRGqCS0e/qO8Y96UA5r+bOXVPc5UDsjL1Nr7qx BYp0pwDw1kGMqGgqXOYQ+X+bNsAMXyUskZFQJcbfPtJ+LABaNtkwmXlIN3+dIQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RPh4R3BBnzclq; Mon, 14 Aug 2023 17:20:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37EHKdYU004446; Mon, 14 Aug 2023 17:20:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37EHKdGn004443; Mon, 14 Aug 2023 17:20:39 GMT (envelope-from git) Date: Mon, 14 Aug 2023 17:20:39 GMT Message-Id: <202308141720.37EHKdGn004443@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dmitry Chagin Subject: git: 0ddd32b617c7 - main - vm: MAP_32BIT_MAX_ADDR defined in sys/mman.h List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dchagin X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0ddd32b617c761cac28fa638c49475dbadbfd1e1 Auto-Submitted: auto-generated The branch main has been updated by dchagin: URL: https://cgit.FreeBSD.org/src/commit/?id=0ddd32b617c761cac28fa638c49475dbadbfd1e1 commit 0ddd32b617c761cac28fa638c49475dbadbfd1e1 Author: Dmitry Chagin AuthorDate: 2023-08-14 17:18:30 +0000 Commit: Dmitry Chagin CommitDate: 2023-08-14 17:18:30 +0000 vm: MAP_32BIT_MAX_ADDR defined in sys/mman.h Reviewed by: kib Differential revision: https://reviews.freebsd.org/D41434 --- sys/vm/vm_mmap.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/sys/vm/vm_mmap.c b/sys/vm/vm_mmap.c index d904c4f38e40..64287f096332 100644 --- a/sys/vm/vm_mmap.c +++ b/sys/vm/vm_mmap.c @@ -108,10 +108,6 @@ static int imply_prot_max = 0; SYSCTL_INT(_vm, OID_AUTO, imply_prot_max, CTLFLAG_RWTUN, &imply_prot_max, 0, "Imply maximum page protections in mmap() when none are specified"); -#ifdef MAP_32BIT -#define MAP_32BIT_MAX_ADDR ((vm_offset_t)1 << 31) -#endif - _Static_assert(MAXPAGESIZES <= 4, "MINCORE_SUPER too narrow"); #ifndef _SYS_SYSPROTO_H_ From nobody Mon Aug 14 17:20:40 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RPh4T4z1Fz4Tkks; Mon, 14 Aug 2023 17:20: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RPh4S5K9Sz3d15; Mon, 14 Aug 2023 17:20:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692033640; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=BSbkH9398RcrAe1SRFRChkk7MeWFTcwyYKWnMzr+f04=; b=ZVreJ4TpGx1mgkEzPE8jmYvpRbI2KtsKWydynpm9HtoeNXqi2eOk4x5/w27ZIAGSsASyLY uFWJm36a+/uMLd2ZhBFtOkGPhx6c4cCuX/I79jHdSX1sC0crLJFjnXKyWnmw+AU3XPghCH 3ccDQV2rhHf6ipZXzQtoTXaD8WSkTr0bXryP8HJjQxfb/e/2xYgABpuWz8aNPxrXjX+Yg/ rZhR/d4VFCH9bjA4PSsq8lE9g+H/UBYjRw6S5D9N2BQl5GugzVTqtK2gW2yDhgz8XkEHou BkoTXiGwXB8h2jz/O4QXMaawWTwcSmw9z6dJPlo/Zn8SpLxZWzEQ7BmDbmYlpg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692033640; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=BSbkH9398RcrAe1SRFRChkk7MeWFTcwyYKWnMzr+f04=; b=lYbvI+KPsjd0L7Ag5ix9HJWSuYSD1ANrQuOlJxPBbCdjEIe6hkstUqTT7fBivh1OOOs9Xu 9dt94LtPe5ShC8UJ5uApbDoORYdaemtIPs5Eq/ZKZgJpUFs2m0DrW57819YnrhBMxRravz duruRNmqaNo2bRWDWJBXLiVGVcdZTvmORAWr9g55IHhAToo/YnUpvSDhIM63EUpRrvc7Wx nId7OcsFYG+M3mweixM9MocdpyYzQos8nSS4Wkpg9msGS5N8ltHxAAuTYd4kIyOntNx1s3 3raM9nf5uD125FXTP5fskw/kd+ht//dF0mXw+M83gMcaw+AOjVrsCVDI9HLN3w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692033640; a=rsa-sha256; cv=none; b=btti1+08tUQNQYNefkhf+fDeF7qYkTA6D0W2rBugyulGSx22sFHn3APQn1F47n1v05ETvo jC39sSVGt5e4zyEdzdz7LLhK9kR1F2gOuHWIarjcGjNTBQCy6gB8I33rFWsI/OTkN20djE 5LcnINmotZMXvCF2pVbUcSnxtM4aXa8Z8HbFhtW++CgyOJv1Ruw2XDfMwZv5PVUpbrjeRe s90sPq2pkJDHzz7MLDYa18qUD/d3KYtlLVcyhSGq7kH1/KxHn0xa/IKpDMXrWi2JsxHToe RW3U3FinnRpF44rZj2iiKQRvSZHZk9fQEdNJVqe+TWvrCsEphil0Vh6A74+new== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RPh4S4BCLzclr; Mon, 14 Aug 2023 17:20:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37EHKe2N004502; Mon, 14 Aug 2023 17:20:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37EHKeoB004500; Mon, 14 Aug 2023 17:20:40 GMT (envelope-from git) Date: Mon, 14 Aug 2023 17:20:40 GMT Message-Id: <202308141720.37EHKeoB004500@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dmitry Chagin Subject: git: f3e11927dc28 - main - vm: Allow MAP_32BIT for all architectures List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dchagin X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f3e11927dc287ff686b5cc3618aba4e1e58a5dca Auto-Submitted: auto-generated The branch main has been updated by dchagin: URL: https://cgit.FreeBSD.org/src/commit/?id=f3e11927dc287ff686b5cc3618aba4e1e58a5dca commit f3e11927dc287ff686b5cc3618aba4e1e58a5dca Author: Dmitry Chagin AuthorDate: 2023-08-14 17:20:20 +0000 Commit: Dmitry Chagin CommitDate: 2023-08-14 17:20:20 +0000 vm: Allow MAP_32BIT for all architectures Reviewed by: alc, kib, markj Differential revision: https://reviews.freebsd.org/D41435 --- lib/libc/sys/mmap.2 | 3 +-- lib/libsysdecode/flags.c | 9 --------- lib/libsysdecode/mktables | 2 +- sys/kern/uipc_shm.c | 8 +------- sys/sys/mman.h | 2 -- sys/vm/vm_mmap.c | 17 ++--------------- tests/sys/vm/Makefile | 5 ----- tests/sys/vm/mmap_map_32bit_helper.c | 1 - 8 files changed, 5 insertions(+), 42 deletions(-) diff --git a/lib/libc/sys/mmap.2 b/lib/libc/sys/mmap.2 index 5a3c6eb5d06e..37006b0355a6 100644 --- a/lib/libc/sys/mmap.2 +++ b/lib/libc/sys/mmap.2 @@ -28,7 +28,7 @@ .\" @(#)mmap.2 8.4 (Berkeley) 5/11/95 .\" $FreeBSD$ .\" -.Dd December 24, 2020 +.Dd August 14, 2023 .Dt MMAP 2 .Os .Sh NAME @@ -145,7 +145,6 @@ Request a region in the first 2GB of the current process's address space. If a suitable region cannot be found, .Fn mmap will fail. -This flag is only available on 64-bit platforms. .It Dv MAP_ALIGNED Ns Pq Fa n Align the region on a requested boundary. If a suitable region cannot be found, diff --git a/lib/libsysdecode/flags.c b/lib/libsysdecode/flags.c index ac109cc454e0..31c125ad71af 100644 --- a/lib/libsysdecode/flags.c +++ b/lib/libsysdecode/flags.c @@ -913,20 +913,11 @@ sysdecode_mmap_flags(FILE *fp, int flags, int *rem) /* * MAP_ALIGNED can't be handled directly by print_mask_int(). - * MAP_32BIT is also problematic since it isn't defined for - * all platforms. */ printed = false; align = flags & MAP_ALIGNMENT_MASK; val = (unsigned)flags & ~MAP_ALIGNMENT_MASK; print_mask_part(fp, mmapflags, &val, &printed); -#ifdef MAP_32BIT - if (val & MAP_32BIT) { - fprintf(fp, "%sMAP_32BIT", printed ? "|" : ""); - printed = true; - val &= ~MAP_32BIT; - } -#endif if (align != 0) { if (printed) fputc('|', fp); diff --git a/lib/libsysdecode/mktables b/lib/libsysdecode/mktables index a0ff8ee8516c..68c3450a03f7 100644 --- a/lib/libsysdecode/mktables +++ b/lib/libsysdecode/mktables @@ -153,7 +153,7 @@ gen_table "vmresult" "KERN_[A-Z_]+[[:space:]]+[0-9]+" "vm/v gen_table "wait6opt" "W[A-Z]+[[:space:]]+[0-9]+" "sys/wait.h" gen_table "seekwhence" "SEEK_[A-Z]+[[:space:]]+[0-9]+" "sys/unistd.h" gen_table "fcntlcmd" "F_[A-Z0-9_]+[[:space:]]+[0-9]+[[:space:]]+" "sys/fcntl.h" "F_CANCEL|F_..LCK" -gen_table "mmapflags" "MAP_[A-Z_]+[[:space:]]+0x[0-9A-Fa-f]+" "sys/mman.h" +gen_table "mmapflags" "MAP_[2-3A-Z_]+[[:space:]]+0x[0-9A-Fa-f]+" "sys/mman.h" gen_table "rtpriofuncs" "RTP_[A-Z]+[[:space:]]+[0-9]+" "sys/rtprio.h" gen_table "msgflags" "MSG_[A-Z_]+[[:space:]]+0x[0-9]+" "sys/socket.h" "MSG_SOCALLBCK|MSG_MORETOCOME|MSG_TLSAPPDATA" gen_table "sigcode" "SI_[A-Z]+[[:space:]]+0(x[0-9abcdef]+)?" "sys/signal.h" diff --git a/sys/kern/uipc_shm.c b/sys/kern/uipc_shm.c index fb210248f9ac..be4a700c4944 100644 --- a/sys/kern/uipc_shm.c +++ b/sys/kern/uipc_shm.c @@ -1549,11 +1549,7 @@ shm_mmap_large(struct shmfd *shmfd, vm_map_t map, vm_offset_t *addr, /* MAP_PRIVATE is disabled */ if ((flags & ~(MAP_SHARED | MAP_FIXED | MAP_EXCL | - MAP_NOCORE | -#ifdef MAP_32BIT - MAP_32BIT | -#endif - MAP_ALIGNMENT_MASK)) != 0) + MAP_NOCORE | MAP_32BIT | MAP_ALIGNMENT_MASK)) != 0) return (EINVAL); vms = td->td_proc->p_vmspace; @@ -1573,10 +1569,8 @@ shm_mmap_large(struct shmfd *shmfd, vm_map_t map, vm_offset_t *addr, if ((foff & mask) != 0) return (EINVAL); maxaddr = vm_map_max(map); -#ifdef MAP_32BIT if ((flags & MAP_32BIT) != 0 && maxaddr > MAP_32BIT_MAX_ADDR) maxaddr = MAP_32BIT_MAX_ADDR; -#endif if (size == 0 || (size & mask) != 0 || (*addr != 0 && ((*addr & mask) != 0 || *addr + size < *addr || *addr + size > maxaddr))) diff --git a/sys/sys/mman.h b/sys/sys/mman.h index 0413249dee2c..29b00107792f 100644 --- a/sys/sys/mman.h +++ b/sys/sys/mman.h @@ -104,9 +104,7 @@ #define MAP_EXCL 0x00004000 /* for MAP_FIXED, fail if address is used */ #define MAP_NOCORE 0x00020000 /* dont include these pages in a coredump */ #define MAP_PREFAULT_READ 0x00040000 /* prefault mapping for reading */ -#ifdef __LP64__ #define MAP_32BIT 0x00080000 /* map in the low 2GB of address space */ -#endif /* * Request specific alignment (n == log2 of the desired alignment). diff --git a/sys/vm/vm_mmap.c b/sys/vm/vm_mmap.c index 64287f096332..8f0b985da627 100644 --- a/sys/vm/vm_mmap.c +++ b/sys/vm/vm_mmap.c @@ -272,11 +272,7 @@ kern_mmap(struct thread *td, const struct mmap_req *mrp) } if ((flags & ~(MAP_SHARED | MAP_PRIVATE | MAP_FIXED | MAP_HASSEMAPHORE | MAP_STACK | MAP_NOSYNC | MAP_ANON | MAP_EXCL | MAP_NOCORE | - MAP_PREFAULT_READ | MAP_GUARD | -#ifdef MAP_32BIT - MAP_32BIT | -#endif - MAP_ALIGNMENT_MASK)) != 0) + MAP_PREFAULT_READ | MAP_GUARD | MAP_32BIT | MAP_ALIGNMENT_MASK)) != 0) return (EINVAL); if ((flags & (MAP_EXCL | MAP_FIXED)) == MAP_EXCL) return (EINVAL); @@ -287,10 +283,7 @@ kern_mmap(struct thread *td, const struct mmap_req *mrp) return (EINVAL); if ((flags & MAP_GUARD) != 0 && (prot != PROT_NONE || fd != -1 || pos != 0 || (flags & ~(MAP_FIXED | MAP_GUARD | MAP_EXCL | -#ifdef MAP_32BIT - MAP_32BIT | -#endif - MAP_ALIGNMENT_MASK)) != 0)) + MAP_32BIT | MAP_ALIGNMENT_MASK)) != 0)) return (EINVAL); /* @@ -331,7 +324,6 @@ kern_mmap(struct thread *td, const struct mmap_req *mrp) /* Address range must be all in user VM space. */ if (!vm_map_range_valid(&vms->vm_map, addr, addr + size)) return (EINVAL); -#ifdef MAP_32BIT if (flags & MAP_32BIT && addr + size > MAP_32BIT_MAX_ADDR) return (EINVAL); } else if (flags & MAP_32BIT) { @@ -342,7 +334,6 @@ kern_mmap(struct thread *td, const struct mmap_req *mrp) */ if (addr + size > MAP_32BIT_MAX_ADDR) addr = 0; -#endif } else { /* * XXX for non-fixed mappings where no hint is provided or @@ -1621,18 +1612,14 @@ vm_mmap_object(vm_map_t map, vm_offset_t *addr, vm_size_t size, vm_prot_t prot, else findspace = VMFS_OPTIMAL_SPACE; max_addr = 0; -#ifdef MAP_32BIT if ((flags & MAP_32BIT) != 0) max_addr = MAP_32BIT_MAX_ADDR; -#endif if (curmap) { default_addr = round_page((vm_offset_t)td->td_proc->p_vmspace-> vm_daddr + lim_max(td, RLIMIT_DATA)); -#ifdef MAP_32BIT if ((flags & MAP_32BIT) != 0) default_addr = 0; -#endif rv = vm_map_find_min(map, object, foff, addr, size, default_addr, max_addr, findspace, prot, maxprot, docow); diff --git a/tests/sys/vm/Makefile b/tests/sys/vm/Makefile index c460ba9d8db7..a3ea83a33cfd 100644 --- a/tests/sys/vm/Makefile +++ b/tests/sys/vm/Makefile @@ -9,14 +9,9 @@ ATF_TESTS_C+= mlock_test \ page_fault_signal \ shared_shadow_inval_test -.if ${MACHINE_ARCH} != "i386" && ${MACHINE} != "arm" && \ - (${MACHINE} != "powerpc" || (${MACHINE_ARCH} != "powerpc" && \ - ${MACHINE_ARCH} != "powerpcspe")) - # MAP_32BIT is only available on 64-bit platforms BINDIR= ${TESTSDIR} ATF_TESTS_SH+= mmap_map_32bit_test PROGS+= mmap_map_32bit_helper -.endif SUBDIR= soxstack TESTS_SUBDIRS+= stack diff --git a/tests/sys/vm/mmap_map_32bit_helper.c b/tests/sys/vm/mmap_map_32bit_helper.c index 47d4b2c53c20..763bba35d2b9 100644 --- a/tests/sys/vm/mmap_map_32bit_helper.c +++ b/tests/sys/vm/mmap_map_32bit_helper.c @@ -11,7 +11,6 @@ #include #include -_Static_assert(sizeof(vm_offset_t) >= 8, "Test is not intended for ILP32"); #define MAP_32BIT_MAX_ADDR ((vm_offset_t)1 << 31) int From nobody Mon Aug 14 18:06:18 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RPj5846tcz4TntN; Mon, 14 Aug 2023 18:06:20 +0000 (UTC) (envelope-from jhb@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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RPj58353Bz4Fjx; Mon, 14 Aug 2023 18:06:20 +0000 (UTC) (envelope-from jhb@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692036380; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=tJS7klJbyAlqp6x0fcpVM6IvLYmW1MYsxDCqWHaylBM=; b=OdrihMjULvyvDOHBU4xo4gnMUrcPCm3EFyze7UfQFwPGcP51JA1JqADUC5o2Tgn7BmnxY9 ebSHtctJAiVNzha/5nq0YMpcO6lKL9RGLNHClhQ7PPGE+xYc51l0UX4FzNaJ85ckJFiLE6 zELvTJuK3kVCP4KLDxTHGMSXrhCaoDMWNN+iHSR/31IHNPrtQJ8kwnmZR8F1tCFJISlZMt cO2/Pxi+ucDW78vjjns1nAEcXNivVTkP9tb6gsBvp0eEmYRtGv7JpWbMMDwg43ZNn0dYxs PAD9ulYi1FhwzpbVNQKmvLZqE+NtkhLC1UGKMznLov10BmRGsUBEdvxkqTQ2Ew== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692036380; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=tJS7klJbyAlqp6x0fcpVM6IvLYmW1MYsxDCqWHaylBM=; b=d1JBq3TSU+imn2RA7IxRNnJDTipTBg+vFUMHQCupL+XZ5dzri3FPl6PutrrGuWe39yvOoc vf11eHjXMmI+p3/hTB4ej6A1wZxhgwOqAGfwUZCDLe6Wwzt0vuWNZpP90B+kztIKM3gR+E VMmkAkVJpEhWeMEl/0zOmBKiyKevUNR1DZ9GJGn/T8gYGFIWXKWmfG08tL6yJJ9U1G9sAi T6wbgjmX6ZydeBAssOvIZxZnX79r1gLgFVRmifRKWBTfClaGyKn8aLD29t8d3qYbzT2VQN LNu1ZrSp2jR/UOI4uzjHwpgn4tmRHvEsWXox8eRt4IGNCOrq5BhiDan+Lzp70g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692036380; a=rsa-sha256; cv=none; b=TO9u4qp5JW/ErmdNLqWH5XjajwgoeNNYCsWE7kPfUKskixGRYHNKZe2zdwjyHmJwHfZllH IJn3ufAM6WnEeq84IFUtJDYWNy0YhLyXxQzOZ6G+mrv24xhuxwkFTmxbOa43fPZuON15xo X+AYaAdQY/qcs46+ZTlwd3OKyntkpoBqeMG/maCDYs7GFOAKsVxfDNw+VZrBM6/OJUBkYW ATSO/0DsN53eUwhPlpTQMntEcj34AURelssAYV+6rjRHzfyRNkBXTTnOwiGigA81IpNdGv iONELqYETsLQ/xATI/ZhS+9unwTHvwcnUlOiizYPC/ECV46woVW4zijo+CJIYQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from [IPV6:2601:648:8683:a9e0:245c:e6ba:2131:1b31] (unknown [IPv6:2601:648:8683:a9e0:245c:e6ba:2131:1b31]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (Client did not present a certificate) (Authenticated sender: jhb) by smtp.freebsd.org (Postfix) with ESMTPSA id 4RPj5764HHz5n; Mon, 14 Aug 2023 18:06:19 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Message-ID: <885195f6-2dbd-4890-affc-5571404e9982@FreeBSD.org> Date: Mon, 14 Aug 2023 11:06:18 -0700 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.15; rv:102.0) Gecko/20100101 Thunderbird/102.14.0 Subject: Re: git: 69f8cc60aa1e - main - ofw_firmware: Only match if there is no compatible Content-Language: en-US To: Emmanuel Vadot , src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org References: <202308130919.37D9JtjW003148@gitrepo.freebsd.org> From: John Baldwin In-Reply-To: <202308130919.37D9JtjW003148@gitrepo.freebsd.org> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit On 8/13/23 2:19 AM, Emmanuel Vadot wrote: > The branch main has been updated by manu: > > URL: https://cgit.FreeBSD.org/src/commit/?id=69f8cc60aa1e3140f41a75c859333a3d56c947fb > > commit 69f8cc60aa1e3140f41a75c859333a3d56c947fb > Author: Emmanuel Vadot > AuthorDate: 2023-08-13 06:28:13 +0000 > Commit: Emmanuel Vadot > CommitDate: 2023-08-13 09:19:44 +0000 > > ofw_firmware: Only match if there is no compatible > > If there is a compatible string it likely means that the firmware needs > a dedicated driver (like on RPI*). > > PR: 273087 > Tested-by: Mark Millard > Sponsored by: Beckhoff Automation GmbH & Co. KG > Fixes: fdfd3a90b6ce ("ofw: Add a ofw_firmware driver") > --- > sys/dev/ofw/ofw_firmware.c | 5 ++++- > 1 file changed, 4 insertions(+), 1 deletion(-) > > diff --git a/sys/dev/ofw/ofw_firmware.c b/sys/dev/ofw/ofw_firmware.c > index faba123c3e09..7d62fc317c1d 100644 > --- a/sys/dev/ofw/ofw_firmware.c > +++ b/sys/dev/ofw/ofw_firmware.c > @@ -100,11 +100,14 @@ ofw_firmware_add_device(device_t dev, phandle_t node, u_int order, > static int > ofw_firmware_probe(device_t dev) > { > - const char *name; > + const char *name, *compat; > > name = ofw_bus_get_name(dev); > if (name == NULL || strcmp(name, "firmware") != 0) > return (ENXIO); > + compat = ofw_bus_get_compat(dev); > + if (compat != NULL) > + return (ENXIO);> > device_set_desc(dev, "OFW Firmware Group"); > return (0); Returning 0 from probe should be discouraged in new drivers FWIW. I'm curious here why you don't instead just return BUS_PROBE_GENERIC here, and let the RPi-specific driver return BUS_PROBE_DEFAULT? -- John Baldwin From nobody Mon Aug 14 19:02:43 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RPkLC3v9Yz4Tsjc; Mon, 14 Aug 2023 19:02: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RPkLC3LPsz4K2y; Mon, 14 Aug 2023 19:02:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692039763; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=sc+PaZzFKqaI9Uc/e4SH8hm7ke7R9bJImK3LowIG7qo=; b=ob2JWb6Jhi7NAlTXdvwmf2vLahfsq8WOq7v1Q7ggcI2odbx24cB4aNNyXjYjZBFd34AShT zupSqs3yOrYFHxvp1NJEVLgopRS6Pkyf+r2axRrYhUNsHVmTSYd4eqYMD8k+LQ8HvMlbgv lwczIMARGlHykb4/kvK9G2Bw/ruopiBidlkxgjtEnJqMCbQLd9bQjwAR2ZdDnLYxWskZuq Kg3hvla7FrKzvHomNK3XqRGIjm2+UkKTsd2VEnoRSTwdliHmkN7DO0EQFx8+qSh3szrHDw 2F5bHuPWaP/kFeXdRqE3N1oSgBTdJGk13qr3vTYXZDXI+Wcju0Oo42WGOe+30Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692039763; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=sc+PaZzFKqaI9Uc/e4SH8hm7ke7R9bJImK3LowIG7qo=; b=C8Cgoq9/HxwbOB5C27z7LRc9Y+SuZyVA56RKmOUAMH/kqZ6eIwA8LXtqOQn56bN3Ypc1po WL5bCULGiF7sBSXrAYdzwdW8CtFbPSK0dcPrNdhTIl/GmUJC/pSMddXRTGk/TGsumHu+7I MHPiHj1Nd7OcyJWj1HBA5RT651T6R+wIsNBW8jleHPJbkKcMVuwGOHMfluc9j4J19Jhu9a E3wQYwnvZNVzsajbc1mrZbv5A8q/usUOT05k2J/1XONndOct975Rat7MaOZRGd3SvpiH6Z +Xfwv6Vxq3cvOwb6Gcyh7kC9j9lEDUnTicTsa0ddSNIAx/NAEYZE5G1fLJz5gw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692039763; a=rsa-sha256; cv=none; b=F5le9rcZPaANarM339Z/K7wC6lIcsYytJsJ0tDit/JjT1n0DwbFNgtanuEUXL5OUMgQmhf Yc1DE9g8KNFQXzxJL5OzRbb4UvK/pKH15/Vue2JCasIoUj3TBzdd50MJY82weVsGTX/pEX OBYNQbS3kXNVi6dWd8f6k+Kzg9jWn7su1pbax+EZemhmcfEhjbMc2PhTgTQ+jRcQZhQpZ8 Vc1jBOQwm5rpZ7WLQMUWbDlbLlgPhLjEY0YCldjRk+8KUsRr4dOLbo6SIYgrJLWzt9BSxN IlxuZKYYq2TbIhoxgXNmJecTym+mJ8PtD2k6m//4DigJWSNjE51DV3mdTDBiXg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RPkLC2QZvzfy4; Mon, 14 Aug 2023 19:02:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37EJ2hmA077710; Mon, 14 Aug 2023 19:02:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37EJ2hOF077707; Mon, 14 Aug 2023 19:02:43 GMT (envelope-from git) Date: Mon, 14 Aug 2023 19:02:43 GMT Message-Id: <202308141902.37EJ2hOF077707@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: e3637e2f5b80 - main - RELNOTES: Trim spurious blank line. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e3637e2f5b802e3ea3b9d4819e505e79c3f072af Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=e3637e2f5b802e3ea3b9d4819e505e79c3f072af commit e3637e2f5b802e3ea3b9d4819e505e79c3f072af Author: John Baldwin AuthorDate: 2023-08-14 19:02:29 +0000 Commit: John Baldwin CommitDate: 2023-08-14 19:02:29 +0000 RELNOTES: Trim spurious blank line. --- RELNOTES | 1 - 1 file changed, 1 deletion(-) diff --git a/RELNOTES b/RELNOTES index 8c1b48de7e5c..4687fc30aa22 100644 --- a/RELNOTES +++ b/RELNOTES @@ -20,7 +20,6 @@ Changes to this file should not be MFCed. be accessed as indices of _ENV; e.g., _ENV['net.fibs']. bdc81eeda05d: - nda is now the default nvme device on all platforms. While nda creates nvd links by default so fstab, etc continues to work, configuration should be updated to the new nda devices. From nobody Mon Aug 14 19:57:12 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RPlY42sYgz4TxK7; Mon, 14 Aug 2023 19:57:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RPlY42GHvz4Nn8; Mon, 14 Aug 2023 19:57:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692043032; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rklU+1sn2cuzBS5c3PErPEiH6P7HxoNHsgD8grz/l9E=; b=MzWicq8WPb2ZKxPwbEgGobc8M2tynSM7Q/HoWMso1TWkBbLDHRT+8uW+BddhDmGWKMC6Va 61+pXBx0awS7Sp8fQt8KBzaXJ7aYOlwR82JwaGmhJbf62wdFtPp0je+deiKSYSnULfdped JbfcF0REJRQDe51W0lTa+HjFw43v+0MTkfw9s2eDHTWZ60a3QGz1lJICOqmubA0+1juLix qIwMjUHBwFSSZre/5CcssS7jZ+vwqanbcoxk0WGNSiqY9HLPRH6V83y7twNTjeLyscNwWg PRUWqnTqfPfjIXXdu5iggFUK8WuqTSQgsH3vt8eHJCa+qKUl1DVXTXjORwEShg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692043032; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rklU+1sn2cuzBS5c3PErPEiH6P7HxoNHsgD8grz/l9E=; b=Gegph/zcIeuJK93eieussnR29wAL29anR8feWtIboyq1KTNhgO4WKi7K0Y5E+bNIcUD0bL 3te5Z7tQ//gPrCyrT+ZQ9FUN2sWWNdNAhMBe+I5SHqVPdVht12NV9qcb/pJypgvQAr3XVj RlQILUfRTkNB6s1wqSo2Wx+dqRCDypUUnB/zBD4pc5NLxvYMO5/9lMvDFuNw3Yb6ekBOLQ TaZT8A79lJFAph1IyXXcMxUx60Q4Hktj0zZqBXGPzt4QZGrXSHNT+hQ5Auu5KKikumAOSV NmDP5tA3qC4QhUY7IdO7/7NuMkX9IpU0r5NZp77G7UoQMhKffiYbN2EgCUCQTQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692043032; a=rsa-sha256; cv=none; b=Ccn+gcG620lZgWf0n88Cyys/3TS5tIbb20t+R7EYaMqjd1KVRAaZO78V9cPa06o3d6jpcx kldyjm5+HluIsxmXsC1pndGPUKcChNtSJBLJcgC2dNE36IDVt6qXnsfgcNFOEX2+ETn8k/ B0+G4QZEbtDorszoD5jVdGLFrEi1rxml0xdUXd2JVbYozEPqKAVIFRxq14Lj7fFH/YA1RX ovQuqT4IfR+0NOMT9HwfinCLLg2ZivO8jONZUb5QiCYyWJdwPF7+5sQ2M8PwPveThSHNtV uaVs5HOwTVhZ4JiKcY3u9c9m+YCA7lMHE5QED5Sttv0SGWbXV6mt86YxxlM0Qg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RPlY41KTlzhC3; Mon, 14 Aug 2023 19:57:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37EJvCjU060378; Mon, 14 Aug 2023 19:57:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37EJvCSP060375; Mon, 14 Aug 2023 19:57:12 GMT (envelope-from git) Date: Mon, 14 Aug 2023 19:57:12 GMT Message-Id: <202308141957.37EJvCSP060375@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gleb Smirnoff Subject: git: d29b95ecc0d0 - main - sockets: on accept(2) don't copy all of so_options to new socket List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: glebius X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d29b95ecc0d049406d27a6c11939d40a46658733 Auto-Submitted: auto-generated The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=d29b95ecc0d049406d27a6c11939d40a46658733 commit d29b95ecc0d049406d27a6c11939d40a46658733 Author: Gleb Smirnoff AuthorDate: 2023-08-14 19:56:07 +0000 Commit: Gleb Smirnoff CommitDate: 2023-08-14 19:56:08 +0000 sockets: on accept(2) don't copy all of so_options to new socket As uncovered by e3ba0d6adde3 we are copying lots of irrelevant options from the listener to an accepted socket, even those that aren't relevant to a non-listener, e.g. SO_REUSE*, SO_ACCEPTFILTER. Stop doing that and provide a fixed opt-in list for options to be inherited. Ideally we shall not inherit anything at all. For compatibility inherit a set of options that are meaningful for a non-listening socket of a protocol that can listen(2). Differential Revision: https://reviews.freebsd.org/D41412 Fixes: e3ba0d6adde3c694f46a30b3b67eba43a7099395 --- sys/kern/uipc_socket.c | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/sys/kern/uipc_socket.c b/sys/kern/uipc_socket.c index eaff57d50d78..f111ec9d0780 100644 --- a/sys/kern/uipc_socket.c +++ b/sys/kern/uipc_socket.c @@ -750,7 +750,19 @@ solisten_clone(struct socket *head) } so->so_listen = head; so->so_type = head->so_type; - so->so_options = head->so_options & ~SO_ACCEPTCONN; + /* + * POSIX is ambiguous on what options an accept(2)ed socket should + * inherit from the listener. Words "create a new socket" may be + * interpreted as not inheriting anything. Best programming practice + * for application developers is to not rely on such inheritance. + * FreeBSD had historically inherited all so_options excluding + * SO_ACCEPTCONN, which virtually means all SOL_SOCKET level options, + * including those completely irrelevant to a new born socket. For + * compatibility with older versions we will inherit a list of + * meaningful options. + */ + so->so_options = head->so_options & (SO_KEEPALIVE | SO_DONTROUTE | + SO_LINGER | SO_OOBINLINE | SO_NOSIGPIPE); so->so_linger = head->so_linger; so->so_state = head->so_state; so->so_fibnum = head->so_fibnum; From nobody Mon Aug 14 20:19:51 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RPm3C49WJz4mJGT; Mon, 14 Aug 2023 20:19: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RPm3C3XlKz4Q36; Mon, 14 Aug 2023 20:19:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692044391; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=t9vvNC+yMJ5ehQ6kbqe8Bbjd7SNGyPdZuWgoVeNdztE=; b=E0s8gADQFVAqwaTyjVDcAzVzO9DK7kcwfl8pl5K1NeBpMg2DT9kbEq7lFRvxYcZl9z1INc oViuUmpXdMV0kJQdDnlNpxngX1w9+9pRgK9MuZlyIkWRIsOoxpUus3BVNEEg5ZN7zHznPe sM7pBMlX7Mo1w06vY0LV7WXovWg47UZKFcmLCfR13g2YKIHqFxtugevByzNtVbavAHwEvc /XXY3/CHbFal8psEe0OyNr56gsxbYgtnUULZrxG+7rxDatm7B5xdc+lZhADyuCwYLrtoz0 cFEkvHfduUIwFKTvMOSsxcqbtBXWXot49bXMFQu118xRXLHTO76/VEk8l6LGjw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692044391; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=t9vvNC+yMJ5ehQ6kbqe8Bbjd7SNGyPdZuWgoVeNdztE=; b=x6t5ZzR1q5nLbTw6gztSKp6+qKDCsNqkMHKYDKXw6BMCzTzbdOL6jvAyCvANfpJyWdhhp2 x8QsHN29myIKGTALjWfidivLKxGIpDu4SAhzNELgarAecfV6y8pE3PEHAYX3TVYs+uk0Fe 9L+IMtfAgDVm/90HWq7hAWUCpegIgD99WsQ/AyxhYmDgEsp5v/f6VGbZDz6MXET+AW78Ax 2AGcc5WMC4+Q3ZaU/flSpF7ddIGLaueGOn8Dhq+V3WGZX61QjU8kwLmVUuHyEyRR6E68F7 yvtzXC0ZlBt+ayCh2VeCyhvqyWIr3WPJhLIe5tFT7m/Sa8zQ6vnHibjLOM7w9A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692044391; a=rsa-sha256; cv=none; b=PKQpa8VbxcvqwBN/7qOhvzlN/Mda+kwQOoemircxZ41msBuTUD+IrXMTGSYGkGIcqI75HC NZTV6SK4+TYlKPjU7Hjn5ADTtkxsNm112oN4C3G9h8eK83czLnbDu1sFaZKImF+GTf9RZg DmKrMPytVbWiJHTRFLboK2jLZtH08S6itAEoI7Yedhr3l1bq/D5qkvqZG2xOgXlDfV6/x3 vxippEahlOpEPFLcWkbIeeWZ/nJH7R04lGQ0P9M15hUAXpCr45DrPOE7YLF4j2D9pz/DcH wJQKXwzIgr0ZxstckDi1h+0tnK1FxX7XHsaytI79E3JoniptuTPtwUymWluuOg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RPm3C2VHQzhdH; Mon, 14 Aug 2023 20:19:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37EKJpK0094596; Mon, 14 Aug 2023 20:19:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37EKJpZC094593; Mon, 14 Aug 2023 20:19:51 GMT (envelope-from git) Date: Mon, 14 Aug 2023 20:19:51 GMT Message-Id: <202308142019.37EKJpZC094593@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: a51f81c2e53f - main - x86: move EARLY_AP_STARTUP into DEFAULTS List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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/main X-Git-Reftype: branch X-Git-Commit: a51f81c2e53f4968f5594822c44ed8da4d2416f6 Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=a51f81c2e53f4968f5594822c44ed8da4d2416f6 commit a51f81c2e53f4968f5594822c44ed8da4d2416f6 Author: Ed Maste AuthorDate: 2023-08-07 21:49:57 +0000 Commit: Ed Maste CommitDate: 2023-08-14 20:17:48 +0000 x86: move EARLY_AP_STARTUP into DEFAULTS EARLY_AP_STARTUP was introduced in 2016 (commit fdce57a04219) with note: As a transition aid, the new behavior is moved under a new kernel option (EARLY_AP_STARTUP). This will allow the option to be turned off if need be during initial testing. I hope to enable this on x86 by default in a followup commit ... It was enabled by default, but became effectively mandatory (on x86) some time later. Move it to DEFAULTS to avoid an unbootable system if the option is left out of a custom kernel configuration file. Reported by: wollman Reviewed by: jhb Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D41352 --- sys/amd64/conf/DEFAULTS | 2 ++ sys/amd64/conf/FIRECRACKER | 1 - sys/amd64/conf/GENERIC | 1 - sys/amd64/conf/MINIMAL | 1 - sys/i386/conf/DEFAULTS | 2 ++ sys/i386/conf/GENERIC | 1 - sys/i386/conf/MINIMAL | 1 - 7 files changed, 4 insertions(+), 5 deletions(-) diff --git a/sys/amd64/conf/DEFAULTS b/sys/amd64/conf/DEFAULTS index bc8a268e1ea4..7a3c54f974ab 100644 --- a/sys/amd64/conf/DEFAULTS +++ b/sys/amd64/conf/DEFAULTS @@ -5,6 +5,8 @@ machine amd64 +options EARLY_AP_STARTUP + # Bus support. device isa diff --git a/sys/amd64/conf/FIRECRACKER b/sys/amd64/conf/FIRECRACKER index ba00d674cf4e..b9cf11543245 100644 --- a/sys/amd64/conf/FIRECRACKER +++ b/sys/amd64/conf/FIRECRACKER @@ -115,7 +115,6 @@ options NETGDB # netgdb(4) client support # Make an SMP-capable kernel by default options SMP # Symmetric MultiProcessor Kernel -options EARLY_AP_STARTUP # Pseudo devices. device crypto # core crypto support diff --git a/sys/amd64/conf/GENERIC b/sys/amd64/conf/GENERIC index 822567ebe4bd..a3adb3ff8fd0 100644 --- a/sys/amd64/conf/GENERIC +++ b/sys/amd64/conf/GENERIC @@ -124,7 +124,6 @@ options NETGDB # netgdb(4) client support # Make an SMP-capable kernel by default options SMP # Symmetric MultiProcessor Kernel -options EARLY_AP_STARTUP # CPU frequency control device cpufreq diff --git a/sys/amd64/conf/MINIMAL b/sys/amd64/conf/MINIMAL index b69706f97690..f52fbb375f6d 100644 --- a/sys/amd64/conf/MINIMAL +++ b/sys/amd64/conf/MINIMAL @@ -80,7 +80,6 @@ options KDB_TRACE # Print a stack trace for a panic. # Make an SMP-capable kernel by default options SMP # Symmetric MultiProcessor Kernel -options EARLY_AP_STARTUP # CPU frequency control device cpufreq diff --git a/sys/i386/conf/DEFAULTS b/sys/i386/conf/DEFAULTS index f4956183b85c..8ed95641af6f 100644 --- a/sys/i386/conf/DEFAULTS +++ b/sys/i386/conf/DEFAULTS @@ -5,6 +5,8 @@ machine i386 +options EARLY_AP_STARTUP + # Bus support. device isa options ISAPNP diff --git a/sys/i386/conf/GENERIC b/sys/i386/conf/GENERIC index d2bc5b195963..877898777749 100644 --- a/sys/i386/conf/GENERIC +++ b/sys/i386/conf/GENERIC @@ -109,7 +109,6 @@ options NETGDB # netgdb(4) client support # To make an SMP kernel, the next two lines are needed options SMP # Symmetric MultiProcessor Kernel device apic # I/O APIC -options EARLY_AP_STARTUP # CPU frequency control device cpufreq diff --git a/sys/i386/conf/MINIMAL b/sys/i386/conf/MINIMAL index d939201d85a9..a2aab1660209 100644 --- a/sys/i386/conf/MINIMAL +++ b/sys/i386/conf/MINIMAL @@ -88,7 +88,6 @@ options KDB_TRACE # Print a stack trace for a panic. # Make an SMP-capable kernel by default options SMP # Symmetric MultiProcessor Kernel -options EARLY_AP_STARTUP device apic # CPU frequency control From nobody Mon Aug 14 20:33:51 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RPmMS1QtHz4mKSK; Mon, 14 Aug 2023 20:33:56 +0000 (UTC) (envelope-from flo@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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RPmMS0q9Pz4QqS; Mon, 14 Aug 2023 20:33:56 +0000 (UTC) (envelope-from flo@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692045236; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:autocrypt:autocrypt; bh=pWRbLRUp8Z6NFcxyQ2fSG7DSEaq1NCP8ACp/wcfhQe8=; b=qyn8CMLy2Y1O4N2y+PZGLQOFU5jVqGivH4q2BdSCSLpxtGjuA0WMF6bLb+sDNHuAe2je5+ nSxPScuasHz5fcAkdFmyA9w8mG2O8pT+OkKDlGSYYVWoWf2O/z+EqdNQgAQETabI5lo1N8 XK7iAj4ROtGbb7afAJgoVfT6QhbgspOj2iTImu/XVcJGJXPRI3uPU9aazuy527NxHt0bYC ffiI2J45iif9UnINw4z3stxv25J7NRlDLLZVtHmmPcoAE/z+BDefePUkE3JTDZOw9i2Mk7 freumLogLdq29ptI5E/sZB2pvlbAELQeiXJEcBSe55eG9hYa/AM17ijvesgeIA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692045236; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:autocrypt:autocrypt; bh=pWRbLRUp8Z6NFcxyQ2fSG7DSEaq1NCP8ACp/wcfhQe8=; b=eaUDAjo08N8PTCWUqkem+WG+qUSt1tGU9mLSr7YzqN7ZHwZEprZNgrUSmC2Hej9GtY7jgf Jlc8w2TYrYD7iM8/xiBWkZApMZqrD9Y4wkRf0XtDbxDCC4yUFhWXxbJXR5VW+m0W628fiN Bw+yupPuaPQVwumkmfcUr+QmALK8tHEe4Jltpcv+ghIRH6ahvQqytLsNx3XAPzR4cYA5ag giA7H1yLsPe0L4rWxxaRKHjNATpt6fC140ItvnqHS5u8VIl+DE4sUVfQcg11CuQDxrF3y5 DhySVBUNeihD0XtwYRYJEWdsAako46QUebtnnxErZ8qSShC2ITTT7dZ9VS5scA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692045236; a=rsa-sha256; cv=none; b=f3VTwS+mSwkB0i4MZdbE2GbhLbnv9r9b2205eq+kYoEDqAzcYPMPcDIDUzGvQLLGvWBLYN F05SGP5YC1iYQjD9LdbDCutyeBHx7D1gVjQMLpmZhB73tdimB9WaZhTeOIH30dSbQ7i6Aa UhyXfCNDp6GvwGzLXf5nd0x2jkyck06wl5rHjWohbLVuA+WWnx9DEpLjh1uVIASoY7nsMd RMy0fn0uRM2JWPex3Y75PXZuYKVPdswafsfKjFSLVHjBaQj2GQbDvlCpQNwG2719chVo84 6zNAUGTNiq/6l8a5kP6Vf8XXj/9L2LH1PoMx9fa/rcov/kURDrgjjgVQRNJ0uA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from [IPV6:2a01:4f8:10a:fd43::666] (unknown [IPv6:2a01:4f8:10a:fd43::666]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) (Authenticated sender: flo/mail) by smtp.freebsd.org (Postfix) with ESMTPSA id 4RPmMR0mdNz1r8; Mon, 14 Aug 2023 20:33:54 +0000 (UTC) (envelope-from flo@FreeBSD.org) Message-ID: <5c546e4e-5637-4582-867c-a87d306bb3d8@FreeBSD.org> Date: Mon, 14 Aug 2023 22:33:51 +0200 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 User-Agent: Thunderbird Daily Subject: Re: git: e3ba0d6adde3 - main - inpcb: do not copy so_options into inp_flags2 Content-Language: en-US To: Gleb Smirnoff , src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org References: <202307270351.36R3pa8o060603@gitrepo.freebsd.org> From: Florian Smeets Autocrypt: addr=flo@smeets.xyz; keydata= xsFNBFpyBwsBEADLq0c46orEtbMn4SptX+VJxR1wB4YwaErZme1bqF4nZHIhlRNET22HsHdQ doagaB4uACq0Rj5kHcu614ZnnNkLPyCxWQATx+cbdiFO4/hfT8tAvKnBtiy3awKJ5uGCNO2E zJwXW6KwdDA8XPRySqN8m1yPl+dW0Cls+/vO/QL/6+YLMupmEpSvFxRzAZTQuKyX4+xl+dYI d24JiPd1yfCuDNOY3+OZ3QBMT00u/699N8lUWRtiTwaQMwAOww8r/26YM6/SgcgFuLH2E/CV plY0sDvfoISlAj8agxdomNXfPjCMQ6w5yGZmA+huFpPCVBTi3on/SWgbQO7dLVpN4BNPuScP osCb/dsOg0S74zCClsIU3gdUGh9rwJY00/Ebid6V0R3c1Czwbg8LQedzlGDuXYXmzp6W2ujg r1cqbUD6lUWikUv2IMdCbb8MxYhHLi3GYUs5Xpi+W7vM6T45KbuMr7O/1SjtcGOlNeDvGNgj cDk20fOgPPZ+M6i9vX5Q2oI9HoYaeTiYNwILkBLVP/L40kTo5EkiQOt4OW6BMbylqXPOaQMW uGVbmhCJQpbx8Vo80s2yiBBVWkLkWQIcIm3KZlLldJqKEFpQBWLBE1eFFqboYgAWzFn73CaV 5tihobijMmmOV3a8cI1fI4kREyl3g+8bW+O0u3m3tuzVOpDpjwARAQABzR9GbG9yaWFuIFNt ZWV0cyA8ZmxvQHNtZWV0cy54eXo+wsGXBBMBCgBBAhsDBQsJCAcDBRUKCQgLBRYDAgEAAh4B AheAAhkBFiEE7LNouHkIv7aRTXJp71uk3NWp88AFAmHwU9QFCQtIlt8ACgkQ71uk3NWp88D6 dA//YNhcYVDRSpLDNMLE9rqJ0DHJFaIRafpExGxQhHHiQKoeXwj87VCKRP++sbewS43g0hw6 3Nh/v/L2WbAwF4QvF3MOAhoiiGaNZoHpPK2XwaWcqa8nh2QK28G51PzLooAx78tagIBYyP3Z oRlhu22Ye3tNnN0f1ckEJMRoJAPO7hDGzFE03kcaFvOu9AOOJNuaZxdVspni6s8B4n9xrHVX NOIlwMoq2UT8irtMJb+ZWsBb/Oj/ZU0+oni8VWJMEMWwVgEOlwweAw8PK+C24F2vAj+tY3DU Q9ZQB6nX4PZesRnah95IKrDFJjOGhmdSls0uGRQkmY/U3ESuD+3AkRGXnXZ7kz6BrTVqoneg mGzG6If3BulvLqv/bdwE32JOe8UIY6cLNhgoRfMlx58Po9DZCnG4uwPr5zVpuRO4SvOC3Rz1 Q9tUV1rbrWa/QWsDlDbwzIX92eXeVs1nrQokO9VE5Fg3279ktyVJGdcSd53h5xXCvO0SKVIk fvNtTOxodhhFzhgfBgDa4eYpJfSlgSMEDOab/vRgjAjqWFbqjY+fa2OAvGXuPhCO8aofKtgn QxCK9yASayptn+3KKNy005/Q5Kuh1C89csjRxhZSw6dB+gLdyZggtD8mv12+aaFIep3FITOK KmA4H/CUcKGDozXVvhL0r90o+BfzjopmIHn6V7LOwU0EWnIHCwEQANHrOm5vydK/ij1zkDyL Zzbogk5zjMh6oAr3cH4oGbJHPLlyFZTCVBYUwD4kh6NV1sKuZOeX/aygyVg1RyLulnzsc6Yj XOIxlqhqQwGI8k8ssAIpMSf029781CNF2HC42CrJeHtXNONDNOjsMuoxzga9zLQCh4jLTlE/ TUJo6KVABWBVRtTVh2Z77pKtN7j2NPFBHvp7K0WHfV+TYnlsgjhUA0ACZnUdHS2YRzBhCzzQ eludxBz54S9xbUq1mfZfVx8AbAGXF2zxo68nvvAAJn48HiBS3dMhCGYJDdZdja6QdUFPiemi nOxwkUzCqmKxm+Aj7USue1SbZZqJxmMI1eF4Ork/BJJI74Z/FnJgYR4UkEiD3J/KUocQCIH3 daB1+/CXlh99Ib7AP+QGuKk3vnNHh7VBq3E+VAiM5LU0BmgW+cdRPHkiwM7sDa2VnV3VqvV7 QmoMKnHFzUB6Nn8uE+iakp5J81Pr68kDOq7kLW3UnGmg1PUqbsnCaTimJb3JAYWzOW/9CYcP lbAdIqi+wH7MOoeL+PA99A3kW/881rGmeOYFzzrsNVLtea+AJfXtp4LN5gOVIPIpovCNSVXX EKgl7a4vjUGzVBzrH7PzT+k4XUEQwNCACfGZxEExtny19bjvumZ0rv+AEAHvsWSKXHUVJzIN jqd9UioaEbKGAPlPABEBAAHCwXwEGAEKACYCGwwWIQTss2i4eQi/tpFNcmnvW6Tc1anzwAUC YfBT/gUJC0iW4AAKCRDvW6Tc1anzwHKpD/9znRaNN0u5+TwJxSD3baeA2OqeebO6gjpscfoT 1z1LOTJiG/pPMz7TB5K2bo+0JwzRV29nfiSeNGQqBx1THZ3Y0ph5tFB8rfF4aEddjhtwxP80 Q4SzxToSZAGMBkndNXlEpMeyHoVpcGoR7qkKAtrr7M9g9ocf8kTO3hzvDzASVIwiASVwl4QB GAv4slShbxJ86DbhtUgvv+6kSe1qm62hMTri8cD/0mVBAEwmAf6k4l9pwYW2oAdl0vjS5sz0 0uqB8nuT22NuiB3XBjSB5CFbeKhy3EZkcpG1taMmuXtwhAgQTmmknruMv9OvP8joSK1nrSyR BwzcMbYW4PS5px4c/RSsdVIcyhQLQ084c1ak9cDImiyU9pZhHnvNIdp84qfEWXOrXtWSUfUy Ej0npK9vAjKH4Vrfakw+WtRrleFC/muTSu1FfskeBphts9gk0fox1VZ+pWMLsxwsKlpgCqhC FzpN5ey+hsawjbOA8X2KJjl2Lr7fYuvmxu/FOgRxPhiO08UMkFAIlHWn+sXivGTbxZxagGos zOr6MZmKT31IcU1WqY3EIjA/ZodDkBz/cT8se4hvh5whroRuGUGfcp5KmVUJhkCvSxnVwMYz 4uDpr8I+TYWU+LnJbIBZcHs8wvNuaSMLd9CLS/4Mi2bJDRvAdmReOwiIxzzxdirXq7KkaA== In-Reply-To: <202307270351.36R3pa8o060603@gitrepo.freebsd.org> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit On 27.07.23 05:51, Gleb Smirnoff wrote: > The branch main has been updated by glebius: > > URL: https://cgit.FreeBSD.org/src/commit/?id=e3ba0d6adde3c694f46a30b3b67eba43a7099395 > > commit e3ba0d6adde3c694f46a30b3b67eba43a7099395 > Author: Gleb Smirnoff > AuthorDate: 2023-07-27 03:35:41 +0000 > Commit: Gleb Smirnoff > CommitDate: 2023-07-27 03:35:42 +0000 > > inpcb: do not copy so_options into inp_flags2 > > Since f71cb9f74808 socket stays connnected with inpcb through latter's > lifetime and there is no reason to complicate things and copy these > flags. > > Reviewed by: markj > Differential Revision: https://reviews.freebsd.org/D41198 Hi Gleb, this commit is causing issues on my mail server. Some incoming connections would just hang, email would stay in the queue of the remote server for hours. Repeated telnet/nc to port 25 would just hang. Some connections do come trough though. I wasn't able to determine a pattern. I'm running postfix 3.8.1 in a bhyve VM and forward port 25 using pf. rdr pass on $ext_if proto tcp from any to 88.x.y.53 port 25 -> 10.211.11.3 port 25 The packets do arrive in the VM, but for some reason the packets aren't accepted. There are no firewalls enabled in the VM itself. 19:47:50.857299 IP 5.x.y.18.34283 > 10.211.11.3.25: Flags [S], seq 65535, win 0, length 0 19:47:51.573109 IP 5.x.y.18.33457 > 10.211.11.3.25: Flags [S], seq 65535, win 0, length 0 19:47:52.702420 IP 5.x.y.18.35528 > 10.211.11.3.25: Flags [S], seq 65535, win 0, length 0 19:47:55.856822 IP 5.x.y.18.34283 > 10.211.11.3.25: Flags [S], seq 65535, win 0, length 0 flo@mail:~ % netstat -an|grep 5.x.y.18 flo@mail:~ % sockstat -l -p 25 -P tcp USER COMMAND PID FD PROTO LOCAL ADDRESS FOREIGN ADDRESS postfix postscreen 980 6 tcp4 *:25 *:* postfix postscreen 980 7 tcp6 *:25 *:* root master 973 13 tcp4 *:25 *:* root master 973 14 tcp6 *:25 *:* vtnet0: flags=1008843 metric 0 mtu 1500 options=80028 ether 58:9c:fc:0e:ca:cb inet 10.211.11.3 netmask 0xffffff00 broadcast 10.211.11.255 I'm now running head from today with only e3ba0d6adde3 reverted, and everything is working fine again. I also verified that unmodified a43e7a96b64e works, but this commit does not. For some reason I did not notice any other ill effect with http(s) or ssh sessions to VMs on this server, but most of them are v6 and not NATed. What else do you need to debug this? Florian From nobody Mon Aug 14 22:05:49 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RPpPT4qFqz4mR5v; Mon, 14 Aug 2023 22:05: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RPpPT4K2Rz4Yd7; Mon, 14 Aug 2023 22:05:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692050749; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zcZ+ZfebUN6LEK+qOyrDV+SEaupHma6j7ffwOuIyy8s=; b=SKGXTcbn8BUNb4mQbZTR0oNS/fjRrvokUYrT6hLwzPkxLnHZwat/3FWIBVU/aH2tKemcBL QAubo0/3/mnlgcL1l0BXtxQMPbz0xCmolI/m8S27cN0sf30sNtT/NPjxs/WE9RirJCYDZI H6A6TH4wphv9qWfG7i0aiUQVmivObpJoVxqXrkF9Ep5Nh8kifS4IVZYAfu0pG8JzmN/cC+ LZzqCeCiTJx+Ac7GGgQzR3CBKYfwYoUKWFMn6IGsXBTD3d7ifBERbFIp+D0sU9D8xhjCUa yZ3Mmef2yVlRb0h/n8vnfI37KzZ8sNu+Q+pA4r7u7orAkM2iQNDAj02hPWDQqg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692050749; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zcZ+ZfebUN6LEK+qOyrDV+SEaupHma6j7ffwOuIyy8s=; b=RK9eu3u5oyAWKPru3cPfgctEHHipNKgt5d6e7zVvNt1kNOjVo8c5/v2mS7H3cEDbmfsyI4 CMnCCAC9mUy1taBq6J0ovVg8QVggrEjcr3nYDvMw87+DEOTtj4easnIY1RUNXCHCYuQpjb 5RVslywu+5ENYbHWaWHovJXI8IsFAi7x+98jiuxMIuXtvnB61ayH0lH/Vwy7Ij+BWDlXIv lOJwSJjHtoXXswU+5NfOQhvzfG5lCj9+YgdecXu4AKxd1PKZHUzBqx7OlIH0QPZyr7UiLm ualAWIZfaMoLgLUGNd2aWLLI0qiB+CT8gKz7C6xhvvks3N+T2NWwJzjNX+nzqg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692050749; a=rsa-sha256; cv=none; b=SQxorgQQeQBe8QpT6rSaDBr8KCqls8gUpP32ab6Oyo2vjyuNPd9m70XO4LwQ6UdREr5odx bJTcPgxG979Zf3Wf6VQBfoDOU6/TFtO6u6P71JV2r6dszrv65cIjLczCOVeoOasmbqnf85 9KvSG6wA/Atj9afsF8X+qkLPt8+BIshR0FexmxRwjn0wCoDFgn3bAzEl5jJ3a8JWJ47YXX C9CE9lBtJR+QjqpLKMIqwH5yWSfVDkc3bIZMXjBVmKc/BNhFGYhPC9tHrPtpMpm0m/uH4r K6INuTfHWOz86cZAWn6H7WJsqwzdBda4IizYAB9XDaF90lfZbU5U1eQgoFVBHA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RPpPT3GXgzlYT; Mon, 14 Aug 2023 22:05:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37EM5ntE076987; Mon, 14 Aug 2023 22:05:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37EM5nnk076984; Mon, 14 Aug 2023 22:05:49 GMT (envelope-from git) Date: Mon, 14 Aug 2023 22:05:49 GMT Message-Id: <202308142205.37EM5nnk076984@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: 43e545e8e016 - main - pci: return 0 for pci_remap_intr_method MSI-X non-error case List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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/main X-Git-Reftype: branch X-Git-Commit: 43e545e8e016d22346a4fe278ea2570328b20cc1 Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=43e545e8e016d22346a4fe278ea2570328b20cc1 commit 43e545e8e016d22346a4fe278ea2570328b20cc1 Author: Ed Maste AuthorDate: 2023-08-14 20:35:34 +0000 Commit: Ed Maste CommitDate: 2023-08-14 21:56:15 +0000 pci: return 0 for pci_remap_intr_method MSI-X non-error case When remapping a MSI-X vector, we would always return ENOENT, even if successful. This didn't really matter, as the sole caller of BUS_REMAP_INTR also didn't check for errors. Return 0 if there's no error, so that we can start handling (or at least warning about) actual failures. Reviewed by: jhb MFC after: 1 week Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D41449 --- sys/dev/pci/pci.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sys/dev/pci/pci.c b/sys/dev/pci/pci.c index cbdfb3acec70..9118ca7781e1 100644 --- a/sys/dev/pci/pci.c +++ b/sys/dev/pci/pci.c @@ -2447,6 +2447,8 @@ pci_remap_intr_method(device_t bus, device_t dev, u_int irq) * through all the slots that use this IRQ and update them. */ if (cfg->msix.msix_alloc > 0) { + bool found = false; + for (i = 0; i < cfg->msix.msix_alloc; i++) { mv = &cfg->msix.msix_vectors[i]; if (mv->mv_irq == irq) { @@ -2466,9 +2468,10 @@ pci_remap_intr_method(device_t bus, device_t dev, u_int irq) pci_enable_msix(dev, j, addr, data); pci_unmask_msix(dev, j); } + found = true; } } - return (ENOENT); + return (found ? 0 : ENOENT); } return (ENOENT); From nobody Mon Aug 14 22:33:37 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RPq1Y403vz4mTLQ; Mon, 14 Aug 2023 22:33: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RPq1Y2ltPz4cxm; Mon, 14 Aug 2023 22:33:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692052417; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=yHI1gGXObh2dFWpkoS3Kcv9ZQ7GuJmbn/OloBL+TfPw=; b=ac5CLj4SCGQ7libY4hXtSBtzU1UARLpIlu5XnxkxqifZr+l8+N/r6GEZfDvhq5H0A/+dBN YRvTNpzcq5DBfcDKDYp5QGDoKEWWzjf+/n3029+lHCcaTr0/7LTFSi1D2j/gLZDGQzZ35S n/q8O4OeJ77mzDRxp3JdlkGHWkwD7xIsJvQOiQ9Y/zxMLiAFhWCTE9Y99tSv9QHB3yt3nI z16cxL20bGJE+yJ+dX6Ze5hfCaJi3JEiCCdsUV04kQNhbR/8L+8i7GJGHp66ztRJxrbfJy Umouh4r+OEaOlZJWZYflCfgQQIF89Y2HSGBMj7z5NhuVFInND6cWAzzy88Hmxw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692052417; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=yHI1gGXObh2dFWpkoS3Kcv9ZQ7GuJmbn/OloBL+TfPw=; b=hJp9ZIVlEUx+ay1QaWheAIIZDl4QBckiPe7fV9H1beYuiZPRghoZ081sdXWrP4tlvzbETL A3ksJw56zSR0nzu6iD8TLhccI8OkjeafYcESmqyiVA4kmzsVnHVZ9u3xaswcW2p4W6aVND vCgFuoJy6GcdJ6E+0SwXZfe7pLJFrPJNSvmyNeLZAlrSgO2oGF9vhqlCada90Ah6Lca5vq rp5EBqtmLe9Kk3NM+7DNXJBeQlPAcqwImAqYn5OfWFxqpi4NtpUrnj9mH2Etppda4Aavyd cvZ7HartISUktC00HY9P6/++XK5DMXcHUV1rBT0n6NWj2m9oEa+qrx3vdFtAQA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692052417; a=rsa-sha256; cv=none; b=uS7RjXz+FjdyDow0QVHx8jnQPsGC0LUC3BySncZFuI3pqd8dszae6n369KJWxuzNH7d/oB TnSCiyvIU9OwwM+i6XoZxwVpDAp5LOYEXcxo0Sh/+pRnv/pgtK9L1Ugimox33coGO+m6ze +rf7+4qY8XGggMAfuTyGVgpbdcQ8Qi4ewFAjF+5lZCCMGluSP5LW1erOqlha90bNW5C480 D/BUVCZU0OkfDqRRVu7IJG+k6z1FUkLEsl4j/mhn3VlM0OPcmdNdJRsAGabUzNzhxnGRIV QXkfsKWtLzn22wmvfYj2rzJ2PW2rsFJ/FZw6PNXpVRIEIwMmFeqxs//wr6+3sQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RPq1Y1pd0zmFR; Mon, 14 Aug 2023 22:33:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37EMXbBI026261; Mon, 14 Aug 2023 22:33:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37EMXbpe026258; Mon, 14 Aug 2023 22:33:37 GMT (envelope-from git) Date: Mon, 14 Aug 2023 22:33:37 GMT Message-Id: <202308142233.37EMXbpe026258@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: 33469f101146 - main - nvme: use mtx_padaalign instead of mtx + alignment attribute List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 33469f101146796a1de3f7736c504ce2539c952b Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=33469f101146796a1de3f7736c504ce2539c952b commit 33469f101146796a1de3f7736c504ce2539c952b Author: Warner Losh AuthorDate: 2023-08-14 22:31:37 +0000 Commit: Warner Losh CommitDate: 2023-08-14 22:33:26 +0000 nvme: use mtx_padaalign instead of mtx + alignment attribute nvme driver predates, it seems, mtx_padalign. Modernize. Sponsored by: Netflix --- sys/dev/nvme/nvme_private.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/dev/nvme/nvme_private.h b/sys/dev/nvme/nvme_private.h index b35e14cb8d0c..bb81676336a6 100644 --- a/sys/dev/nvme/nvme_private.h +++ b/sys/dev/nvme/nvme_private.h @@ -203,7 +203,7 @@ struct nvme_qpair { struct nvme_tracker **act_tr; - struct mtx lock __aligned(CACHE_LINE_SIZE); + struct mtx_padalign lock; } __aligned(CACHE_LINE_SIZE); From nobody Tue Aug 15 00:33:20 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RPsgh61Dqz4q6YR; Tue, 15 Aug 2023 00:33: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RPsgh5974z3JDB; Tue, 15 Aug 2023 00:33:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692059600; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jMVk5j443WFt4SgrRk01t9WmoP4kgVUQNxbSc5ACFgw=; b=eEZYD2SemS2Uk/LIVSBKWhhnd1ZgccNxELBrZofxCLY7tQIqcStC95NWISPhufdeJz6I2Q Hw0CmoeVSlogvebqDwLzB458WQkeqLnDeO4vhSelZAqO2B+ZzMBEAX6+XmMGdCEr4sEWen laN/an8CVx+WupbB7zquGLQ/lfZti2UFVLpdHdi4kFLzBKu7LlfrV1COgp55Yt2ptbpiEa lZTia5hCHIFQfwzRxED6JAq9YgINrtQWjuyUi6R/F1KWFlwhhFO2AvtGTxw6p28xKj8hdw uR9SdegVbQ2T3FJq/GAxMru8SQYH23mZ83Swlqm+VwTDUThX1pvcT5oGGNVjkw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692059600; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=jMVk5j443WFt4SgrRk01t9WmoP4kgVUQNxbSc5ACFgw=; b=TqF1J3ppRj/VEg7L+KXOKr56ay/8Flxz1Yl3OHZ7urYEE89o9ymBTCxduh+rdHO0J6eXIx xQof4rKZN7arOubuySnKty+xAuo5tf2gFG83hu9U6IFJyhYzyTIjxDRGvTyg57G1EgStop +5e3Ov0eo70VsXrZlAeiCDZhfj4DReVP6IwRlyHTHsQh1iz5tFv6gbbJ+p8vplBsnmwYf3 TZD9BJ40Fpib7pMh49opIrBR20OOGr/DNsdLdLP4m111rZUFMuGQR68ZgC23yziP+hmDKN sFczTfMpebBfLKHcOhp0e6SlCzLn66mokaZy8hc8wRhSYf8DTXK1UT4g0o0pgg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692059600; a=rsa-sha256; cv=none; b=xFVr7kH3LjEgz+9goJc6ZjV9iC2DXK6HpPC8wSEMetFSsTlVQSLH81HJkgNgLhk1vv0EdC w/uffFnHGSE0jCP/rb2Y114Z6KGNjEMFh6d3/BWLfOTSq0VPX3p8IHr7U1BDJ32k3E+YRJ zsT8HbhPAydMpjDNFsnNYQ0t9dhkmBPRXV5nNd9huiA00cTVm9SwhzOS0HghUuUnvtqja6 4jwIaT8Jb4tT+JyYZjsmQDSvJqMk0a7f4U8bC2C6LiXPB9jGK7VlOUKgMIANhJqKEx9qf8 e5T6PncZXTHVEvILu0enlACKAM/bk0JJsQZCFhf4OrTjESrwbBPT5aeDSmyz9A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RPsgh4FJSzpvY; Tue, 15 Aug 2023 00:33:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37F0XKC9025258; Tue, 15 Aug 2023 00:33:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37F0XKGe025255; Tue, 15 Aug 2023 00:33:20 GMT (envelope-from git) Date: Tue, 15 Aug 2023 00:33:20 GMT Message-Id: <202308150033.37F0XKGe025255@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kevin Bowling Subject: git: 797e480cba88 - main - e1000: disable TSO on lem(4) and em(4) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kbowling X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 797e480cba8834e584062092c098e60956d28180 Auto-Submitted: auto-generated The branch main has been updated by kbowling: URL: https://cgit.FreeBSD.org/src/commit/?id=797e480cba8834e584062092c098e60956d28180 commit 797e480cba8834e584062092c098e60956d28180 Author: Kevin Bowling AuthorDate: 2023-08-15 00:25:39 +0000 Commit: Kevin Bowling CommitDate: 2023-08-15 00:25:39 +0000 e1000: disable TSO on lem(4) and em(4) Disable TSO on lem(4) and em(4) until a ring stall can be debugged. I am not able to reproduce the issue on lem(4) but disabling there in abundance of caution in case the issue is not specific to em(4). Reported by: grog --- sys/dev/e1000/if_em.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/sys/dev/e1000/if_em.c b/sys/dev/e1000/if_em.c index 069ff37c6a75..ca6bf59b5dd1 100644 --- a/sys/dev/e1000/if_em.c +++ b/sys/dev/e1000/if_em.c @@ -906,6 +906,9 @@ em_if_attach_pre(if_ctx_t ctx) scctx->isc_tx_csum_flags = CSUM_TCP | CSUM_UDP | CSUM_IP_TSO | CSUM_IP6_TCP | CSUM_IP6_UDP; + /* Disable TSO on all em(4) until ring stalls can be debugged */ + scctx->isc_capenable &= ~IFCAP_TSO; + /* * Disable TSO on SPT due to errata that downclocks DMA performance * i218-i219 Specification Update 1.5.4.5 @@ -938,6 +941,9 @@ em_if_attach_pre(if_ctx_t ctx) scctx->isc_tx_csum_flags = CSUM_TCP | CSUM_UDP | CSUM_IP_TSO | CSUM_IP6_TCP | CSUM_IP6_UDP; + /* Disable TSO on all lem(4) until ring stalls can be debugged */ + scctx->isc_capenable &= ~IFCAP_TSO; + /* 82541ER doesn't do HW tagging */ if (hw->device_id == E1000_DEV_ID_82541ER || hw->device_id == E1000_DEV_ID_82541ER_LOM) { From nobody Tue Aug 15 06:45:53 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RQ1xY5XMPz4qZhn; Tue, 15 Aug 2023 06:45: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RQ1xY3BfLz4QFr; Tue, 15 Aug 2023 06:45:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692081953; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gCddEBXJXnJoXysZXHFiPFe3BP09Uuftw4yZ2BI/wME=; b=VYqtXRZ+7OK+B3/4ek/91FOH6KqnB42q81yrfmQTMVa9wEwGbidtIV6yRW9RlsVnfP8CCG VFKGrGCEvINkVYKEGaedtCO71VJOIrdxMib7ffNWpkNx6Z115HCri4589Ppza65HujCy4H KnNRQlDxNVODVDQGCnWsdwMDU+p8GTOEscZJJXnERt32V2uIIT5TkWI2ErAXht5VT30E0a 5FyewEACrmV0aEe8C4MKFqpCFjT6704T1gxjizPM82aMWkFnAxBycufuO3nMlo1M4oxtUL AZKlCHkIzbShP7iA+t8vM9U8kYuCwsehOmbpbI2W2A/3PACJnGrSad8Y/7+eFA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692081953; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gCddEBXJXnJoXysZXHFiPFe3BP09Uuftw4yZ2BI/wME=; b=UVYxupGxQlEosAP4WWUjSTBJK7Q20s3H5oRoeaFRr6MxxbVlmvW81Uv8Juv7hSIGy2BF57 lSjKD0KUJtPk2vv5JQ+94WlA9IzYvHsj+R7q4bD1MJPzig9k9IlYvwQOno3Xwds85PZG0S AzZkJJvg1WsXo3xHDawrSAKcWpmnSvomgWS3ltYyaM6FMpvsi8FXFiOezemKS/cchLr3FL c50XAa+pr8uBdtVmEbUfGUfPJRNhY5/xoAt+SfgParKKlcc839nyLbvPsPcFFByLf0nJKP KA63qBNMYYqbOu9omciU0D+ANuoV2banXqmwbK71pis5rQxQee0oeATW+e3pQw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692081953; a=rsa-sha256; cv=none; b=bZdMsjjwjnnMg3xiFdGqidMNVOfgXFPXGPuW4NWrDyz9ZAAT215oYFGyQpzg1ochxpgrkt B6SuIkral3MuF4ZzlkxH0RbhJAaqpQj0sG+ZWE3xCRnEbm7KbvHRyaaPmurcA992U8Dvr3 gmZfoYdIziJNqjDT7igWhdTiPhXHOUZ3ZIJ+OKJib091Xd5OhXDCSlzuLMGmlM+entQQGN gmolMWrqE7qkXcGPgZXAcAANL/IVLBGDzNQ1Ht+7lVd6RDOB3QolEruhOGRXWcYWY++Q3A DenCTKkmDaTu600qvNW68Ge/O2VDkTPSFlv5buuJYXODpaqvJVA0pR91eKvwRQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RQ1xY24k6z10sY; Tue, 15 Aug 2023 06:45:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37F6jrrU042902; Tue, 15 Aug 2023 06:45:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37F6jrot042900; Tue, 15 Aug 2023 06:45:53 GMT (envelope-from git) Date: Tue, 15 Aug 2023 06:45:53 GMT Message-Id: <202308150645.37F6jrot042900@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Emmanuel Vadot Subject: git: 81b41b2ef5bf - main - ofw_firmware: Return BUS_PROBE_GENERIC instead of 0 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: manu X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 81b41b2ef5bfd571123919e93d37624d53d4f589 Auto-Submitted: auto-generated The branch main has been updated by manu: URL: https://cgit.FreeBSD.org/src/commit/?id=81b41b2ef5bfd571123919e93d37624d53d4f589 commit 81b41b2ef5bfd571123919e93d37624d53d4f589 Author: Emmanuel Vadot AuthorDate: 2023-08-15 05:59:09 +0000 Commit: Emmanuel Vadot CommitDate: 2023-08-15 06:45:22 +0000 ofw_firmware: Return BUS_PROBE_GENERIC instead of 0 While here make it only probe if the node is directly under the root one. If it's not it's likely a device node named 'firmware' and not the firmware group we're interested in. Suggested by: jhb Sponsored by: Beckhoff Automation GmbH & Co. KG --- sys/dev/ofw/ofw_firmware.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/sys/dev/ofw/ofw_firmware.c b/sys/dev/ofw/ofw_firmware.c index 7d62fc317c1d..8723965f74be 100644 --- a/sys/dev/ofw/ofw_firmware.c +++ b/sys/dev/ofw/ofw_firmware.c @@ -101,16 +101,21 @@ static int ofw_firmware_probe(device_t dev) { const char *name, *compat; + phandle_t root, parent; name = ofw_bus_get_name(dev); if (name == NULL || strcmp(name, "firmware") != 0) return (ENXIO); + parent = OF_parent(ofw_bus_get_node(dev)); + root = OF_finddevice("/"); + if (parent != root) + return (ENXIO); compat = ofw_bus_get_compat(dev); if (compat != NULL) return (ENXIO); device_set_desc(dev, "OFW Firmware Group"); - return (0); + return (BUS_PROBE_GENERIC); } static int From nobody Tue Aug 15 12:14:29 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RQ9Dj4cJPz4mJBs; Tue, 15 Aug 2023 12:14:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RQ9Dj3r5Rz3THm; Tue, 15 Aug 2023 12:14:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692101669; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=SEThKNU9RPxYvJuGxC2hh014ZuN97M7E3jhEaBOGsQY=; b=GihV7NUJlA+6oDuBfvKyUv4rp4uqWBVCZ4Xm5mc7NBD9fxwym5HARVeJi/hgihlKaiNlLh rPYkcz8sVyc9tnKJHt6ukjzI3t3qOqhq0+KxeXzHavwlyRS3G6MLm5GCJ8xsCi0eycON/R GadIFIlq0bS5ijERr8TT5v03R/b5AYj7nDkIL2IZGbPSK9Acw5x1Dy62Dm0fiydF8j1D8g qgo0Qmf9Il7JW6jrj1L6o0iH8tQoggkAF0tNfgiRHnQgbV/VqaGMp/J+qm4YFDeghTeFM4 x4bKhPnXP2y1viHCua5G1uNekNBwBVoDuBOiK+qCQBs21IuJG74qOhimMcv3oQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692101669; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=SEThKNU9RPxYvJuGxC2hh014ZuN97M7E3jhEaBOGsQY=; b=cV12+DEZRO6l4W0IIyn/HXdcCdJQ6uBV1+NeL3M0vPAkkBTqYgAM5qoeDIdJzHUq+iwiHL G1t0u2kkI7szyBZB0RdGlrM5hgbr4sKNYfD/HN7qk4pPo/AS+0ny43oPqxN9s8L6FVd8cg k+eYlh9tJDpTK+8e8uiGRiT+k7gKg8HBHwXy/VmPTPY4nVDAQXUHdNjB5Az2cdRGalMANx 5WORn701eYRb1OkcKQG+9T5IDTkRTTy07wMENPOBof5Umn5gA0dZ950c2Rsm6VeNNW+eN/ YXNZCObNHU08iYl82zh9luDOvCgENoN4+YojqnKUjP6o85bYxhoqr0VO64EAYg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692101669; a=rsa-sha256; cv=none; b=iLHDKC9jJtvohOTeuS3PIZawxqEH7TbiWJIuroq+reuzZRUIvitFeH+WTfjT4V73NHyTIP YsFZ9mkOf8sdJCuP5cvoaiowZdCX3BOdEZptDL+EiYdB9cDxctByvuLJupOaHD8mSyhXZo OdbRk++iARcabFGmMQac7EFQ0m9E4Uq75V8wGU/EBFC883ElZ8TgZw85XNjZBK16BXIdjA /TCrNnm7utc2iUC6hAgRObjwQGQtteICsK49evCx2ZI3v17vdZmDVGHGqiKSkSKyclX42k QmeoqMQMF9q1vEbQ4hNQDj1omscOs0ew49emp13Lkp+7sHVGq2+UrkxHsjBYoA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RQ9Dj2tZjz18wx; Tue, 15 Aug 2023 12:14:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37FCETUF093754; Tue, 15 Aug 2023 12:14:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37FCETdX093751; Tue, 15 Aug 2023 12:14:29 GMT (envelope-from git) Date: Tue, 15 Aug 2023 12:14:29 GMT Message-Id: <202308151214.37FCETdX093751@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Andrew Turner Subject: git: 9d09051e261c - main - arm64: Add a driver for the Arm PL031 RTC List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: andrew X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9d09051e261c7020e5aa933c6aa1c2d84ebd0457 Auto-Submitted: auto-generated The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=9d09051e261c7020e5aa933c6aa1c2d84ebd0457 commit 9d09051e261c7020e5aa933c6aa1c2d84ebd0457 Author: Andrew Turner AuthorDate: 2023-08-01 15:21:21 +0000 Commit: Andrew Turner CommitDate: 2023-08-15 12:13:39 +0000 arm64: Add a driver for the Arm PL031 RTC It is a simple RTC found in some Arm SoCs, e.g. the Arm Juno. Reviewed by: manu Sponsored by: Arm Ltd Differential Revision: https://reviews.freebsd.org/D41267 --- sys/arm64/arm64/pl031_rtc.c | 153 ++++++++++++++++++++++++++++++++++++++++++++ sys/arm64/conf/std.arm | 3 + sys/conf/files.arm64 | 1 + 3 files changed, 157 insertions(+) diff --git a/sys/arm64/arm64/pl031_rtc.c b/sys/arm64/arm64/pl031_rtc.c new file mode 100644 index 000000000000..5663b264af00 --- /dev/null +++ b/sys/arm64/arm64/pl031_rtc.c @@ -0,0 +1,153 @@ +/*- + * SPDX-License-Identifier: BSD-2-Clause + * + * Copyright (c) 2023 Arm Ltd + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + */ + +/* + * Driver for the Arm PL031 RTC device + */ + +#include +#include +#include +#include +#include +#include +#include + +#include +#include + +#include +#include +#include + +#include "clock_if.h" + +#define RTCDR 0x00 +#define RTCMR 0x04 +#define RTCLR 0x08 +#define RTCCR 0x0c +#define RTCIMSR 0x10 +#define RTCRIS 0x14 +#define RTCMIS 0x18 +#define RTCICR 0x1c + +struct pl031_softc { + struct resource *reg; + int reg_rid; +}; + +static device_probe_t pl031_probe; +static device_attach_t pl031_attach; +static device_detach_t pl031_detach; + +static clock_gettime_t pl031_gettime; +static clock_settime_t pl031_settime; + +static int +pl031_probe(device_t dev) +{ + if (!ofw_bus_status_okay(dev)) + return (ENXIO); + + if (!ofw_bus_is_compatible(dev, "arm,pl031")) + return (ENXIO); + + device_set_desc(dev, "PL031 RTC"); + return (BUS_PROBE_DEFAULT); +} + +static int +pl031_attach(device_t dev) +{ + struct pl031_softc *sc; + + sc = device_get_softc(dev); + + sc->reg_rid = 0; + sc->reg = bus_alloc_resource_any(dev, SYS_RES_MEMORY, &sc->reg_rid, + RF_ACTIVE); + if (sc->reg == 0) + return (ENXIO); + + clock_register(dev, 1000000); + + return (0); +} + +static int +pl031_detach(device_t dev) +{ + struct pl031_softc *sc; + + sc = device_get_softc(dev); + + clock_unregister(dev); + bus_release_resource(dev, SYS_RES_MEMORY, sc->reg_rid, sc->reg); + + return (0); +} + +static int +pl031_gettime(device_t dev, struct timespec *ts) +{ + struct pl031_softc *sc; + + sc = device_get_softc(dev); + ts->tv_sec = bus_read_4(sc->reg, RTCDR); + ts->tv_nsec = 0; + + return (0); +} + +static int +pl031_settime(device_t dev, struct timespec *ts) +{ + struct pl031_softc *sc; + + sc = device_get_softc(dev); + bus_write_4(sc->reg, RTCLR, ts->tv_sec); + return (0); +} + +static device_method_t pl031_methods[] = { + /* Device interface */ + DEVMETHOD(device_probe, pl031_probe), + DEVMETHOD(device_attach, pl031_attach), + DEVMETHOD(device_detach, pl031_detach), + + /* Clock interface */ + DEVMETHOD(clock_gettime, pl031_gettime), + DEVMETHOD(clock_settime, pl031_settime), + + /* End */ + DEVMETHOD_END +}; + +DEFINE_CLASS_0(pl031, pl031_driver, pl031_methods, + sizeof(struct pl031_softc)); + +DRIVER_MODULE(pl031, simplebus, pl031_driver, 0, 0); diff --git a/sys/arm64/conf/std.arm b/sys/arm64/conf/std.arm index 2b40fd7b0eb8..fb5561506531 100644 --- a/sys/arm64/conf/std.arm +++ b/sys/arm64/conf/std.arm @@ -8,6 +8,9 @@ device pci_n1sdp # ARM Neoverse N1 SDP PCI # GPIO / PINCTRL device pl061 # Arm PL061 GPIO controller +# RTC +device pl031 # Arm PL031 RTC + # Serial (COM) ports device pl011 diff --git a/sys/conf/files.arm64 b/sys/conf/files.arm64 index 29d805dd64b7..0d3c43af0c00 100644 --- a/sys/conf/files.arm64 +++ b/sys/conf/files.arm64 @@ -64,6 +64,7 @@ arm64/arm64/minidump_machdep.c standard arm64/arm64/mp_machdep.c optional smp arm64/arm64/nexus.c standard arm64/arm64/ofw_machdep.c optional fdt +arm64/arm64/pl031_rtc.c optional fdt pl031 arm64/arm64/ptrauth.c standard \ compile-with "${NORMAL_C:N-mbranch-protection*}" arm64/arm64/pmap.c standard From nobody Tue Aug 15 12:22:11 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RQ9Pb34kcz4mJnt; Tue, 15 Aug 2023 12:22: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RQ9Pb2bS0z3TjW; Tue, 15 Aug 2023 12:22:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692102131; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=OaqmZNWajkdf8/oWw1pmHLT5NV6qxjhcbwQ0JdvC46o=; b=Du/9zxsmhk/wKcY5CCj6kQyS0j5Qe6lESlwBnVRWb3l2+3KMIjvYE9o4MtTEvFJfqqVsrh fpLdzCHLHBwHv6BjZtLWsPoB7cHwqaVGhhhv7LzZMEp7RIpuR/CzQmUApvyjHAMlndNw93 6LfOBwOp6zjnrEWkY8Uhigj/D5SrZX9Y06uegvA0TeN94b3pebCLZlf/LKhUBkhYEg2o3T SMqruV8lxsuwx8tgfHuaRmSVzi6WT77iBUg2kZfSFFBIIUD6q4rnL3ok9Hl5H5+ot+29Tb kORdiSLGS/d681jVFnYrW82EcQ61nvAoH2ngnuYECI1RUzZ9DCtWlzqEx3XQyw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692102131; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=OaqmZNWajkdf8/oWw1pmHLT5NV6qxjhcbwQ0JdvC46o=; b=uF7384/WZW641VcHCfiwXMSfZZdSBonE6pKYPDrAQsACTTJBgQqFO/dR05OmbAOPJnx5OF 0iQo4xb6Cwvg1ZO9+WmfU9HVB/raeFWxH8yFzHGSSDRmkIl8cYoyOzM9xsSwjYdWNfV0Go OmxVxuMgypks+9hwpQDRnzToayeXuAyckRldttnh4oG26tmsTYuWO2CFA6jhoN6Sg6jc2F +1nXpZOmdmctbw/3uGqahc7ZQbjdNmR2BnihMDcuvHWbZGV5gMQ865A7d6BnrNBaUbSevh X4Jredh9Jk414FzOLg2H5D8VVb9JKi2RYav+J2T2rhRv8Su+eTAzwuabD/wx6Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692102131; a=rsa-sha256; cv=none; b=yzwa4298jpQgBmeP1kYQ6B4v1Scygj98Tbdqurp9teLWjV2ePtpYxdj+KCjUzyny4N0LEk XJj40e3Z2H+dE5BBPxjQ5dhYKmLCJtBerOjIpmAcRw4X/RbE0n+KUOFyy3Qchn0U+V5dRM +Ig1BasYR0G8OdqCCyHyYoic/GGYb3XqIZDJ3yScnm6nlzQbetsq2Ko9pWzzu2SGvPUtoY Xf3/U0s+Inq2nwj9T4hl8kGe8NcBB1dN3afiaJuQ3QbVxjpzQAICjEsRL8XwGdF6t/Lexv bCI1fFSb8MQBe323dKWnGpUcE6NTg30L495jDk8r//PY9BZVs4Dpj76KAlHRKw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RQ9Pb1g4Dz18hR; Tue, 15 Aug 2023 12:22:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37FCMBMB010300; Tue, 15 Aug 2023 12:22:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37FCMBIG010297; Tue, 15 Aug 2023 12:22:11 GMT (envelope-from git) Date: Tue, 15 Aug 2023 12:22:11 GMT Message-Id: <202308151222.37FCMBIG010297@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: e0c6e8910898 - main - arm64: increase MAXCPU to 1024, following amd64 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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/main X-Git-Reftype: branch X-Git-Commit: e0c6e8910898e49c3f83a0131dbdb1a9e774de44 Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=e0c6e8910898e49c3f83a0131dbdb1a9e774de44 commit e0c6e8910898e49c3f83a0131dbdb1a9e774de44 Author: Ed Maste AuthorDate: 2023-08-03 21:47:06 +0000 Commit: Ed Maste CommitDate: 2023-08-15 12:22:02 +0000 arm64: increase MAXCPU to 1024, following amd64 As in commit 9051987e40c5 for amd64, support up to 1024 CPU cores. arm64 hardware with more than 256 CPU cores is currently available and will become increasingly common over FreeBSD 14's lifetime. PR: 269572 Reviewed by: andrew Relnotes: Yes Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D41319 --- sys/arm64/include/param.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/arm64/include/param.h b/sys/arm64/include/param.h index a44fa3fcd9d2..417bd38574e4 100644 --- a/sys/arm64/include/param.h +++ b/sys/arm64/include/param.h @@ -60,7 +60,7 @@ #ifdef SMP #ifndef MAXCPU -#define MAXCPU 256 +#define MAXCPU 1024 #endif #else #define MAXCPU 1 From nobody Tue Aug 15 13:31:18 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RQBxM0F45z4mPZh; Tue, 15 Aug 2023 13:31: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RQBxL6mjFz4DKp; Tue, 15 Aug 2023 13:31:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692106279; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=KDV1imXUWRLQCSx9wRPXPCKjZ80Fy5Q/p8/WuBUwdAE=; b=fDdFnfZluaY1EYR6+UPWMr6wQkQ2/tK3KkE2p0AP6YwhlofKrnXZXmHvP+n7hj6crAbTXf K6ZvlVe5iU0eATnrAu2N1w+icMjNR8g67mYoBbe5BigF3fUYa3s8pO5AkErR6qsMl8lCRT wLU21J9iuSkAmAZGJWmB3VTulodfsMO5QwdUaIndzGWnooprC6oJBaFPFzHYARmEA5IL21 c6x5NEPcJ3cFocTumdyapBeuFBogY4AJgew0FBTdEZ3B3fZNy9WJm0cioDWpD8FxN9lsLO xblTooaV0B/2qGn+MaqocEhmqyqDPifIUhcxyvq25AdMB0W/q8R/9mGu+PnVhQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692106278; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=KDV1imXUWRLQCSx9wRPXPCKjZ80Fy5Q/p8/WuBUwdAE=; b=XRvWvnn9eKfYaRG3XZT0bMJI2nrnQC7wu2T+Cgh13jU34AmwdZsz2bFjHH39O+hxv+IaxO qZ8rtV9IPSHD+qYo+AeCLQ1xS3qaZoXDG7YzsAwGHQhH7a/lmHhjdT0PxuOileljSPy5X8 ZrH8WfVOthkjoAWM5sRZXPWmgR6XY0bhgAtKjTIF/Yj0LFKxYo+j1Y0KCao5fR+EgesU7j JsG282Qknk9kzsJ1eNL02xkP25NGmmNFMj6+R7jSGmCtDY1wRxog/j4xi2cUIsLeHBBeCZ 5waTrHR18YVuMhpRnsKqtQxiXlpkBRAgIE7SEBwsy0Ho6MX90zhzR/Tp6MGO+A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692106278; a=rsa-sha256; cv=none; b=id5PorYFXsrrYyS3QQ4rphIwqfCQPg/WoSF+XmJI9XZOCZOTYEJClhwI43V/e0h/M2hAbi a3L5XX6ntzjmAJubXzi7jjdSpL+a/ThlgB2i+KwL0jALSJ17xAYlZXMtpAJZiQsQhVfqQ/ npiBmYXRDidR1NOvAFX715ByMoTZE86LQDQqNQaGdSZjwHQojWZ7ujHNd06Q9GIrBc5j4w ccMDEFSKFnhkQxPzQy9ad38CuVuACPo+sEViVI8CLdJjHei/68PkKcVkQttnVKsJRPoBQq r+//ZO9PhQPWq6VRvyr/ldFjQ8xpC3A2DXI50AlHLFTOtXWdL8bje2Nc+030Cw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RQBxL5t6qz1BYv; Tue, 15 Aug 2023 13:31:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37FDVIgB020472; Tue, 15 Aug 2023 13:31:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37FDVItx020469; Tue, 15 Aug 2023 13:31:18 GMT (envelope-from git) Date: Tue, 15 Aug 2023 13:31:18 GMT Message-Id: <202308151331.37FDVItx020469@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: 33a23ef2878f - main - ssh: correct VersionAddendum date List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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/main X-Git-Reftype: branch X-Git-Commit: 33a23ef2878fe525700983fb754f6f9f9f8fc4b7 Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=33a23ef2878fe525700983fb754f6f9f9f8fc4b7 commit 33a23ef2878fe525700983fb754f6f9f9f8fc4b7 Author: Ed Maste AuthorDate: 2023-08-15 13:29:06 +0000 Commit: Ed Maste CommitDate: 2023-08-15 13:30:31 +0000 ssh: correct VersionAddendum date Reported by: Herbert J. Skuhra Fixes: 535af610a4fd ("ssh: Update to OpenSSH 9.4p1") Sponsored by: The FreeBSD Foundation --- crypto/openssh/sshd_config | 2 +- crypto/openssh/sshd_config.5 | 2 +- crypto/openssh/version.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/crypto/openssh/sshd_config b/crypto/openssh/sshd_config index 523da42f8d12..b73f21e0c9c8 100644 --- a/crypto/openssh/sshd_config +++ b/crypto/openssh/sshd_config @@ -105,7 +105,7 @@ AuthorizedKeysFile .ssh/authorized_keys #PermitTunnel no #ChrootDirectory none #UseBlacklist no -#VersionAddendum FreeBSD-20230910 +#VersionAddendum FreeBSD-20230810 # no default banner path #Banner none diff --git a/crypto/openssh/sshd_config.5 b/crypto/openssh/sshd_config.5 index 211938369b27..06385c648f3d 100644 --- a/crypto/openssh/sshd_config.5 +++ b/crypto/openssh/sshd_config.5 @@ -1927,7 +1927,7 @@ The default is Optionally specifies additional text to append to the SSH protocol banner sent by the server upon connection. The default is -.Qq FreeBSD-20230910 . +.Qq FreeBSD-20230810 . The value .Cm none may be used to disable this. diff --git a/crypto/openssh/version.h b/crypto/openssh/version.h index fc40cf1cdccd..44109aba3c80 100644 --- a/crypto/openssh/version.h +++ b/crypto/openssh/version.h @@ -5,4 +5,4 @@ #define SSH_PORTABLE "p1" #define SSH_RELEASE SSH_VERSION SSH_PORTABLE -#define SSH_VERSION_FREEBSD "FreeBSD-20230910" +#define SSH_VERSION_FREEBSD "FreeBSD-20230810" From nobody Tue Aug 15 13:39:09 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RQC6P6wjHz4mQJ2; Tue, 15 Aug 2023 13:39: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RQC6P4QT9z4DnX; Tue, 15 Aug 2023 13:39:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692106749; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=STCvMXcC5uwD3cEBN5PQeJMsUc3usvQol8Igt5yCvSk=; b=hE5fRwV/W02mXB/Sd4rTEBTuF0V3HLR57BXcHE2xoy69ZUI3jrBzvIrflKo/RSH8pIAj9X /uLYCWv8370uI+hVcu2FW4pq9deJaUuVjtVKl00aRpESCRTngVvsmQ99zq8nmw+MVR1MAb baoCipXxP+lBQeSXsUeZdorpbEjV9kQKO0LZ2wz94UHyVxLwPV4P62bHOqKYFiYK086bRM TVzy61JPwqusU/feq9NXx1YjOyfOtATr7qFHvmXhasaowk9rGARXTRkb2fw4EaQRC1xrav DxCsqlB/KkwV/24salELjqD4T02meod4uIkzBVcna1PYc6X+31YvR6E16/eo+A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692106749; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=STCvMXcC5uwD3cEBN5PQeJMsUc3usvQol8Igt5yCvSk=; b=r1KL6y8KkjsQdUBP7Y0QkZWY9wv+DNOtPDKZZIqYUu6+2qaff82vVLaRvJeQPjKam7B3mT ayVKvC/keCI0lon4M8FfXF6rSTrOzBPMlg5CmWzfLQRp40hCZ4YPHLKIB+dHUnD1Rv5/ZI CwZfUNlnfp8IVWXAFISFBprvIIAuPhvvl1oI9VvYwHq6C+APq9ykDmVMWB22XOkk57+uHL UpJS1MfB9C2RflBHHHCVwSafjsNkSVq4mcGgVI8FZE0VoZRFrozgbRFEXykBb/g0t7YclS U50zgP+2QJU9bd8FKTjh2YW1bMu6UlpBAG/R6BgGMdm9wgL78krs56bDqJ8VLQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692106749; a=rsa-sha256; cv=none; b=XqWbgHmRrCKZcHrk6N+IMWrym+ftXO50SrfoeuYNUQcgVk2vqsUzvPMyz5Qa+Mu5tcAysG HHx1cgZZNGBKeuiGCSRhzrs9qqHFbYK2RR2JwAeZhdfbNZkVoKtafIxJR9mUp/cQd2xgxo OTPyFQx2TASt8pDoYMGcD9c7mtukknfCM0GKaDLBe0zNsVIg1dkRuT1IRZqfE2hP6CChVq 8x3SZ4DtiIYyeaz+VPbq85JB45t2U/qeKh2hZR2tbnpd8mE78kLtvjodPTkTKpZtc0gfai YEZVOpQXCg/QKjZbhf98juE/p7uKUDocJwZTw0vP6GWGrymVpxKWK4O8jfmKFw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RQC6P3VRzz1BLD; Tue, 15 Aug 2023 13:39:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37FDd96l027664; Tue, 15 Aug 2023 13:39:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37FDd99S027661; Tue, 15 Aug 2023 13:39:09 GMT (envelope-from git) Date: Tue, 15 Aug 2023 13:39:09 GMT Message-Id: <202308151339.37FDd99S027661@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: fe5d8f7a64e9 - main - x86: include CPU ID in "Invalid CPU ID" panic List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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/main X-Git-Reftype: branch X-Git-Commit: fe5d8f7a64e9530bd6e220a08ed4394c5761b837 Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=fe5d8f7a64e9530bd6e220a08ed4394c5761b837 commit fe5d8f7a64e9530bd6e220a08ed4394c5761b837 Author: Ed Maste AuthorDate: 2023-08-04 18:56:15 +0000 Commit: Ed Maste CommitDate: 2023-08-15 13:38:29 +0000 x86: include CPU ID in "Invalid CPU ID" panic Sponsored by: The FreeBSD Foundation --- sys/x86/x86/intr_machdep.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/x86/x86/intr_machdep.c b/sys/x86/x86/intr_machdep.c index 524258ef7dc8..7fe5a99dfc00 100644 --- a/sys/x86/x86/intr_machdep.c +++ b/sys/x86/x86/intr_machdep.c @@ -639,7 +639,7 @@ intr_add_cpu(u_int cpu) { if (cpu >= MAXCPU) - panic("%s: Invalid CPU ID", __func__); + panic("%s: Invalid CPU ID %u", __func__, cpu); if (bootverbose) printf("INTR: Adding local APIC %d as a target\n", cpu_apic_ids[cpu]); From nobody Tue Aug 15 13:44:48 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RQCDw5qbDz4mR1P; Tue, 15 Aug 2023 13:44:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RQCDw4ztDz4Gg5; Tue, 15 Aug 2023 13:44:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692107088; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0joZBK3Kckvv1ObCp8aodtnYC1REGiSaeD2fH79R3vc=; b=wVDFPWFTCJ/+W5yPNKNJYoNiLuLjjVlbBkHjo02OdVtUTsZY9p8q6Ysq67Mp+oZwNLj0td qksyiAtEGTfnpY83Ba537heX7NgOwbFgHNL8NKu2eNshJyDiQZX+bCTDcNaFJHeaIJl5EH fZs16ua1wgmvrpGc2fhRErTwee16EMReEcRJGDc7LY707zxSzl+LB/06Agt9lsn5y5EwTh VIq15OcS6ILgHJJzqlAnv9VKN2sHgJPree0C++lTiuSEM8JT3KypmsbFsoQaWtv6nRY2oV RA3MbM8UN6AmDaFVE/o1mpgoMKjyjhkSH0cjWPuxj+4GG/YdHeY58aVzfDsBFw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692107088; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0joZBK3Kckvv1ObCp8aodtnYC1REGiSaeD2fH79R3vc=; b=bpGKPxHrejnDHC4GTChDZvN5gmZ0sI7Obv3lZWJyphiUNobyxozmmK70QPY3jicqdmPTYx Y/8+bx0FvyDja0tL1TDQjMo7KhkW9ukV5aOmpMQdbuacmi04iR6PN3NpiYxLZwMerhO8K4 s4lt5SX+8zN0smc8bbB6ol0ZLoFRUDuSL/IlK726qR6s6SH9Fl8J6biz/5YCAAM6tKeoay /lB86UECZ3pNR9r0wvGuyE9MJtCSkQdMQoy9/Jx3zhRv2cLZ3DbYvdGQ/z9rTiHfXDy30Q J1rIZq8w7dd9PkrKhqsFmSRC4UAMjR76D0EgQqrNw/eHH3RP2DDyE8g1d1i3ZQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692107088; a=rsa-sha256; cv=none; b=hUW+fot7MtPItK4PwphY4CwrvzHEzidbMjzykEld33IYj4DvJPE++Hr3KayIlZDZYdekB0 dAAy2Uioocj9N0lM54Bwbf0h5CJFWHq/LnCEZ4PMi4Szh6iLRfUDyUAYXOz+jljz0t3cvz 4XwEx6zwaC3unSD3UoLvTSdXLgRtGgQ5oaPb1zp13KB8IFjIRMj7gcf3kgUXC3hydnIg98 S0lElWNPehCmdmCjJWqMy7kHEhXGhX5RAl6ReJOgQtUqfRpbgPRGsjXt5Bfwtvez/TVZ1E hqz2bvaTSW+yhvbRrzT3PHRLkY3N6azCNiigOXRpMznNE2eqb0OixtiPXKtQ8A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RQCDw3xXxz1Bb2; Tue, 15 Aug 2023 13:44:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37FDimU9043395; Tue, 15 Aug 2023 13:44:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37FDimKD043392; Tue, 15 Aug 2023 13:44:48 GMT (envelope-from git) Date: Tue, 15 Aug 2023 13:44:48 GMT Message-Id: <202308151344.37FDimKD043392@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: bfe6a0afaa71 - main - etdump: warn only once for non El Torito bootable ISO images List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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/main X-Git-Reftype: branch X-Git-Commit: bfe6a0afaa718c88061ee70f2ce970ae8a3ba69d Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=bfe6a0afaa718c88061ee70f2ce970ae8a3ba69d commit bfe6a0afaa718c88061ee70f2ce970ae8a3ba69d Author: Ed Maste AuthorDate: 2023-04-22 00:36:28 +0000 Commit: Ed Maste CommitDate: 2023-08-15 13:40:39 +0000 etdump: warn only once for non El Torito bootable ISO images Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D39869 --- usr.bin/etdump/etdump.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/usr.bin/etdump/etdump.c b/usr.bin/etdump/etdump.c index b234fc9d7ff8..e393eba61a84 100644 --- a/usr.bin/etdump/etdump.c +++ b/usr.bin/etdump/etdump.c @@ -167,9 +167,8 @@ dump_eltorito(FILE *iso, const char *filename, FILE *outfile, bvd = (boot_volume_descriptor *)buffer; if (memcmp(bvd->identifier, ISO_VOLUME_DESCRIPTOR_STANDARD_ID, 5) != 0) warnx("%s: not a valid ISO", filename); - if (bvd->boot_record_indicator[0] != ISO_VOLUME_DESCRIPTOR_BOOT) - warnx("%s: not an El Torito bootable ISO", filename); - if (memcmp(bvd->boot_system_identifier, ET_ID, 23) != 0) + if (bvd->boot_record_indicator[0] != ISO_VOLUME_DESCRIPTOR_BOOT || + memcmp(bvd->boot_system_identifier, ET_ID, 23) != 0) warnx("%s: not an El Torito bootable ISO", filename); boot_catalog = isonum_731(bvd->boot_catalog_pointer); From nobody Tue Aug 15 13:44:49 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RQCDx6BsQz4mR1T; Tue, 15 Aug 2023 13:44: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RQCDx5dp4z4GrX; Tue, 15 Aug 2023 13:44:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692107089; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=uiB+ICjeIIk6fHuvTuMt7E/KOYqUDbApyx1JPgYiTUo=; b=mnUE5vc4iHh+B8OEPLM7qm71C1gcxq8/OQj5CM1uFaHcqt0lXehHMx5d+BrBHzdMpyTAjy Mx/PFa2+g6YEgu19hiS/pJ92lKQVffz55ya3eINeHV0xU9Psjm/aguB3udMbPxbdEtWt+A ME3p9Ew5htzSAU6Oqwuc/sm96XgE0iwFxCRm5su0aIHB/HFSUdUK3OO0x+D3n/GWFGI+oP rc9d5IOZ2+8fZxnIcwGrj29f7MKl62BMAOSf6zt8VEjBnVHycpJhvWr3Ya5XQq1Z1MBtqu KO7T2AL2Gj0xgAyQ1LK/L82GiVNGW4jHHG7E/clLiELaFte1VIVVV3JFjmMWLA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692107089; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=uiB+ICjeIIk6fHuvTuMt7E/KOYqUDbApyx1JPgYiTUo=; b=MxiZDOLoWlVJZi9HsuxTwvrtgu+9wix3Jkol9T10ASkpxeNUwcL20iKTKVqh8OP4TpxAmH 0GAbJcqzXfdX4le3E7WlvbdDiONOSsyyIWu2hs9vjAdJ+9aT78mLaxv/b2cTWs1vVLrk3h zMGttw4O+zXECTGopXanBzO/MVo+QUhx1qeS/2uqMaJmAflhGf02vFKKuZLpTdN4HQnDvZ d0VnsYW7bpuvdwK8+KpSVUgthVRAzyjB2EnF/sdwGGXNWa0urr1EiO/7lc2w4yd5DYPMu/ gW3Ssv3Ug2XbjaBmudjTviVxqEmbTG4mV5BnvaTu/3GzIUSY8NtJwfs4XqjbEw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692107089; a=rsa-sha256; cv=none; b=ekP3QUoVBMhyWacNrE6eLgCx7X4uYXyB7nsPMCFQodriiTcgESbJKQ8KfRQw3R089tXvu3 jS1xz9v/jHQZp1e+q2YmPZCiLqwaoE2pyLe2F5i9TQ96FCkW0Sf28g4GSdqbUIfonDGA6c 9Z5EpsYtzZ+l5zdPeJzEFhM0jjcjO3HNhuOMBpAh/2UEUNNDFLJsTuyFZ+j+uvs7sjMhmr ahpDrqblHvjfQoWeGFdsmoxnv2j/qbEv+FukTY2Dbzb9Y/fjm0whSQEUfpv0WUK1w1QOKz 2pAsPnYCHJlFnPZPCjTkS8fCFHtqFZmtHJTSOJfP2w/N/CrbwUz3qhDCQmjwDw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RQCDx4jDtz1C5Q; Tue, 15 Aug 2023 13:44:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37FDinpL043443; Tue, 15 Aug 2023 13:44:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37FDinhM043440; Tue, 15 Aug 2023 13:44:49 GMT (envelope-from git) Date: Tue, 15 Aug 2023 13:44:49 GMT Message-Id: <202308151344.37FDinhM043440@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: eb228f2b217a - main - drm2: remove unused Alpha and MIPS #defines List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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/main X-Git-Reftype: branch X-Git-Commit: eb228f2b217a7ba57342137a044f50fdb15d1bcb Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=eb228f2b217a7ba57342137a044f50fdb15d1bcb commit eb228f2b217a7ba57342137a044f50fdb15d1bcb Author: Ed Maste AuthorDate: 2022-10-18 14:27:32 +0000 Commit: Ed Maste CommitDate: 2023-08-15 13:43:45 +0000 drm2: remove unused Alpha and MIPS #defines --- sys/dev/drm2/drm_sarea.h | 7 ------- 1 file changed, 7 deletions(-) diff --git a/sys/dev/drm2/drm_sarea.h b/sys/dev/drm2/drm_sarea.h index 72f52dd737ba..e33f1ae8f9d6 100644 --- a/sys/dev/drm2/drm_sarea.h +++ b/sys/dev/drm2/drm_sarea.h @@ -37,15 +37,8 @@ __FBSDID("$FreeBSD$"); #include -/* SAREA area needs to be at least a page */ -#if defined(__alpha__) -#define SAREA_MAX 0x2000U -#elif defined(__mips__) -#define SAREA_MAX 0x4000U -#else /* Intel 830M driver needs at least 8k SAREA */ #define SAREA_MAX 0x2000U -#endif /** Maximum number of drawables in the SAREA */ #define SAREA_MAX_DRAWABLES 256 From nobody Tue Aug 15 15:58:02 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RQGBf2zbgz4q4FJ; Tue, 15 Aug 2023 15:58: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RQGBf2GT5z4QvP; Tue, 15 Aug 2023 15:58:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692115082; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Rvv3hNU3etgNQafMyJXOF0mCUOvBksv8B5SWo5/o8so=; b=HTuVISvY/HrgCr/skwvcmy2PS+yHF0YNRrNM5HSYyFZoPtNgcAtl/Iam9hBgU9fm+Olqsq RFfgMjvnAFvymTFPK9LXxHqiDiPyE/vHfOyl/4vqo6VqAb2Kty4I8ylYxwLoVIJNQf8jhQ 6FI7Rg3f9iqtnsiUs+IbyLvfG7oCdKGpG8whNGlWU+YnVGIA+8NGBOysWovBeX9hTHp7oY f/jU1gLnQ1CJrrQheRY8ehBRCYGZ7EvMobXMUHEK1kgRvT/9lhZupyor8fPNe+HY/WtNXn A+4fGl2pBSrKfhxWC/vhGSFyduHqldO8Dhq2Dit0Uooqo6QT8vq3n4nOnxhEhg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692115082; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Rvv3hNU3etgNQafMyJXOF0mCUOvBksv8B5SWo5/o8so=; b=LgFjyDq8RDe9pT9Gamnj7rPjTEqsdE+s+bWBA/25+DxtCnUnMr6NE1eQvoHa5q301Pe19A p6qNMFhJy6szgPj0hP12ZNC3zttxlCoemOWYi2DeifJx4lnQ1HsWKomS/lRec/HqSSqZ8O e9W4FkaPTiXtzJPH3B4CwrrJEohvVXS/s6PaeZ10BR5wHB8W2tIicZNJbTQDxBXoAJTsuZ zrcBhu2W8EU4nWctJGgSvePBfgmzY6WAGIDC4dRUiFrk1u4bgJvf5dLHkjOm9ul/XRvriL xmwTeaejMVmVNyOjIRr8gCEjKQke/cQ2N61i9mlJo8dZKgSCxyS4BxHEfdElsw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692115082; a=rsa-sha256; cv=none; b=mGSwVmG9uax+mLW7zE2Mqtm2T7Rp4w0FqE0uVS6ZD01r/0ZWGHPxEIn1tUv7vl54jtdz/d gqxKTp9x6Urd3OGi5u4v0vWfKuM1I9xnDBAQwAfeE2yYnzCS6e44ByX7jmiSNDOJIFAnJb kLe0OfnJTmJwHnfhj5VYXdgIT2GxmeLna/A3ipDd31X2fy91PSHy6B8q00d5w6nGMWhazo nD92R+yO3d6CSC1FyMS2DPnm7TXxGqS2QBzQ/PrQb7nVP+s/swRpx9PVfzxWqfMntnRy8H tbLqgHtMeMHgkm/7PS4Rg63ve5zAySrA8Md+wiTZnbc3OjPtlPPG0cp5qXYsAw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RQGBf1DDSz2DC; Tue, 15 Aug 2023 15:58:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37FFw2Tv059069; Tue, 15 Aug 2023 15:58:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37FFw2dn059066; Tue, 15 Aug 2023 15:58:02 GMT (envelope-from git) Date: Tue, 15 Aug 2023 15:58:02 GMT Message-Id: <202308151558.37FFw2dn059066@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: 14e78a3656ef - main - ssh: Remove note about memory leak now resolved upstream List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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/main X-Git-Reftype: branch X-Git-Commit: 14e78a3656efef8f3cbacbab9c0653dff3f925f4 Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=14e78a3656efef8f3cbacbab9c0653dff3f925f4 commit 14e78a3656efef8f3cbacbab9c0653dff3f925f4 Author: Ed Maste AuthorDate: 2023-08-15 15:54:09 +0000 Commit: Ed Maste CommitDate: 2023-08-15 15:56:08 +0000 ssh: Remove note about memory leak now resolved upstream OpenSSH 9.4p1 (updated in commit 535af610a4fd) includes the memory leak fix that we originally applied in 69c72a57af84 ("sftp: avoid leaking path arg in calls to make_absolute_pwd_glob."). Sponsored by: The FreeBSD Foundation --- crypto/openssh/FREEBSD-upgrade | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/crypto/openssh/FREEBSD-upgrade b/crypto/openssh/FREEBSD-upgrade index 8d3f3a14f823..2950731c7401 100644 --- a/crypto/openssh/FREEBSD-upgrade +++ b/crypto/openssh/FREEBSD-upgrade @@ -171,21 +171,12 @@ A number of paths are changed to match FreeBSD's configuration (e.g., using /usr/local/ instead of /uxr/X11R6/). -10) Memory leaks - - Coverity reported a memory leak for which we proposed a fix in - https://reviews.freebsd.org/D37253 and sent to the upstream mailing list at - https://lists.mindrot.org/pipermail/openssh-unix-dev/2022-November/040497.html - - Upstream subsequently fixed only one of the related leaks, so we reverted - the partial fix and applied our change. - -11) Retired patches +10) Retired patches We no longer have client-side VersionAddendum, but we recognize and ignore the configuration options to avoid breaking existing configurations. -12) PrintLastLog bugfix +11) PrintLastLog bugfix Upstream's autoconf sets DISABLE_LASTLOG if the system does not have lastlog.ll_line, but uses it to disable the PrintLastLog configuration From nobody Tue Aug 15 16:20:43 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RQGht3Pp1z4q5t9; Tue, 15 Aug 2023 16:20:46 +0000 (UTC) (envelope-from flo@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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RQGht30Fkz4T7G; Tue, 15 Aug 2023 16:20:46 +0000 (UTC) (envelope-from flo@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692116446; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=mQu8cIeQMpUiWy6D6nWzX2mFQPtiebq1ZToaHVkmHXg=; b=VsgoAFvJp6AH47gPYDwm51s9WEVmvr8GtMnr8DwbkqSJrzoV9eXYUWz7+nG/RnECA31uTz 4oT6PyBgVe207kVUu/Wzq4Neuf8Mzs/I8ZpF+hXFH63Gp0No9FMX9ik+jEZgF3J86MHQO+ tixrhKXtTB4fyub691Q9pG3I9SFK/hg7bA6D7nkFjonqLdnjf+6bSGiH2cEOon1j29H6x5 V0yQ91SmRIfE2Bt/r/Haq6PiJkuVMUIOcAeHFyvU3SWD9I6/+ZCDisYMBVdHXAW/NXF0pn Zt2I0CgCO+yfIuhPGUtzyqSAGG55zy2gZIKCCv8RT1/9e5xNrsUYdZgef+Th8w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692116446; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=mQu8cIeQMpUiWy6D6nWzX2mFQPtiebq1ZToaHVkmHXg=; b=mKsHehmQ4oRg0QhapN6DnDTBDgQSnLYWc4gelPgTxS94YotVOvCaScWgbW/KMoYOJVcXr1 0Wi52wjwFa21PjGkjcNU6OOPT5EsuWJuhZQF2czDo0PY9b3588/JV8SVbcsfHNzeS+XRGn 13Mjpc7ajp0cT94LgPCxvkwYHVjcOx6cxK8Xpf1ug7UjOSroxqAU1DsQT1GZGbjBCALhr+ JTQ4EhEKbhI4i0VRlTNVMv2RAtFgaxrD0feLyKjBGerBZgOUxP9iwFkIX8/LdECkd/S9bW 9Hk0red1ikmOvQTCXFWTUbRrDSb1sdMSvL41Nqs88xx6eB1QvTvZ4tGrokNgmw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692116446; a=rsa-sha256; cv=none; b=Cv//AzL0WXrv/AgduGz8aYmk+ComuUMpsM3z4oRea/Pp1VQCNi3yWkmxmTnjEl8u425nTZ OyUHI7N/vd1Umw45hZ9X9+tMmmT9PmOk+CUONIpsFCUyHT5cL1mcxKaj3qmIMYxv6pQExR NXxQfsYIHVKnsSB3LZokgImryBafj9PRwOEgTwQNcXuf7KLhN0au1zl/FP3mm9cEyPtqQS lLuvPrmnPrN53cZo4187z34w5HCPRRhTTOfWpcspW75evcONbWZphMzHoFeHvgqsPobsFV FwfAtbJN5BNulJX+4A5+upSFqwUmmZSGvGdAUyJP7q+pSLKGuaBsvbgiAYfy6A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from [IPV6:2a01:4f8:10a:fd43::666] (unknown [IPv6:2a01:4f8:10a:fd43::666]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) (Authenticated sender: flo/mail) by smtp.freebsd.org (Postfix) with ESMTPSA id 4RQGhs4KdRzv2l; Tue, 15 Aug 2023 16:20:45 +0000 (UTC) (envelope-from flo@FreeBSD.org) Message-ID: <8afb1108-c053-4479-b63c-3aa6f11f8636@FreeBSD.org> Date: Tue, 15 Aug 2023 18:20:43 +0200 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 User-Agent: Thunderbird Daily Subject: Re: git: e3ba0d6adde3 - main - inpcb: do not copy so_options into inp_flags2 Content-Language: en-US From: Florian Smeets To: Gleb Smirnoff , src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org References: <202307270351.36R3pa8o060603@gitrepo.freebsd.org> <5c546e4e-5637-4582-867c-a87d306bb3d8@FreeBSD.org> In-Reply-To: <5c546e4e-5637-4582-867c-a87d306bb3d8@FreeBSD.org> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit On 14.08.23 22:33, Florian Smeets wrote: > On 27.07.23 05:51, Gleb Smirnoff wrote: >> The branch main has been updated by glebius: >> >> URL: https://cgit.FreeBSD.org/src/commit/? >> id=e3ba0d6adde3c694f46a30b3b67eba43a7099395 >> >> commit e3ba0d6adde3c694f46a30b3b67eba43a7099395 >> Author:     Gleb Smirnoff >> AuthorDate: 2023-07-27 03:35:41 +0000 >> Commit:     Gleb Smirnoff >> CommitDate: 2023-07-27 03:35:42 +0000 >> >>      inpcb: do not copy so_options into inp_flags2 >>      Since f71cb9f74808 socket stays connnected with inpcb through >> latter's >>      lifetime and there is no reason to complicate things and copy these >>      flags. >>      Reviewed by:            markj >>      Differential Revision:  https://reviews.freebsd.org/D41198 > > Hi Gleb, > > this commit is causing issues on my mail server. Some incoming It looks like d29b95ecc0d049406d27a6c11939d40a46658733 fixes the issues. The commit mail didn't arrive in my inbox until after I sent the email as I was busy rebooting and testing different kernels on my mail server :) Thanks, Florian From nobody Tue Aug 15 17:55:02 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RQJnn6VNRz4qD9X; Tue, 15 Aug 2023 17:55:09 +0000 (UTC) (envelope-from glebius@freebsd.org) Received: from glebi.us (glebi.us [162.251.186.162]) by mx1.freebsd.org (Postfix) with ESMTP id 4RQJnn0QGbz3FX9; Tue, 15 Aug 2023 17:55:09 +0000 (UTC) (envelope-from glebius@freebsd.org) Authentication-Results: mx1.freebsd.org; none Received: by glebi.us (Postfix, from userid 1000) id 2F4CF557A9; Tue, 15 Aug 2023 10:55:02 -0700 (PDT) Date: Tue, 15 Aug 2023 10:55:02 -0700 From: Gleb Smirnoff To: Florian Smeets Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: e3ba0d6adde3 - main - inpcb: do not copy so_options into inp_flags2 Message-ID: References: <202307270351.36R3pa8o060603@gitrepo.freebsd.org> <5c546e4e-5637-4582-867c-a87d306bb3d8@FreeBSD.org> <8afb1108-c053-4479-b63c-3aa6f11f8636@FreeBSD.org> List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: <8afb1108-c053-4479-b63c-3aa6f11f8636@FreeBSD.org> X-Rspamd-Queue-Id: 4RQJnn0QGbz3FX9 X-Spamd-Bar: ---- 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:27348, ipnet:162.251.186.0/24, country:US] Florian, On Tue, Aug 15, 2023 at 06:20:43PM +0200, Florian Smeets wrote: F> On 14.08.23 22:33, Florian Smeets wrote: F> > On 27.07.23 05:51, Gleb Smirnoff wrote: F> > > The branch main has been updated by glebius: F> > > F> > > URL: https://cgit.FreeBSD.org/src/commit/? F> > > id=e3ba0d6adde3c694f46a30b3b67eba43a7099395 F> > > F> > > commit e3ba0d6adde3c694f46a30b3b67eba43a7099395 F> > > Author:     Gleb Smirnoff F> > > AuthorDate: 2023-07-27 03:35:41 +0000 F> > > Commit:     Gleb Smirnoff F> > > CommitDate: 2023-07-27 03:35:42 +0000 F> > > F> > >      inpcb: do not copy so_options into inp_flags2 F> > >      Since f71cb9f74808 socket stays connnected with inpcb through F> > > latter's F> > >      lifetime and there is no reason to complicate things and copy these F> > >      flags. F> > >      Reviewed by:            markj F> > >      Differential Revision:  https://reviews.freebsd.org/D41198 F> > F> > this commit is causing issues on my mail server. Some incoming F> It looks like d29b95ecc0d049406d27a6c11939d40a46658733 fixes the issues. F> The commit mail didn't arrive in my inbox until after I sent the email as I F> was busy rebooting and testing different kernels on my mail server :) I'm sorry for the troubles caused. It also took me a while to understand what's wrong. I actually was bisecting just to find my own commit :( -- Gleb Smirnoff From nobody Tue Aug 15 18:07:17 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RQK3n3hDBz4qF2B; Tue, 15 Aug 2023 18:07: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RQK3n2y8Gz3GRD; Tue, 15 Aug 2023 18:07:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692122837; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8/nDSUmGHsUq9spcY3IYjkNO8V3YFglUQDMylzaxqmc=; b=u4w0nrgsrzisPWLyCoxIRVxhHLE3xDIvb5S1b2TS1gWJQL5ZxjwCIededl3tli9fN2DK8t T5LlMWCXwmS5fRxeATuGXHwWri8cwcqcUe2R88g0CZrpdUZPRuKtsgUg1gOb5qAGYU+SZM QmWO2G2A4Q7tI+ETHOSvA9uEwXeC0TIoAPyQG1fbmmpq96c1FQge1pLC7Qp0JS/Y0I4o59 Qrd9bQzTSrFggHT7UApCMgVM2tMGZn7+hLAuWkalMmNEXJ1U04+/wsnYddYkH9m7M0eaoV YsksLtDdQomNP3nt/ohdO5KXQvPXttREVIUeMelaKQTdAaHY+u65sIgP4cMFOQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692122837; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=8/nDSUmGHsUq9spcY3IYjkNO8V3YFglUQDMylzaxqmc=; b=dOPvCYyP9Ta3v1ChWsmjVC/3RSCNBsfpqQE6iMuMfEBFo6VYCkKsgOc8jZhsXXk0xYWE+5 xrJ65r/ot0SHe0PuQy0wgY2uSER4MBC8Cp45/yxzXbLNDlGiEh5adJw6TL18FCkG7rSlgc O0NUkN4MQpxD5qOuaSwgc9GXRt2YUUkMopE0Tyw7rUAcCTBXwwvg8Akya/tq1JPiq4wWtn 7Ve13sRn6VdFtodo4c5unkR6wDJ0FR3VEH3CwNXR/U/wFMDa6QIt/WA56j4AIOUd6lz+Yt uvQeiGGm089xeq91r8SzEfpeMrEBzR0lN9Np8U+BhQlrk47cyKSPeMVAruOOJg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692122837; a=rsa-sha256; cv=none; b=XXT1RRh3vP+vZTkaSFA5G+PnvtSrAwyk99ObELETlAh5hETeximUqF9vwu4iWj6clBx8vi fl5HnatyKSVRycJ6CmvsgC2Vi6qCDNVnqeL5kvkpmxmm+90AbvmeSM54gT9t+pYxfCIuh7 mjWh0NEqrvc0F/4Jvb+kkEOeVjgqnzi4prSPxS0gUSVROCue3InqclFtxzIPraeMB2vSBV pZpLfYkXRkaUp82s6415mPwQ2o5otpmsOIEiHOMq88cVa00hMH5GmEUrDOb2Wp3DqhxHv3 5zXgGKxJEyN9LxVxDl+pk50TK5gUgld/j8qGbCyuJylpyvOMDIdJw3u908D7Wg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RQK3n20DSz5VZ; Tue, 15 Aug 2023 18:07:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37FI7HXI075718; Tue, 15 Aug 2023 18:07:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37FI7HIK075715; Tue, 15 Aug 2023 18:07:17 GMT (envelope-from git) Date: Tue, 15 Aug 2023 18:07:17 GMT Message-Id: <202308151807.37FI7HIK075715@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: 081c22db8507 - main - nvme.h: Fix a comment typo in admin opcode enum List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 081c22db8507cdc12e6f7d71230af34d1b4dd1af Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=081c22db8507cdc12e6f7d71230af34d1b4dd1af commit 081c22db8507cdc12e6f7d71230af34d1b4dd1af Author: John Baldwin AuthorDate: 2023-08-15 18:05:30 +0000 Commit: John Baldwin CommitDate: 2023-08-15 18:06:58 +0000 nvme.h: Fix a comment typo in admin opcode enum Sponsored by: Chelsio Communications --- sys/dev/nvme/nvme.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/dev/nvme/nvme.h b/sys/dev/nvme/nvme.h index b63a7d0bf270..150b9ad02479 100644 --- a/sys/dev/nvme/nvme.h +++ b/sys/dev/nvme/nvme.h @@ -855,7 +855,7 @@ enum nvme_admin_opcode { NVME_OPC_CAPACITY_MANAGEMENT = 0x20, /* 0x21-0x23 - reserved */ NVME_OPC_LOCKDOWN = 0x24, - /* 0x15-0x7b - reserved */ + /* 0x25-0x7b - reserved */ NVME_OPC_DOORBELL_BUFFER_CONFIG = 0x7c, /* 0x7d-0x7e - reserved */ NVME_OPC_FABRICS_COMMANDS = 0x7f, From nobody Tue Aug 15 19:11:43 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RQLV74h0Tz4qJR3; Tue, 15 Aug 2023 19:11: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RQLV74DY7z3P0q; Tue, 15 Aug 2023 19:11:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692126703; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=TIF/eNQl51k+e87nQOeXMpdkNdzTedjm2eixU3NUNcQ=; b=KWS6uGjJVk+SWcPkNkA02GH2H6UWE4a/eCi4JH0K9g5RAlFcAXBBdJmvzfYvkWUjsgz5R5 d6Ug0AiyKgFroGCXsV+vJ7NdrN1X/zbU0uXrKbGTqcSiRLkZeLuyGMbVrOkY9BgSvfjO/4 VGYs/0LspoURv3WTYCgjm422Kh4d2FCcGVxNeXPuqUEObmUDBLe/Pi6DHFtr00UFwPbaqu 3fY3RjAplvkO9lnjiYKOSSbIy/5aQGW/HxL6LISngOtg4WNT58nBnu2ItoHnLpxGT1au4U j1UTp+XrV1VXHrDNQxWQR99CMa86UwkzwTMm4MSX4YLbtfbdXqcItZ4WmcIMcg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692126703; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=TIF/eNQl51k+e87nQOeXMpdkNdzTedjm2eixU3NUNcQ=; b=T4QsMxqar8/P9suH59gqRR7oPnp/C2xlaemTWFQlo9Gq/2OKYHAAnw7HVw81phOSiAGnS/ eGVQwb1yncNzklACdESGGJzn1p0GtDRKXMHIGjqHMyUWLJTLW7QTf9ygEfgGXZq4XFAf32 b7OiRZJciQ3XjOAjU4rkLWhrQTISEcNQdxM7KZCcAV0lGjcfotlnmHo7d2ZAoGA4SE5GIK KjLCa7RKaCnChpFrZZUVrky82/MixEbq9xS4ieJOIF3vZ4xutY41lYO39ZACa33rC65KzU n9FKb61YEKgKCPd9uqa6Nxrx3C0LnHWTl0e1BeVEqF5+W6j8cVf0JpfISo0KUQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692126703; a=rsa-sha256; cv=none; b=fhzACjoZCADtpQSvGFVN1SyY157/vbHiyPTHQ4W7L2NsY0GKDaZPI3Qr8GyGzBtS26a1ph km+EzcgfU9i1fDWYmrejDfLs3+Hx/AkO1B+g7N5N4w2gzAzosn9ESqfdRbNn/QZMepxeas 4BIRQO9q0R09yoCGcSPNlqcdQOMye96zyzkMRpeELnsU2Vxrbw9diGJVqk4W6xB4y8eQEF hIwae0Cyr3J5PYrLF15CaSok+sB45CIYUH1UjEOsRgPawnY6avVxQksvSCPFoNfevKYqo1 5Z0ZJbH7XElyQYb5a1x07vkoDGmsraSW6WwatuYSsrD7QhFffirtryHGFwHKqQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RQLV73HcKz6wX; Tue, 15 Aug 2023 19:11:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37FJBhqk089119; Tue, 15 Aug 2023 19:11:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37FJBhcT089116; Tue, 15 Aug 2023 19:11:43 GMT (envelope-from git) Date: Tue, 15 Aug 2023 19:11:43 GMT Message-Id: <202308151911.37FJBhcT089116@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: 43b41bee90c7 - main - llvm: fix armv[67] after 0bc26e325450 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 43b41bee90c711ba47a507e2df14915b7a1ae228 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=43b41bee90c711ba47a507e2df14915b7a1ae228 commit 43b41bee90c711ba47a507e2df14915b7a1ae228 Author: Warner Losh AuthorDate: 2023-08-15 19:08:39 +0000 Commit: Warner Losh CommitDate: 2023-08-15 19:11:06 +0000 llvm: fix armv[67] after 0bc26e325450 During the life-cycle of the patch that landed as 0bc26e325450, the variable names changed and I missed that in the rebase. Use the proper TARGET_TRIPLE_ABI. Fixes: 0bc26e325450 Sponsored by: Netflix --- lib/clang/llvm.build.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/clang/llvm.build.mk b/lib/clang/llvm.build.mk index f9fd62e78f4e..a2f5a5a4c341 100644 --- a/lib/clang/llvm.build.mk +++ b/lib/clang/llvm.build.mk @@ -41,9 +41,9 @@ BUILD_ARCH?= ${MACHINE_ARCH} # For all other targets, we stick with 'unknown'. .if ${TARGET_ARCH:Marm*} .if !defined(CPUTYPE) || ${CPUTYPE:M*soft*} == "" -TARGET_ABI= -gnueabihf +TARGET_TRIPLE_ABI=-gnueabihf .else -TARGET_ABI= -gnueabi +TARGET_TRIPLE_ABI=-gnueabi .endif .else TARGET_TRIPLE_ABI= From nobody Tue Aug 15 19:15:58 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RQLbJ6Vjcz4qJPS for ; Tue, 15 Aug 2023 19:16:12 +0000 (UTC) (envelope-from jrtc27@jrtc27.com) Received: from mail-wm1-f43.google.com (mail-wm1-f43.google.com [209.85.128.43]) (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 "GTS CA 1D4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RQLbJ03RZz3QBp for ; Tue, 15 Aug 2023 19:16:11 +0000 (UTC) (envelope-from jrtc27@jrtc27.com) Authentication-Results: mx1.freebsd.org; dkim=none; spf=pass (mx1.freebsd.org: domain of jrtc27@jrtc27.com designates 209.85.128.43 as permitted sender) smtp.mailfrom=jrtc27@jrtc27.com; dmarc=none Received: by mail-wm1-f43.google.com with SMTP id 5b1f17b1804b1-3fe167d4a18so54062735e9.0 for ; Tue, 15 Aug 2023 12:16:11 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1692126970; x=1692731770; 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=0OEboiv/LnFPetM4ITcyQPbmnKc5yndhHPRhuYncY00=; b=gQnc7VqYjJYv70zbYdyxgHJFWYD29c2muaouBdzeHNEBxcNJFq2aGo5F1FFa51eji4 CxjWhE5vw760aSjwGL9Mdb8Tu/hYx+UFFcCW1J5jzcCobyLfP1x76q36eK2c3JlX2qOB Z77qVw8agWLoRZjCFveyMeBWMekMAFhb+tWEwoQmLDXYe8rfd9lV97BL2eIke0/6Z5z/ NILEY7+ohrAcN0+9lw5mAeUBzSgJZ3DLQ1GNti+LWrfz5OVUogkiIxgerBbm0M1spkoB zM9DCSEsHCeimYWU4C7zTAoMKRjwDkJWf/uOzAnO/LwZ9S258AVPkWfvkcIdO8W3HIjR OMCQ== X-Gm-Message-State: AOJu0YzQtJ0+B+TQIxdcNFvzJl+FN0/HdpaK4e16MBNbJmqUb2H01Zqb BCbwAFfj6Yd4TdFt0S5ugx5nGA== X-Google-Smtp-Source: AGHT+IHbvfe/wsaX9VOr9MAE4lEdp9hMLzopv72SIQeKHMGng9Z/xKPA04TZc6Y8T1fLSYtjVSc7pw== X-Received: by 2002:a1c:7208:0:b0:3fa:99d6:4798 with SMTP id n8-20020a1c7208000000b003fa99d64798mr10963855wmc.37.1692126969429; Tue, 15 Aug 2023 12:16:09 -0700 (PDT) Received: from smtpclient.apple ([131.111.5.246]) by smtp.gmail.com with ESMTPSA id e6-20020adffd06000000b003196b1bb528sm12140679wrr.64.2023.08.15.12.16.08 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 15 Aug 2023 12:16:09 -0700 (PDT) Content-Type: text/plain; charset=utf-8 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org Mime-Version: 1.0 (Mac OS X Mail 16.0 \(3731.600.7\)) Subject: Re: git: 28f6c2f29280 - main - Import GoogleTest 1.14.0 From: Jessica Clarke In-Reply-To: <202308100232.37A2Wdaw040438@gitrepo.freebsd.org> Date: Tue, 15 Aug 2023 20:15:58 +0100 Cc: "src-committers@freebsd.org" , "dev-commits-src-all@freebsd.org" , "dev-commits-src-main@freebsd.org" Content-Transfer-Encoding: quoted-printable Message-Id: <5759AF55-F1DE-4128-9579-B0A654114D92@freebsd.org> References: <202308100232.37A2Wdaw040438@gitrepo.freebsd.org> To: Enji Cooper X-Mailer: Apple Mail (2.3731.600.7) X-Spamd-Result: default: False [-2.50 / 15.00]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; NEURAL_HAM_LONG(-1.00)[-1.000]; NEURAL_HAM_SHORT(-1.00)[-1.000]; MV_CASE(0.50)[]; FORGED_SENDER(0.30)[jrtc27@freebsd.org,jrtc27@jrtc27.com]; R_SPF_ALLOW(-0.20)[+ip4:209.85.128.0/17:c]; MIME_GOOD(-0.10)[text/plain]; PREVIOUSLY_DELIVERED(0.00)[dev-commits-src-all@freebsd.org]; DMARC_NA(0.00)[freebsd.org]; TO_MATCH_ENVRCPT_SOME(0.00)[]; RCPT_COUNT_THREE(0.00)[4]; MIME_TRACE(0.00)[0:+]; MLMMJ_DEST(0.00)[dev-commits-src-all@freebsd.org]; RCVD_IN_DNSWL_NONE(0.00)[209.85.128.43:from]; FROM_HAS_DN(0.00)[]; TO_DN_EQ_ADDR_SOME(0.00)[]; RWL_MAILSPIKE_POSSIBLE(0.00)[209.85.128.43:from]; RCVD_TLS_LAST(0.00)[]; TO_DN_SOME(0.00)[]; RCVD_VIA_SMTP_AUTH(0.00)[]; FREEFALL_USER(0.00)[jrtc27]; R_DKIM_NA(0.00)[]; MID_RHS_MATCH_FROM(0.00)[]; ASN(0.00)[asn:15169, ipnet:209.85.128.0/17, country:US]; ARC_NA(0.00)[]; FROM_NEQ_ENVFROM(0.00)[jrtc27@freebsd.org,jrtc27@jrtc27.com]; RCVD_COUNT_TWO(0.00)[2] X-Spamd-Bar: -- X-Rspamd-Queue-Id: 4RQLbJ03RZz3QBp On 10 Aug 2023, at 03:32, Enji Cooper wrote: >=20 > The branch main has been updated by ngie: >=20 > URL: = https://cgit.FreeBSD.org/src/commit/?id=3D28f6c2f292806bf31230a959bc4b19d7= 081669a7 >=20 > commit 28f6c2f292806bf31230a959bc4b19d7081669a7 > Author: Enji Cooper > AuthorDate: 2023-08-08 06:17:32 +0000 > Commit: Enji Cooper > CommitDate: 2023-08-10 09:32:33 +0000 >=20 > Import GoogleTest 1.14.0 This should be a merge commit from the vendor branch but isn=E2=80=99t. > GoogleTest 1.14.0 now requires C++14 to build. Change > `googletest.test.inc.mk` to reflect this requirement. >=20 > Adjust the build integration logic to handle the new version of > GoogleTest (add/remove headers/sources as needed). >=20 > Tighten down warnings via `CXXFLAGS.clang` instead of ignoring all > warnings. Some new warnings snuck in after I did my last round of = fix > submissions upstream. >=20 > Also address some overlinking added in the previous version import = by > removing superfluous libraries. >=20 > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D >=20 > Expect WhenDynamicCastToTest.AmbiguousCast to fail >=20 > This change reapplies the expected failure from 1.10.0. >=20 > Ref: https://github.com/google/googletest/issues/2172 >=20 > MFC after: 2 weeks > Reviewed by: asomers, emaste > Differential Revision: https://reviews.freebsd.org/D41399 >=20 > Merge commit '8ef491440fcaec96f899d73e08873426c78583a4' into = googletest-v1.14.0-import What=E2=80=99s this thing? Sounds like you did some merging, squashing = and rebasing, didn=E2=80=99t fix up the commit message and didn=E2=80=99t = notice that git rebase eats merges? See [1] for how to do this properly. Jess [1] = https://docs.freebsd.org/en/articles/committers-guide/#_rebasing_your_chan= ge_against_latest_freebsd_source_tree From nobody Tue Aug 15 21:39:50 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RQPn244lBz4qSJj; Tue, 15 Aug 2023 21:39: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RQPn23Fz4z4Fy4; Tue, 15 Aug 2023 21:39:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692135590; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9u6w/hShzPs1ZnLvvWEKjbOhQVOiy9JZTOTqvvTqjPU=; b=UBN0pvhdOc+M4dEDneJfuRWuwxE7NhoR6LOc94QwwlNwHhh9dM1TxtkiUTGwUhNhbDhFK+ 5Y6NFRj4PBL72JROfyoMeptEkEqJpYQQHJiMuo3FriexbxfyQJ2PEH30o1WG8ixF5G7Neo zVUv+WiRrffJw7xuQbIj+zlCTYJB8hKGgiCl/476MOHFY7LOkZgbuplgB+vMAydy3doxLE ExUPBPAZzjafIEI3of9YMOT3yqnbWz+Jounwrej9fwnX+GTQYBsYzEUR0913OfnRwWhylK +kB2gNTlsETbgubdbpW/QIItJQnSTgLIBMfr9ePKMPRfcJrQYcEYAE2SuWqJWQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692135590; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9u6w/hShzPs1ZnLvvWEKjbOhQVOiy9JZTOTqvvTqjPU=; b=WBgvVHnEKxVPmJrN5h1fshDyW9aVeCuOJ4O7E6W1uQZJSFlHL5Fds49UZ9es11caT6Mkf1 SKm71TMRdDd3D+RhxLUYZetOugnpC1yMiNw8W73FI+0t+5llUsK5Es7x1hzSDqpvUeH/mf i/hjnlG8W0WxqCN3u3lnPJNuv5mycxQO3KKmd5d9rTmeVTg+mf47s548R9ihhdcHllooNZ +k/sQQFmQPe9XL/mzR5U5pAgY5N9phhF9FgYgMR0BCYHykPY8mw5s28+HL5HefJejWqqKa h8hiqoXN/+kPWAqr8pg6nAjZ/7iFaAqEJ+DctrOFeNL8vyqQ2kucs4YZVEI+7Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692135590; a=rsa-sha256; cv=none; b=yJ3KAB+37c4rMXovO9nfnohVrXgBvYls+0oRzR2PZxRMTmGoiRi7AUxcBhwPXs4vQXkg6S jDk7l35AtbYVeyj1hmP9tWYIRLXawpgXOCkjkIBL38ElenZunMQvHhJML5G5smW1zdIghZ BxWiyZ+7Y/7ftVPsPgNiB1ZoflcxrLY009Cq8jkC1cxKlr6BAhiPuGmaYSx6R1bAZZ+cs0 k1txk0NqCTTwwZSaBS8R8LYVpYv6mF7GwZbrF7MVSG7lZXyMQaE8ZhlQ6qjjY/fHQrmm1Q KwgHQqObd9xUl5F7WlRzm7xKL5l/iJ1/mBMnFwraP+b5srT/ZZKADZUNy0nA7Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RQPn22BZ8zBNT; Tue, 15 Aug 2023 21:39:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37FLdonP026291; Tue, 15 Aug 2023 21:39:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37FLdoXT026288; Tue, 15 Aug 2023 21:39:50 GMT (envelope-from git) Date: Tue, 15 Aug 2023 21:39:50 GMT Message-Id: <202308152139.37FLdoXT026288@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kevin Bowling Subject: git: eac761e967b3 - main - e1000: Fix off by one ipcse List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kbowling X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: eac761e967b34066aa7183474249df87d79a2f32 Auto-Submitted: auto-generated The branch main has been updated by kbowling: URL: https://cgit.FreeBSD.org/src/commit/?id=eac761e967b34066aa7183474249df87d79a2f32 commit eac761e967b34066aa7183474249df87d79a2f32 Author: Kevin Bowling AuthorDate: 2023-08-15 21:37:43 +0000 Commit: Kevin Bowling CommitDate: 2023-08-15 21:39:35 +0000 e1000: Fix off by one ipcse This has been off by one in the FreeBSD drivers as far back as I've looked. Emperically HW and SW emulations I have available don't seem to mind. Noticed while debugging other issues. MFC after: 3 days --- sys/dev/e1000/em_txrx.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/dev/e1000/em_txrx.c b/sys/dev/e1000/em_txrx.c index b90ab21cd825..765458d621f9 100644 --- a/sys/dev/e1000/em_txrx.c +++ b/sys/dev/e1000/em_txrx.c @@ -290,7 +290,7 @@ em_transmit_checksum_setup(struct e1000_softc *sc, if_pkt_info_t pi, offsetof(struct ip, ip_sum); if (csum_flags & CSUM_IP) { *txd_upper |= E1000_TXD_POPTS_IXSM << 8; - TXD->lower_setup.ip_fields.ipcse = htole16(hdr_len); + TXD->lower_setup.ip_fields.ipcse = htole16(hdr_len - 1); cmd |= E1000_TXD_CMD_IP; } else if (csum_flags & (CSUM_IP6_TCP | CSUM_IP6_UDP)) TXD->lower_setup.ip_fields.ipcse = htole16(0); From nobody Tue Aug 15 22:46:04 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RQRFS6Lyhz4mJxL; Tue, 15 Aug 2023 22:46: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RQRFS5rpJz4LGd; Tue, 15 Aug 2023 22:46:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692139564; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zcDWZB7AcroQyAS/S5L5Ehe2rjksV23Rtq6OD6sEbH4=; b=Q1EvrcY+iEg21J17LdyWcTC8Z+IzemkFcSDF1ROm3zbL7OTGe58ykDKYVphexEFp4FlXoP tMpdeBrjNRNTKS/SnFFldAzPx48Ihs6BD40UNdFGz7QET2CCkQRTtfBeZQsylArKZKmxeE ZvxgCEucKBeb/zlbPHtFX6a9dwQFQknHIqqNTD64Tgvury/j+GmyLO50aAtrVsGW2gqDaC TaDQmtmuvv9B+cF1iZ6ahUJHgn5b8y4AWhm/WQuKCiZqyeeohKzSLzQP0BHqZUCp0zz1ld t+aBaCAqxwRcMhlO8Mx8Oq5XMosR6uzDrmtoVRg5zpWJySiEnbDEQ4e5aEszpQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692139564; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zcDWZB7AcroQyAS/S5L5Ehe2rjksV23Rtq6OD6sEbH4=; b=Gc4GPChudVEmnpsFwuIzngQeh6tuVbPwU2US55Ejjo2XAJEIkY3OC8BNsHfcqeBb+qHcqV KtcrE1laQVtuqK9t+tTrghsLT6qMN3SMUTGOWkVTCtjgU2mq4aH2B4+/QD38SHgFTuT0U3 P9g5Xs9Lz/QfDXZBT8pehIUHi2dk7mGwzTN4SJVAZgVM5SCqbzc/nuncqNxqcXGA9DTfBM kw9soZ957c+DbMON5g+vuC5DKj0iHYJbYMxiG3sbdxqlaYbWzWetMW98yrcIdtTVSQy69k tu3sUU1daUCrhXpsyPegMKvXtDGzfWGBb3sLJsXR3yyCbYD87PxvOLTx52JcDA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692139564; a=rsa-sha256; cv=none; b=QtP7M6yYtcXor80a9H0ISzPF3ok+xUF8IPOtFRkCXJKAlxQWObNwSmTZGmcUwOliphwrD+ f9cH03FRtz0ZaqwuKSL0Cg9SAHzAmhNcgdqwYaj3X1io1MYsEqqZQWtOmVSspRzgECA0U/ orsFmTfDUAO6mDw+H0I9XXAmD7jgbzdy9q1nXFTyxdZVIoSRCAAFFAMhP+e6c/O6HOhFI6 Y+W9S5cssgS9SIfPbNEEevg+ScRgrUNi0yf1AMU9t1QZRg66jTfDIw59H9wW29kXRMM3ZG GdVdHG5+KreUGd/8Vfg79yX/zjNyqO7m34RMQp35NZb27KgrQa6b7l5WDZVFIA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RQRFS4wHCzDCj; Tue, 15 Aug 2023 22:46:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37FMk4nV041753; Tue, 15 Aug 2023 22:46:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37FMk4l8041750; Tue, 15 Aug 2023 22:46:04 GMT (envelope-from git) Date: Tue, 15 Aug 2023 22:46:04 GMT Message-Id: <202308152246.37FMk4l8041750@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: 34d55be0747b - main - boot0: add a note about BIOS-supported serial rates List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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/main X-Git-Reftype: branch X-Git-Commit: 34d55be0747ba4452f9611ca88fe21e9d94be266 Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=34d55be0747ba4452f9611ca88fe21e9d94be266 commit 34d55be0747ba4452f9611ca88fe21e9d94be266 Author: Ed Maste AuthorDate: 2023-08-15 22:42:22 +0000 Commit: Ed Maste CommitDate: 2023-08-15 22:45:58 +0000 boot0: add a note about BIOS-supported serial rates We plan to increase the default serial rate to 115200 (see review D36295) but early boot components that use BIOS interfaces do not support higher rates. Add a note to that effect. Reported by: imp Sponsored by: The FreeBSD Foundation --- stand/i386/boot0/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stand/i386/boot0/Makefile b/stand/i386/boot0/Makefile index 5e82d7b6ae67..83eee46dfd11 100644 --- a/stand/i386/boot0/Makefile +++ b/stand/i386/boot0/Makefile @@ -56,7 +56,7 @@ ORG= 0x600 # 2 stop bits (set = 2, clear = 1) # 1-0 data bits (00 = 5, 01 = 6, 10 = 7, 11 = 8) .if !defined(BOOT_BOOT0_COMCONSOLE_SPEED) -BOOT_COMCONSOLE_SPEED?= 9600 +BOOT_COMCONSOLE_SPEED?= 9600 # BIOS interfaces do not support higher rates. .if ${BOOT_COMCONSOLE_SPEED} == 9600 BOOT_BOOT0_COMCONSOLE_SPEED= "7 << 5 + 3" .elif ${BOOT_COMCONSOLE_SPEED} == 4800 From nobody Tue Aug 15 22:57:10 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RQRVG2ls6z4mKjq; Tue, 15 Aug 2023 22:57: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RQRVG2Gvnz4M36; Tue, 15 Aug 2023 22:57:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692140230; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=x5Nd1cW1zhgpYTgY9zAq5ANfbW+f5d76FO78jsB9HZE=; b=WB+X2RxjPJ1IHaz5mZGWzyAvvW4PW1OFU7ftx+J6OdMHFbuV5x0c2jqc3gvI8K4KXMmnnJ 9XTYrL1DNdvnLtLz8w4VN9rEwYCyQkbXvnSGiu9kKz04XSwWg59yviWCUgzLMr2ptx+Yd0 eOTXrPZayt4Z2I7HXtUJ41VHLYugNkUdHHkXcRJbjfGX09vNfLt2sZ+m1VUdddGz7hwnvk B8PLQ5co/jri1sHw2sAYyuFDwlmUv+lD1RQu0hulLQbS2vmMWX+u5ciFbgwCs7Q1LXR+7j A8mMgD+ZsJ7Z8w/W3QXgaPI/d/QOSO2nc59J0OBeCAG5qCuPHIY1uilP+21w4Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692140230; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=x5Nd1cW1zhgpYTgY9zAq5ANfbW+f5d76FO78jsB9HZE=; b=kJSqYQoDnOSFI0eq+iWiDb2q2yO4BLrgTVjyGMuaVnGYGia9kG5VdxKeyQRGW4a5bOXalf 4K7h9bAo6hUVqAxti5PEOWXfvFG10nYMoy0cgPyz40RDDgoQLiiVpra4Sen/WF5AQ/oawl /AYBcHXzU78LiUQJ3KKWYx/4ElppLb0r91zAh4EP9Pk+UyaVBRd7O15n6Ge2DNojPkrZid P80AJp1Xhr4z7sVN/QpUC4VvrgqJeVYcFiPwYzXtNJhwP+loFF+WGFJKstfD+9aCV1Zjyw Px20VsALpBf/BPxKDvBigUvfOmeVztTBje7Jzl7lvZniE4oZ+jvhEpYF79xkPg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692140230; a=rsa-sha256; cv=none; b=eTR5gmHfLwn2Yf1+8Zo8jtk1lwdUo30m0tl5CIh/v6EOYA/qDWsvB4p7mErF4bQhztIUP3 ZDTHn2H7bPtyTxqZiFR7kUwBRy9LMOxZ39/A5f3S4K2pmOGN+GA+5PucFgAurLpYQ4DX4M DzKBo4Jr8IwT+9W0ibwCB8Xhb1tlKdod1q6CZDfGWKG3ObiDk00LhMfV5TkGd6FI5JWr5+ NfQpAlr/5DBIDe5g9D8/8bcdGjuVS2QgzRWWec2YWzA1/iErqMs0/1Rg/FT6mITZS3i5pv TkENk9rWh/a19FTUX2OdQGnAn+juOYhQKBk4XDGHfeRRDiCfe96xSsCSFR9Wuw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RQRVG1LsZzDTp; Tue, 15 Aug 2023 22:57:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37FMvA9j058875; Tue, 15 Aug 2023 22:57:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37FMvAeQ058872; Tue, 15 Aug 2023 22:57:10 GMT (envelope-from git) Date: Tue, 15 Aug 2023 22:57:10 GMT Message-Id: <202308152257.37FMvAeQ058872@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: a1df36f1b99b - main - devmatch: introduce quiet command line option List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a1df36f1b99bf2b8dcee66327f55888667fa4b2f Auto-Submitted: auto-generated The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=a1df36f1b99bf2b8dcee66327f55888667fa4b2f commit a1df36f1b99bf2b8dcee66327f55888667fa4b2f Author: Bjoern A. Zeeb AuthorDate: 2023-08-13 21:33:48 +0000 Commit: Bjoern A. Zeeb CommitDate: 2023-08-15 22:54:48 +0000 devmatch: introduce quiet command line option In setups without hints whatsoever one can get a long list of "Can't read linker hints file" error messages during boot. Add a -q/--quiet option which would suppress the noise and leave space for more essential information. While here switch to a pre-defined exit code from sysexits. MFC after: 4 weeks Reviewed by: imp Differential Revision: https://reviews.freebsd.org/D41443 --- sbin/devmatch/devmatch.8 | 7 ++++++- sbin/devmatch/devmatch.c | 16 +++++++++++++--- 2 files changed, 19 insertions(+), 4 deletions(-) diff --git a/sbin/devmatch/devmatch.8 b/sbin/devmatch/devmatch.8 index 14e2add65aa1..68705cd954ad 100644 --- a/sbin/devmatch/devmatch.8 +++ b/sbin/devmatch/devmatch.8 @@ -23,7 +23,7 @@ .\" .\" $FreeBSD$ .\" -.Dd November 3, 2022 +.Dd August 13, 2023 .Dt DEVMATCH 8 .Os .Sh NAME @@ -35,6 +35,7 @@ .Op Fl d | -dump .Op Oo Fl h | -hints Oc Ar file .Op Oo Fl p | -nomatch Oc Ar event +.Op Fl q | -quiet .Op Fl u | -unbound .Op Fl v | -verbose .Sh DESCRIPTION @@ -59,6 +60,10 @@ guessed from the current module load path. Parse and use a standard NOMATCH event from .Xr devd 8 for matching instead of searching the device tree. +.It Fl q Fl -quiet +Suppress some error messages and simply return a non-zero exit code. +This is helpful to avoid an endless list of warnings during bootup if +no hints are available. .It Fl u Fl -unbound Attempt to produce a list of those drivers with PNP info whose driver tables with that PNP info cannot be found. diff --git a/sbin/devmatch/devmatch.c b/sbin/devmatch/devmatch.c index 20a57353ecf6..f9f5122663a1 100644 --- a/sbin/devmatch/devmatch.c +++ b/sbin/devmatch/devmatch.c @@ -36,6 +36,7 @@ __FBSDID("$FreeBSD$"); #include #include #include +#include #include #include #include @@ -48,6 +49,7 @@ static struct option longopts[] = { { "dump", no_argument, NULL, 'd' }, { "hints", required_argument, NULL, 'h' }, { "nomatch", required_argument, NULL, 'p' }, + { "quiet", no_argument, NULL, 'q' }, { "unbound", no_argument, NULL, 'u' }, { "verbose", no_argument, NULL, 'v' }, { NULL, 0, NULL, 0 } @@ -59,6 +61,7 @@ static int all_flag; static int dump_flag; static char *linker_hints; static char *nomatch_str; +static int quiet_flag; static int unbound_flag; static int verbose_flag; @@ -114,8 +117,12 @@ read_linker_hints(void) continue; break; } - if (q == NULL) - errx(1, "Can't read linker hints file."); + if (q == NULL) { + if (quiet_flag) + exit(EX_UNAVAILABLE); + else + errx(EX_UNAVAILABLE, "Can't read linker hints file."); + } } else { hints = read_hints(linker_hints, &len); if (hints == NULL) @@ -565,7 +572,7 @@ main(int argc, char **argv) { int ch; - while ((ch = getopt_long(argc, argv, "adh:p:uv", + while ((ch = getopt_long(argc, argv, "adh:p:quv", longopts, NULL)) != -1) { switch (ch) { case 'a': @@ -580,6 +587,9 @@ main(int argc, char **argv) case 'p': nomatch_str = optarg; break; + case 'q': + quiet_flag++; + break; case 'u': unbound_flag++; break; From nobody Tue Aug 15 23:43:13 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RQSWV63yqz4mPDP; Tue, 15 Aug 2023 23:43:18 +0000 (UTC) (envelope-from yaneurabeya@gmail.com) Received: from mail-pj1-x1036.google.com (mail-pj1-x1036.google.com [IPv6:2607:f8b0:4864:20::1036]) (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 "GTS CA 1D4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RQSWV3pX6z4RLm; Tue, 15 Aug 2023 23:43:18 +0000 (UTC) (envelope-from yaneurabeya@gmail.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-pj1-x1036.google.com with SMTP id 98e67ed59e1d1-26b41112708so2547587a91.3; Tue, 15 Aug 2023 16:43:18 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1692142996; x=1692747796; h=references:to:cc:in-reply-to:date:subject:mime-version:message-id :from:from:to:cc:subject:date:message-id:reply-to; bh=Ci42YmOx5kraAPqcip4ifXVG5eyaniuWsUPTra4K9yc=; b=nnflEr/0nB/Sx3Dd1wfhHgn7ppxodICHZq/UmMtDbbucik/JuwIdVJWpaB4mtKWB+Y o2Wdr9NqP0omcA5NZexKJ5pEuQN6cfbwZT/kkf2EtAwlisEHfBdtB7C9ge6YeDXONeC2 tGzPSs5/THe83OJo4WGc3Gb7yMqJulajf5A/hrU4kxXDlJc0qYfxRvvmQX01by+6gQfI wpXgnFxEdynn0bMQNdm5Q1kYVSGQvIlKbX6rzis/EQoT2VBqU7zeED+uM9e6sw350FH7 JauClUipY5NibPI8wmFxNlvr9ENVwf0xF+XssvQni+SkosY8sKV8DLkYNomismEA9ERI GvSg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1692142996; x=1692747796; h=references:to:cc:in-reply-to:date:subject:mime-version:message-id :from:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=Ci42YmOx5kraAPqcip4ifXVG5eyaniuWsUPTra4K9yc=; b=d5/XDh7rGXXH//0RRcLN4eO9mJrFzYcOeWG28833O9Okno9Sx+N3r+65Zl1hR4YM/v +5/jJllkC42g9HpZ8wBD/tp33qx4oi0yb+AVlCGiVh+IkHd3OqLqCAFa7w1WxbUpExKl 3VtGKcLIVp+FrlHQ53H0wC8+eWbjFNOvmz3vWBsg8iR2DdWnn5r26hFJ5F0VCbYUqf1A cOK1QbqyUPku1r0eI7hOP6VkKf2EY99qFnhU5bqfQWHSe4QZFX5B3TR3q1MxRN0porKe OGShzcvUp86HCgmJvWlK1pj9SsiVcsedRCqPnRUpwpCfLMM9WDuVD+c+4w3NNzzohxsZ aLeA== X-Gm-Message-State: AOJu0YylXvZk9URELqk7YxS7jjPYD3nCMRvm2FPMhpHxEJOMDa74ftlR Y4sh96QFqoxgrfMJ2vQ41wYczi70u1Y= X-Google-Smtp-Source: AGHT+IFGLddBbbrgRa7XoXyXFQlpYfWyU1pvr0jcjBU1IrIUzjfMd71fMcnw93bWxzSOaOrzAMUjug== X-Received: by 2002:a17:90a:e004:b0:26b:be62:c229 with SMTP id u4-20020a17090ae00400b0026bbe62c229mr96623pjy.32.1692142995807; Tue, 15 Aug 2023 16:43:15 -0700 (PDT) Received: from smtpclient.apple (c-73-19-52-228.hsd1.wa.comcast.net. [73.19.52.228]) by smtp.gmail.com with ESMTPSA id c6-20020a17090a674600b0026b25c05495sm8133681pjm.20.2023.08.15.16.43.14 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 15 Aug 2023 16:43:15 -0700 (PDT) From: Enji Cooper Message-Id: Content-Type: multipart/signed; boundary="Apple-Mail=_EB5587B2-0386-451C-91B3-AC4B4469B6DD"; protocol="application/pgp-signature"; micalg=pgp-sha256 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org Mime-Version: 1.0 (Mac OS X Mail 16.0 \(3696.120.41.1.4\)) Subject: Re: git: 28f6c2f29280 - main - Import GoogleTest 1.14.0 Date: Tue, 15 Aug 2023 16:43:13 -0700 In-Reply-To: <5759AF55-F1DE-4128-9579-B0A654114D92@freebsd.org> Cc: Enji Cooper , "src-committers@freebsd.org" , "dev-commits-src-all@freebsd.org" , "dev-commits-src-main@freebsd.org" To: Jessica Clarke References: <202308100232.37A2Wdaw040438@gitrepo.freebsd.org> <5759AF55-F1DE-4128-9579-B0A654114D92@freebsd.org> X-Mailer: Apple Mail (2.3696.120.41.1.4) X-Rspamd-Queue-Id: 4RQSWV3pX6z4RLm X-Spamd-Bar: ---- 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] --Apple-Mail=_EB5587B2-0386-451C-91B3-AC4B4469B6DD Content-Type: multipart/alternative; boundary="Apple-Mail=_751F167C-0D1F-463B-B157-0D03B9E730C1" --Apple-Mail=_751F167C-0D1F-463B-B157-0D03B9E730C1 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset=utf-8 > On Aug 15, 2023, at 12:15 PM, Jessica Clarke = wrote: =E2=80=A6 > What=E2=80=99s this thing? Sounds like you did some merging, squashing = and > rebasing, didn=E2=80=99t fix up the commit message and didn=E2=80=99t = notice that git > rebase eats merges? See [1] for how to do this properly. Ugh. That process looks incredibly annoying=E2=80=94especially = when dealing with conflicts that can=E2=80=99t be easily scripted due to = changes made in the pre-git vendor-forked source tree. Ok, I'll do next = time. Thank you for the pointer, -Enji --Apple-Mail=_751F167C-0D1F-463B-B157-0D03B9E730C1 Content-Transfer-Encoding: quoted-printable Content-Type: text/html; charset=utf-8
On = Aug 15, 2023, at 12:15 PM, Jessica Clarke <jrtc27@FreeBSD.org> = wrote:

=E2=80=A6
What=E2=80=99s this thing? = Sounds like you did some merging, squashing and
rebasing, didn=E2=80=99t fix up = the commit message and didn=E2=80=99t notice that git
rebase eats merges? See [1] for = how to do this properly.

Ugh. That process looks = incredibly annoying=E2=80=94especially when dealing with conflicts that = can=E2=80=99t be easily scripted due to changes made in the pre-git = vendor-forked source tree. Ok, I'll do next time.
Thank you for the pointer,
-Enji
= --Apple-Mail=_751F167C-0D1F-463B-B157-0D03B9E730C1-- --Apple-Mail=_EB5587B2-0386-451C-91B3-AC4B4469B6DD Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename=signature.asc Content-Type: application/pgp-signature; name=signature.asc Content-Description: Message signed with OpenPGP -----BEGIN PGP SIGNATURE----- iQIzBAEBCAAdFiEEtvtxN6kOllEF3nmX5JFNMZeDGN4FAmTcDZIACgkQ5JFNMZeD GN4hthAAlEEKAKgoWmn7iQYrhFwT0l6oAET3hcMESDrD4JWc03OpLZRUlt+hDjPx +WXG5Ff2LK206ZMg5IMS+GLF/9VP6Uu0w9qTKTlH4wuLi4g+OiiHzzCb6oJMnDL6 daxqaaWTjL5sJGlBb2HBgWWcR5ulpKVLlud7p6pesJ3VKjtTvYNWXimPwYzhd47i fiyey2IdK897Xfj4ISUso1kFor6jpovVD7dFSrnLRJrfDkY7ej3rMimDVLQ94Y5b BeYBlqjJjqf/zOk9+rochFPH1Yup/WYmh+M4L84RrB0uVZYvu322UETLjLjeLeli XFnjdNkY6rhHUKR0DJr44XIgvv01AYCR6DKJ1EE8G7q3eMGym6HA7B93Jrobya16 yUToD7W9SmMvnOxHHj6PvSLJ+w1eHhYgZZyrFAkHstTPclv/corAZPsBxpcOoGQT MTR8atIGg5HAMKX4QGi/L3C2u26/3aUBwYjJW8dw2tg7dbknoJsJL+BQx8zTyZur LRmuRnQGC9ordZ0YnlgQD2lZYMaPmQ86rZ7b/z+TVHhRlxja1ys0WbQhLBEgSRGo UkM60BYgGxA30KcTR3xsUwdGGOwcvQFj2E0uq4X+96iC0xDn/4FqGQPcYkZD6wvk /nDIaQeUf212xUKpegfM3IhLG1KiDucDP2cEFxrdsmj7/SbrD4M= =N8jH -----END PGP SIGNATURE----- --Apple-Mail=_EB5587B2-0386-451C-91B3-AC4B4469B6DD-- From nobody Wed Aug 16 03:24:14 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RQYQQ5lssz4q6SR; Wed, 16 Aug 2023 03:24:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RQYQQ4wQ5z4ndS; Wed, 16 Aug 2023 03:24:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692156254; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=QO6RPpKo+zgGpX9Wut/ddi9JZdYAEbximygB6F9gWBc=; b=Ekfs3WCZiUPVcKNO14Uko8U44McVqPh2eg0AIrQE7xZEwPlr9AkUw7fPvI1q3JYsrIur7h b66NqeQk3T1+ONJsvugnJ5Whj3nGFAGFrIMQr51APtdjIijdVfQEUBrnIw9kmZ2K9/TIl1 TXnM6Ags2Pde0ULdYNllbNrWjg1ZUtkQ030MbbEJNGZ5EKrnV/HYZ7mqMVooh+ivtScRLx BvFL5IXe0Cn0i6Q6HxsyVoaC7ZljVTj/km6yBEVXpIpDVg5ErAlfDvzBGmGB4v8wiwvtfy OzkmzDGkFu74ZfiwYq3BSTZ8X15XcgmvRNwGUgJ2/oAvToBvI2Jq0Y7TSCKDUw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692156254; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=QO6RPpKo+zgGpX9Wut/ddi9JZdYAEbximygB6F9gWBc=; b=vX8Kugr1dhe6aqvz3Qks74RYAln5f/evqNa4aS0+IUBO8akZOZ+sUZL8U6VNn4qCUD0Xcv 7i9683UFZmwnCc948IUfywvW+b+XQ3/fccKyrQrYW8ONuUzP0I8zk0jfs/5OsCj+7vcymO 7un/Z6fwS8S6wHI34bX3rhrcxK1cDilOfEmVw2vI8kZ+mIU0KtX1H92nO9facYFlMUGd61 rqYSNjmmoPaaj9pLd55Vq2/d7m5dxnALYall9SB0q6mBsdqQBapgjCjtG2htVPJ9CivW9h xk/xmmCwTA4WLTO6kBExlQOenFr2lRunGcJoJfOf2L1JCvlS7beluIE8gY4ZFw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692156254; a=rsa-sha256; cv=none; b=E8eh2GmZQKhHkkgB5Cb3L7GQV+CGwSvlMnV6B2nqZ7RjXKQ03u849umwBQm+OsN5uRbC6s GuLig6mN7nrz+njpqHV9UxY9TibmNkFIm22K7octJ6yI0KTAcbyXSd6I1ThjDeA4fwMRgo +Wd3nJ9d7kDw8juW1s0oEB0hZhttKa2rk+cwrgqEzhdCRXb/2/KbfZLDLsKSymY2TIS+Kz 4p1dJ1WuuuhsmYBVpbFEA/8DekcqfioOEJ3xhrAwhKYnav47Tqq7GTk9MRfx2kVuv80zFU TxahFNDVedm9r5PpNAqgfjwNgaWjkvrNGNQIBKa7Hsd/utZtZxxJbbhRiS7/dA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RQYQQ3zxlzbtm; Wed, 16 Aug 2023 03:24:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37G3OEpX008126; Wed, 16 Aug 2023 03:24:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37G3OEGv008123; Wed, 16 Aug 2023 03:24:14 GMT (envelope-from git) Date: Wed, 16 Aug 2023 03:24:14 GMT Message-Id: <202308160324.37G3OEGv008123@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: bf46512a54cd - main - systat: Remove obsolete copyright string List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: bf46512a54cdf9a5b2e4f520be860add21efbfd5 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=bf46512a54cdf9a5b2e4f520be860add21efbfd5 commit bf46512a54cdf9a5b2e4f520be860add21efbfd5 Author: Warner Losh AuthorDate: 2023-08-16 03:22:50 +0000 Commit: Warner Losh CommitDate: 2023-08-16 03:22:50 +0000 systat: Remove obsolete copyright string This is unused, so remove it. We don't put a copyright string in most of the other binaries. This one doesn't need one either. Sponsored by: Netflix --- usr.bin/systat/main.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/usr.bin/systat/main.c b/usr.bin/systat/main.c index a52fbd7ebc4d..0f57f9fbf6bc 100644 --- a/usr.bin/systat/main.c +++ b/usr.bin/systat/main.c @@ -37,12 +37,6 @@ __FBSDID("$FreeBSD$"); static const char sccsid[] = "@(#)main.c 8.1 (Berkeley) 6/6/93"; #endif -#ifndef lint -static const char copyright[] __unused = -"@(#) Copyright (c) 1980, 1992, 1993\n\ - The Regents of the University of California. All rights reserved.\n"; -#endif - #include #include #include From nobody Wed Aug 16 05:40:39 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RQcRq3rjGz4qFtT; Wed, 16 Aug 2023 05:40:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RQcRq3Qnzz3GNV; Wed, 16 Aug 2023 05:40:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692164439; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HXCfgOuWwo8/FXg58DJIn82109dvcovalPD+xiuNdOw=; b=bBbx7WHPx08oF0I8iGoDgtnVDyjNHL+5FpHaPi0y7xuGLZuQXZ7iTWtaQfEx61UibxJ0bj FxVMC21ReEAHaCPFggi2paijzJQOMVFhZ07ZSDEFz6ZbHRR4NHBS0AlCYbs+sqvLL568t3 XotUXK3UAjuifHPm1JkjjyCsaqcXoCVotgReYSJpQJF+mwhNrfy7xKvmamYZ2Be1JA1TI4 /vt5aHEwNO3Z+KSJtgsOGecHZ6Sggg8WeHsIwUYd1yAFnOpE22Y2+V4Q441yiGrVX54Vu5 0NyCZPeehk5ESJ32y9nIWoOMEx3/tZl3KkiuL0FgyactlHsv2dHawS6SS/Z8EA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692164439; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=HXCfgOuWwo8/FXg58DJIn82109dvcovalPD+xiuNdOw=; b=K/5JkiX5lYWmy18febGm2NM1mYORFZHWkSNjpiqMLkq7r8UGIqvTwqY25mHUxOmvUXsBZn e6VSW+u4jLh25X9dVQhnAfXp7468VDWeIHmyODzunsS3eNfZejZ6oKCKackMhvx5462yfP vPhb7UkoCc1hq3n86w/4TQbgzwoWyVf5nOjrdpMaTO+I1Ns+i7sZAdGT/cch6zRBsE1SnB UeTR736khk4BZOj8co3SVPcLvTFEzFi0zk1zROMaGp4+t4SGJjpEaq3YsF5fezfctHS4K6 1oJgqpxsRMbBm5XgzJlBSGiYsjX1An2ndqdMvVY0leH7hFOz5Ej7lfKHgplpmg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692164439; a=rsa-sha256; cv=none; b=hw9ELkNu2nioKL7lkGL6YVOyQEvoSGHz0J64W/wMGCj32ak2HqhKAMqxjy9yne0Po14hxS IAzITG7UFD7aAHmOw1a9OmHr9J5k/SBVCzpLw07V8whJavYv6L3q8GmFC7xXY0plwZ+Nzm Rqy/1gKOGVtbdx+sJ9lJpSe+Ai5GgojK0EpC3I8Vdj2R32Y1RNNymbCHjQHWdCRUGS+ALF QtmvDiTEmmXLfyKyzmaYmnLM2Qi6Dx0PEJoAEj3C3yyymI/bgfihe8ylx6WPEiOjV89rVZ NAyDkiK8rzXy4Rp+d3ExSQMAPGpDmRp0Ppd1bx46jBd+1GBU6HuPCbwZ53T6HA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RQcRq2VPbzg3V; Wed, 16 Aug 2023 05:40:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37G5edlQ033770; Wed, 16 Aug 2023 05:40:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37G5ed0h033767; Wed, 16 Aug 2023 05:40:39 GMT (envelope-from git) Date: Wed, 16 Aug 2023 05:40:39 GMT Message-Id: <202308160540.37G5ed0h033767@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: 94b73d30ef2b - main - usbdevs2h: Ignore First Line and stop generating $FreeBSD$ List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 94b73d30ef2b0d85d4834a1e4dc29e0457a8faef Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=94b73d30ef2b0d85d4834a1e4dc29e0457a8faef commit 94b73d30ef2b0d85d4834a1e4dc29e0457a8faef Author: Warner Losh AuthorDate: 2023-08-16 05:32:04 +0000 Commit: Warner Losh CommitDate: 2023-08-16 05:34:18 +0000 usbdevs2h: Ignore First Line and stop generating $FreeBSD$ Just ignore the first line of the usbdevs file. And stop recording what the usbdevs* files were generated from. It's said '$FreeBSD$' for years now... Sponsored by: Netflix --- sys/tools/usbdevs2h.awk | 5 ----- 1 file changed, 5 deletions(-) diff --git a/sys/tools/usbdevs2h.awk b/sys/tools/usbdevs2h.awk index 42e57cf190a8..25c29c798b3e 100644 --- a/sys/tools/usbdevs2h.awk +++ b/sys/tools/usbdevs2h.awk @@ -45,9 +45,6 @@ function header(file) printf("/*\n") > file printf(" * THIS FILE IS AUTOMATICALLY GENERATED. DO NOT EDIT.\n") \ > file - printf(" *\n") > file - printf(" * generated from:\n") > file - printf(" *\t%s\n", VERSION) > file printf(" */\n") > file } @@ -234,8 +231,6 @@ line=0; while ((getline < srcfile) > 0) { line++; if (line == 1) { - VERSION = $0 - gsub("\\$", "", VERSION) if (dfile) header(dfile) if (hfile) From nobody Wed Aug 16 05:40:40 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RQcRs112Xz4qFQB; Wed, 16 Aug 2023 05:40: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RQcRr4TZ5z3GSt; Wed, 16 Aug 2023 05:40:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692164440; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ioQSlgLExwtEyrw0olATyZ+LAfQSDSmFr/vD2NTdTck=; b=XFeJDCOJ4xcMWFqQ7OuQueNPz09vgBceEuSAvk3jjayBmzBLzPH6Pm1hK99cwOp1v0D7q5 6j5tDAlZjotlarcCRSGjlUnZOVHrTFUTtggzRBMBQGyeK80H5cK+9KHoRMk3BpuVB8m64G QXL0/GdttRpnhZ7IKMz/ECoJpXq3RkqgXNk9smirfLAEfdqQAKYVfwIXr9PzlkD4dFS9JV ++gY+T/PEj4brubqmn/gRP7Dfgugblb1BqdOT8CtBzGM9XRF1Hdz57bbs4usCWHKakpmu1 MVGRV61nr12iTw61ITY9/gYvIhYQwnUFsQsIUhojYSONoxGB4cAL++6+4sxzeA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692164440; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ioQSlgLExwtEyrw0olATyZ+LAfQSDSmFr/vD2NTdTck=; b=w+JXjmeGqIcpRORMqbIVd+7JnEXvm/sQlNZUGpnSDmyS0t3oufYNcTzH4dS6f2FWgzfoIi Iz9wgubQgDKhl3ZranLJ52/6Vr55tXJ+qKbMeC/xxdozs15m1WVaZltCSL8nee1MHMZzxS hpjx/BCvLWEkoMh3ZMaSKtqcVkERMfwCCf2viuxFbYx1SY/4Cl3bZ8MTk5tJKzu641AvGr mzTtQMKHAXn7Of62uxFmbKOYZpGM8hDrXbsYa5f0B2eP5QgSvbVM1dPBLSYyDDkltdPE7x 8XFrrbXxWT9jsxk7hSizlEIc25NcwFKFOpllt/ENsGxlnx9bxKmrqW70HUVdyg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692164440; a=rsa-sha256; cv=none; b=vh28Cuk2XOgo6LpLPc0DUFuU69DIVFDAK3KYPVWj8VtzbFMxmTOGhIongtuw6BNhe+H5OC xET5lBwlZ0GtX+kOTqu1CY5QzwXjemE3+ywp5RphNsyraaxBIq7knwQ1QkFJMplaOwWZyW WjbIzVMfaMuXcQ5Cc1HpKUI6Fu4n5B5GXqfg4hYW1HfsAD0ovMIKcUSiKNgTxs178tLTlD +dF1cKEulTgTiN1F8EeBspgeBlo8cZ823jA7d/003h6PZDHJAaY1G5CJRWe+Mrnj47kkxw e+FORQizEEdUYSTvceSG9Tk8VHn3Cdgm7mRB327LQC7TolTkKbyJu0OwzRirFA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RQcRr3CzYzgH2; Wed, 16 Aug 2023 05:40:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37G5ee8F033821; Wed, 16 Aug 2023 05:40:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37G5eeLQ033818; Wed, 16 Aug 2023 05:40:40 GMT (envelope-from git) Date: Wed, 16 Aug 2023 05:40:40 GMT Message-Id: <202308160540.37G5eeLQ033818@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: 021c4fa6b04c - main - miidevs2h: Ignore the first line List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 021c4fa6b04ced4bed9a4937086c62ebbe571f63 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=021c4fa6b04ced4bed9a4937086c62ebbe571f63 commit 021c4fa6b04ced4bed9a4937086c62ebbe571f63 Author: Warner Losh AuthorDate: 2023-08-16 05:33:18 +0000 Commit: Warner Losh CommitDate: 2023-08-16 05:34:19 +0000 miidevs2h: Ignore the first line The first line hasn't contained version information in years. Ignore it entirely. Sponsored by: Netflix --- sys/tools/miidevs2h.awk | 7 ------- 1 file changed, 7 deletions(-) diff --git a/sys/tools/miidevs2h.awk b/sys/tools/miidevs2h.awk index 54b9c28fe508..fba5049460d2 100644 --- a/sys/tools/miidevs2h.awk +++ b/sys/tools/miidevs2h.awk @@ -93,16 +93,9 @@ BEGIN { hfile="miidevs.h" } NR == 1 { - VERSION = $0 - gsub("\\$", "", VERSION) - - printf("/* \$FreeBSD\$ */\n\n") > hfile printf("/*\n") > hfile printf(" * THIS FILE AUTOMATICALLY GENERATED. DO NOT EDIT.\n") \ > hfile - printf(" *\n") > hfile - printf(" * generated from:\n") > hfile - printf(" *\t%s\n", VERSION) > hfile printf(" */\n") > hfile next From nobody Wed Aug 16 06:28:10 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RQdVf2zpdz4qJ5H; Wed, 16 Aug 2023 06:28: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RQdVf23kfz3L81; Wed, 16 Aug 2023 06:28:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692167290; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=cNb6DscHtRhtDYa/l1dwbWtDBGbhW9EDway3zSt01VI=; b=SN2/RdooNETzyLoR4vfba90wK5BbcoXx23wlVeGgwP5E6F4pMWWh3T2eY9aECq0gxIHwD4 dOz1nLHub1aOcexHJxAqFxZmMz9QeLn8r+YwdDXqbGttsyUIrZuc8zzaz1k2pAAOIcZHv6 esv1d0/mroN6cvIGmQ/OlrADMKXOdQdMTwb1YAEC6T2U0PLdFDB/8v+GxTRHsyfRpYmbQk 4E14PR3jP0OkzKtxrpDUwuDTsZPraaXAoToV3IfzUR6+M9EpGmC9WdfuBJQWLwaJc7aybC iq6GXPY61g+Z2APHVOk3BsvhCNJfhFod1i5vzOLPqyG+NH9Z6HhN82W6dfUhwA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692167290; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=cNb6DscHtRhtDYa/l1dwbWtDBGbhW9EDway3zSt01VI=; b=EnhljqniPR3UGcT/46lmOxKLLRaebiK4N0u0o28LdhpmWHJ5b1buPrKIzCILvUTKE/V+yL r4ZKpjq5W141UQ2zG9JAXcHvCuzUvI2pHHJioup34c3QuI8wqQDI0Jn/sgiCWK4cQJarSg +ZYotsr2skYMvpiJm5Wgwc0tzH1t2/S6aNGWpKFzHSKqPJdf/HPSh1uP/esh2XFUy/3AmV tVJcNWmd35eayYPLpphj74a8WJF/yLNv71xKl4OWwqi3TgY/zuJvChkqIkeQ5D/M4EXINl kFJI6WaJizNjtnxtiPQB8mvXqPVQTpIx4yWS2kZ3gfjcLDmGxADD1ugxu+KY7w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692167290; a=rsa-sha256; cv=none; b=gjltnLBwE28+x4JaaHDs6J+eWUy7qhI376o+W4qTBElwts/19X9n9G2d15PBeu5+FNGppj tcIBxtgGiOZgK4BUtYOpFDx6W99SSodnSeJFZ0pwAPyWQIXGk0uzGrpYNvNGZCDF0M/h4H 4Y+IVg9HyR9Sf+3UavhLPEFXnkMtTBGMRCtXn6JKY/TpHd+y2eG9ZFGKU1cxN7NGmKxK8L nx6UCL7NA4UQ2FIpkRyJRPdrdY8V6EUTk90VBcg3SkJGNwTxTJuBoiEybu340EL/zeIWVi VkeBh5FwMnjzH8qqmD8VrCZANYGhfE+jsmcXqJXNkjZ38mm25f2i3O2++9qKQQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RQdVf169Mzh7b; Wed, 16 Aug 2023 06:28:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37G6SAZr008118; Wed, 16 Aug 2023 06:28:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37G6SAmY008116; Wed, 16 Aug 2023 06:28:10 GMT (envelope-from git) Date: Wed, 16 Aug 2023 06:28:10 GMT Message-Id: <202308160628.37G6SAmY008116@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: fa12e8fe5145 - main - fw_stub: Don't add $FreeBSD$ to generated file List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: fa12e8fe5145722728bac4e394edb11b2a86c675 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=fa12e8fe5145722728bac4e394edb11b2a86c675 commit fa12e8fe5145722728bac4e394edb11b2a86c675 Author: Warner Losh AuthorDate: 2023-08-16 06:21:20 +0000 Commit: Warner Losh CommitDate: 2023-08-16 06:23:37 +0000 fw_stub: Don't add $FreeBSD$ to generated file Sponsored by: Netflix --- sys/tools/fw_stub.awk | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/sys/tools/fw_stub.awk b/sys/tools/fw_stub.awk index c769c0a5721d..7e4c482a3a37 100644 --- a/sys/tools/fw_stub.awk +++ b/sys/tools/fw_stub.awk @@ -126,8 +126,7 @@ gsub(/[-\.]/, "_", modname); # Avoid a literal generated file tag here. generated = "@" "generated"; printc("/*\ - * Automatically " generated " by:\ - * $FreeBSD$\ + * Automatically " generated "\ */"); printc("#include "); printc("#include "); From nobody Wed Aug 16 06:28:11 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RQdVg6Zz7z4qHmM; Wed, 16 Aug 2023 06:28: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RQdVg3ByHz3LD9; Wed, 16 Aug 2023 06:28:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692167291; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=QGxo6z2ntofhOqMe3sFouAkJiQcbrMeoLEl6ym5WRxg=; b=oPO2L98pCQetZhhkZDKNWEotX/PChkWJ9k1fSNUZYsYR0ShoV921DfiAw7v/XnfCsf+/6C sJWvVUrZUi2lBvDpVNerKWrcq1MZ4LBJpZSb9LAxS25JL+AfHlA5FyF7ecKNcZ1P6kZptw 0Ud54doVWXTuA5Ho0MEA+a23IEj22EiZSvZdR7kr1722bG+6/0cqVdyD/RRelleLH4tbI/ qiR4cDq6tmvIviejWucYnacC9cnFWUcKoOgh+TjUhGGuXX0VgiBXF/Ng8m+FRzCrrv1X2z FFMcJeSHMuTgBLwZEDCs20jRjsUuUlNwLPSFwzi1whFTxOHQ/TXSrSod6TXyMw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692167291; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=QGxo6z2ntofhOqMe3sFouAkJiQcbrMeoLEl6ym5WRxg=; b=gMOjsAgQuef7uK0+ddSsCPF+19MpVh4m3Bq1vq8ap4/dNKKYm9ErY0lRWMu6BoZT2jgNG4 +PmiC1HUsCr4MtKsvAxRjULEwvQLaQS5EoILMb3FhFBTmDAsg5Kebok1KPl9Y8x8H9eAyf GHO0rkiWrM0jCA1Urqzf4v4Ai3yutgAdelZwGgkt7xFun+01yGOHLiHOX+3kqYawCgrRVR 5pWWfJ4YRxxJxlZe9ooTIGadlIVxGRHrQ3KVhSu1oGz5HDBmXCFQwUi2y7PPVDC4Z6/tkf /aOOdAOtVXkumml2h7LUnXwY7Q+8hYlDa3WSFs/CiMEyvbHXSkR+RE8afXu10g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692167291; a=rsa-sha256; cv=none; b=QsSSKEJdMCeNrsVLVEuRIYMBqD6wm/JuzKSsg1jDDj2WXueWfJCD1z95IUHJ3D7OO5vI1k 4gHr+AN8nWwjGaiV6Ye7/m87NQqH/QtdAJi2QLBC3CUKsm52iD4blTwKdq9lF1FVPKX2CF xZ0bABj4/oN6VPPzDQ0PBzwryEkSqmrjRRg2b5Y2ZCSRn6Llp7ZwpF6xMSY1cc8zXTmV95 5lsDJpLeaI5Xjq+5YmhsYrFkOZ3wgCpDXOv+UAS0CNA5zYIc+qUTFNeAK1PcAKrMj+EJpp K2bhh+smBZYLF69GyY/qWaxlFF24zqfAAn2HddIqQHk3kNTdpzmTgLPL7DitXg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RQdVg23fbzh7c; Wed, 16 Aug 2023 06:28:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37G6SBjG008173; Wed, 16 Aug 2023 06:28:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37G6SB8m008170; Wed, 16 Aug 2023 06:28:11 GMT (envelope-from git) Date: Wed, 16 Aug 2023 06:28:11 GMT Message-Id: <202308160628.37G6SB8m008170@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: 750a49b606f1 - main - vnode_if: Don't add $FreeBSD$ to the output List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 750a49b606f173fdc2a53461882260fcf6a407f1 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=750a49b606f173fdc2a53461882260fcf6a407f1 commit 750a49b606f173fdc2a53461882260fcf6a407f1 Author: Warner Losh AuthorDate: 2023-08-16 06:22:54 +0000 Commit: Warner Losh CommitDate: 2023-08-16 06:23:39 +0000 vnode_if: Don't add $FreeBSD$ to the output Sponsored by: Netflix --- sys/tools/vnode_if.awk | 2 -- 1 file changed, 2 deletions(-) diff --git a/sys/tools/vnode_if.awk b/sys/tools/vnode_if.awk index 7fdaca208a9b..f27fc0486f36 100644 --- a/sys/tools/vnode_if.awk +++ b/sys/tools/vnode_if.awk @@ -173,8 +173,6 @@ common_head = \ "/*\n" \ " * This file is " generated " automatically.\n" \ " * Do not modify anything in here by hand.\n" \ - " *\n" \ - " * Created from $FreeBSD$\n" \ " */\n" \ "\n"; From nobody Wed Aug 16 06:43:32 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RQdrP1RtJz4qJr2 for ; Wed, 16 Aug 2023 06:43:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RQdrN5wgRz3NFp; Wed, 16 Aug 2023 06:43:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692168212; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=r5rXuqwLFH0iHRLuOiZaUQNbj6wbAb+f3wVccfbP7mE=; b=m+x5x+Dese1zjJPkDliidMiGlSck7ltnIifYOhkEOWg0MNGjA2e5cpdTa7ZVYK7WCUPYAH NG5hbZicKs3Tj4LEg8PdR6TsSWFbkYzH6VWPrF/pVWRCKyp/vNWfWIl4EOkD+q/hHLpjZo z+zUljG3Z0pTI6eppPhr8wM3q2UlkP5ZEVCHHjCOJDYydE4vseAliDE/CCOc83/h0A8GN+ JQ1pXbTJokiw5oi8GxXKkuCdfMI1SkYmSVX4lbax5F9pUWDYOX0/vb8tnShcr5034ipFSJ LsWuMH5TQk4I+4dOzblNmkcGN+EfHyh53KvN15XOprQfhQoEEWDA85bD8iv7eg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692168212; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=r5rXuqwLFH0iHRLuOiZaUQNbj6wbAb+f3wVccfbP7mE=; b=ZFB92xic3JPiWBm0Khdmu0fc0x+jc1Gr6IpeSy1MzasL8SuFEncJ3U5fb5iESw3ZH2kVYG 36jUFFdxP6TUJ5pJhg1eqrQTJNJYLCd1DXKObR9s+1Ini99sb5Yx3ddiKYcquoiuk6/NBn g5No69MhgJjgjarNt79K/gBaAuSuvjt+kYMGra1OKAy4ZmYTaqX1fkzorZqpDKEbghJ0Qn U80Ea1ZuijaeVuijt+35l5LD1zVDo70xcRaw7hKErnpeQZwtYOO1S8mkPewdtdRTbxmwyS 7aPBBk7rmaZS8sEK539262pr5UXyseCkjvTf0Ns/gICYBT7AHI0a3IcxiWUItA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692168212; a=rsa-sha256; cv=none; b=BpcWUOPUMKu3n7mOEEaCuYkqT5CXdK+4mgn7qntGFoQDn18m6Ee0CUjwor8m6jiwAYSF0x tXw5IAAAWGW/11kPtfgX+B6QPTtKiE2XScI3AMnFVifLkkZAyT9jCsGDVd6WWJHlPaEurY 4tsiqVDAVd8/6hRL6DH4zeK+pb1H1rdFBqd/wTIQxXvmpdT4R9gFptGAur/lclYD373xSo 2oguz4tww/OOUC67ZtvNJhSqrUURZsfit+Vtp7GQal1ANxu0iijY1d1+NgX+rkLSJW6Lde bdXlT+M6HVWJKZz/Wy6OtY0bmyTMgEvKdK0sqQ3MhkjdmAAE+IZTUbf7HG7o+A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RQdrN52Cdzhd7; Wed, 16 Aug 2023 06:43:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37G6hW5p041268; Wed, 16 Aug 2023 06:43:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37G6hWps041265; Wed, 16 Aug 2023 06:43:32 GMT (envelope-from git) Date: Wed, 16 Aug 2023 06:43:32 GMT Message-Id: <202308160643.37G6hWps041265@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org From: Sergio Carlavilla Delgado Subject: git: 38472aaf8af7 - internal/admin - Safekeep rajeshasp's src bit following commit bit expiration policy List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: carlavilla X-Git-Repository: src X-Git-Refname: refs/internal/admin X-Git-Reftype: branch X-Git-Commit: 38472aaf8af7efd16758be555d0fe70673359c92 Auto-Submitted: auto-generated The branch internal/admin has been updated by carlavilla: URL: https://cgit.FreeBSD.org/src/commit/?id=38472aaf8af7efd16758be555d0fe70673359c92 commit 38472aaf8af7efd16758be555d0fe70673359c92 Author: Sergio Carlavilla Delgado AuthorDate: 2023-08-16 06:42:40 +0000 Commit: Sergio Carlavilla Delgado CommitDate: 2023-08-16 06:42:40 +0000 Safekeep rajeshasp's src bit following commit bit expiration policy Thank you for your years of service as an src committer With a goal of maintaining security on FreeBSD project infrastructure, the Core Team has decided to consistently apply the commit bit expiration policy[1] and disable access for inactive accounts. [1] https://www.freebsd.org/internal/expire-bits/ Approved by: core (implicit) --- access | 1 - 1 file changed, 1 deletion(-) diff --git a/access b/access index f91b976d055a..89efb2166d60 100644 --- a/access +++ b/access @@ -134,7 +134,6 @@ phk pho pjd pstef -rajeshasp ram ray rew From nobody Wed Aug 16 06:44:46 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RQdsp6Stjz4qJp6 for ; Wed, 16 Aug 2023 06:44: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RQdsp5r3Mz3NpM; Wed, 16 Aug 2023 06:44:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692168286; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=DISjjb4Ol3lMYrETCb+MiRDSjhfLfnqB5RMmMVmV6A8=; b=m6XNPV1XMHhVDzE4mlfCLjRrKSg402F0zdlu+hoeKtduFtIiI3W023CgQPzfVqSi47H2t5 F+HjOtH1Jz7qUuI6fsSwqpsJSICmWFSqUuuhPU2iajFNjxUEihbZ3mDOKV6yfRtzJ/uq+Z mBuP3o8yr2DsXzoTzNF/bdh5LnuX/4oVD5YNOK4plBirUgVKEx1NuSR4Hdts6Z5y7buV4n gj0XhYg1sdv4RVXPArme2LTN2ouo15lxcEBeI/aQSTBbD9yebSjCRfjJbCFp3ZsA69Gvyo pcu7HAfvyET6byNbnz/Xj5Jip1c60WvoBMs6vVFO5QPsD7A6vRkjTPZtBYSBeg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692168286; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=DISjjb4Ol3lMYrETCb+MiRDSjhfLfnqB5RMmMVmV6A8=; b=kjRGwa4FtyHL6imDBip0vE+e/5L/3qLXxaEVFpq3Chw+RoD4y2JRfpjSiqeP7Bt1SRMMwW 6UWcdAph7TGzzessZGs5Bi+FV4OA0l9BpgoOcJ0/tYg6h6abWy19MxlIUCbB2iMkBVKFDe t9XlFsiZR3tDkCXlumTWuCTdQOD+rdsJnKn/ohMzdBa3ham9BnBMj6V1Qenofs9ZVQlo9m uslfgViRS3AxDIYbz8Z27ifRu77nfPDIsMSMD7E5vZK2kN45PXNmCxJQKUs18lIdNooO4v YN80zY5EbieZ3BFnBQwrTyNA66vnbNPbLlEmml3sGbB28MVa2m3LyADsfo2DAQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692168286; a=rsa-sha256; cv=none; b=MER9x/9O/R/5OkxbdhHnUamjR4umCbMqtM8ZGx2aYHqIlSsSvBR45Y+DaCoX8k0yqdbtfR l1f6OSvZIaS812GI2t73v1CgeCiLiYym74y4zlOam+x/xnRlSFOon5n8vi0zcliTnDSW5d fP0ddCO2kWy7Y8g+d/ovwt2p0gFN9Lvp/eHRfAVnk5HHCiH+WsxsdlJEUhNxMIstRHB6PC /0YLBhReTZiT+f4PYGHNARosRUeHWkXR2EUZwXwliTP3ZX+Mh4weWugKBWfITxMcyW7ftC cSsaEWOlK1OPVKofdTaOeccYtBGndaQFcxc+lNjQRMJPHRbBCgocDpRxdEhWkQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RQdsp4v6pzj35; Wed, 16 Aug 2023 06:44:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37G6ikEh041588; Wed, 16 Aug 2023 06:44:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37G6ikY3041585; Wed, 16 Aug 2023 06:44:46 GMT (envelope-from git) Date: Wed, 16 Aug 2023 06:44:46 GMT Message-Id: <202308160644.37G6ikY3041585@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org From: Sergio Carlavilla Delgado Subject: git: fe1b56eceecd - internal/admin - Safekeep uqs's src bit following commit bit expiration policy List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: carlavilla X-Git-Repository: src X-Git-Refname: refs/internal/admin X-Git-Reftype: branch X-Git-Commit: fe1b56eceecd1120dcccc3d3fae49bf47fde3004 Auto-Submitted: auto-generated The branch internal/admin has been updated by carlavilla: URL: https://cgit.FreeBSD.org/src/commit/?id=fe1b56eceecd1120dcccc3d3fae49bf47fde3004 commit fe1b56eceecd1120dcccc3d3fae49bf47fde3004 Author: Sergio Carlavilla Delgado AuthorDate: 2023-08-16 06:43:59 +0000 Commit: Sergio Carlavilla Delgado CommitDate: 2023-08-16 06:43:59 +0000 Safekeep uqs's src bit following commit bit expiration policy Thank you for your years of service as an src committer With a goal of maintaining security on FreeBSD project infrastructure, the Core Team has decided to consistently apply the commit bit expiration policy[1] and disable access for inactive accounts. [1] https://www.freebsd.org/internal/expire-bits/ Approved by: core (implicit) --- access | 1 - 1 file changed, 1 deletion(-) diff --git a/access b/access index 89efb2166d60..12d9a497f97c 100644 --- a/access +++ b/access @@ -163,7 +163,6 @@ trasz tsoome tuexen ume -uqs vangyzen vmaffione whu From nobody Wed Aug 16 06:45:27 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RQdtc0JbVz4qJpC for ; Wed, 16 Aug 2023 06:45: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RQdtb6rf6z3Nr1; Wed, 16 Aug 2023 06:45:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692168328; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=l8fiDmZtTqy5xhDMDkT5wEeKRJ8RWuk6AHxJltUyp20=; b=xnEcA4zj7bLovQwU96la8WqDLQcZvzRqTdPfnZoiem8ccnNLiLAn3DWijfmMYiLchmWwZT aOHJrZOzkdorxFgOFT6MKPsIhfUIasEchH1Ipf4s08O7+nkEWjVsHKCTCs7bT+IO7TyFNn b2oyV71dzu95jUfG5DdameI3+HlT6pEKJeFnRo2V/jaFqnEnQS99n12wisRJdHmDVBovXu XVMc0HjJFRk8c+mwzJ0o2hYnBrnRTU05X8kUmyGI/wSWBwceC2RQL1tuQq9bPsDhuLWTVB vzM8F6wQL8t6U8615cTuWUxR/D0ZBbny6GKH/odd7ovVZMPOZOq6zqA7fGgbJQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692168328; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=l8fiDmZtTqy5xhDMDkT5wEeKRJ8RWuk6AHxJltUyp20=; b=RcMDXPbZErw5XVbpwHbo4v8cCx5voY2jJTHXK3sZ1QQdTDsvwZB4kvMdbwbqIgp8X1MeQ0 oAc9BcRFwZ/BSKVbFU2dVd7hLKUwoSsDMFvt0gdMZW1xil5NWlPbehKbmBW49M8jtME3Le RGo667vXs3ddUvjLZygy1ruRticvyOewSC2r5xrr+5bVRV8NaydnDnaISF2R0HY1pso9TL rv1Xp2UCnUDiOyD/5Rsn6mdePBHHUL2elVa5pK/pTz/ZU5KvREovKP6hxytDjQWEF0gjOy PE7Bhz8RKpwByiO+gCSfHdanIdUeADsD2VgSALqu+mcpM9R7XaDB+DxJreY7lQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692168328; a=rsa-sha256; cv=none; b=aCwqT2PBXzt/x/NkdCc+rmtZof5dEV+joj70bnbkdsjKyofDT8u2ksePkNgQQO3+jyTC+t eFSQgPUkQ99LPPkuc6J8FV0tSoUOsP+LCugRqiLNJp1+iW7Z/D8SxAgGr2nf9FrYrTx3gh Wma6BPFrpgXjeVDwMo/x5geX6dEkmd2mwWXRqwE9P4UbwkDbQlelP7qO50ZFQYphxCnjm0 w+PCU2rE7QlTft2bBjUsPtrNEVGpCSIzm56ia2T7RqzPqXfnHNkpsSGT5dnXLCn5Tzm2Xe wtff7lpNdj4yZycvbXhVb9UPwAOFf+WvcVfCW/eucoHZSaPXDzOG1m8/mkKPkg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RQdtb5xfMzhxF; Wed, 16 Aug 2023 06:45:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37G6jRDo041849; Wed, 16 Aug 2023 06:45:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37G6jRsH041846; Wed, 16 Aug 2023 06:45:27 GMT (envelope-from git) Date: Wed, 16 Aug 2023 06:45:27 GMT Message-Id: <202308160645.37G6jRsH041846@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org From: Sergio Carlavilla Delgado Subject: git: fc0cf729fd35 - internal/admin - Safekeep cem's src bit following commit bit expiration policy List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: carlavilla X-Git-Repository: src X-Git-Refname: refs/internal/admin X-Git-Reftype: branch X-Git-Commit: fc0cf729fd352d10c31fdbc3f198d5bf0e8536c4 Auto-Submitted: auto-generated The branch internal/admin has been updated by carlavilla: URL: https://cgit.FreeBSD.org/src/commit/?id=fc0cf729fd352d10c31fdbc3f198d5bf0e8536c4 commit fc0cf729fd352d10c31fdbc3f198d5bf0e8536c4 Author: Sergio Carlavilla Delgado AuthorDate: 2023-08-16 06:45:09 +0000 Commit: Sergio Carlavilla Delgado CommitDate: 2023-08-16 06:45:09 +0000 Safekeep cem's src bit following commit bit expiration policy Thank you for your years of service as an src committer With a goal of maintaining security on FreeBSD project infrastructure, the Core Team has decided to consistently apply the commit bit expiration policy[1] and disable access for inactive accounts. [1] https://www.freebsd.org/internal/expire-bits/ Approved by: core (implicit) --- access | 1 - 1 file changed, 1 deletion(-) diff --git a/access b/access index 12d9a497f97c..65c95f73f397 100644 --- a/access +++ b/access @@ -40,7 +40,6 @@ brueffer bryanv bz cc -cem christos chs chuck From nobody Wed Aug 16 06:46:21 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RQdvd4YKsz4qKCm for ; Wed, 16 Aug 2023 06:46:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RQdvd3z2Qz3PBG; Wed, 16 Aug 2023 06:46:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692168381; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=czgGFj4DBRaCFuShpT/33kMcFriCmo2ILrcouXQTiCU=; b=H8A9zW5/fdpdME0sIdvn/lhN1vqGQVN4940nK7Bg/HxPn0ajNxmtleu37VnPBh/fLZspXG bxfiEXRuC2PaIPl6IhBrbZYMNowx9bjdEst2IJlaUsUTw5CqicYG08IDlT5w4xNDRogM+C 5XIVhK88UsVfEf2sIJ8sHU+bMilOvNCBAQ2PtL5uHIJIyAy7fNeRP2fDaMYIw4YzrPb9bP xDhghGCN2cVzvy5n8MAmJBSYlCN0rV7WAwtvkeZH3nggXWbQ4orTd7E7kA7gcZEGEPH1WX EFIxudyKNsZ7qioRNS5Ce6ZizYNbcj4dur3HNbwIPABn3HhAmbCoL0QUoQKQzw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692168381; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=czgGFj4DBRaCFuShpT/33kMcFriCmo2ILrcouXQTiCU=; b=ujp21qtUj5GXPjoh1wVRvMd++9HwE/z8J8OK79bg4VPLOgC1BWrK1WIw83zpcQzBV5L54k 1IJQoKhzoRi5a7qaITHYNL0MbW291Z/aBbdmJEhl0bP2Ca/ZY9LjLn9acLCKVxFgHHooSp yUrZNiZNRWyZeV8eCtG0nXYcUzAL5Z3Gd/vcTMubfcshQn/oWrMNzVq0a5xOPNkzenZ5YZ 1jOqnc5/q6MYqRMANsiRvgos0AlrBg9Djg4VV2MzqOIvmC29MIONwySFhUMtIm652xlcrV izd5zzcLYFWRzC+tOuCIf/GLquW0iWPUjNi9fnUf0BYVqsHX4WRm+fM2DZxymQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692168381; a=rsa-sha256; cv=none; b=Yq943riSxyPC7JEN5U6tBmyKNTf0T8TBjy3eWgA+NlwxBEEHFRAjA9wFnakDAhkqaGNSvT bmbGP6Xc89gY5K/8CIIHtAztsyl2CS+ZevhA5oHRi+fNgGjJpGyKzcdmAdxQTS6h1To01Z 5L5Sm5FmfmOHrNuRvRn3efIOmuWVEFc0h9BZ/PDmHuUj33s3YnEjZViFmhY3rQXwXOyrm+ kl/IOVrDu/HTxcmZ/KgPxQB0NvP3Staa38l8llYYR+jv3bcVh26dQGYJWsuyOCPV7lF4B+ +EJAX9shNqEBJSL7qRV0+EUD5JHj3Yy8vaI5H+MsRMlp23BCD8+7Glnu0Y+YsA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RQdvd2zWvzhRP; Wed, 16 Aug 2023 06:46:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37G6kLDQ042107; Wed, 16 Aug 2023 06:46:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37G6kL1N042104; Wed, 16 Aug 2023 06:46:21 GMT (envelope-from git) Date: Wed, 16 Aug 2023 06:46:21 GMT Message-Id: <202308160646.37G6kL1N042104@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org From: Sergio Carlavilla Delgado Subject: git: a13f1bb93209 - internal/admin - Safekeep dwmalone's src bit following commit bit expiration policy List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: carlavilla X-Git-Repository: src X-Git-Refname: refs/internal/admin X-Git-Reftype: branch X-Git-Commit: a13f1bb9320930259b0dd68fa69ef03d223426f5 Auto-Submitted: auto-generated The branch internal/admin has been updated by carlavilla: URL: https://cgit.FreeBSD.org/src/commit/?id=a13f1bb9320930259b0dd68fa69ef03d223426f5 commit a13f1bb9320930259b0dd68fa69ef03d223426f5 Author: Sergio Carlavilla Delgado AuthorDate: 2023-08-16 06:46:08 +0000 Commit: Sergio Carlavilla Delgado CommitDate: 2023-08-16 06:46:08 +0000 Safekeep dwmalone's src bit following commit bit expiration policy Thank you for your years of service as an src committer With a goal of maintaining security on FreeBSD project infrastructure, the Core Team has decided to consistently apply the commit bit expiration policy[1] and disable access for inactive accounts. [1] https://www.freebsd.org/internal/expire-bits/ Approved by: core (implicit) --- access | 1 - 1 file changed, 1 deletion(-) diff --git a/access b/access index 65c95f73f397..bc836a11c46e 100644 --- a/access +++ b/access @@ -58,7 +58,6 @@ donner dougm dsl dteske -dwmalone dwmalone=freebsd-committers@maths.tcd.ie emaste erj eugen From nobody Wed Aug 16 06:47:24 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RQdwr3zVpz4qJxD for ; Wed, 16 Aug 2023 06:47:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RQdwr3Sycz3PNB; Wed, 16 Aug 2023 06:47:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692168444; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=PT7hkHmg+K8ac0/HjvoBz+QRgI6CLty6rm16Kh+UHf8=; b=J/13t9g8GN+XOoW8+jSuMbGTKEEG6vNngRM/rVtUMpch0JoqNrsuZ2ZgpZo063NPxRoMeH +KhFBfxTOaCheF9aHd+39TVZpz8Yg5ApwZ14l1X+rdxVpV/O7XrpJXs68W9QVi/CJZA54H 51RTzNqHGOKv+zz6P21L5jf07E8to/sQd8415Khb537AbageFm1qxd2kFgIWCcbNSKjJNy QUfS0vf5p8iB/7F7YypCo4Hg+gHS52S554TA3r0AKenfhVyXiva43CLpO7mLL35d0YSMt0 Djf40HnL38ntn7QiSw4iM1EGKa+JO1bSwuiHpRl04mapsOjafMzKwYT9JZxcSA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692168444; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=PT7hkHmg+K8ac0/HjvoBz+QRgI6CLty6rm16Kh+UHf8=; b=G/xlGWU1iRy27ojVIHHjoLlrDpx1EjA+DwCNIF1o2L3pQGShZxbptP6SlnUIqMcpKK29hn WS1IXDb+RozjyXhumSm1gkRp3RJVPUmgcvPjbA4jRxBLlK43/d0brBXGxsNTrkWXnCFw5B mKGG/DiY7TxtnvI0/2+YAlfTn0mcbNg4JsmTc32Ime7ZzRwTHlULSo4tUQW2qfd1xVuTuN XzwRgoOX0GTPzf9kcLCaN4a21SZaiM47LlvGsewZQJdkiM5sAOGaRKipcCImylswXUOxV3 gvq/EKtWuedUNQbjYHyutxsDh1iOS3fn76Lt4dODiYZ2BZhBkhab+Z7ewUuxag== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692168444; a=rsa-sha256; cv=none; b=Z/aI1H6QGRHdr7gW5dGF7Q9hOCoApMald8Jk0IPQ/bwGD+5jbrJfWm4JUFLlccTMthyDj3 jHChooB4gc8h4YPdM47d1NHgkgiYvp6s4KfvwFzGFuczs+PGY+yIhtMYRmtaLQ4QEhftgH pm/HtM8DQnnfaI798T9hJy+HHuyj2KSjnSyA0lnQ4B3N3ANa03qLGDYYCQJAZfa9CS6yex ExIPd8esBffmqTdn6ncCSEUtkatYGRskNWpDp8CjtT57wBtU4lnEKzRCZuJ6NJtU1FpI// HBXjAvnxqzHyYUaJhOg+Hd7dy81dc9GMjmcow38Ivkd+i8d2NueuuWIdbosggA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RQdwr2WrqzhRQ; Wed, 16 Aug 2023 06:47:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37G6lOiL042399; Wed, 16 Aug 2023 06:47:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37G6lOnc042396; Wed, 16 Aug 2023 06:47:24 GMT (envelope-from git) Date: Wed, 16 Aug 2023 06:47:24 GMT Message-Id: <202308160647.37G6lOnc042396@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org From: Sergio Carlavilla Delgado Subject: git: 9152eb23006d - internal/admin - Safekeep ray's src bit following commit bit expiration policy List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: carlavilla X-Git-Repository: src X-Git-Refname: refs/internal/admin X-Git-Reftype: branch X-Git-Commit: 9152eb23006dccc302b3342d3fffa1bbf4e47fec Auto-Submitted: auto-generated The branch internal/admin has been updated by carlavilla: URL: https://cgit.FreeBSD.org/src/commit/?id=9152eb23006dccc302b3342d3fffa1bbf4e47fec commit 9152eb23006dccc302b3342d3fffa1bbf4e47fec Author: Sergio Carlavilla Delgado AuthorDate: 2023-08-16 06:47:03 +0000 Commit: Sergio Carlavilla Delgado CommitDate: 2023-08-16 06:47:03 +0000 Safekeep ray's src bit following commit bit expiration policy Thank you for your years of service as an src committer With a goal of maintaining security on FreeBSD project infrastructure, the Core Team has decided to consistently apply the commit bit expiration policy[1] and disable access for inactive accounts. [1] https://www.freebsd.org/internal/expire-bits/ Approved by: core (implicit) --- access | 1 - 1 file changed, 1 deletion(-) diff --git a/access b/access index bc836a11c46e..9bbdae3e7628 100644 --- a/access +++ b/access @@ -133,7 +133,6 @@ pho pjd pstef ram -ray rew rmacklem royger From nobody Wed Aug 16 07:25:55 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RQfnJ1rNBz4qM7v; Wed, 16 Aug 2023 07:25: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RQfnJ10r1z3W3N; Wed, 16 Aug 2023 07:25:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692170756; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ak3uqk/FX0mOIagXwt6NTJY6vPqfVqgKQkLazFw6trM=; b=bfxxMp8PAT3pyxibPBtna+eN61Ain78yiPAyhtvyabjBJb1DXD2ROfBfACfDF2Ihroqgkp JcSg+P7VgegL0+jORfBmGZcuCwWm2h1SKSpgyuVHiz9xZLkzPPYRxaZpn4M0sOLkTlKV1O gMq2hmfhSbIO7FEEsGX5aqSV+DILC2pm1eNoQofbCTt0VdOuiM1Zb0k9Kkk+qhSdtOPdgx jdGEtgT4kIqO7UbRw/vp0ABAi69hN8+vGleVcd05Cs2pn9Y4jzyvwCzoY6gEbWD2vtjm47 4OMqWbIX53l7oam/NIEcZOx5LbTra6BWVtFsFbPSC2NY7Y8/v0FRhOS94eWseg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692170756; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ak3uqk/FX0mOIagXwt6NTJY6vPqfVqgKQkLazFw6trM=; b=WiIFu4hXiQrU7BsXCpVYzVU3w2o22RmzVMxbCAILZzKxqrBeGp0lpZAICyLDzswwA0kyvh EIXJ+2RswjLm1B/62yjNZAnXf6tE7EYLncKOBY7l+a4hSHI9p7N9J71Jf/b9RJYcbWfnPA lyGufHBLXKHzIsLa46xJr/lP2CGkt3WcP+PCjeLng9WDxvdwaXj0meMHjCunwnF7t+9HAi Ub+xM+LFb4B8uoi2PkjUh55EAfNCBof9IlQ2DJM/ENPJ0MIcnn/U8t8dJaNexQznks+oO1 Xt06cpUeuQ5Jjxqazn/V9VHZl3iWl90UpWNRtoiJ9vj9SwCY4IThNnr5o3UxWQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692170756; a=rsa-sha256; cv=none; b=VQfWaBkkpJNaI5ZOTg99omONEzTTGeFyxwG8niLvkuGOGVdhfl4po8l5BboMI/E8RsUW28 YGBtWTtlzKMmoZbmJHX8rKUeTXbaQ+cj+hzyvJwokl+4kAVZNSUHG9nj3VMHc3vf7bmo8Z 50O7gAo6FtNf9kEqWToyx064+qvvRcdcj3qpvmP71gn63RhD9QO5NR/tFL2ILtoWaBVezk URXPKKTSE9knwejmwO/kvv1Kq6MarZ6NkCx7ve8iO2OlTcUqwEqM5cZ6bFX0BqMDSnzCez 2UNohnr3ohst+oNd2qWKYMckM9wJQ3e5k0mEtU8Qtjw8/wlyff+bCri/s4IMxQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RQfnH6xQdzk7H; Wed, 16 Aug 2023 07:25:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37G7PtqL009527; Wed, 16 Aug 2023 07:25:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37G7PtIU009524; Wed, 16 Aug 2023 07:25:55 GMT (envelope-from git) Date: Wed, 16 Aug 2023 07:25:55 GMT Message-Id: <202308160725.37G7PtIU009524@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: bed13771a359 - main - generate-hfs.sh: don't embed $FreeBSD$ in generated code List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: bed13771a3596e9501adec2f133db1b511c05b7e Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=bed13771a3596e9501adec2f133db1b511c05b7e commit bed13771a3596e9501adec2f133db1b511c05b7e Author: Warner Losh AuthorDate: 2023-08-16 07:24:03 +0000 Commit: Warner Losh CommitDate: 2023-08-16 07:24:40 +0000 generate-hfs.sh: don't embed $FreeBSD$ in generated code Sponsored by: Netflix --- stand/powerpc/boot1.chrp/generate-hfs.sh | 2 -- 1 file changed, 2 deletions(-) diff --git a/stand/powerpc/boot1.chrp/generate-hfs.sh b/stand/powerpc/boot1.chrp/generate-hfs.sh index ef368d1566b4..4ecebfb305b9 100755 --- a/stand/powerpc/boot1.chrp/generate-hfs.sh +++ b/stand/powerpc/boot1.chrp/generate-hfs.sh @@ -50,14 +50,12 @@ BOOTINFO_OFFSET=$(echo 0x$BOOTINFO_OFFSET | awk '{printf("%x\n",$1/512);}') BOOT1_OFFSET=$(echo 0x$BOOT1_OFFSET | awk '{printf("%x\n",$1/512);}') echo '# This file autogenerated by generate-hfs.sh - DO NOT EDIT' > Makefile.hfs -echo '# $FreeBSD$' >> Makefile.hfs echo "BOOTINFO_OFFSET=0x$BOOTINFO_OFFSET" >> Makefile.hfs echo "BOOT1_OFFSET=0x$BOOT1_OFFSET" >> Makefile.hfs bzip2 $OUTPUT_FILE echo 'HFS template boot filesystem created by generate-hfs.sh' > $OUTPUT_FILE.bz2.uu echo 'DO NOT EDIT' >> $OUTPUT_FILE.bz2.uu -echo '$FreeBSD$' >> $OUTPUT_FILE.bz2.uu uuencode $OUTPUT_FILE.bz2 $OUTPUT_FILE.bz2 >> $OUTPUT_FILE.bz2.uu rm $OUTPUT_FILE.bz2 From nobody Wed Aug 16 07:30:48 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RQftw6C5tz4qM3g; Wed, 16 Aug 2023 07:30:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RQftw5Vtbz3WbK; Wed, 16 Aug 2023 07:30:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692171048; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XZ1mUfP+PzGY8eYuDrKEDl7OkPV5D58cYLOO9BTlnEE=; b=C68cwk2pw+grxMaroPzgjDjA8xy6HZH/wGTZ2INU58XNth/YCmaK6TboZhIPOrsgqX1aHt SFnvcuFo0F1b5LSatJPBjA1b5klEuqOHadEAbzItSmcfVAnXtmF1ByUJ2ACksu1Td6gUau 3335Gze/qYPs6GTg13UoSCIN91XsW3dxQpIiEu8xeQIR0eoVpn3i04cyK4qCktXyroi+DD iCjTtI47MMPVmattj+VVyGicfv1s4pr0RNexyY1uOF8VY9QWGSePfnAoxlA8BXfvaBlv3a C+Z1eQ5ag0hZyOmVetuT9bztbG+vZvQylcX+9/vstKK9WObl3+4zB9vENozl2g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692171048; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XZ1mUfP+PzGY8eYuDrKEDl7OkPV5D58cYLOO9BTlnEE=; b=HdEL981sgX/Xhxxf1UlkBWCfRBui2hmW6bmn2aBypKlYV34Wf6wi0oIWAMFyO17iS5rpxn AP7FyuMYZFhCf9liGQFnSKkS1A+tNhUEilfyKjfP78MMW9VoKG/XTVi4keRmtzfU25KNyS nE8QusoKpyRUDTxb3dLgQ9oon5ua2YTpD1fchPzM/U0Vk/+PhAYCPu0IkeiHkWI300Pppy DbMFRVGP03dWX7BzpzWDzWmyGS7VMGGCRXU+Zi2be1K8dUp5hZIJW0WXKa+tluq7cGWMqs qWH1JE5m5c3jljNHuBHBudlIrOnf5ilsfxqNNwvnCPXr0sGzb9aVSWkJrB2tqw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692171048; a=rsa-sha256; cv=none; b=j0dDJsn1HxQqybR89ESc8Th6bVGEqgpuaOFa1C7fgCBXi87CjJOADe2Ga1wK/saAetyUJC N5/Q0aN1lZ9if61h+J2FgGCcR4nNJFyvAISQFh/sDEs77B2vEjcNJcQ9dWooMheSUAfkGY OZP26qsV3cgbeKqTfkgmoSHXENBritQExupLMVdKJZ0LeeTOvA4DRarReqJB2el2RNxhW+ drGwxK5999pLxujhGrboTQ02FZToVO5LSEVklUbyPumphbFvrYj60Y2kK5ZIIdAZSmh4H6 pJN5VwPv5FWA3hb9ehTsH1vcmH9M+pSn/k5j1gWqKa7/7cb8tMxibXzaxGbiFg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RQftw4cCvzjtF; Wed, 16 Aug 2023 07:30:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37G7Um6b020584; Wed, 16 Aug 2023 07:30:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37G7Umwk020582; Wed, 16 Aug 2023 07:30:48 GMT (envelope-from git) Date: Wed, 16 Aug 2023 07:30:48 GMT Message-Id: <202308160730.37G7Umwk020582@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: fba400ef51d5 - main - ps3: Don't add $FreeBSD$ to generated file List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: fba400ef51d5e5701f752000e62e3a9dd59ab751 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=fba400ef51d5e5701f752000e62e3a9dd59ab751 commit fba400ef51d5e5701f752000e62e3a9dd59ab751 Author: Warner Losh AuthorDate: 2023-08-16 07:30:04 +0000 Commit: Warner Losh CommitDate: 2023-08-16 07:30:34 +0000 ps3: Don't add $FreeBSD$ to generated file Sponsored by: Netflix --- sys/powerpc/ps3/ps3-hv-asm.awk | 1 - 1 file changed, 1 deletion(-) diff --git a/sys/powerpc/ps3/ps3-hv-asm.awk b/sys/powerpc/ps3/ps3-hv-asm.awk index 8b8165bde66d..21241a82773e 100644 --- a/sys/powerpc/ps3/ps3-hv-asm.awk +++ b/sys/powerpc/ps3/ps3-hv-asm.awk @@ -9,7 +9,6 @@ # $FreeBSD$ BEGIN { - printf("/* $FreeBSD$ */\n\n"); printf("#include \n\n"); printf("#define hc .long 0x44000022\n\n"); } From nobody Wed Aug 16 07:38:37 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RQg3y150hz4qMYZ; Wed, 16 Aug 2023 07:38: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RQg3x6FnTz3YJb; Wed, 16 Aug 2023 07:38:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692171517; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=m1AR7et88672Ga/+JSox+6Sv2jEDEZfS3Ud8fAWhyOY=; b=qje5ZJPfbQk8CyTP4Qc41qzAVf6W6uW3x95A/pnxDmXM6cx0m9g734yVGgAjwqpPcH/CWC FfpYuIMaedRxom9F1/OwZ26LU3aaJVlhn3yq3EwugUU7uhAkj4TNS8QseGOJkm71sNBFPX fNPGkFZuogaCjrokfjK2EcG6AOx9py/ctChwrz3ZpfVcGW1CMKC4P3CLHfyeZ72IO6N/LT h56MQXq8po58uBKFSKIVulcBLkdNEWTZxR1iHRZF75ORgp5+PbBUIdJt/6miMRJ9HlZ+cJ sOKIiNnktm2TJJX586zt1UyIlcEB3bQjXbtjqFSUA7X+vhlY/j/f5PolpqRAgQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692171517; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=m1AR7et88672Ga/+JSox+6Sv2jEDEZfS3Ud8fAWhyOY=; b=NByzxpeS9Wbm+ROWWhRMbXqCk/qGAeL5Uj2kUu3y/oQ658ZZj7ys/Pl7S3Vl4mwt5SYuk9 4raWSjh+/dSo6miLDHsPFj5OnnC4B4oGh3IHKM7KQtOIEYG7RvZ9aseti0P3nzQxR8Rdqz Cch5RCdYoCoL7OFhh7mW07SRF/r0zPo6IWxLXy9g5i0M81+sqJcC2vHqRpbh303UZFStwO eKE8Hk/RH71FzdtES2WiUwvi1c9SNGT8EpSp3vLsx9qZaBBO0ujycHMylu55ZkCYHwTAyq wHRqRzeKsn7nhXVvcenX9qahcq5q8TBiaHA9Y+iPFTl5ld344HtJO85gPnqpRQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692171517; a=rsa-sha256; cv=none; b=R0TtAPCS0Do2A3LsnBVcj1MkpkLo+P+C2Tn7X8HvpHgImi3GCwuPbp/4gUcfDCs0UV6TGx yf1dxqws1CM1rBTetne5PE0DXvjMAndIxUOjH6yHWPEv3MWBqjtDSkfJShJqdmW1lperqR tMokyJMHw8pP74+KSf3STRR9qR/KbXUs9jictV4SsC8l7JuB/1pDZGBZfR2V96I56m4GWv By1wukuvEL+NmhEFvXTZDdIeqx8BGrUzlK4UT70LY4EaxDWA7EqYRZRVcNz2nxRWkQMVaX zI+wKE4QBylmtJu+yHc1T8foKWhcN+Dq2TqsGyTP14T8RiAfHwJ4Y6pdRZ3+Qg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RQg3x5M3zzjs8; Wed, 16 Aug 2023 07:38:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37G7cb8m026560; Wed, 16 Aug 2023 07:38:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37G7cbRa026557; Wed, 16 Aug 2023 07:38:37 GMT (envelope-from git) Date: Wed, 16 Aug 2023 07:38:37 GMT Message-Id: <202308160738.37G7cbRa026557@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: 19fae0f66023 - main - cursor.bdf: Remove $FreeBSD$ tag List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 19fae0f66023a97a9b464b3beeeabb2081f575b3 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=19fae0f66023a97a9b464b3beeeabb2081f575b3 commit 19fae0f66023a97a9b464b3beeeabb2081f575b3 Author: Warner Losh AuthorDate: 2023-08-16 07:36:00 +0000 Commit: Warner Losh CommitDate: 2023-08-16 07:36:00 +0000 cursor.bdf: Remove $FreeBSD$ tag Remove $FreeBSD$ tag COMMENT Sponsored by: Netflix --- sys/dev/syscons/fonts/cursor.bdf | 2 -- 1 file changed, 2 deletions(-) diff --git a/sys/dev/syscons/fonts/cursor.bdf b/sys/dev/syscons/fonts/cursor.bdf index 08b90009faea..125ccb4a283f 100644 --- a/sys/dev/syscons/fonts/cursor.bdf +++ b/sys/dev/syscons/fonts/cursor.bdf @@ -1,7 +1,5 @@ STARTFONT 2.1 COMMENT -COMMENT $FreeBSD$ -COMMENT COMMENT Mouse cursors for syscons. All except some unused ones are the COMMENT main 10x16 one scaled down to 9x13 and/or scaled to minimize COMMENT distortion with non-square pixels. Details of the scaling are From nobody Wed Aug 16 07:38:38 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RQg3z0f3cz4qMQ0; Wed, 16 Aug 2023 07:38:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RQg3z0973z3YP7; Wed, 16 Aug 2023 07:38:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692171519; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Mr7Oq8hovlEg0evEgzOSCCkwMQCxM5r72Y2muGXX81o=; b=BJc1E48kQTdNCkfFEVh3yZq6SC7yumoKpppQz/GXCMoFWmVxIei6gYGnQP49Ppbag6UVXV b8t6Ssn+9kjgebCXgKYWquuD+GcDHGOku7r8G5IV0HBBU8JZoypSSZ8FwQwFYWCCyq60eq SmWi8Ov+68afJPzytRd4H6NdEFm7NNUEkQOwpRHpaCd2k1yjAerOqQVu5zivfEiR+5nIF4 mCoxYtgqas1NHFud4p0dILcV/Zc6xSSU3b00LEDapab4eZ5+QuHcs/k2A0ajlLWk1N3LQI kw3hsYv7dV0Ry7KYxLmffj8DedUw7iBLta6s/x50SJJNhvI/LfmLH4kXmd1fZQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692171519; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Mr7Oq8hovlEg0evEgzOSCCkwMQCxM5r72Y2muGXX81o=; b=wIpsSKKD1sqG2c+y6Yyt10k31OGv4BYKP0iAZ5dbG6Aq5Mp/nAjllxSAnFWq8D6OqR2rs6 Bmk2AYwSt/n+GXMbuHS9xeYDFHOuYPMakTcFNC5VV2pJ5C/kWPRxjAPqqa+BO99Rm41BXY kzFr2WXgycL09Rt/Svkw7A3k1XppiMdBjXofbI/6mJsuEgSzkg9J33LMQURdn8uUeV2ojg Ts6uVEcuuKso6Qw3dy0nHEXvAE8G/j5Psl+iIoT/8To9r2mg2fp3z6H+hlJ9zABeQ313Fj M3JA0cB+h2zhNPOE61WYQualzq2WFen8uXr6LkvevvijfV/laXOAOEAaO23mBQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692171519; a=rsa-sha256; cv=none; b=HBHoy9XWY6OEMnZnZ3trop58KVLfQvKOW9Cl0P+C+1xLDGnnNDvFiblVbgH3eurNOvQy6/ Jam2k0XZtn4j1f+9gT8agbLrkiwr31DEpTy/QFE4aMbD8q+0J436ugsIORvMygu+gTlFvA leoEyKc5cvumlr+yNf6o9q6G4VhIg2CAu2c1iRfYvrFUzd0fTY2IHiWgdD2c817swuMC2i KRYZEkl8vBqHt+1Ecwqzft0LvSxfpTLIa/00DX8DYLtEQtSQCJYyfGvAZp98OCw85O8TJb X92+ol+9z5vsuRnt43fZKF/iMeoIJ9oVMFDsULFjgqBODxcsCWycB0uokoFkkg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RQg3y6Kx9zjtm; Wed, 16 Aug 2023 07:38:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37G7cc9F026599; Wed, 16 Aug 2023 07:38:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37G7ccoe026596; Wed, 16 Aug 2023 07:38:38 GMT (envelope-from git) Date: Wed, 16 Aug 2023 07:38:38 GMT Message-Id: <202308160738.37G7ccoe026596@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: be6151e43cff - main - mpool: Remove $FreeBSD$ comment List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: be6151e43cffa86cea04212ccb212222e608614e Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=be6151e43cffa86cea04212ccb212222e608614e commit be6151e43cffa86cea04212ccb212222e608614e Author: Warner Losh AuthorDate: 2023-08-16 07:37:16 +0000 Commit: Warner Losh CommitDate: 2023-08-16 07:37:16 +0000 mpool: Remove $FreeBSD$ comment Remove non-standard $FreeBSD$ comment. It's not useful Sponsored by: Netflix --- lib/libc/db/mpool/mpool.libtp | 1 - 1 file changed, 1 deletion(-) diff --git a/lib/libc/db/mpool/mpool.libtp b/lib/libc/db/mpool/mpool.libtp index bcd827dce29d..b4e893a9987d 100644 --- a/lib/libc/db/mpool/mpool.libtp +++ b/lib/libc/db/mpool/mpool.libtp @@ -1,6 +1,5 @@ /****************************************************************************** -VERSION $FreeBSD$ PACKAGE: User Level Shared Memory Manager DESCRIPTION: From nobody Wed Aug 16 07:47:35 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RQgGH5353z4qMtR; Wed, 16 Aug 2023 07:47: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RQgGH4Qc1z3ZrG; Wed, 16 Aug 2023 07:47:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692172055; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=IiJFGzpB8KCJ7F1cWwUFg0hMYe13LerXP+MpChAmeHw=; b=rjj+055bTZ0oUaG4M05TFujnZ54x4gt9thMrWXrDfBNRM8TjF9arfLJLMBsn6GO7MORYP6 ABqGEMQNQh4efU9WDB0AtLoPfXIOdx7oVtXCD3bVtWONhbZ1mOSg1/n3n0oxANNCM9Hgx6 KvQJk/h1vGVt8+oHdtYt5alY8MAj+A78xF7bTrQIftO29UDHxpofBc2zh1YQDFxPQPmo1L hnFRX3AYNKYQ+M6dX3AIKppLQ5f7Up5WzRbJ7cvgAIHaOJ8wZDK5ai+BKz/9UyGBoBDFiu h4bOmMEX0Pq6mgoZdjH8m1HPYaMlBsnizkP1JEX1rlDqEc6ATZOfR9Ibu9pjRQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692172055; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=IiJFGzpB8KCJ7F1cWwUFg0hMYe13LerXP+MpChAmeHw=; b=xamRptvv8n2juRXgDH4+g3RKWNcIT6zq6N3iGlhtQxI8HnTlSJWBoqA3VpudETabj1yR7N sBgSVeLrKnkYLb0qecpi/LA1mnv/qMvSO0Xzc6V6TOYulh4nJNDl9nc/LqS95LmjXtz8nE bNXyCN4niVkyCunia6ejG0r6+aJgJB0OnHGtBSHcgx23XjS/eMeq37OloeYCpAunEPbuHp auTlvFcO4l7uZBeiXeMPzq0LBdsgiCkmqo64+VOGt25bi/LoqtOYm0EnKg5bNnga6A7LrP t7akP73eDK3IOMruWHJdC6PHeXd119YwFJgI7OpjKCnGEHtJPBQATrFsXFkw4g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692172055; a=rsa-sha256; cv=none; b=dIbVUmzvUdLqMql5COlE9C6lEwOxFXQM66CZfXJAgWuyhjrJ2sywt9lc8usu8uMifJ5eAV SS2cxc24wXkphE3Xg2/Ozyi7Zb/w/vaCjQYqur29nG6GZidlQwvj0C49B7NWXQgg7z5s+/ 21ZYCG2pykbjp60swbAws7JzK2EnUDQnMdxR4GZjL+A7/xOWFA0Gc3gi+MREpvnZ2E4o91 R3lJhTmPKJZaYdT0iJEqMy92QgEqBsoItYgc1WXbiIXfTCghuRP9Q5hZCJxrqQictLhaJo WmZbCATChyNoS+v5CXveLKwa99d5tYPNpzA9kal5h1VNxsboVBbCh9ytagk50g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RQgGH3NLCzkL0; Wed, 16 Aug 2023 07:47:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37G7lZRD043174; Wed, 16 Aug 2023 07:47:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37G7lZtG043171; Wed, 16 Aug 2023 07:47:35 GMT (envelope-from git) Date: Wed, 16 Aug 2023 07:47:35 GMT Message-Id: <202308160747.37G7lZtG043171@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: c25155762166 - main - glob.h: Remove $FreeBSD$ List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c25155762166bd03329667e525b2e2c1253a4d6a Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=c25155762166bd03329667e525b2e2c1253a4d6a commit c25155762166bd03329667e525b2e2c1253a4d6a Author: Warner Losh AuthorDate: 2023-08-16 07:42:14 +0000 Commit: Warner Losh CommitDate: 2023-08-16 07:46:21 +0000 glob.h: Remove $FreeBSD$ This likely documented where this file was copied, but the $FreeBSD$ tag was lost as soon as it was committed. Just remove it. Also remove the one that looked like it was intended to track versions. That will simplify the MFC. Sponsored by: Netflix --- lib/libc/gen/glob-compat11.h | 2 -- 1 file changed, 2 deletions(-) diff --git a/lib/libc/gen/glob-compat11.h b/lib/libc/gen/glob-compat11.h index d43086f819c5..720f3fab36f9 100644 --- a/lib/libc/gen/glob-compat11.h +++ b/lib/libc/gen/glob-compat11.h @@ -30,8 +30,6 @@ * SUCH DAMAGE. * * @(#)glob.h 8.1 (Berkeley) 6/2/93 - * from: $FreeBSD$ - * $FreeBSD$ */ #ifndef _GLOB_COMPAT11_H_ From nobody Wed Aug 16 07:47:36 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RQgGJ5W2kz4qMtV; Wed, 16 Aug 2023 07:47: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RQgGJ4zMKz3Ztq; Wed, 16 Aug 2023 07:47:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692172056; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XTT/89jebF6EEC3i4oqRbkrOfNnePlwOHo4gf2WJahE=; b=diL4myvf7D+Xqbncli4n4o2VLeaPIaCZzLSIg6oecUAClk669K6ffpIRpMSP7cwmDjnXpw UnZD8aCHII9IO/VAtFZ3Wf4Z6ASosPy6ai8xMpCfes1d3/1vGKYIKwReEyNbeaiChe+zAB JD6TJCjqxt/LxRLyMAvKxOhM2q5HLbmuvK/DLZW5HkeQs6+YxEf30hqdOAunDy3NB8YYRg l2iIP5oocxXadaBW4xfgoQTAZPIspelEaNQZ55zFtWuWx+yXCIEt8bW6QnCMyubTUWp/2l 8qa/3nD0sFWbP6UtvSryJe0EFbZU77T2hnvTiRl0Bzk4vEf5Xf1UaMBL68gLbg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692172056; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XTT/89jebF6EEC3i4oqRbkrOfNnePlwOHo4gf2WJahE=; b=KRJut4hdM18Dvg3ol7k8UVAD/3PX7xeMqM9900UnO9XXTQ9MZ1n6Kqzx5rXOGy8zR6ghBO jLchz4DKhqXezk901wqpFfjVmEqktabzuZL2Bo9rAj8ONrMSgGHDLzCyeLe9C1/1+XR12v O2cHRJMav5Poc1fRRliJps5LBTTbhEeIkPnFacPmsf8sN4Z/Y67aDi2cifPKTdNzbkNwjq w9df4z/GMkZHAAYA3j+cTzgszobxqCRGQD0oIBQrDE2JMxJofwZWe5RbJvJNh8LDgBs2fv 8WYxxVTWTAf9kOeCrJ3YrhUybyC3iX6QkyML0ufo9a+/GHbhtuYvGkdCHsZANg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692172056; a=rsa-sha256; cv=none; b=uwcwzAmrGAxCEYclLcUOSI1EXNh9Z384dqnWyr65oZ4kNWU+p3ounS9b8cei54KJs0fLZ8 6DLG8+ZyEUpl3G11CV8RXZDlYzpJkpRY4RozgS98Mes8LruRHjmq9/DaPwVsiJBHUXP4jt Omu5xw54f00jJ/Z3mLYvZXPVG1mogi4U+j3OUaGO1g/Znu0GBv73t7i+6jQkpd4IqJsCBa wynyc/jBst+PlSYoePXmLJkXuV5fnOz936Xb8cEkSaE7krf5f8H+s8uCFNKkNdKs6+TOCr c4l2Zum7NXefiRBPOT+w4YcgMOOsKH/e7pjybNQeUaUFqtj97rC7AtNormKTeg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RQgGJ3rQwzjvH; Wed, 16 Aug 2023 07:47:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37G7lamF043220; Wed, 16 Aug 2023 07:47:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37G7la8T043217; Wed, 16 Aug 2023 07:47:36 GMT (envelope-from git) Date: Wed, 16 Aug 2023 07:47:36 GMT Message-Id: <202308160747.37G7la8T043217@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: 77a999ef2f0c - main - powerpc/ata: Remove non-standard __FBSDID() List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 77a999ef2f0c3003822ef2085752a4373f3af148 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=77a999ef2f0c3003822ef2085752a4373f3af148 commit 77a999ef2f0c3003822ef2085752a4373f3af148 Author: Warner Losh AuthorDate: 2023-08-16 07:42:59 +0000 Commit: Warner Losh CommitDate: 2023-08-16 07:46:47 +0000 powerpc/ata: Remove non-standard __FBSDID() This one has an extra '* ' at the front, so isn't picked up by the scripts Sponsored by: Netflix --- sys/powerpc/powermac/ata_dbdma.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/sys/powerpc/powermac/ata_dbdma.c b/sys/powerpc/powermac/ata_dbdma.c index 65e99e57f68a..ae5a35e60577 100644 --- a/sys/powerpc/powermac/ata_dbdma.c +++ b/sys/powerpc/powermac/ata_dbdma.c @@ -27,9 +27,6 @@ * SUCH DAMAGE. */ -#include -__FBSDID("* $FreeBSD$"); - /* * Common routines for the DMA engine on both the Apple Kauai and MacIO * ATA controllers. From nobody Wed Aug 16 09:17:30 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RQjG24Sh4z4qS3F; Wed, 16 Aug 2023 09:17: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RQjG23b66z4Dx2; Wed, 16 Aug 2023 09:17:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692177450; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7CCQT8BGE1y7XcV4MQ+skuc1Q9vWccxNFB3q9DMbKZQ=; b=anIMTH26VbPBzmdpHzYcnl5m374UoHlAKg+1eg9IhlomroRX5gAd890DFwHbg7/wAMqFzi oKBElsFTv8gUVKraQse4QsOhddA8+faJf7iTZzzuK8knNd0rFIX3mbB8Vbz+eEKIMZYd/e /IT3oodZp7zvdJ+lnm1DjykeF/prqOCKaX38sxtiA45FQaWwCrbQGBUa7pnWC+UTWke3tt K21L/2Fj36wV3MjykeM1SqYyrTqVOvnwY6N0UD2xOp0Uq0L85WxPPWRHtgv97HPao838Ud hb4fShlH6Xyi7+ob0hdRXxf0EvhNW8oiDI23YQOGrrnSLWuSfAIkRDzH4Tb3Jw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692177450; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7CCQT8BGE1y7XcV4MQ+skuc1Q9vWccxNFB3q9DMbKZQ=; b=WmIPhDgbnkDLYDK7x9KhXTbx1VIK9rz0sBa2umRGo0d4Y+PT5GCBop5S8uE0PhJulPGmen Kjrqk0V/AcCr/v/oCnpfeYZRztId+GQrnH+aIutOjb6Qprov+8WYw6wL2tmgzuK+6uQ7X2 cP5PyeJjvL2SeTvNewKY8y8JZDVfVx/X7OmkSfICQdhRaP692wMh35gMdBpOd2mQr/9447 ON8RusDkJaJL42E3Gf7McSGWWFmOumwLovFL0AXG7C+QLvTXijfPm/Ti8cyQd5QBIx6u+4 gQHDemVzrRJ9+ULB1Jsu2ZZ5eY9VXGii9Hn02sx+x36NEpkonlU14AwC30GhHg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692177450; a=rsa-sha256; cv=none; b=fpV0IuLCUlfILSKO15gSwljA/KkKnVrIVTDOIAxVixfdfBimNZeXqXwwk2Qhr5HHeK0wMy VHoRPOXay8F7fvexd/wjxBiVas5C4Dqs2+/aYt7PJk0mbBW7h8olcBd+bFB45QwJ/XMcY/ cgKZEeyB+1BmJ/PvnXCwVSIlogvnHdFC5e6GvnCEpG80df0f8iRsfxFjyS+KxjWm7P38uO mTErgSUEgZvvUzukDahwP9sGEPTJp2BlYv3vIb+3LBKZFLv5oQEgQcYi8cN9JpdCBy7rPv iMGh4rR7nVu+mBEt0i+DE/VVX74k6yTnzQ2lRmHaoiDZQlkX30I2d26OqhELaA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RQjG22Q79zm5D; Wed, 16 Aug 2023 09:17:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37G9HU5O093611; Wed, 16 Aug 2023 09:17:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37G9HUnt093608; Wed, 16 Aug 2023 09:17:30 GMT (envelope-from git) Date: Wed, 16 Aug 2023 09:17:30 GMT Message-Id: <202308160917.37G9HUnt093608@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: b9ccef49d02c - stable/13 - vnode read(2)/write(2): acquire rangelock regardless of do_vn_io_fault() List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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/13 X-Git-Reftype: branch X-Git-Commit: b9ccef49d02c9ad9e3b986347562408d80271b6c Auto-Submitted: auto-generated The branch stable/13 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=b9ccef49d02c9ad9e3b986347562408d80271b6c commit b9ccef49d02c9ad9e3b986347562408d80271b6c Author: Konstantin Belousov AuthorDate: 2023-07-23 15:55:50 +0000 Commit: Konstantin Belousov CommitDate: 2023-08-16 09:16:09 +0000 vnode read(2)/write(2): acquire rangelock regardless of do_vn_io_fault() PR: 272678 (cherry picked from commit 5b353925ff61b9ddb97bb453ba75278b578ed7d9) --- sys/kern/vfs_vnops.c | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/sys/kern/vfs_vnops.c b/sys/kern/vfs_vnops.c index 8f618a9ad46d..42080181d094 100644 --- a/sys/kern/vfs_vnops.c +++ b/sys/kern/vfs_vnops.c @@ -1442,6 +1442,7 @@ vn_io_fault(struct file *fp, struct uio *uio, struct ucred *active_cred, void *rl_cookie; struct vn_io_fault_args args; int error; + bool rl_locked; doio = uio->uio_rw == UIO_READ ? vn_read : vn_write; vp = fp->f_vnode; @@ -1464,12 +1465,7 @@ vn_io_fault(struct file *fp, struct uio *uio, struct ucred *active_cred, } foffset_lock_uio(fp, uio, flags); - if (do_vn_io_fault(vp, uio)) { - args.kind = VN_IO_FAULT_FOP; - args.args.fop_args.fp = fp; - args.args.fop_args.doio = doio; - args.cred = active_cred; - args.flags = flags | FOF_OFFSET; + if (vp->v_type == VREG) { if (uio->uio_rw == UIO_READ) { rl_cookie = vn_rangelock_rlock(vp, uio->uio_offset, uio->uio_offset + uio->uio_resid); @@ -1481,11 +1477,22 @@ vn_io_fault(struct file *fp, struct uio *uio, struct ucred *active_cred, rl_cookie = vn_rangelock_wlock(vp, uio->uio_offset, uio->uio_offset + uio->uio_resid); } + rl_locked = true; + } else { + rl_locked = false; + } + if (do_vn_io_fault(vp, uio)) { + args.kind = VN_IO_FAULT_FOP; + args.args.fop_args.fp = fp; + args.args.fop_args.doio = doio; + args.cred = active_cred; + args.flags = flags | FOF_OFFSET; error = vn_io_fault1(vp, uio, &args, td); - vn_rangelock_unlock(vp, rl_cookie); } else { error = doio(fp, uio, active_cred, flags | FOF_OFFSET, td); } + if (rl_locked) + vn_rangelock_unlock(vp, rl_cookie); foffset_unlock_uio(fp, uio, flags); return (error); } From nobody Wed Aug 16 09:17:31 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RQjG34mnDz4qS3G; Wed, 16 Aug 2023 09:17: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RQjG3492hz4FH4; Wed, 16 Aug 2023 09:17:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692177451; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=QubN6wewfC3qcBT537985FxaZ167GqdaNitI/xK+JsA=; b=kPlJ9p6QBDOWZNVno60bQmwwKx5OjoxBKtATTz4Khg1c3Tkxk/ce7bWGt5CUPB9uM3RVUE RJcaweS/vI2VWYqCTgAQ5/oBHxAvaFjr5LbE7znnwx3G1iX6GJ7UA6b+MNCnZ49sJeYGSE 1V7gtrtM7XRrR0YJ703A5PDP6Odzi7rme9SCFBkd1SxZIulHZfIrxcWU2Ku2rKKO9xGh2A 6b4QmvpxIMmUmdRWjgiAP9ZrY5JWIzvGGkussxVMDOGbIfpZLO24reRwDiWgbsW1+vZJka DCoQJcdBbi5OkMmKguA49HfTlR/lioun4vBlGlTDpYp/nzk3cvRIj8oYDAaGzw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692177451; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=QubN6wewfC3qcBT537985FxaZ167GqdaNitI/xK+JsA=; b=d7tgYvtZoqkyasq1kHqf53LXhbC1jioIOGNVUwFUhqLxSpi/MmVe+NdIja3zcNn8oNoJov bN6Z2FXUY/LxK2eN6llKSTUQAtCi/hJ4Kp3rV12jnYsDqSlYyfZsP3FaXzP0ed37Xyv+V1 xBC6dKvaN16WvPB4m3TgthoWFx34UvauQEHnoFm34ZtEj64KXNt7cCMwmUmYhh4I3J2WTG lNPfBG310dO4bw8MpIixtqE0No8oXiau8kASZwv3oK5PrTusqdYSSBXGTit6fCFnON93CE lex10RgwA/p9USWVpWu20efQIqVY+hiM/VOB1gZ7ozXS7w3taKz9yw4NeASnxw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692177451; a=rsa-sha256; cv=none; b=XHn75NPakuoUXdalrDN9/OCTMAH7PV0HmhPEA4yVdxEQfxgBDl/4XDr7Z7S+UdI8hkZZfm BBphvYsvJd+xHsIqmdagrwNaOeHmH5RKgAL7vgvY4E2g8GBg2rChnW+rST1iNF+0Pqh28m 0K0dg9Vu4w5LuYh4+8cKitLW8TeVjQypIWQHStvzJBwsCjhmvzRVWN1yVneyWDmhoYUH7k eslpOwnglD4IRwRkGxrInqrvxqbJAWPF/ga3M1JNt1ZZ8rkBqyh2eNfHwofg5H3jQC4k7o sPFlzyALYXiQvXdddSGEktbWBgG2SMMqk/FfQ2dudwc8p9vcV9JntgvLtcXhbw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RQjG32wBMzmVD; Wed, 16 Aug 2023 09:17:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37G9HVMm093662; Wed, 16 Aug 2023 09:17:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37G9HVdr093659; Wed, 16 Aug 2023 09:17:31 GMT (envelope-from git) Date: Wed, 16 Aug 2023 09:17:31 GMT Message-Id: <202308160917.37G9HVdr093659@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: febdac6a879a - stable/13 - Revert "vnode read(2)/write(2): acquire rangelock regardless of do_vn_io_fault()" List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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/13 X-Git-Reftype: branch X-Git-Commit: febdac6a879ab5727d00086fc7c6f295b3036896 Auto-Submitted: auto-generated The branch stable/13 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=febdac6a879ab5727d00086fc7c6f295b3036896 commit febdac6a879ab5727d00086fc7c6f295b3036896 Author: Konstantin Belousov AuthorDate: 2023-08-06 01:23:42 +0000 Commit: Konstantin Belousov CommitDate: 2023-08-16 09:16:09 +0000 Revert "vnode read(2)/write(2): acquire rangelock regardless of do_vn_io_fault()" (cherry picked from commit 651fdc3d198d066b18823db3b74cf38a0144dfac) --- sys/kern/vfs_vnops.c | 21 +++++++-------------- 1 file changed, 7 insertions(+), 14 deletions(-) diff --git a/sys/kern/vfs_vnops.c b/sys/kern/vfs_vnops.c index 42080181d094..8f618a9ad46d 100644 --- a/sys/kern/vfs_vnops.c +++ b/sys/kern/vfs_vnops.c @@ -1442,7 +1442,6 @@ vn_io_fault(struct file *fp, struct uio *uio, struct ucred *active_cred, void *rl_cookie; struct vn_io_fault_args args; int error; - bool rl_locked; doio = uio->uio_rw == UIO_READ ? vn_read : vn_write; vp = fp->f_vnode; @@ -1465,7 +1464,12 @@ vn_io_fault(struct file *fp, struct uio *uio, struct ucred *active_cred, } foffset_lock_uio(fp, uio, flags); - if (vp->v_type == VREG) { + if (do_vn_io_fault(vp, uio)) { + args.kind = VN_IO_FAULT_FOP; + args.args.fop_args.fp = fp; + args.args.fop_args.doio = doio; + args.cred = active_cred; + args.flags = flags | FOF_OFFSET; if (uio->uio_rw == UIO_READ) { rl_cookie = vn_rangelock_rlock(vp, uio->uio_offset, uio->uio_offset + uio->uio_resid); @@ -1477,22 +1481,11 @@ vn_io_fault(struct file *fp, struct uio *uio, struct ucred *active_cred, rl_cookie = vn_rangelock_wlock(vp, uio->uio_offset, uio->uio_offset + uio->uio_resid); } - rl_locked = true; - } else { - rl_locked = false; - } - if (do_vn_io_fault(vp, uio)) { - args.kind = VN_IO_FAULT_FOP; - args.args.fop_args.fp = fp; - args.args.fop_args.doio = doio; - args.cred = active_cred; - args.flags = flags | FOF_OFFSET; error = vn_io_fault1(vp, uio, &args, td); + vn_rangelock_unlock(vp, rl_cookie); } else { error = doio(fp, uio, active_cred, flags | FOF_OFFSET, td); } - if (rl_locked) - vn_rangelock_unlock(vp, rl_cookie); foffset_unlock_uio(fp, uio, flags); return (error); } From nobody Wed Aug 16 09:17:32 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RQjG53F7Rz4qSD0; Wed, 16 Aug 2023 09:17: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RQjG455P4z4F0g; Wed, 16 Aug 2023 09:17:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692177452; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=GrddOUuFDRXzRRSz0Bd0x1Wib4Fc4ioI4HCIQO9dz5Q=; b=elN5eeFEXLS9d+gPXEZRKSlVZ0+JMhL9S6RNu1Uy52Gq/z/GPOvORzAVRrgUgFY3XnOUgt 0veirPEz9eWR6CohOncN6LSet2VDpBhpr5KLEsa7C4xH4PuhfSmCU8jADQ4S83PSWisxVB X1bzlQqk+IOipPLeRDX73VJ+Hj+8LA8i23Lk1aPOOM37VK2K9x+uGCylPO5I5Ay3OH7xV2 zlrapBFxFb0ko4602h1A7SUGBhz2yC5VwXVqDztdmo4x5J8uR/fojyXBpvCNwgV/Ury/kU NkK+nhLm4tBZy4hM66yTFFqZgMtb2Xvr0TTRhCSsh9C7V0ZMzJ8UvhlcTgFHkQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692177452; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=GrddOUuFDRXzRRSz0Bd0x1Wib4Fc4ioI4HCIQO9dz5Q=; b=skpssNCgHNRk1SOPFcstmkKi8715wat1RxhcF2pew2se+pOix3sokEOS8K4QzU4mq5aP9j GrVm4KMzXYykFOHSBSFAkV/cvL7BkJ8Cw9fdeTRULSL/57Un76kpyMAFUeMTcDDcVhAxRd jryO0c3hnn+y+00Gc4Y67kbbTYvYlCqUyioL5oBoSh4tWkSrC6LmVHRhuwmjQWRVTPAWUY GO7RSYbonmidYqjmsYtJkRQ49tWKwkSsdo7hfzeHUm0zFCm68iXRAlhm3vExr6jV8GQOUu nIyhVKpi0whzselUDgybNN/FShoxpE7PhSRgUOk0PbuHT74SnOWlfcSjzPapeg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692177452; a=rsa-sha256; cv=none; b=oWWK5ZHcfC/qzMo6U7zmzatOArnzL1L/iW/ADA58YtKdcUw3R0KR2vO/sgSbIzg5D0ySK7 E1nZEH0YZLgpIUqio5Q14ZoNr46aFg7xpwmcdURrAsVPe5XG2LVwK5cc66j1jTJTeRxHeM 8W/YwU3dPV/OM2Npf8orBBzQZBoLRbajhfLuQ5aAC3bJvoSdfbfV5LDeZdX3xCjo9lsJOG KDfcqti1D0Rg8tUfp8Y1sU2FxfWQgBg7B7YTFuKOJ7/wHB0E1Kho4qu4/iNEhyYtgT7ADk dvOl2XZy1evLhTzLNlPf/Elhz6epKEh+BcsoqFbzn5nkI8c/IznJh4faJj+/rA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RQjG43yq5zm5F; Wed, 16 Aug 2023 09:17:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37G9HWvB093716; Wed, 16 Aug 2023 09:17:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37G9HWej093713; Wed, 16 Aug 2023 09:17:32 GMT (envelope-from git) Date: Wed, 16 Aug 2023 09:17:32 GMT Message-Id: <202308160917.37G9HWej093713@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: ee3b3146293c - stable/13 - vnode io: request range-locking when pgcache reads are enabled List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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/13 X-Git-Reftype: branch X-Git-Commit: ee3b3146293c0dd2e8a779ebb0a3ee65318e8c3b Auto-Submitted: auto-generated The branch stable/13 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=ee3b3146293c0dd2e8a779ebb0a3ee65318e8c3b commit ee3b3146293c0dd2e8a779ebb0a3ee65318e8c3b Author: Konstantin Belousov AuthorDate: 2023-08-06 01:23:35 +0000 Commit: Konstantin Belousov CommitDate: 2023-08-16 09:16:09 +0000 vnode io: request range-locking when pgcache reads are enabled PR: 272678 (cherry picked from commit 821dec4d56a876db56a82cf1dc54a84905b74f5b) --- sys/kern/vfs_vnops.c | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/sys/kern/vfs_vnops.c b/sys/kern/vfs_vnops.c index 8f618a9ad46d..d9bd52c2822e 100644 --- a/sys/kern/vfs_vnops.c +++ b/sys/kern/vfs_vnops.c @@ -1442,6 +1442,7 @@ vn_io_fault(struct file *fp, struct uio *uio, struct ucred *active_cred, void *rl_cookie; struct vn_io_fault_args args; int error; + bool do_io_fault, do_rangelock; doio = uio->uio_rw == UIO_READ ? vn_read : vn_write; vp = fp->f_vnode; @@ -1463,13 +1464,10 @@ vn_io_fault(struct file *fp, struct uio *uio, struct ucred *active_cred, return (EISDIR); } + do_io_fault = do_vn_io_fault(vp, uio); + do_rangelock = do_io_fault || (vn_irflag_read(vp) & VIRF_PGREAD) != 0; foffset_lock_uio(fp, uio, flags); - if (do_vn_io_fault(vp, uio)) { - args.kind = VN_IO_FAULT_FOP; - args.args.fop_args.fp = fp; - args.args.fop_args.doio = doio; - args.cred = active_cred; - args.flags = flags | FOF_OFFSET; + if (do_rangelock) { if (uio->uio_rw == UIO_READ) { rl_cookie = vn_rangelock_rlock(vp, uio->uio_offset, uio->uio_offset + uio->uio_resid); @@ -1481,11 +1479,19 @@ vn_io_fault(struct file *fp, struct uio *uio, struct ucred *active_cred, rl_cookie = vn_rangelock_wlock(vp, uio->uio_offset, uio->uio_offset + uio->uio_resid); } + } + if (do_io_fault) { + args.kind = VN_IO_FAULT_FOP; + args.args.fop_args.fp = fp; + args.args.fop_args.doio = doio; + args.cred = active_cred; + args.flags = flags | FOF_OFFSET; error = vn_io_fault1(vp, uio, &args, td); - vn_rangelock_unlock(vp, rl_cookie); } else { error = doio(fp, uio, active_cred, flags | FOF_OFFSET, td); } + if (do_rangelock) + vn_rangelock_unlock(vp, rl_cookie); foffset_unlock_uio(fp, uio, flags); return (error); } From nobody Wed Aug 16 09:17:33 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RQjG64zfDz4qS5P; Wed, 16 Aug 2023 09:17: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RQjG55pG2z4FHS; Wed, 16 Aug 2023 09:17:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692177453; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fjPdlh0wXyP22A9Kyv/oxrrEjvBt+dTRzVKU3KD/8uY=; b=xEB1IYIM4YqkcVE1NHRzNg8RMGLRkWiE3en84a9OLzvQpXNrEfEpf7X1I6RGovWIC2DdNj RAhpV+IpHXVlyg9hO8gAF5sMkWeKWFzhIrW5pMrrFRtSJG6PRqc2vjbpcJdAaC9mcGy7ST twz+Vb1Zk8pQk6/kO3fBty2V7sN5pkP1xTLv4pIQJJ/2gsglzm9rW+UcWViFJR5YOx4chX A026rSLNTZ5XjQ+54MDXKo/Tw+Ws9tn8yt0mHWoK/BO2Dz8rxOBJrpPVMH1p1eha4xuhWX HgLPk4UvTFp9NhcgpVS2BmtCzcmvdUturAcZhMgwC/GF00GolelzCbII/uv2+w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692177453; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fjPdlh0wXyP22A9Kyv/oxrrEjvBt+dTRzVKU3KD/8uY=; b=YQlNaLIpdd4I4veRXQ2rd+tAgVq7T66tXvJrp9uikkcj1XStc+cIzRiHSI/qvOmsK8Pf+W yOPwkJJs7sG9ZPmBrlw/crkqoMnFQj9BL/W85WftXKuOqsX2VVvE+JzPJG2zVcEmdjTcfU PejyeTc9zoXcRRP+wniqL4OPeK/EDZPGgjvpoLl6Ku2GKvXR6Ymo2C0JRlr7hDUDpUerN3 q8nAtV7x3FiyOi2KA6gyLodRqtzfCKX1OoBjVCkhIRf44A1OnRWx1VkGIwF77re25i1gh8 c+l1lLw6aeTIggXwFqYCGIi/i7c4t+bkLsF3Wa/7Xvv3Muuq+hBnZh5wjy0f5Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692177453; a=rsa-sha256; cv=none; b=MU5NwtbROlKCV6vlXzzrUQ+8MJYTbSzP334lvl8AJeaVh+ER1bgDCuYuH9ayTlnqMKrenr GrK8UP8jr6yTJD9PytdY4hsUFvmnqKrVvCgKBHAcwXjoK3X8BZlbnqDZnqoaISQCoRqcTy OF4QSxQfIdwUnVmAdgAah0abwfi6WpLJnfeDtRdrSXLZOio5Edj67Cm3zXVQASBqRmi9Hr JelinOp1mytcMqmV1fT4Uk6FusXMMs4XnCz4qf94L8hXbCV8XYsTdF7imenta8HTctUbGl 1swsYBlJBj3qw4+NthzWm5/7dkBSa7yqD9/MhKayJAgK2bI5Cu/rmJpYbo+WLA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RQjG54YMRzm0M; Wed, 16 Aug 2023 09:17:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37G9HX5h093775; Wed, 16 Aug 2023 09:17:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37G9HXEm093772; Wed, 16 Aug 2023 09:17:33 GMT (envelope-from git) Date: Wed, 16 Aug 2023 09:17:33 GMT Message-Id: <202308160917.37G9HXEm093772@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: 14e8b328e324 - stable/13 - tmpfs: add a knob to enable pgcache read for mount List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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/13 X-Git-Reftype: branch X-Git-Commit: 14e8b328e3245d9260212ec9e108f7fe23158cd8 Auto-Submitted: auto-generated The branch stable/13 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=14e8b328e3245d9260212ec9e108f7fe23158cd8 commit 14e8b328e3245d9260212ec9e108f7fe23158cd8 Author: Konstantin Belousov AuthorDate: 2023-08-06 01:35:36 +0000 Commit: Konstantin Belousov CommitDate: 2023-08-16 09:16:09 +0000 tmpfs: add a knob to enable pgcache read for mount (cherry picked from commit 0f613ab85e5a5274704d179f39fb15163d46e7c4) --- sys/fs/tmpfs/tmpfs.h | 3 +++ sys/fs/tmpfs/tmpfs_subr.c | 2 +- sys/fs/tmpfs/tmpfs_vfsops.c | 4 +++- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/sys/fs/tmpfs/tmpfs.h b/sys/fs/tmpfs/tmpfs.h index 8d2ec4354d3e..a56fdfa6c408 100644 --- a/sys/fs/tmpfs/tmpfs.h +++ b/sys/fs/tmpfs/tmpfs.h @@ -405,6 +405,9 @@ struct tmpfs_mount { bool tm_nonc; /* Do not update mtime on writes through mmaped areas. */ bool tm_nomtime; + + /* Read from page cache directly. */ + bool tm_pgread; }; #define TMPFS_LOCK(tm) mtx_lock(&(tm)->tm_allnode_lock) #define TMPFS_UNLOCK(tm) mtx_unlock(&(tm)->tm_allnode_lock) diff --git a/sys/fs/tmpfs/tmpfs_subr.c b/sys/fs/tmpfs/tmpfs_subr.c index 49c1b729d753..98f28ead23e6 100644 --- a/sys/fs/tmpfs/tmpfs_subr.c +++ b/sys/fs/tmpfs/tmpfs_subr.c @@ -1069,7 +1069,7 @@ loop: VI_LOCK(vp); KASSERT(vp->v_object == NULL, ("Not NULL v_object in tmpfs")); vp->v_object = object; - vn_irflag_set_locked(vp, VIRF_PGREAD); + vn_irflag_set_locked(vp, (tm->tm_pgread ? VIRF_PGREAD : 0)); VI_UNLOCK(vp); VM_OBJECT_WUNLOCK(object); break; diff --git a/sys/fs/tmpfs/tmpfs_vfsops.c b/sys/fs/tmpfs/tmpfs_vfsops.c index 32c26823efc1..9a9c3f4570de 100644 --- a/sys/fs/tmpfs/tmpfs_vfsops.c +++ b/sys/fs/tmpfs/tmpfs_vfsops.c @@ -329,7 +329,7 @@ tmpfs_mount(struct mount *mp) struct tmpfs_mount *tmp; struct tmpfs_node *root; int error; - bool nomtime, nonc; + bool nomtime, nonc, pgread; /* Size counters. */ u_quad_t pages; off_t nodes_max, size_max, maxfilesize; @@ -407,6 +407,7 @@ tmpfs_mount(struct mount *mp) maxfilesize = 0; nonc = vfs_getopt(mp->mnt_optnew, "nonc", NULL, NULL) == 0; nomtime = vfs_getopt(mp->mnt_optnew, "nomtime", NULL, NULL) == 0; + pgread = vfs_getopt(mp->mnt_optnew, "pgread", NULL, NULL) == 0; /* Do not allow mounts if we do not have enough memory to preserve * the minimum reserved pages. */ @@ -454,6 +455,7 @@ tmpfs_mount(struct mount *mp) tmp->tm_ronly = (mp->mnt_flag & MNT_RDONLY) != 0; tmp->tm_nonc = nonc; tmp->tm_nomtime = nomtime; + tmp->tm_pgread = pgread; /* Allocate the root node. */ error = tmpfs_alloc_node(mp, tmp, VDIR, root_uid, root_gid, From nobody Wed Aug 16 09:17:34 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RQjG70BKWz4qSD3; Wed, 16 Aug 2023 09:17: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RQjG66n9tz4F5s; Wed, 16 Aug 2023 09:17:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692177454; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=hWEsrRdGkDFj2CHbGYtXBuh2oswwBRuYV6MLVR0nZEA=; b=rjXb5iObbpbzS3DGIw2ghZAqMkTMD0WheD/QOklSV6ErIkbY2+YolNloUjHUdwJb39vTbm Z9rT7yv99nKAfGxblQTd2veiv6kWXQbL9uWyRM0JekdS/oeHvgrDclNGqqaVCsELjQY2aQ VR/6ipNleLjENnlK2Qh0KNjNk6zgRVcCoKoycVXEMoaH1c9TOwRrzFXl4U4ZnDy3IYENmA qQv9CzPCn5vGzgLJf8NPGeITB5Aq0XhfaS9Y3oY+VF8G+bqvP+xQXBy8HMbZzxEgWM3y1O hKBTdJHB20+Uv4NiI5URPTL8sqFfU+5AADCBUdvddfko/e7gqCdzl4WeOorW4A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692177454; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=hWEsrRdGkDFj2CHbGYtXBuh2oswwBRuYV6MLVR0nZEA=; b=mqHNYq2I/8XpHW2oQDEQWXRS/y8vvir6VaD9Q224nXOGpvIcZA2NQUKNEPVCqg4OXs1two R5zurm81ZcSSX9IqX26fQyAqZJGMI6mND7jmnMyhb/TiCk+wD95zpY23YgaE80DlT/QbtI 20PJKggpd91INBh7c7DMJeW2R8JxccZawtk0bK+yDDsoQwFr5Xlp8xwPrWJjiJqIZXRCno YkQdQ0H8HBb7b77CGwsmy796tpZTiTflcb8MJph61ZgcnZphxU+LApfo6MlsFeHQHF0Qam DfvhUZ7dN65r68GRsqPfVDenBR+PAaZSCiwQ3AlsCEY6ZznijfYBj/Cymgc1Ug== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692177455; a=rsa-sha256; cv=none; b=Utb+8eiZ9SMSM083oM4g3LoIZXtukoOiusUmxMTN+s1zko/e1vzw2BcEuL3+ZB5LsrAvPQ rlhSFk1NmFJErnpye+AX5PVW+P4uXJlllZJuOkKIBHaDjPRwlPU8fjSFJ9zyWY55WIZqg+ WRGk3vNnN9nMnNMAGsFgC85oUW/VtiI4iBzhAVP2wtNvqwCVRty+DC6KZIlSB4kpvY0cL+ mTJfLbhuh+nbygbDC+P8HQdJ8bWlUzxDU3sD7Jja17VdjaMGk5WyUYkNaAy86LiTrzZazw /TshoL/uez9sp1+J/YUaCici3NC/G//uxUOcauNIVcdl30Zlw4xj/DIs91vkOg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RQjG65tSRzmMn; Wed, 16 Aug 2023 09:17:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37G9HYNj093841; Wed, 16 Aug 2023 09:17:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37G9HYHv093838; Wed, 16 Aug 2023 09:17:34 GMT (envelope-from git) Date: Wed, 16 Aug 2023 09:17:34 GMT Message-Id: <202308160917.37G9HYHv093838@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: 0fbf21482f5a - stable/13 - tmpfs: add the "pgread" mount option to the allowed options list for mount List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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/13 X-Git-Reftype: branch X-Git-Commit: 0fbf21482f5a594d26314e1354df4dd691bc6401 Auto-Submitted: auto-generated The branch stable/13 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=0fbf21482f5a594d26314e1354df4dd691bc6401 commit 0fbf21482f5a594d26314e1354df4dd691bc6401 Author: Konstantin Belousov AuthorDate: 2023-08-11 18:00:44 +0000 Commit: Konstantin Belousov CommitDate: 2023-08-16 09:16:09 +0000 tmpfs: add the "pgread" mount option to the allowed options list for mount (cherry picked from commit 765ad5b28d3fa272208aedc3047a6a3dff561037) --- sys/fs/tmpfs/tmpfs_vfsops.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/fs/tmpfs/tmpfs_vfsops.c b/sys/fs/tmpfs/tmpfs_vfsops.c index 9a9c3f4570de..af0b158988f7 100644 --- a/sys/fs/tmpfs/tmpfs_vfsops.c +++ b/sys/fs/tmpfs/tmpfs_vfsops.c @@ -93,7 +93,7 @@ static int tmpfs_statfs(struct mount *, struct statfs *); static const char *tmpfs_opts[] = { "from", "size", "maxfilesize", "inodes", "uid", "gid", "mode", "export", - "union", "nonc", "nomtime", "nosymfollow", NULL + "union", "nonc", "nomtime", "nosymfollow", "pgread", NULL }; static const char *tmpfs_updateopts[] = { From nobody Wed Aug 16 12:32:13 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RQnZk2Pw2z4qd54; Wed, 16 Aug 2023 12:32:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RQnZj6zhwz4TFk; Wed, 16 Aug 2023 12:32:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692189134; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=L4ut3NxO5Ny/TpOt1kPCkpi83B4YQUIM8ZSBiFJyZ0Q=; b=hptau+XfLICKo27BR50DdvteXgXdQonYOazsdTJiTlKijT8sT154oyojjHkejvpZwQfK9m lXbH9R88Sh3aCJyJAoE7mijdtjhO+O4qSdRczNow0OPKBIOj4EAhfOmUs6DsIB7+HSNNn9 voMvjSX+HGz6BF/SJrMJHr7Y8Q+aKGZmSzqC/0rtd5RO8LBS1WnuY0G5l3UC0xvc94zXwO noS4M9P5hwhe5e9r5Lm5uZPx5blGSggJPvyHtHe+edHPHCk/BOy6d9emfsIvPjskenfUhp LglOz/eX5Q+sejqCvVN9323sE7+HHRlqFI/Sf0Mbuq+4EtnLUnv2SPmpHOentg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692189134; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=L4ut3NxO5Ny/TpOt1kPCkpi83B4YQUIM8ZSBiFJyZ0Q=; b=ZRiOK8vrvdu59SCxh1ukhdrT3ddOUnJqxj2u81TMzlV6LFGSbTKSCVfb2osEOkf3NAfoUJ J5IhX0Xhks04ZXi2ENa6fMRydSb2F3Guy/ty2O7Hmdpurgrf1SV203PvtAER59qR3N44FV u9nRFaU8dkiyYc5SYg7HaZee2Jem/CLntJFR5g3lM5D55bbN3C8t5xPlfA7kXX7n74xWJ9 y7fLQej3C+DT5tFw14v+bEboEehX+EF00S8iR5ooBZGtv5ZKCF27jHhKT3DFopqDavJpw7 nRiCLXfdsYBBvC3TJTJqQeUqdkhEi2dLiXmpCqfpelWd1mZ4rPKZa3/ecHMdfw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692189134; a=rsa-sha256; cv=none; b=VLeEbs+AH9EOZDOaBJjP2yRnGunPz9e1HLZZKxjPIt1Xs7JNTmG2e7Zbpa3uaivAU90PeA LP8IVtdf4R/Gx8mmA2PgeEH3P3N4uF9dHMLT33CFu8FEXqXeIcXsL8hSL8uTzkyfTgGh12 lW75veb7/DigJBzPUGOeAWIdBzbXPqxRv4wdO+pQxOlBhsv5I+2oRQzGsy6wTJUWuXIkEs x/xtbBklpIqFN+Norv5OxR8WVuS9j7RCFUN9GJUNWPukVUQzd3Vl+SkAT2plh9e/pv/d2H dG14g/zBcdUTglwdy/nTOY4qCDzCCwyk4koRUXMWMMMFcf4wDX8METLO+0FHBQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RQnZj64Z3zs4l; Wed, 16 Aug 2023 12:32:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37GCWD10023359; Wed, 16 Aug 2023 12:32:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37GCWDrb023356; Wed, 16 Aug 2023 12:32:13 GMT (envelope-from git) Date: Wed, 16 Aug 2023 12:32:13 GMT Message-Id: <202308161232.37GCWDrb023356@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Doug Rabson Subject: git: 3af770071046 - stable/13 - ifconfig(8): Teach ifconfig to attach and run itself in a jail List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dfr X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 3af7700710466b330e54307ff5bc5ea6bb91fec4 Auto-Submitted: auto-generated The branch stable/13 has been updated by dfr: URL: https://cgit.FreeBSD.org/src/commit/?id=3af7700710466b330e54307ff5bc5ea6bb91fec4 commit 3af7700710466b330e54307ff5bc5ea6bb91fec4 Author: Yan Ka Chiu AuthorDate: 2023-05-23 20:39:22 +0000 Commit: Doug Rabson CommitDate: 2023-08-16 12:25:57 +0000 ifconfig(8): Teach ifconfig to attach and run itself in a jail Add -j flag to ifconfig to allow ifconfig to attach and run inside a jail. This allow parent to configure network interfaces of its children even if ifconfig is not available in child's tree (e.g. Linux Jails) Reviewed by: emaste, khng, melifaro Event: Kitchener-Waterloo Hackathon 202305 MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D40213 (cherry picked from commit 7e49aa86a2824e76e9d9becf61db12066bc0d79d) --- sbin/ifconfig/ifconfig.8 | 22 ++++++++++++++++++++++ sbin/ifconfig/ifconfig.c | 40 ++++++++++++++++++++++++++++++++++------ 2 files changed, 56 insertions(+), 6 deletions(-) diff --git a/sbin/ifconfig/ifconfig.8 b/sbin/ifconfig/ifconfig.8 index e7d41da45bec..651d64fb31df 100644 --- a/sbin/ifconfig/ifconfig.8 +++ b/sbin/ifconfig/ifconfig.8 @@ -36,6 +36,7 @@ .Nd configure network interface parameters .Sh SYNOPSIS .Nm +.Op Fl j Ar jail .Op Fl kLmn .Op Fl f Ar type Ns Cm \&: Ns Ar format .Ar interface @@ -49,9 +50,11 @@ .Oc .Op Ar parameters .Nm +.Op Fl j Ar jail .Ar interface .Cm destroy .Nm +.Op Fl j Ar jail .Fl a .Op Fl dkLmuv .Op Fl f Ar type Ns Cm \&: Ns Ar format @@ -61,13 +64,16 @@ .Nm .Fl C .Nm +.Op Fl j Ar jail .Fl g Ar groupname .Nm +.Op Fl j Ar jail .Fl l .Op Fl du .Op Fl g Ar groupname .Op Ar address_family .Nm +.Op Fl j Ar jail .Op Fl dkLmuv .Op Fl f Ar type Ns Cm \&: Ns Ar format .Sh DESCRIPTION @@ -233,6 +239,22 @@ Setting to .Cm all selects all interfaces. +.It Fl j Ar jail +Perform the actions inside the +.Ar jail . +.Pp +The +.Cm ifconfig +will first attach to the +.Ar jail +(by jail id or jail name) before performing the effects. +.Pp +This allow network interfaces of +.Ar jail +to be configured even if the +.Cm ifconfig +binary is not available in +.Ar jail . .It Fl k Print keying information for the .Ar interface , diff --git a/sbin/ifconfig/ifconfig.c b/sbin/ifconfig/ifconfig.c index 6deeebba9f01..f93a97572a78 100644 --- a/sbin/ifconfig/ifconfig.c +++ b/sbin/ifconfig/ifconfig.c @@ -42,6 +42,9 @@ static const char rcsid[] = #include #include +#ifdef JAIL +#include +#endif #include #include #include @@ -189,12 +192,12 @@ usage(void) } fprintf(stderr, - "usage: ifconfig [-f type:format] %sinterface address_family\n" + "usage: ifconfig [-j jail] [-f type:format] %sinterface address_family\n" " [address [dest_address]] [parameters]\n" - " ifconfig interface create\n" - " ifconfig -a %s[-d] [-m] [-u] [-v] [address_family]\n" - " ifconfig -l [-d] [-u] [address_family]\n" - " ifconfig %s[-d] [-m] [-u] [-v]\n", + " ifconfig [-j jail] interface create\n" + " ifconfig [-j jail] -a %s[-d] [-m] [-u] [-v] [address_family]\n" + " ifconfig [-j jail] -l [-d] [-u] [address_family]\n" + " ifconfig [-j jail] %s[-d] [-m] [-u] [-v]\n", options, options, options); exit(1); } @@ -412,12 +415,18 @@ main(int argc, char *argv[]) struct ifreq paifr; const struct sockaddr_dl *sdl; char options[1024], *cp, *envformat, *namecp = NULL; +#ifdef JAIL + char *jail_name = NULL; +#endif struct ifa_queue q = TAILQ_HEAD_INITIALIZER(q); struct ifa_order_elt *cur, *tmp; const char *ifname, *matchgroup, *nogroup; struct option *p; size_t iflen; int flags; +#ifdef JAIL + int jid; +#endif all = downonly = uponly = namesonly = noload = verbose = 0; f_inet = f_inet6 = f_ether = f_addr = NULL; @@ -438,7 +447,7 @@ main(int argc, char *argv[]) atexit(printifnamemaybe); /* Parse leading line options */ - strlcpy(options, "G:adf:klmnuv", sizeof(options)); + strlcpy(options, "G:adf:j:klmnuv", sizeof(options)); for (p = opts; p != NULL; p = p->next) strlcat(options, p->opt, sizeof(options)); while ((c = getopt(argc, argv, options)) != -1) { @@ -459,6 +468,15 @@ main(int argc, char *argv[]) usage(); nogroup = optarg; break; + case 'j': +#ifdef JAIL + if (optarg == NULL) + usage(); + jail_name = optarg; +#else + Perror("not built with jail support"); +#endif + break; case 'k': printkeys++; break; @@ -511,6 +529,16 @@ main(int argc, char *argv[]) if (!namesonly && argc < 1) all = 1; +#ifdef JAIL + if (jail_name) { + jid = jail_getid(jail_name); + if (jid == -1) + Perror("jail not found"); + if (jail_attach(jid) != 0) + Perror("cannot attach to jail"); + } +#endif + /* -a and -l allow an address family arg to limit the output */ if (all || namesonly) { if (argc > 1) From nobody Wed Aug 16 12:32:14 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RQnZl2MRDz4qd23; Wed, 16 Aug 2023 12:32:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RQnZl1VQsz4Tcm; Wed, 16 Aug 2023 12:32:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692189135; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=I49I65jSVruZZAG9XuyCMaNgy5irzS4ogkDUkLI5Eu4=; b=wDsxz8y34r+Kc08MlQZWHlSIoLcB3T/hGiaMHiow6MR9rC5K9NWBwnVOEcaBGf8559wTvw Bv/h7uxCjlxeuHddQ93402jEg0FeoAqlKy0cTLulIUKaUCVUvdxJo0fY8MruW3QZsLDLHy eeY7kYEXqxAfydMvflh6RqDpIi4sKBglY7oPvo87NxgJXirI+nHMtAnCp9uZVJIA+owEGZ pMNYxExsiA5vEV6l5++vqnXpO1qVcfnhX1bKkuNWso8VBRFaiPML2YuVRPfRn/GZB5GwUF bkDqhsDE8jCjrNLARfMKHufq/HdHj5QqU0aHD8qYE1npHyYgFxs9wNw4YppxiA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692189135; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=I49I65jSVruZZAG9XuyCMaNgy5irzS4ogkDUkLI5Eu4=; b=wNdPadCauUk94lLHJhMS6B3P2gRfbnlrLDtwomGtd3fIafsBhMJFOiDeceEsiWCb4MvXR5 UoOxlx4I7Zrd0nWlbE82eGhlSiyXveu7kL7XZ+B1oVc8GYoRVslVwy4PLfn1Arl40uZdSN 1HCe3aXqmbwkvssXX3UrN1EbW8YLFDkR/6fxUwp4MnC+mAnIWIdXqu/tODqkMEzWZl3TOO euSrL9xEkclghCpTJxX2BkvP/zOycKBK5JBuz+5dFu5Zzt9GnGE0jJkXdgzeGTNIS6qtCp BSaWF4ao0+UxzzGP7ssPLRqHIeNnE2KKm+lpAuA1wZjgkqpl4TSjL+qEqaCpIA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692189135; a=rsa-sha256; cv=none; b=mrD7sK19PV4k6cIGamQl4E6phVEc8MxamjIPGjlj+cH3XhELG2SOAkPVtFV3QBupFQRX1Q uGTZsGY9HM7dYPZfeqXybYaYQ0h7y83Wu2imeJwpqSwqim+6zUAhhu9ntwHVnBcV6R2l6k LN9oBafK3NeijU6neQlQcbIqrY2TVtNy1e7yHwyTCVslPGX5UIa++Y4/ddVWf+Sx8gdBkN PkzVyVBmqwSeEXDdWCURrlf2OLscJc1m5DKO/itfRxNZUKTWiPixr1XN1tU/VBjHhnAvJu BwS7w4psXoc8OSdJarQAIg6PFnEML/camSbdIi6cKEj50sAAg5mElNEG4eBc/g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RQnZl06Lczs4m; Wed, 16 Aug 2023 12:32:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37GCWEU1023412; Wed, 16 Aug 2023 12:32:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37GCWEsT023408; Wed, 16 Aug 2023 12:32:14 GMT (envelope-from git) Date: Wed, 16 Aug 2023 12:32:14 GMT Message-Id: <202308161232.37GCWEsT023408@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Doug Rabson Subject: git: 07cbc2f943ff - stable/13 - route(8): teach route to attach to jails List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dfr X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 07cbc2f943ff32bee33c4405903795d5545d57ea Auto-Submitted: auto-generated The branch stable/13 has been updated by dfr: URL: https://cgit.FreeBSD.org/src/commit/?id=07cbc2f943ff32bee33c4405903795d5545d57ea commit 07cbc2f943ff32bee33c4405903795d5545d57ea Author: Yan Ka, Chiu AuthorDate: 2023-06-13 06:05:17 +0000 Commit: Doug Rabson CommitDate: 2023-08-16 12:25:57 +0000 route(8): teach route to attach to jails Add -j flag to route(8) to allow route to perform actions in a Jail. Differential Revision: https://reviews.freebsd.org/D40377 MFC after: 2 weeks (cherry picked from commit ab4d1b73cbf8980dbe05cde7d822010042db8344) --- sbin/route/Makefile | 5 +++++ sbin/route/route.8 | 5 ++++- sbin/route/route.c | 36 ++++++++++++++++++++++++++++++++++-- 3 files changed, 43 insertions(+), 3 deletions(-) diff --git a/sbin/route/Makefile b/sbin/route/Makefile index e65030f805bb..2cecadd24a72 100644 --- a/sbin/route/Makefile +++ b/sbin/route/Makefile @@ -19,6 +19,11 @@ CFLAGS+= -DINET6 .endif CFLAGS+= -I. +.if ${MK_JAIL} != "no" && !defined(RESCUE) +CFLAGS+= -DJAIL +LIBADD+= jail +.endif + HAS_TESTS= SUBDIR.${MK_TESTS}+= tests diff --git a/sbin/route/route.8 b/sbin/route/route.8 index afcf55ab44c7..72c22bee23ed 100644 --- a/sbin/route/route.8 +++ b/sbin/route/route.8 @@ -28,7 +28,7 @@ .\" @(#)route.8 8.3 (Berkeley) 3/19/94 .\" $FreeBSD$ .\" -.Dd March 14, 2023 +.Dd June 13, 2023 .Dt ROUTE 8 .Os .Sh NAME @@ -36,6 +36,7 @@ .Nd manually manipulate the routing tables .Sh SYNOPSIS .Nm +.Op Fl j Ar jail .Op Fl dnqtv .Ar command .Oo @@ -91,6 +92,8 @@ Suppress all output from the and .Cm flush commands. +.It Fl j Ar jail +Run inside a jail. .El .Pp The diff --git a/sbin/route/route.c b/sbin/route/route.c index 5f33cecb1b20..e10d0b18ee40 100644 --- a/sbin/route/route.c +++ b/sbin/route/route.c @@ -48,6 +48,9 @@ __FBSDID("$FreeBSD$"); #include #include #include +#ifdef JAIL +#include +#endif #include #include #include @@ -63,6 +66,9 @@ __FBSDID("$FreeBSD$"); #include #include #include +#ifdef JAIL +#include +#endif #include #include #include @@ -90,6 +96,9 @@ static struct keytab { {0, 0} }; +#ifdef JAIL +char * jail_name; +#endif static struct sockaddr_storage so[RTAX_MAX]; static int pid, rtm_addrs; static int s; @@ -161,7 +170,7 @@ usage(const char *cp) { if (cp != NULL) warnx("bad keyword: %s", cp); - errx(EX_USAGE, "usage: route [-46dnqtv] command [[modifiers] args]"); + errx(EX_USAGE, "usage: route [-j jail] [-46dnqtv] command [[modifiers] args]"); /* NOTREACHED */ } @@ -169,12 +178,15 @@ int main(int argc, char **argv) { int ch; +#ifdef JAIL + int jid; +#endif size_t len; if (argc < 2) usage(NULL); - while ((ch = getopt(argc, argv, "46nqdtv")) != -1) + while ((ch = getopt(argc, argv, "46nqdtvj:")) != -1) switch(ch) { case '4': #ifdef INET @@ -207,6 +219,15 @@ main(int argc, char **argv) case 'd': debugonly = 1; break; + case 'j': +#ifdef JAIL + if (optarg == NULL) + usage(NULL); + jail_name = optarg; +#else + errx(1, "Jail support is not compiled in"); +#endif + break; case '?': default: usage(NULL); @@ -216,6 +237,17 @@ main(int argc, char **argv) pid = getpid(); uid = geteuid(); + +#ifdef JAIL + if (jail_name != NULL) { + jid = jail_getid(jail_name); + if (jid == -1) + errx(1, "Jail not found"); + if (jail_attach(jid) != 0) + errx(1, "Cannot attach to jail"); + } +#endif + if (tflag) s = open(_PATH_DEVNULL, O_WRONLY, 0); else From nobody Wed Aug 16 13:06:12 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RQpKw4B41z4qfZp; Wed, 16 Aug 2023 13:06:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RQpKw3TT0z4WlK; Wed, 16 Aug 2023 13:06:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692191172; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=QQjLiZksvkUFx/qU/OyJG0IFcrJqgahsrXTT1rTfH7o=; b=IwpzaNK2PypKEO85WhxP515MRsmehLUAheAv4cSIMfR3OkGN2mQcMlVJDqjURsajHy6a5b VnrFMFMQkxBjW0gkkuvaWhm+ERiDwgv81Wk/pUawJPuAAEea8B/Ek/iHG4VSSTqO0lLgsH VPMrkPLa6N4NOPuyoKZKSrkPy4WFCgPQU1S/d0wCNoWr/yvm4ar4Zdv7EqA7J4MCHBromR 1ZkQVQ3VhFUNwqTCa5qyRWl7susgyrJrx+T6xcxqo65TwMU1WGzE+iwVqmv2T1Uz4cdOXH 2VQrnIRTdrfccqUhsvcVstJM1lsgQvtLQtJa1UqQY6ef24uoseATuDKouCeKHg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692191172; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=QQjLiZksvkUFx/qU/OyJG0IFcrJqgahsrXTT1rTfH7o=; b=ftUgHiDDSCEVEhnOzk3IVwbiXihTqv/C5TFB3PYF4xq9YlPcO+fGb21z+TxkZthSgj+MLb HLjECznfRQZT63e3XFSIwQujkRNNhDRrBOVlkm06Jd7oSDXxtq1AwHlIp2yitG47KrnBxG 1OFRznlRSY8aW9r2oggzph3bG1x8ewj67gBeZILjUpi7MAHSOySfMXcpUP6oow2hdJh+Vi Cko3ZolagcbxAs4QQ+3n58lnr6ZcKdYE/8Z2glcgyhAfNPUmJ34udPhy0336+V3EXF4TnD zCONZe3kUNHtXwqWKUmvSxTxwWTc4lj5QmtdqCHXNPcp1ZMqBzhndc6TemTdVA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692191172; a=rsa-sha256; cv=none; b=EsjQ3drWF7/EmynVFNMPpydT8n1PXkGqkXZY1dC9gJ8j3JspXPCbTk2+kIZ0yiR1kasHco 8GPTpYjurqqnhF18a7EnbuCPuYMhhhm+67BJWOOtLzCMd7an1DFosq2M/dNw5i+BHIQXQU Y94rsuZiyLh4CSFWpZyYph1WAg3Z3TOzn/LJHwvV9C4FtEb6/yb+UUqmJmuOh01OYVYbXo FRC4dXUoGobZP0Z9MpZWvY3N44jNTjYnL/DurvA/F0mEI6QCmd7NpzpllCs12u1RAfofZF IxSqPOW+Bf3U4Iskuib2F0voc1ePMfNiNVEir+94UCIm6l+0GYa7ztTLTdAB/A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RQpKw2Gr7zt5w; Wed, 16 Aug 2023 13:06:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37GD6CMA075865; Wed, 16 Aug 2023 13:06:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37GD6Cbu075863; Wed, 16 Aug 2023 13:06:12 GMT (envelope-from git) Date: Wed, 16 Aug 2023 13:06:12 GMT Message-Id: <202308161306.37GD6Cbu075863@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Doug Rabson Subject: git: 182e8ae26d7c - main - netstat(1): teach netstat to attach to jails List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dfr X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 182e8ae26d7cad119bcfce7cc788c1f5cb06e226 Auto-Submitted: auto-generated The branch main has been updated by dfr: URL: https://cgit.FreeBSD.org/src/commit/?id=182e8ae26d7cad119bcfce7cc788c1f5cb06e226 commit 182e8ae26d7cad119bcfce7cc788c1f5cb06e226 Author: Doug Rabson AuthorDate: 2023-08-14 08:01:28 +0000 Commit: Doug Rabson CommitDate: 2023-08-16 13:05:13 +0000 netstat(1): teach netstat to attach to jails Add -j flag to netstat(1) to allow access to network information from a jail. MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D41446 --- usr.bin/netstat/Makefile | 5 +++ usr.bin/netstat/main.c | 57 ++++++++++++++++++++++++++-------- usr.bin/netstat/netstat.1 | 79 +++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 128 insertions(+), 13 deletions(-) diff --git a/usr.bin/netstat/Makefile b/usr.bin/netstat/Makefile index 92f8aa9c30fa..e578cea03183 100644 --- a/usr.bin/netstat/Makefile +++ b/usr.bin/netstat/Makefile @@ -69,4 +69,9 @@ SRCS+= route_netlink.c CFLAGS+=-DWITHOUT_NETLINK .endif +.if ${MK_JAIL} != "no" && !defined(RESCUE) +CFLAGS+= -DJAIL +LIBADD+= jail +.endif + .include diff --git a/usr.bin/netstat/main.c b/usr.bin/netstat/main.c index 61b4536a5788..e8a808bb4f56 100644 --- a/usr.bin/netstat/main.c +++ b/usr.bin/netstat/main.c @@ -46,6 +46,9 @@ __FBSDID("$FreeBSD$"); #include #include +#ifdef JAIL +#include +#endif #include #include #include @@ -60,6 +63,9 @@ __FBSDID("$FreeBSD$"); #include #include #include +#ifdef JAIL +#include +#endif #include #include #include @@ -233,6 +239,9 @@ int interval; /* repeat interval for i/f stats */ char *interface; /* desired i/f for stats, or NULL for all i/fs */ int unit; /* unit number for above */ +#ifdef JAIL +char *jail_name; /* desired jail to operate in */ +#endif static int af; /* address family */ int live; /* true if we are examining a live system */ @@ -245,6 +254,9 @@ main(int argc, char *argv[]) int fib = -1; char *endptr; bool first = true; +#ifdef JAIL + int jid; +#endif af = AF_UNSPEC; @@ -252,7 +264,7 @@ main(int argc, char *argv[]) if (argc < 0) exit(EXIT_FAILURE); - while ((ch = getopt(argc, argv, "46AaBbCcdF:f:ghI:iLlM:mN:nOoPp:Qq:RrSTsuWw:xz")) + while ((ch = getopt(argc, argv, "46AaBbCcdF:f:ghI:ij:LlM:mN:nOoPp:Qq:RrSTsuWw:xz")) != -1) switch(ch) { case '4': @@ -340,6 +352,15 @@ main(int argc, char *argv[]) case 'i': iflag = 1; break; + case 'j': +#ifdef JAIL + if (optarg == NULL) + usage(); + jail_name = optarg; +#else + errx(1, "Jail support is not compiled in"); +#endif + break; case 'L': Lflag = 1; break; @@ -436,6 +457,16 @@ main(int argc, char *argv[]) } #endif +#ifdef JAIL + if (jail_name != NULL) { + jid = jail_getid(jail_name); + if (jid == -1) + errx(1, "Jail not found"); + if (jail_attach(jid) != 0) + errx(1, "Cannot attach to jail"); + } +#endif + /* * Discard setgid privileges if not the running kernel so that bad * guys can't print interesting stuff from kernel memory. @@ -890,24 +921,24 @@ static void usage(void) { (void)xo_error("%s\n%s\n%s\n%s\n%s\n%s\n%s\n%s\n%s\n%s\n%s\n%s\n", -"usage: netstat [-46AaCcLnRSTWx] [-f protocol_family | -p protocol]\n" +"usage: netstat [-j jail] [-46AaCcLnRSTWx] [-f protocol_family | -p protocol]\n" " [-M core] [-N system]", -" netstat -i | -I interface [-46abdhnW] [-f address_family]\n" +" netstat [-j jail] -i | -I interface [-46abdhnW] [-f address_family]\n" " [-M core] [-N system]", -" netstat -w wait [-I interface] [-46d] [-M core] [-N system]\n" +" netstat [-j jail] -w wait [-I interface] [-46d] [-M core] [-N system]\n" " [-q howmany]", -" netstat -s [-46sz] [-f protocol_family | -p protocol]\n" +" netstat [-j jail] -s [-46sz] [-f protocol_family | -p protocol]\n" " [-M core] [-N system]", -" netstat -i | -I interface -s [-46s]\n" +" netstat [-j jail] -i | -I interface -s [-46s]\n" " [-f protocol_family | -p protocol] [-M core] [-N system]", -" netstat -m [-M core] [-N system]", -" netstat -B [-z] [-I interface]", -" netstat -r [-46AnW] [-F fibnum] [-f address_family]\n" +" netstat [-j jail] -m [-M core] [-N system]", +" netstat [-j jail] -B [-z] [-I interface]", +" netstat [-j jail] -r [-46AnW] [-F fibnum] [-f address_family]\n" " [-M core] [-N system]", -" netstat -rs [-s] [-M core] [-N system]", -" netstat -g [-46W] [-f address_family] [-M core] [-N system]", -" netstat -gs [-46s] [-f address_family] [-M core] [-N system]", -" netstat -Q"); +" netstat [-j jail] -rs [-s] [-M core] [-N system]", +" netstat [-j jail] -g [-46W] [-f address_family] [-M core] [-N system]", +" netstat [-j jail] -gs [-46s] [-f address_family] [-M core] [-N system]", +" netstat [-j jail] -Q"); xo_finish(); exit(1); } diff --git a/usr.bin/netstat/netstat.1 b/usr.bin/netstat/netstat.1 index 3ba0b1d191f6..df95651499c7 100644 --- a/usr.bin/netstat/netstat.1 +++ b/usr.bin/netstat/netstat.1 @@ -38,16 +38,19 @@ .Bk -words .Bl -tag -width "netstat" .It Nm +.Op Fl j Ar jail .Op Fl -libxo .Op Fl 46AaCLnPRSTWx .Op Fl f Ar protocol_family | Fl p Ar protocol .It Nm Fl i | I Ar interface +.Op Fl j Ar jail .Op Fl -libxo .Op Fl 46abdhnW .Op Fl f Ar address_family .Op Fl M Ar core .Op Fl N Ar system .It Nm Fl w Ar wait +.Op Fl j Ar jail .Op Fl -libxo .Op Fl I Ar interface .Op Fl 46d @@ -55,46 +58,55 @@ .Op Fl N Ar system .Op Fl q Ar howmany .It Nm Fl s +.Op Fl j Ar jail .Op Fl -libxo .Op Fl 46sz .Op Fl f Ar protocol_family | Fl p Ar protocol .Op Fl M Ar core .Op Fl N Ar system .It Nm Fl i | I Ar interface Fl s +.Op Fl j Ar jail .Op Fl -libxo .Op Fl 46s .Op Fl f Ar protocol_family | Fl p Ar protocol .Op Fl M Ar core .Op Fl N Ar system .It Nm Fl m +.Op Fl j Ar jail .Op Fl -libxo .Op Fl M Ar core .Op Fl N Ar system .It Nm Fl B +.Op Fl j Ar jail .Op Fl -libxo .Op Fl z .Op Fl I Ar interface .It Nm Fl r +.Op Fl j Ar jail .Op Fl -libxo .Op Fl 46nW .Op Fl F Ar fibnum .Op Fl f Ar address_family .It Nm Fl rs +.Op Fl j Ar jail .Op Fl -libxo .Op Fl s .Op Fl M Ar core .Op Fl N Ar system .It Nm Fl g +.Op Fl j Ar jail .Op Fl -libxo .Op Fl 46W .Op Fl f Ar address_family .It Nm Fl gs +.Op Fl j Ar jail .Op Fl -libxo .Op Fl 46s .Op Fl f Ar address_family .Op Fl M Ar core .Op Fl N Ar system .It Nm Fl Q +.Op Fl j Ar jail .Op Fl -libxo .El .Ek @@ -111,6 +123,7 @@ command uses. .Nm .Op Fl 46AaCLnRSTWx .Op Fl f Ar protocol_family | Fl p Ar protocol +.Op Fl j Ar jail .Ek .Xc Display a list of active sockets @@ -238,6 +251,10 @@ Filter by .Ar protocol . See .Sx GENERAL OPTIONS . +.It Fl j Ar jail +Run inside a jail. +See +.Sx GENERAL OPTIONS . .El .It Xo .Bk -words @@ -247,6 +264,7 @@ See .Op Fl f Ar address_family .Op Fl M Ar core .Op Fl N Ar system +.Op Fl j Ar jail .Ek .Xc Show the state of all network interfaces or a single @@ -316,6 +334,10 @@ Filter by .Ar protocol_family . See .Sx GENERAL OPTIONS . +.It Fl j Ar jail +Run inside a jail. +See +.Sx GENERAL OPTIONS . .El .It Xo .Bk -words @@ -326,6 +348,7 @@ See .Op Fl M Ar core .Op Fl N Ar system .Op Fl q Ar howmany +.Op Fl j Ar jail .Ek .Xc At intervals of @@ -374,6 +397,10 @@ See Exit after .Ar howmany outputs. +.It Fl j Ar jail +Run inside a jail. +See +.Sx GENERAL OPTIONS . .El .It Xo .Bk -words @@ -383,6 +410,7 @@ outputs. .Op Fl f Ar protocol_family | Fl p Ar protocol .Op Fl M Ar core .Op Fl N Ar system +.Op Fl j Ar jail .Ek .Xc Display system-wide statistics for each network protocol. @@ -419,6 +447,10 @@ See Use an alternative kernel image See .Sx GENERAL OPTIONS . +.It Fl j Ar jail +Run inside a jail. +See +.Sx GENERAL OPTIONS . .El .It Xo .Bk -words @@ -428,6 +460,7 @@ See .Op Fl f Ar protocol_family | Fl p Ar protocol .Op Fl M Ar core .Op Fl N Ar system +.Op Fl j Ar jail .Ek .Xc Display per-interface statistics for each network protocol. @@ -470,6 +503,10 @@ See Use an alternative kernel image See .Sx GENERAL OPTIONS . +.It Fl j Ar jail +Run inside a jail. +See +.Sx GENERAL OPTIONS . .El .It Xo .Bk -words @@ -477,6 +514,7 @@ See .Fl m .Op Fl M Ar core .Op Fl N Ar system +.Op Fl j Ar jail .Ek .Xc Show statistics recorded by the memory management routines @@ -491,6 +529,10 @@ See Use an alternative kernel image See .Sx GENERAL OPTIONS . +.It Fl j Ar jail +Run inside a jail. +See +.Sx GENERAL OPTIONS . .El .It Xo .Bk -words @@ -498,6 +540,7 @@ See .Fl B .Op Fl z .Op Fl I Ar interface +.Op Fl j Ar jail .Ek .Xc Show statistics about @@ -534,6 +577,10 @@ For more information about these flags, please refer to .Bl -tag -width indent .It Fl z Reset statistic counters after displaying them. +.It Fl j Ar jail +Run inside a jail. +See +.Sx GENERAL OPTIONS . .El .It Xo .Bk -words @@ -544,6 +591,7 @@ Reset statistic counters after displaying them. .Op Fl f Ar address_family .Op Fl M Ar core .Op Fl N Ar system +.Op Fl j Ar jail .Ek .Xc Display the contents of routing tables. @@ -628,6 +676,10 @@ See Use an alternative kernel image See .Sx GENERAL OPTIONS . +.It Fl j Ar jail +Run inside a jail. +See +.Sx GENERAL OPTIONS . .El .It Xo .Bk -words @@ -636,6 +688,7 @@ See .Op Fl s .Op Fl M Ar core .Op Fl N Ar system +.Op Fl j Ar jail .Ek .Xc Display routing statistics. @@ -652,6 +705,10 @@ See Use an alternative kernel image See .Sx GENERAL OPTIONS . +.It Fl j Ar jail +Run inside a jail. +See +.Sx GENERAL OPTIONS . .El .It Xo .Bk -words @@ -661,6 +718,7 @@ See .Op Fl f Ar address_family .Op Fl M Ar core .Op Fl N Ar system +.Op Fl j Ar jail .Ek .Xc Display the contents of the multicast virtual interface tables, @@ -696,6 +754,10 @@ See Use an alternative kernel image See .Sx GENERAL OPTIONS . +.It Fl j Ar jail +Run inside a jail. +See +.Sx GENERAL OPTIONS . .El .It Xo .Bk -words @@ -705,6 +767,7 @@ See .Op Fl f Ar address_family .Op Fl M Ar core .Op Fl N Ar system +.Op Fl j Ar jail .Ek .Xc Show multicast routing statistics. @@ -734,11 +797,16 @@ See Use an alternative kernel image See .Sx GENERAL OPTIONS . +.It Fl j Ar jail +Run inside a jail. +See +.Sx GENERAL OPTIONS . .El .It Xo .Bk -words .Nm .Fl Q +.Op Fl j Ar jail .Ek .Xc Show @@ -749,6 +817,10 @@ The flags field shows available ISR handlers: .It Li C Ta Dv NETISR_SNP_FLAGS_M2CPUID Ta "Able to map mbuf to cpu id" .It Li D Ta Dv NETISR_SNP_FLAGS_DRAINEDCPU Ta "Has queue drain handler" .It Li F Ta Dv NETISR_SNP_FLAGS_M2FLOW Ta "Able to map mbuf to flow id" +.It Fl j Ar jail +Run inside a jail. +See +.Sx GENERAL OPTIONS . .El .El .Ss GENERAL OPTIONS @@ -808,6 +880,13 @@ Wider output; expand address fields, etc, to avoid truncation. Non-numeric values such as domain names may still be truncated; use the .Fl n option if necessary to avoid ambiguity. +.It Fl j Ar jail +Perform the actions inside the +.Ar jail . +This allows network state to be accessed even if the +.Cm netstat +binary is not available in the +.Ar jail . .El .Sh EXAMPLES Show packet traffic information (packets, bytes, errors, packet drops, etc) for From nobody Wed Aug 16 14:14:39 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RQqrv6Cf6z4qjt1; Wed, 16 Aug 2023 14:14:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RQqrv5fwGz4cxD; Wed, 16 Aug 2023 14:14:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692195279; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=k24/g61ZL27AF3HSo0bJ7GuohAqE3hN8p+/+ONcwYVs=; b=INbQXVIQUhSR7KnOMcq1wYDT3WkyPlSXVldiuE7i0ixn6cFXHhOrQ4lT8vmh6W/dJWLTGC qGgTNwjHi61S7q810Ga+TA6eHNQFe7/WIGvRYzaGKdMzy2oD97sgeWaQdDldD1ZCsEj7sL mhCXnOrRWk2MNsCRqMnJgd53deLwxJmTiOmTy0m/UAbAkByC2STYDU6UkzG8En8WQliBcm 22Kwmw7cdeTPkVkkF5FYLzQqipoDbJt/MKQhkkpy3bvpopvqwRkfy4oalI3VTuhDdkTL6Q Ooyt5LEWH+N7MgbnC2g5zLzvSoTEBNByKT6ctAqwieJDJC5ppIVd2rVnLo0RJg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692195279; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=k24/g61ZL27AF3HSo0bJ7GuohAqE3hN8p+/+ONcwYVs=; b=MZsQ1VSOu0ZuZE/6dNN3ARjbMpuBr++E4YlI51uEcq7hYYYZylh5tpoJBg9u6c5kNO8WMY g3Xp8YjE4K4eByJiHb7THmzuhKBdbG46sStz8jrblyYKTOS1VFd3buXI9k9WmsQxg+U1Dl IRJ1rIjzj83t5fgue5joJPJ34MsGjCZJLT1jjGwgaX/mUdJMDL/PjEoeSTonmmlfCgSMY5 fl6x3aLb6JUPQksmC7aEP1BmNfztXnGDmL0dbIt8O7UDRPxZjsn6ushpdt9rub1hzjHTWu B50hjsBS1ikJafON53+bT+ud7Yb0wgNb8ESyvfRLElPhEuhz82XhYJhl8Efnig== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692195279; a=rsa-sha256; cv=none; b=yLH9DZlgLy/BoVUO9cQVKrwRRZAX0reuZm/rOXuwgLa4LUeaDT0gTXR22IPvblUbws3J+P 85CcVev+E8cMK2Pfcz/6e8gLl3kNlG6VO2hMBbQ9xaI8TafIWhW96EaVwU4N2Eb+q1aKeX WMw59ZSEq6w7x4UtWEsG8lIADu3BoJMi3TX1tj3ddSDcCAas62sW00vmEHsJcZ0X4+QoY8 oboHTxWdMz4CuzMPLWEfTUAN8dm/9KNsR6+cRDJ6rWTzXKsOsqvNp7M8uM3H5vvW9YlSF1 ynyvxLK4CEz5wQCa+caPuYe89NVzgAmz6eLtr/cUW9qS917iiY2wCJEnDlPLGw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RQqrv4lQFzvPk; Wed, 16 Aug 2023 14:14:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37GEEd4j091551; Wed, 16 Aug 2023 14:14:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37GEEdBi091548; Wed, 16 Aug 2023 14:14:39 GMT (envelope-from git) Date: Wed, 16 Aug 2023 14:14:39 GMT Message-Id: <202308161414.37GEEdBi091548@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Doug Rabson Subject: git: 3af3571ca5b8 - main - netstat(1): fix manpage date List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dfr X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3af3571ca5b82a56ae88654ec5cb35acfbe5d12c Auto-Submitted: auto-generated The branch main has been updated by dfr: URL: https://cgit.FreeBSD.org/src/commit/?id=3af3571ca5b82a56ae88654ec5cb35acfbe5d12c commit 3af3571ca5b82a56ae88654ec5cb35acfbe5d12c Author: Doug Rabson AuthorDate: 2023-08-16 14:13:31 +0000 Commit: Doug Rabson CommitDate: 2023-08-16 14:13:42 +0000 netstat(1): fix manpage date MFC after: 1 week --- usr.bin/netstat/netstat.1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr.bin/netstat/netstat.1 b/usr.bin/netstat/netstat.1 index df95651499c7..9a97d85bcbad 100644 --- a/usr.bin/netstat/netstat.1 +++ b/usr.bin/netstat/netstat.1 @@ -28,7 +28,7 @@ .\" @(#)netstat.1 8.8 (Berkeley) 4/18/94 .\" $FreeBSD$ .\" -.Dd June 26, 2023 +.Dd August 14, 2023 .Dt NETSTAT 1 .Os .Sh NAME From nobody Wed Aug 16 15:31:58 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RQsZ71GmPz4qnB3; Wed, 16 Aug 2023 15:31: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RQsZ70qpCz3DpM; Wed, 16 Aug 2023 15:31:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692199919; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Tny43CqEaU0GuBl12GMQ6up6JMKI43zcj3r1Zlmvamo=; b=MoylvAqvidpRZ4Dd5l9R5B8rXy1iMR3wHUoVJrlzPjGrH/OdCbfyF+0dxQixBWOqtf8O51 WfI9xXSnYTNBcSiztVgM5qLvybwHZZlrjVTrmttxUtTxNviQVngv7F+H+sRr61ci86I+wa lZyBtPOID9bXb3mh+fAmlUNM2ns+G0GPNzB91ZEownNLeygHNpl3gpHiAESaPfLJ5EA1iq 0t3UdkFzzdTNOnBc9PTa+MCMhOwebBOnze9JMsjKLi2mCdLh2Re/ZcyQONZcRvtrOVk7Qr 0IK2ueXp6nqPoIydCyN+SbvXxySapuVsCID2LkZoXX1e2idraQGzTmvb1xhzmQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692199919; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Tny43CqEaU0GuBl12GMQ6up6JMKI43zcj3r1Zlmvamo=; b=imzW8B2S01vwByM0Zpw6uMxoVSJ01K3kpdJ/GuULTrfZFyTA4tmX1t59hhLpL5uwBGm2bu zsnIaJuAd95KvqaPR7IvfiHAiewFVJeSMdv01FRNhh7TrD9lKsw0EUjwThQSsgMgRDi846 8HNSW1yiJ+ROTpD1N4bZ/RPZ+zVn7S4yDhZwB/bBeDgho9ic8fVLEqWEr+7ICv/RSzC3Lx WZwKg5wigd9OX08utpTCnO/UYJKD7R9sy9OgYFpXslYKcLrFOi4SWzFhfI/u68eJIgje9M aXorSZmCTg2S+iKe3JrF8PBtKN25FpsIRUGgdI7jBM/PePvBVaaOdKM7eXZJLQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692199919; a=rsa-sha256; cv=none; b=qHmwREbgw6tLlCvWu5ZGrJjy8ZNweXaSRnwu/hiRS/t5ui3jkZaKIrjTH3KDwO9X7YEjgO eBPo3HclKrz9TC2DR0wzbV6xuDC9TjdFm33xrIlyB1MQ/VZm5RvQOxb2iM4NDUJm9S9MLz YiTT1hMfLf5f/GngxHVl0Hl80nZ6JhHjb78oYD0MglnUq+OYdF0a93dxa0CoALv4RY23rB 9+xdemhG3TipcIMCK1k7Hk5Z3v415mTVMuRfV6PEkneh44810EJS9eVt8xXRsCdUn+RF3h dl327ABFG39CTK7glM8FdAFuRk1hzJa44MDWhdVyUajmzz8+8DiO1WWOzh83cw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RQsZ671PyzxRM; Wed, 16 Aug 2023 15:31:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37GFVwO0020194; Wed, 16 Aug 2023 15:31:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37GFVwAW020191; Wed, 16 Aug 2023 15:31:58 GMT (envelope-from git) Date: Wed, 16 Aug 2023 15:31:58 GMT Message-Id: <202308161531.37GFVwAW020191@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Simon J. Gerraty" Subject: git: 93ac817faed2 - main - local.dirdeps.mk ensure tools/build is built if needed List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: sjg X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 93ac817faed22c7d7d7de5211ac6eb7da6910e02 Auto-Submitted: auto-generated The branch main has been updated by sjg: URL: https://cgit.FreeBSD.org/src/commit/?id=93ac817faed22c7d7d7de5211ac6eb7da6910e02 commit 93ac817faed22c7d7d7de5211ac6eb7da6910e02 Author: Simon J. Gerraty AuthorDate: 2023-08-16 15:31:11 +0000 Commit: Simon J. Gerraty CommitDate: 2023-08-16 15:31:11 +0000 local.dirdeps.mk ensure tools/build is built if needed If MK_host_egacy is yes, we need it built, make sure that happens. Reviewed by: stevek --- share/mk/local.dirdeps.mk | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/share/mk/local.dirdeps.mk b/share/mk/local.dirdeps.mk index 1bf81e72f363..14024c06ac0e 100644 --- a/share/mk/local.dirdeps.mk +++ b/share/mk/local.dirdeps.mk @@ -84,7 +84,11 @@ DIRDEPS_FILTER.xtras= DIRDEPS_FILTER.xtras+= Nusr.bin/clang/clang.host .endif -.if ${DEP_MACHINE} != "host" +.if ${DEP_MACHINE:Nhost*} == "" +.if ${MK_host_egacy} == "yes" && ${DEP_RELDIR:Ntools/build:Ntargets/*:N*/stage} != "" +DIRDEPS += tools/build +.endif +.else MK_host_egacy.${DEP_MACHINE}= no # this is how we can handle optional dependencies From nobody Wed Aug 16 16:15:16 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RQtX51VLJz4qpg9; Wed, 16 Aug 2023 16:15: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RQtX511dCz3HZN; Wed, 16 Aug 2023 16:15:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692202517; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=FlQKDITAMpr+rt1npbUi7y6ksaVnN6ZyXtcXrX1sUHQ=; b=k956jyuKp+nTG5bKZpRr77aKwtDqMdS+E4Kzp/nMC03QdDFXgsONjfmOzuzUEEdwcFwHBG +zyYvSESBUlT/iqI8M8IXSiYWC7KH4zCXyCYaeVzsPu1sRlvpt5YEb1ceQWIiU6QDZtf9l kdXue/BpClyt/oh+H0IeeukMdlzCdDJfIqn75sAr22eEkcWI+BPjkwy+qeolcIH15ZkoC9 lSIp5SqwyAzmSSRV3NI/Cz9ycjj9Y0t8EcuROpnsb0Ue38BMz4HdjsUG+xsFdt/MNQUsNF bU7BUn96dgqckfUrsyPj0XVMT1CIQRc8tqh7KOJ9IbwP/h+i3W++LZ261W6iNA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692202517; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=FlQKDITAMpr+rt1npbUi7y6ksaVnN6ZyXtcXrX1sUHQ=; b=p9XcUdEN0xuQye+ruJtZkamlFQx4GJN71kr2kGpNTVySlhWCfBiUlS7xPzMRYWXgy1gteF 5puHjn6Lml7Cm3Xrbg7o1HG4NuQF8l95yuv5cFnCiqCQgG2vexSkRXl1vBzcXjcRhpkRN8 G0RkbOXbhlJyeX1amD17JLQe1QztBJvz8uTlj01IGuZJF0bwNqoEkku1DfcLktIVrFF7U/ tVOfxKkXV4MJOunQ4r1Tq1g91x+lDpvrx6PXu3IwoNHF2H+HkiqaxMQ/eBtoEGgTRy4Oz6 Fm5rgdrn34uicR4qrONVsvdOgWkAFmrK5gDwQ5kfgI4VzavPrSB1Dg3qkTreWg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692202517; a=rsa-sha256; cv=none; b=ZRlHCYRNokS5wNrAY+lkNmnM1b64sAwhPd2yLI76h5GrAKuk3VkcatEyQ3iWVpCF1Ut2+D A7+W6usD3e94aQtYrGpV5CPaoDpSc/HlrZqBge/WRbRZXGYNJf3UH5IhLjAUTpA6Jaxk95 8NAeIIuGMv9mRBYtO1/uoV2gd0DvKkcvNNxw+9+JwCeXJCwa2Dk6QPe7JvQNJtVUUthLv/ 2XZUSnXCLX+efY8llhYkbKWXZATSdVJTK7pWMhY8xeZ13FVavTY9DfEWAFkcgDhoN1B/Yk caisk+cU4bkhZJ8F9/PlGwsZ0uX6Rk8PoxIermimJ1J/lG1VeHRcs+t64ko9fw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RQtX46v8NzyWb; Wed, 16 Aug 2023 16:15:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37GGFGoO092656; Wed, 16 Aug 2023 16:15:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37GGFGTF092653; Wed, 16 Aug 2023 16:15:16 GMT (envelope-from git) Date: Wed, 16 Aug 2023 16:15:16 GMT Message-Id: <202308161615.37GGFGTF092653@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Navdeep Parhar Subject: git: 8a2e880ab07f - main - cxgbe(4): Update firmwares to 1.27.4.0 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: np X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8a2e880ab07f3cd04a0f458809fba5d4eacf75f1 Auto-Submitted: auto-generated The branch main has been updated by np: URL: https://cgit.FreeBSD.org/src/commit/?id=8a2e880ab07f3cd04a0f458809fba5d4eacf75f1 commit 8a2e880ab07f3cd04a0f458809fba5d4eacf75f1 Author: Navdeep Parhar AuthorDate: 2023-08-16 12:42:00 +0000 Commit: Navdeep Parhar CommitDate: 2023-08-16 15:43:43 +0000 cxgbe(4): Update firmwares to 1.27.4.0 This is the list of changes since last release, taken from the release notes of Chelsio Unified Wire 3.18.0.1. Version : 1.27.4.0 Date : 07/05/2023 ======================================= Fixes ----- BASE: - Handle 40G to 100G cable change. - Avoid unnecessary i2c read. ======================================= Obtained from: Chelsio Communications Sponsored by: Chelsio Communications MFC after: 1 week --- sys/conf/files | 6 +++--- .../{t4fw-1.27.3.0.bin => t4fw-1.27.4.0.bin} | Bin 570880 -> 570880 bytes sys/dev/cxgbe/firmware/t4fw_interface.h | 6 +++--- .../{t5fw-1.27.3.0.bin => t5fw-1.27.4.0.bin} | Bin 678912 -> 678912 bytes .../{t6fw-1.27.3.0.bin => t6fw-1.27.4.0.bin} | Bin 730624 -> 730624 bytes sys/modules/cxgbe/t4_firmware/Makefile | 2 +- sys/modules/cxgbe/t5_firmware/Makefile | 2 +- sys/modules/cxgbe/t6_firmware/Makefile | 2 +- 8 files changed, 9 insertions(+), 9 deletions(-) diff --git a/sys/conf/files b/sys/conf/files index f831ee2b5275..0feeded13ba4 100644 --- a/sys/conf/files +++ b/sys/conf/files @@ -1456,7 +1456,7 @@ t4fw.fwo optional cxgbe \ no-implicit-rule \ clean "t4fw.fwo" t4fw.fw optional cxgbe \ - dependency "$S/dev/cxgbe/firmware/t4fw-1.27.3.0.bin" \ + dependency "$S/dev/cxgbe/firmware/t4fw-1.27.4.0.bin" \ compile-with "${CP} ${.ALLSRC} ${.TARGET}" \ no-obj no-implicit-rule \ clean "t4fw.fw" @@ -1490,7 +1490,7 @@ t5fw.fwo optional cxgbe \ no-implicit-rule \ clean "t5fw.fwo" t5fw.fw optional cxgbe \ - dependency "$S/dev/cxgbe/firmware/t5fw-1.27.3.0.bin" \ + dependency "$S/dev/cxgbe/firmware/t5fw-1.27.4.0.bin" \ compile-with "${CP} ${.ALLSRC} ${.TARGET}" \ no-obj no-implicit-rule \ clean "t5fw.fw" @@ -1524,7 +1524,7 @@ t6fw.fwo optional cxgbe \ no-implicit-rule \ clean "t6fw.fwo" t6fw.fw optional cxgbe \ - dependency "$S/dev/cxgbe/firmware/t6fw-1.27.3.0.bin" \ + dependency "$S/dev/cxgbe/firmware/t6fw-1.27.4.0.bin" \ compile-with "${CP} ${.ALLSRC} ${.TARGET}" \ no-obj no-implicit-rule \ clean "t6fw.fw" diff --git a/sys/dev/cxgbe/firmware/t4fw-1.27.3.0.bin b/sys/dev/cxgbe/firmware/t4fw-1.27.4.0.bin similarity index 99% rename from sys/dev/cxgbe/firmware/t4fw-1.27.3.0.bin rename to sys/dev/cxgbe/firmware/t4fw-1.27.4.0.bin index e1576783a65c..9addb9e25422 100644 Binary files a/sys/dev/cxgbe/firmware/t4fw-1.27.3.0.bin and b/sys/dev/cxgbe/firmware/t4fw-1.27.4.0.bin differ diff --git a/sys/dev/cxgbe/firmware/t4fw_interface.h b/sys/dev/cxgbe/firmware/t4fw_interface.h index bbe6896430d3..e68e4a2c5461 100644 --- a/sys/dev/cxgbe/firmware/t4fw_interface.h +++ b/sys/dev/cxgbe/firmware/t4fw_interface.h @@ -10003,17 +10003,17 @@ enum fw_hdr_chip { enum { T4FW_VERSION_MAJOR = 1, T4FW_VERSION_MINOR = 27, - T4FW_VERSION_MICRO = 3, + T4FW_VERSION_MICRO = 4, T4FW_VERSION_BUILD = 0, T5FW_VERSION_MAJOR = 1, T5FW_VERSION_MINOR = 27, - T5FW_VERSION_MICRO = 3, + T5FW_VERSION_MICRO = 4, T5FW_VERSION_BUILD = 0, T6FW_VERSION_MAJOR = 1, T6FW_VERSION_MINOR = 27, - T6FW_VERSION_MICRO = 3, + T6FW_VERSION_MICRO = 4, T6FW_VERSION_BUILD = 0, }; diff --git a/sys/dev/cxgbe/firmware/t5fw-1.27.3.0.bin b/sys/dev/cxgbe/firmware/t5fw-1.27.4.0.bin similarity index 60% rename from sys/dev/cxgbe/firmware/t5fw-1.27.3.0.bin rename to sys/dev/cxgbe/firmware/t5fw-1.27.4.0.bin index fcae45a4df35..b32f270b1866 100644 Binary files a/sys/dev/cxgbe/firmware/t5fw-1.27.3.0.bin and b/sys/dev/cxgbe/firmware/t5fw-1.27.4.0.bin differ diff --git a/sys/dev/cxgbe/firmware/t6fw-1.27.3.0.bin b/sys/dev/cxgbe/firmware/t6fw-1.27.4.0.bin similarity index 76% rename from sys/dev/cxgbe/firmware/t6fw-1.27.3.0.bin rename to sys/dev/cxgbe/firmware/t6fw-1.27.4.0.bin index 31bd7019e51e..a47f287848f1 100644 Binary files a/sys/dev/cxgbe/firmware/t6fw-1.27.3.0.bin and b/sys/dev/cxgbe/firmware/t6fw-1.27.4.0.bin differ diff --git a/sys/modules/cxgbe/t4_firmware/Makefile b/sys/modules/cxgbe/t4_firmware/Makefile index f70a13a3e30e..807dc6beaf35 100644 --- a/sys/modules/cxgbe/t4_firmware/Makefile +++ b/sys/modules/cxgbe/t4_firmware/Makefile @@ -17,7 +17,7 @@ FIRMWS+= ${F}:${F:C/.txt//}:1.0.0.0 .endif .endfor -T4FW_VER= 1.27.3.0 +T4FW_VER= 1.27.4.0 FIRMWS+= t4fw-${T4FW_VER}.bin:t4fw:${T4FW_VER} .include diff --git a/sys/modules/cxgbe/t5_firmware/Makefile b/sys/modules/cxgbe/t5_firmware/Makefile index b586727a994a..a7aae96b111f 100644 --- a/sys/modules/cxgbe/t5_firmware/Makefile +++ b/sys/modules/cxgbe/t5_firmware/Makefile @@ -17,7 +17,7 @@ FIRMWS+= ${F}:${F:C/.txt//}:1.0.0.0 .endif .endfor -T5FW_VER= 1.27.3.0 +T5FW_VER= 1.27.4.0 FIRMWS+= t5fw-${T5FW_VER}.bin:t5fw:${T5FW_VER} .include diff --git a/sys/modules/cxgbe/t6_firmware/Makefile b/sys/modules/cxgbe/t6_firmware/Makefile index be5ed1d99bb4..77905f4d8861 100644 --- a/sys/modules/cxgbe/t6_firmware/Makefile +++ b/sys/modules/cxgbe/t6_firmware/Makefile @@ -17,7 +17,7 @@ FIRMWS+= ${F}:${F:C/.txt//}:1.0.0.0 .endif .endfor -T6FW_VER= 1.27.3.0 +T6FW_VER= 1.27.4.0 FIRMWS+= t6fw-${T6FW_VER}.bin:t6fw:${T6FW_VER} .include From nobody Wed Aug 16 16:53:32 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RQvND2g9Fz4qrPL; Wed, 16 Aug 2023 16:53: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RQvND1ylHz3M4D; Wed, 16 Aug 2023 16:53:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692204812; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kxSa3FWl+5vvn53UZpA1vK7xp3WxSjqcLFf4OhdZbFg=; b=S8elBSX6EYWuGCXSEVKfW+HFg0HLaAY2Ba4dFmAw4B5AjxPRApG9DsHUPdF8GsCoiSuuiu JGoZ/b8wffaz610pOnHB5IhvNTtVr86jCjfWZAu0aU2DSNQFmC0/zn1SLRtdv/AXOkieVZ uBF7aLew5redRhdtGHa2sESHtt8QiIbgoY8TohbF/eqovTXtwsdlErAeJ64nXfwHBg5FCQ aKW4NpGobz3ANyxazRHHgt/PB9xSaT/gk3tneB6rZTGX6VYCHDnv6X5qKZE0lxyYVo2dEC Hfw9/gMGY2BmglAhJe4IHDiKhgptIX2p5Yalllr3cU5ehF1CBSueWldyHTrriA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692204812; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kxSa3FWl+5vvn53UZpA1vK7xp3WxSjqcLFf4OhdZbFg=; b=drlYmb7+o8KlC/iv164I37WCNfADnocaFnzeSyXXVBHVKlmsXAa7mvoIFQNdaPyp3rDbEh diCyidbWVehiCzC5o39XjkiB58g2uAsE0ecJvVpwPFxMrk+2KSOlh6NqakPoDRedYGIVh+ zeEjFoJ5quC8zFq49ONDLr+ZdM7jE+tAwmu3v57+X/184v3ch8pRO2tQj/1I96HTwW9/M9 rmWVCOBretycqgc906OOEkJJ/ZfUqY6BTnkInF5v7iX0dprcvVleHMJyhi5dBrt5l6oQHd 0aBDZ6eCtQhK5/aPtb7voqo1xdUAveL0O4uBT24mkg7uzlxqeds4uQEzdt86Ug== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692204812; a=rsa-sha256; cv=none; b=oVdK0pik9ziCqc+rL38VgQEj7iXrrcgMyx4oDbJnH1atK804/7PrWbSnHvk2GuEyStFoSn yCI/oo0wXIa9YPl/4nvvZy3hRf5ireHgaEJvWZYtO9WhRCR5y0nUmvw5A8S6dyYrKhYRmn N5dWarQJdD3NYr0LM7MVkAKVw2VdF4MEKMowMfGgtXY/Qclmh7wumyGLZWkx6GNGtjo8hN aXePghLcKX/jdWOKVLCU1feBfqqjrdibChs4LMKk7ijrA8wAM/mmR8wVEGbByMzrhGE9v2 6erU2ZX4v4YsPgH66VSzjvZ8ZBUsAcvggx7koE6TyyXG6kUOHJ9RMbcKWVYckg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RQvND11pzz100m; Wed, 16 Aug 2023 16:53:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37GGrWXa057999; Wed, 16 Aug 2023 16:53:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37GGrWAg057996; Wed, 16 Aug 2023 16:53:32 GMT (envelope-from git) Date: Wed, 16 Aug 2023 16:53:32 GMT Message-Id: <202308161653.37GGrWAg057996@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: 41582f28ddf7 - main - sys: Add a deprecation warning for 32-bit kernels. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 41582f28ddf7b42b713b270d41e8da80160b69a3 Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=41582f28ddf7b42b713b270d41e8da80160b69a3 commit 41582f28ddf7b42b713b270d41e8da80160b69a3 Author: John Baldwin AuthorDate: 2023-08-16 16:48:51 +0000 Commit: John Baldwin CommitDate: 2023-08-16 16:48:51 +0000 sys: Add a deprecation warning for 32-bit kernels. Per recent discussions on arch@ and at the BSDCan developer summit, we are considering removing support for 32-bit platforms (in some form) for 15.0 (at the earliest). A final decision on what will ship in 15.0 will be made closer to the release of 15.0. However, we should communicate the potential deprecation in 14.0 to provide notice to users. This commit adds a warning during boot on 32-bit kernels that they are deprecated and may be removed in 15.0. More details will be included in a followup commit to RELNOTES. Reviewed by: brooks, imp, emaste Differential Revision: https://reviews.freebsd.org/D41163 --- sys/kern/init_main.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/sys/kern/init_main.c b/sys/kern/init_main.c index abc6b3f6e2f2..78377d5d7ce7 100644 --- a/sys/kern/init_main.c +++ b/sys/kern/init_main.c @@ -395,6 +395,15 @@ SYSINIT(diagwarn2, SI_SUB_LAST, SI_ORDER_FIFTH, print_caddr_t, diag_warn); #endif +#if __SIZEOF_LONG__ == 4 +static char ilp32_warn[] = + "WARNING: 32-bit kernels are deprecated and may be removed in FreeBSD 15.0.\n"; +SYSINIT(ilp32warn, SI_SUB_COPYRIGHT, SI_ORDER_FIFTH, + print_caddr_t, ilp32_warn); +SYSINIT(ilp32warn2, SI_SUB_LAST, SI_ORDER_FIFTH, + print_caddr_t, ilp32_warn); +#endif + static int null_fetch_syscall_args(struct thread *td __unused) { From nobody Wed Aug 16 16:53:33 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RQvNF40rLz4qrgc; Wed, 16 Aug 2023 16:53: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RQvNF3Gkyz3LsL; Wed, 16 Aug 2023 16:53:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692204813; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+8rH7QpRrvPMTrJcSCMfGUBKfrtj3jmGLVi/VEA5YHo=; b=mQ3brmu2QrsJYrG+dYpSzsztjZndR4eJZzBV26g9wR0bOuqHhlW91zCFPNYLOTrmTHq4bx UF02iZjsTTZCrbsF55LuJB1YkrUWRdVxtGFgXtZE+k4VRYQEeRkMfKoPmW4afIFM/Z+UzA 3VenO6kqZCjNxOZMMGFhvJG+1dqH1rhdcRphpGXD9+RAbnV6ZloDX0NAm8qJ7QmMTVh94+ LPn1UlHxGmGGlQDpVsw8bs3Pxs50Xqgx2xGheDzF43fJkJLHoIVxIvikeJnLyD14d7R+YN 1CbUtnIDWvDCdJL9aXas4UzCQnsGXz8DYsTywNDWm4VIIdsEy6rMB1um1/otZA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692204813; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+8rH7QpRrvPMTrJcSCMfGUBKfrtj3jmGLVi/VEA5YHo=; b=rUS7lT84TQDbFKWHCrk1MPdgAOFPeENxX0fsdysGgPWgdtBZBlU13aYzSxLLSaDZ5WRYRv ZmrXYqIcFz/hsWxtmEEc391TsAnMcmEKZ9YRRQ580LDI8cvi0IJcEVEknnnfiKjqCRn5RR 7U0hGYz06/SO7eim+Cr9nyas0h38ax841bH7sne3mKs5J/A6aPEFr2jmJ4nW10s3DDFtyR 8I8HCGQzWlaRbwjYGH+7rzetApY7T0AVbQ1N2DBNESjhU6cX01THnseEv08KxU1KqW0bzb ZUy8OyHxLYLDa6Lbs6MZBSQc1DYZFN0a3CwFSi0SyLdAxOn33ylXvR8N6c6uSg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692204813; a=rsa-sha256; cv=none; b=eyHrLsxml/oLzZJ/ZlL/WG0JmCTzC1Cl4b0hcwnm1O/vg+D5DqSdrOJ/AC8/pAOJavG+b9 OoeHWrP+2U6BWHTPtYx7OGaLoaMi+wrGy+oj8Gj7Q9sjJK6XGQSIIgBlEi0H9h+NIh6L6D 8tcMs5kzFe1td7fCQL/9jVo6vF1+BUMcKoMIH77mSA4DZYBvOnEi9v2vJ2WOFWsflHw0Os 33UCRUffFRwfzB/le9zQDrkopVFeLmj3aca4s8Cq+lHvyy5NfAVyp8FMnA416NtZQMQYZk w1mZlDgf5cO+H5ihzecvPqDj+zPTLi4PD9EymWYmWyr+6cPecXj5mAFfauJZ/g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RQvNF1prgz1096; Wed, 16 Aug 2023 16:53:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37GGrX3n058053; Wed, 16 Aug 2023 16:53:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37GGrXLu058051; Wed, 16 Aug 2023 16:53:33 GMT (envelope-from git) Date: Wed, 16 Aug 2023 16:53:33 GMT Message-Id: <202308161653.37GGrXLu058051@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: da51a1211dc7 - main - RELNOTES: Note the deprecation of 32-bit platforms for 15.0. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: da51a1211dc799fa123f5d7f041eaf83c36f976b Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=da51a1211dc799fa123f5d7f041eaf83c36f976b commit da51a1211dc799fa123f5d7f041eaf83c36f976b Author: John Baldwin AuthorDate: 2023-08-16 16:49:17 +0000 Commit: John Baldwin CommitDate: 2023-08-16 16:52:16 +0000 RELNOTES: Note the deprecation of 32-bit platforms for 15.0. This draws a line in the sand of removing support for 32-bit worlds and kernels aside from COMPAT_FREEBSD32 and lib32 support. The project may choose to alter this approach when 15.0 is released by extending some level of 32-bit support in 15.0 or later. In particular, at present there is a fair bit of interest in retaining armv7 support in 15.0 at least. Reviewed by: brooks Differential Revision: https://reviews.freebsd.org/D41164 --- RELNOTES | 40 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) diff --git a/RELNOTES b/RELNOTES index 4687fc30aa22..5f75215807f4 100644 --- a/RELNOTES +++ b/RELNOTES @@ -10,6 +10,46 @@ newline. Entries should be separated by a newline. Changes to this file should not be MFCed. +41582f28ddf7: + FreeBSD 15.0 will not include support for 32-bit platforms. + However, 64-bit systems will still be able to run older 32-bit + binaries. + + Support for executing 32-bit binaries on 64-bit platforms via + COMPAT_FREEBSD32 will remain supported for at least the + stable/15 and stable/16 branches. + + Support for compiling individual 32-bit applications via + `cc -m32` will also be supported for at least the stable/15 + branch which includes suitable headers in /usr/include and + libraries in /usr/lib32. + + Support for 32-bit platforms in ports for 15.0 and later + releases is also deprecated, and these future releases may not + include binary packages for 32-bit platforms or support for + building 32-bit applications from ports. + + stable/14 and earlier branches will retain existing 32-bit + kernel and world support. Ports will retain existing support + for building ports and packages on 32-bit systems on stable/14 + and earlier branches as long as those branches are supported + by the ports system. However, all 32-bit platforms are Tier-2 + or Tier-3 and support for individual ports should be expected + to degrade as upstreams deprecate 32-bit platforms. + + With the current support schedule, stable/14 will be EOLed 5 + years after the release of 14.0. The EOL of stable/14 would + mark the end of support for 32-bit platforms including source + releases, pre-built packages, and support for building + applications from ports. Given an estimated release date of + October 2023 for 14.0, support for 32-bit platforms would end + in October 2028. + + The project may choose to alter this approach when 15.0 is + released by extending some level of 32-bit support for one or + more platforms in 15.0 or later. Users should use the + stable/14 branch to migrate off of 32-bit platforms. + 3cb2f5f369ec: The lua-flavored loader(8) will now interpret .lua files that appear in loader_conf_files as lua, and execute them in a sandbox. Existing From nobody Wed Aug 16 16:55:37 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RQvQh0vZ5z4qrmV; Wed, 16 Aug 2023 16:55:40 +0000 (UTC) (envelope-from jhb@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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RQvQg72pwz3Mgd; Wed, 16 Aug 2023 16:55:39 +0000 (UTC) (envelope-from jhb@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692204940; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=j+eRziAhjBnFbNBdAdMnw6Vup81W0K7wdxtRJn8M//A=; b=mqZFueEAiyCk+G1wlUKQlVLU/OzGvAtEaP+0SobTegyxQr2ctIXOSG6r456U4M+hOSFUSd fRZafG/iHBjtTzN6xSASEx79XZVEp17zC2PaUg0Er404TLxvoJAQ+3bzcGWE0HKR3niVc6 pZf3bHuM9hLC+sC72w23FBOcy7bHqEFWvY4YEgRJuHyTUrPO8lJk5SPFztCH/4t9X2gHBf qPr4NYxMDnz3y2WrUIaQD0IhI4StvQj46UkveMz3NbHsR75DLdp2ygP+gs3+18Jhoz/6bc zkccYnT6/oRolBJnkkNE2ePaaOJWF181+MyZf/zG+S5ccg/DpKi3SoYXhMr8jw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692204940; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=j+eRziAhjBnFbNBdAdMnw6Vup81W0K7wdxtRJn8M//A=; b=HJvhSqJ1Pq7t4jSUK4WxxE5cpglZ94ZK9vXEPxGstqHZqnqlYeGtkSGOGugr6Did+m+MHI RcJcnPdVb8K3qYXf18PB0wCSlZ8otznykTpPIUuDNu53of7kVBayZfBftzPI1SNPsTSHzp Vg5CJyc6vclB5PTKah2lIc4H3LgJ67woQqmMg68liUZ6dkgpFNjzZ5AMLXgnjK/TmRVQKM VPRKalbCk6WmJ75PXUjbdIkURXg4di9Bb6W9aswjoM+so7BwKSxvrbEsCv/xVDwqZ35C6L DrNjzd+QiIVekt51PBzlx+WmvbkZGnDG8OCzDVKb7omRuigMWp+yoWx71WmgNA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692204940; a=rsa-sha256; cv=none; b=syf88sTZzOXcDMDTMohndXjsvbB31FKUxxWwlvQl8CHC8Lvievl1E3vQh4O+wu4DyIRV6t TDjBIt820Y8dLv6fGvdZ2MFxDldhgCj+ZKSagu51enKV4BWtirwAZI6XXbyADqHo7YC+zS sjZkQM3vsw0+ZNgTVNmIhtR/o74m01iFBHMN2GvdXX7sjBR3Cx46sBD+LPC/a+Bel2Q5mZ F9qEwDHOdZ/83vS/aV/2phLRC/Ia36BOusiGBee9+zVQl1AGirYerHVpzE5d8eFALXQdcM WoRVTu7Mdelsg6i+cSmGlDbkrhzpvOHZTt0Ch8526PB7IYZPLV8wWNqGtsz0tA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from [IPV6:2601:648:8683:a9e0:a0ef:9b93:b075:79a4] (unknown [IPv6:2601:648:8683:a9e0:a0ef:9b93:b075:79a4]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) (Authenticated sender: jhb) by smtp.freebsd.org (Postfix) with ESMTPSA id 4RQvQg3Rkkz1LVK; Wed, 16 Aug 2023 16:55:39 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Message-ID: <137aaabe-cba6-e88d-05d6-7fd214c9a594@FreeBSD.org> Date: Wed, 16 Aug 2023 09:55:37 -0700 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.15; rv:102.0) Gecko/20100101 Thunderbird/102.14.0 Subject: Re: git: da51a1211dc7 - main - RELNOTES: Note the deprecation of 32-bit platforms for 15.0. Content-Language: en-US From: John Baldwin To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org References: <202308161653.37GGrXLu058051@gitrepo.freebsd.org> In-Reply-To: <202308161653.37GGrXLu058051@gitrepo.freebsd.org> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit On 8/16/23 9:53 AM, John Baldwin wrote: > The branch main has been updated by jhb: > > URL: https://cgit.FreeBSD.org/src/commit/?id=da51a1211dc799fa123f5d7f041eaf83c36f976b > > commit da51a1211dc799fa123f5d7f041eaf83c36f976b > Author: John Baldwin > AuthorDate: 2023-08-16 16:49:17 +0000 > Commit: John Baldwin > CommitDate: 2023-08-16 16:52:16 +0000 > > RELNOTES: Note the deprecation of 32-bit platforms for 15.0. > > This draws a line in the sand of removing support for 32-bit worlds > and kernels aside from COMPAT_FREEBSD32 and lib32 support. The > project may choose to alter this approach when 15.0 is released by > extending some level of 32-bit support in 15.0 or later. > > In particular, at present there is a fair bit of interest in retaining > armv7 support in 15.0 at least. This language probably needs further tweaking before 14.0 ships, but it's a start at least, and we need to get the associated warning into 14.0 to give users lots of heads up before 15.0 ships. -- John Baldwin From nobody Wed Aug 16 16:56:11 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RQvRJ53KFz4qrmZ; Wed, 16 Aug 2023 16:56:12 +0000 (UTC) (envelope-from jhb@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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RQvRJ48Hdz3N4g; Wed, 16 Aug 2023 16:56:12 +0000 (UTC) (envelope-from jhb@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692204972; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=v95Jbu/GTgpF64ANn5RmAZdf/npg/TzFMPMqnjfDTqk=; b=hP56+lmysEwz9ywlAKQ1txWIAR2Kb32sj9WBsX3+Txv7jxYEk3W89ofMWeRUaeJizXI6Xt ft4sSQqDgL0w7LzCN9BKXbnEtg8zXSgeyljZib2ZMTdAMNwO4SHpTjUWTtqWQBVUwnhM8m YITKglieJasEW4XOLPJNo8dFYTUWbzj6nT5Rn4FrORqkj5tYvCdBvYgJlmh2bYMKaUDfe0 qcggepjUh/Fu2xSBqqualbFkHTYOPZKFVsMarK1BEKRgTMBQr4taQCJoBCnrb45jnkoYXJ Ez82EX/ceCKKdopBgqkJTQ06Jiy6qtXVpJA95sLf6RAabq/rD722NLHL8eYUTg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692204972; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=v95Jbu/GTgpF64ANn5RmAZdf/npg/TzFMPMqnjfDTqk=; b=IdsuQZuvWUqhTmw7LZHUM5CLsbVHsqREWqX7PegJOXr8fKNTrphMU1VjTLXaxTDhTsZrPH ZSyx8611ljTdL+ZoItcQXyvK1gMhChPW6U42xIoPf/ZCOQ60d8E+uG8HmYzaM5rh0+MZPh FdRRoTVwF2GPBsOkFyKlmSqIzKIPk5lJtf/AwPy0IxEbCBZ9+zkKNrS6Kvp2Dhq9N7Nb74 ab/+uPIKr39fwNemv7P/qTc3EM8SFyqbd/WULRa0fz58tfPfxKKu0nedRjMCBMjOvHXVb6 Yorc9gwJiFr1HVt2uhdxapBRgxYiETLAp6oHqhYfhSYC/GOsUmSRzfGKepFosA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692204972; a=rsa-sha256; cv=none; b=qg6acryRGvw2tAV1y3xSJfbStyq+xXUzgngZIIw2+hfZRz7RqJmeU9pfi4oVvK2YJBSj2D 8ZaFAiuO4x5wXgaNYN1uvxBFg6RgevtU9X9ZWMpEEx+wEszO+mkVqJOkLBqojS/k44vpO+ 2ccS10uLfPRZFSGJwSYrqJp90bTHP3Qflz+QOeD9H28Q+8Nnqt+R4BIYfdEikSg7Br8Kcj kMjjLz/Mjmn/6CI6y0TseioD9/CfrVjrlYsj5930qw6QgwYlOOlh9woBiM/PaiSTUhXbkM soeWJDR+c30Y/A0ksCK8QiTWw4hGwG04h8UrdXmNwJya/bWRkx2E600PGTtLWw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from [IPV6:2601:648:8683:a9e0:a0ef:9b93:b075:79a4] (unknown [IPv6:2601:648:8683:a9e0:a0ef:9b93:b075:79a4]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (Client did not present a certificate) (Authenticated sender: jhb) by smtp.freebsd.org (Postfix) with ESMTPSA id 4RQvRJ0rT7z1MjB; Wed, 16 Aug 2023 16:56:12 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Message-ID: <7315f078-32fd-89ef-01fa-3010cce751bf@FreeBSD.org> Date: Wed, 16 Aug 2023 09:56:11 -0700 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.15; rv:102.0) Gecko/20100101 Thunderbird/102.14.0 Subject: Re: git: 41582f28ddf7 - main - sys: Add a deprecation warning for 32-bit kernels. Content-Language: en-US From: John Baldwin To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org References: <202308161653.37GGrWAg057996@gitrepo.freebsd.org> In-Reply-To: <202308161653.37GGrWAg057996@gitrepo.freebsd.org> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit On 8/16/23 9:53 AM, John Baldwin wrote: > The branch main has been updated by jhb: > > URL: https://cgit.FreeBSD.org/src/commit/?id=41582f28ddf7b42b713b270d41e8da80160b69a3 > > commit 41582f28ddf7b42b713b270d41e8da80160b69a3 > Author: John Baldwin > AuthorDate: 2023-08-16 16:48:51 +0000 > Commit: John Baldwin > CommitDate: 2023-08-16 16:48:51 +0000 > > sys: Add a deprecation warning for 32-bit kernels. > > Per recent discussions on arch@ and at the BSDCan developer summit, we > are considering removing support for 32-bit platforms (in some form) > for 15.0 (at the earliest). A final decision on what will ship in > 15.0 will be made closer to the release of 15.0. However, we should > communicate the potential deprecation in 14.0 to provide notice to > users. > > This commit adds a warning during boot on 32-bit kernels that they are > deprecated and may be removed in 15.0. More details will be included > in a followup commit to RELNOTES. We should also merge this to stable/13 before the next 13.x release. -- John Baldwin From nobody Wed Aug 16 17:10:06 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RQvlV06hSz4qsQ3; Wed, 16 Aug 2023 17:10:14 +0000 (UTC) (envelope-from mike@karels.net) Received: from mail2.karels.net (mail2.karels.net [3.19.118.201]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "freebsd", Issuer "freebsd" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RQvlT5cWQz3Ndj; Wed, 16 Aug 2023 17:10:13 +0000 (UTC) (envelope-from mike@karels.net) Authentication-Results: mx1.freebsd.org; none Received: from mail2.karels.net (localhost [IPv6:0:0:0:0:0:0:0:1]) by mail2.karels.net (8.17.1/8.17.1) with ESMTP id 37GHA7WH064208; Wed, 16 Aug 2023 12:10:07 -0500 (CDT) (envelope-from mike@karels.net) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=karels.net; s=mail2; t=1692205807; bh=1sd5NMleGe34PO0gqrGRaXwH++LlvtaWCqI2/+90BvA=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=fc8bqIVfus6PymjghZjd4IpQYqH7lJqiTkxUsWtXSdfVaGDgK9WCrtrz+wrO65zhU 3VFaa6CdodvVpLFpK+rAuOElEJzrAEOtdyEcT5Xtq4cTsP6tXkBKZLapRc3eM8gVrP JzV0upfVZOzmciwo4hsV3ombjkR1fRGxIqkyXG+TKJJS3RsNIZmMCgGC4Pok560/aW dMbS8JAexKsw8b+ALXnwm1g04Ic9P/6nL+L+TWp6B0qejezgK7RISVhNJf/wjNDiMC 4WAKYNP4C7oA7Q2gsJehbvHlPhDE4c+3fuXnBTJu567eB8euYa/VsyaMhdl9+CPLyv BPvO5ZpXQLqYw== Received: from [10.0.2.130] ([73.62.165.147]) by mail2.karels.net with ESMTPSA id 2PP/Ae8C3WTO+gAAs/W3XQ (envelope-from ); Wed, 16 Aug 2023 12:10:07 -0500 From: Mike Karels To: John Baldwin Cc: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: Re: git: da51a1211dc7 - main - RELNOTES: Note the deprecation of 32-bit platforms for 15.0. Date: Wed, 16 Aug 2023 12:10:06 -0500 X-Mailer: MailMate (1.14r5964) Message-ID: In-Reply-To: <137aaabe-cba6-e88d-05d6-7fd214c9a594@FreeBSD.org> References: <202308161653.37GGrXLu058051@gitrepo.freebsd.org> <137aaabe-cba6-e88d-05d6-7fd214c9a594@FreeBSD.org> List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain Content-Transfer-Encoding: quoted-printable X-Rspamd-Queue-Id: 4RQvlT5cWQz3Ndj X-Spamd-Bar: ---- 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:16509, ipnet:3.16.0.0/14, country:US] On 16 Aug 2023, at 11:55, John Baldwin wrote: > On 8/16/23 9:53 AM, John Baldwin wrote: >> The branch main has been updated by jhb: >> >> URL: https://cgit.FreeBSD.org/src/commit/?id=3Dda51a1211dc799fa123f5d7= f041eaf83c36f976b >> >> commit da51a1211dc799fa123f5d7f041eaf83c36f976b >> Author: John Baldwin >> AuthorDate: 2023-08-16 16:49:17 +0000 >> Commit: John Baldwin >> CommitDate: 2023-08-16 16:52:16 +0000 >> >> RELNOTES: Note the deprecation of 32-bit platforms for 15.0. >> This draws a line in the sand of removing support for 32-bit = worlds >> and kernels aside from COMPAT_FREEBSD32 and lib32 support. The >> project may choose to alter this approach when 15.0 is released b= y >> extending some level of 32-bit support in 15.0 or later. >> In particular, at present there is a fair bit of interest in = retaining >> armv7 support in 15.0 at least. > > This language probably needs further tweaking before 14.0 ships, but it= 's a > start at least, and we need to get the associated warning into 14.0 to = give > users lots of heads up before 15.0 ships. =46rom the RELNOTES entry: + FreeBSD 15.0 will not include support for 32-bit platforms. That sounds quite definite, although it is softened in the last paragraph= =2E Maybe "is not planned to include" or something like that? Mike > -- = > John Baldwin From nobody Wed Aug 16 17:39:38 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RQwPR11w8z4qtVy; Wed, 16 Aug 2023 17:39:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RQwPQ72J3z3SGX; Wed, 16 Aug 2023 17:39:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692207579; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=r4yZM3oDSwGPJq7602dxoQpByfH4YTRZcxsqthXT9yo=; b=yQ3OZuyCydn+PG5qZ2gvJSrj/eMnBzwoTNbNddipmTJDTbyqaoSv6pfq/LKqtlcog9dQd1 seMocuzjo97O0gjJhBk4tdbiNI9rlpkN0gGGN17ZvPH0YqtK8eqXJS2Q3TW11gUThIiXCc 5e0/4Xp3ecW/LfDDui97MW63a5ynx8xR7KpJe7bNovCtR0sS8sf8TSogoY45LTl2rTNAOz pQll/3GNN29U62orf4GQQJ3fwCXNHOElMFJK+tYxHddb4Zkvy79XAoE1u0KOStQMfeN0FV KanLpKC+axEbEkCSVH+GNoF9sZE4IOITktFm+cQVFwT6oi+vX3nBr6wPAKTkbA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692207579; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=r4yZM3oDSwGPJq7602dxoQpByfH4YTRZcxsqthXT9yo=; b=u6B9ri0KsA6WFZw2H9gToSLrI+R2lX+BrmsuuXT5IJBOxJCJHcb4u1BpIQkXZY4koar4Hs 9rB0c9oj0Dgk3xFF0cd5zOUL/tFENCUAhcrMR/PxqBL5f+i9nQT+cSioZg6cTaxxsFJzXR G/rA5iquw/Xu7I1MjE5+f2xocBc2VzNcHW0kC9ISFs+MQgEAyrfc4gBYTfH5es/GV0Aryd LjWzmnwdyeB0oT7+wk5fva9LUTf+KYYfte2I7yqfU+mhfsL+jAiJ0wxduY+cn+SkeSiF6g /ldnohjlTba3Vf6/t3lcW57GZSa0F3N0DxTRg91DIxUIJG2VrCGN6sJv34CPiw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692207579; a=rsa-sha256; cv=none; b=QKvuJIDIYHlULgGFdT1HZQPGWFzbI3CR5N3y24GN25BS6Kba0EwnpFb9Ked3NtFc4JL5F4 ujjLHYFX+Ia1hcCV6xLbt83Z915T3lQBQBwJ4r3qeVWqvEr/taGx5SYfHSWJYGrAR3XXaz nYibfg0vdAkKzLNamlHAnmWAhOKvVRv5xHe6LTbAnldOsl9OMB+7pJASD/ubfGSfBTE41S o+gZCz0UaLwzMi7L3h4k0T08GUml1PMqTna6wML4zxI+IhXNDtwVUTOFqqCdZISDxGAjbC PSBezt6sYktcPr0zXDCf5Q5uV4ByTrrLIpTZ9+WJClPjLPO4901CEGDjP44GLA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RQwPQ5zXZz11LY; Wed, 16 Aug 2023 17:39:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37GHdccd025932; Wed, 16 Aug 2023 17:39:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37GHdcX5025929; Wed, 16 Aug 2023 17:39:38 GMT (envelope-from git) Date: Wed, 16 Aug 2023 17:39:38 GMT Message-Id: <202308161739.37GHdcX5025929@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dimitry Andric Subject: git: d5af300a69f1 - main - Fix incremental builds after GoogleTest update List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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/main X-Git-Reftype: branch X-Git-Commit: d5af300a69f10e2cf9f1c03a317b7b49115927ed Auto-Submitted: auto-generated The branch main has been updated by dim: URL: https://cgit.FreeBSD.org/src/commit/?id=d5af300a69f10e2cf9f1c03a317b7b49115927ed commit d5af300a69f10e2cf9f1c03a317b7b49115927ed Author: Dimitry Andric AuthorDate: 2023-08-15 21:14:26 +0000 Commit: Dimitry Andric CommitDate: 2023-08-16 17:39:22 +0000 Fix incremental builds after GoogleTest update At the moment, several Makefiles under tests/ do not correctly generate .depend files, which can lead to link errors when doing incremental (e.g. WITHOUT_CLEAN) builds: ld: error: undefined symbol: testing::internal::g_linked_ptr_mutex >>> referenced by gtest-port.h:2137 (/usr/obj/usr/src/amd64.amd64/tmp/usr/include/private/gtest/internal/gtest-port.h:2137) >>> mockfs.o:(testing::internal::linked_ptr_internal::depart()) >>> referenced by gtest-port.h:2139 (/usr/obj/usr/src/amd64.amd64/tmp/usr/include/private/gtest/internal/gtest-port.h:2139) >>> mockfs.o:(testing::internal::linked_ptr_internal::depart()) >>> referenced by gtest-port.h:2139 (/usr/obj/usr/src/amd64.amd64/tmp/usr/include/private/gtest/internal/gtest-port.h:2139) >>> mockfs.o:(testing::internal::linked_ptr_internal::depart()) >>> referenced 3 more times For the time being, put in a depend-cleanup.sh workaround for this. Reported by: des Reviewed by: emaste Fixes: 28f6c2f29280 MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D41476 --- tools/build/depend-cleanup.sh | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/tools/build/depend-cleanup.sh b/tools/build/depend-cleanup.sh index 687f04f57f8c..6741c2285588 100755 --- a/tools/build/depend-cleanup.sh +++ b/tools/build/depend-cleanup.sh @@ -204,3 +204,10 @@ clean_dep lib/libc ffsll S clean_dep lib/libc fls S clean_dep lib/libc flsl S clean_dep lib/libc flsll S + +# 20230815 28f6c2f29280 GoogleTest update +if [ -e "$OBJTOP"/tests/sys/fs/fusefs/mockfs.o ] && \ + grep -q '_ZN7testing8internal18g_linked_ptr_mutexE' "$OBJTOP"/tests/sys/fs/fusefs/mockfs.o; then + echo "Removing stale fusefs GoogleTest objects" + run rm -rf "$OBJTOP"/tests/sys/fs/fusefs +fi From nobody Wed Aug 16 17:48:08 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RQwbD4prSz4qtyk; Wed, 16 Aug 2023 17:48:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RQwbD48bmz3TBJ; Wed, 16 Aug 2023 17:48:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692208088; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5p09CQyEpR+OMoJV/MeyGnJj67E2pGrjSF3Q/knDbZk=; b=FTO4c/IAMqdZBb5rWID60+jbA3Sgtc9Iyz+xZm5l7oBYxhKQygDFm4jsjbnrU1obYw3Psm pBdPVvFngR48hAdhMNBsGmQF/2+Q2emx6BInNFVHc9iLArOma0nSO2Kq0VlAJObpl/nBFN isRrzDQ4DFrSFt5sr4E7uT0sLwRZIKbirr6eJS4UqcN5MzcAFoo8Llw+1nExXALaZMaK16 kT6Dbe8ef7/wCZJQUH+GtGlmtGH4y2C1L3h+joCcAuZye9fT/dZr7xWoLQTcHRRKXV4TQm tr8AwwNrmZcDOiExdxlKjYindm2dLN4f28FROhZ4lclxiTpCqKcRmcCtgOQj/A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692208088; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5p09CQyEpR+OMoJV/MeyGnJj67E2pGrjSF3Q/knDbZk=; b=r4LaXcv9+EPZYrxkIN2dsb4rWGrcQ1FDJSKeDUC65knVzg4vaa9uG+JMeZZH7zAhzJA1UC 6rkxJoHEOesy2NuxuLatGD0gN+2B+ujntuq1tzdT+wYXlQiv9qFE1CwJ2h7oXi/IJwHd3C gZDChFfwAxCWXKngA0i63vadEm+3UcOw1O4reiytDRNJIAJ0slJJHZ0RGbjme8WTDuHLJr IkAWgMwLKeiI4M6t6jhF3e8cIz7g5dk5/5/RegjJGECezcyR6Jq8m6AmKZtEsWqy4Amh6v GDyblwIKzh5gkwtOwFT0xE0OC0yxkQrjZziY023DFyzeUxPM8WpdHPiWgTl/oQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692208088; a=rsa-sha256; cv=none; b=rUoqJkuSktCpnvty/oVNtHDCnREvy5Xy/I4vwVcRW5jjBUQCxLjKRouu1BW2mbwGs+V8Tx 2MLViRcfJg9sNzjUZ0P+eDgvJ/Wk4GTj934tmcZGGYbeKqo+tKcEz9Z7WtfudFUG/M13Lf iVVQK/KKESLO38cNMn7QTqXL3T6rlAQVaFxLyxgGATwCSyi/vdWHhS3V+iF2xgJmz4QL9G IkNJ0DMxS9qQkWw5cY6bSoi/BQ9kCNdhHYZYENIUs8PMRVVKud82O1YRsgfVxwsth/7J9R kN4BS3NPJEfpfbWlI3P2KrWBoK1E64oj/vEvRc/ZwjHr/XgYJ9GsCzLfuEHGIg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RQwbD31fnz11Pv; Wed, 16 Aug 2023 17:48:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37GHm81u042031; Wed, 16 Aug 2023 17:48:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37GHm8cE042028; Wed, 16 Aug 2023 17:48:08 GMT (envelope-from git) Date: Wed, 16 Aug 2023 17:48:08 GMT Message-Id: <202308161748.37GHm8cE042028@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: 31d385e78eba - stable/13 - ping: use the in6_addr buffer when parsing src address as AF_INET6 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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: 31d385e78eba5d0fd8a3d13fde86e345917a2588 Auto-Submitted: auto-generated The branch stable/13 has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=31d385e78eba5d0fd8a3d13fde86e345917a2588 commit 31d385e78eba5d0fd8a3d13fde86e345917a2588 Author: R. Christian McDonald AuthorDate: 2023-08-08 18:40:02 +0000 Commit: Kristof Provost CommitDate: 2023-08-16 15:04:04 +0000 ping: use the in6_addr buffer when parsing src address as AF_INET6 Reviewed by: kp MFC after: 1 week Sponsored by: Rubicon Communications, LLC ("Netgate") (cherry picked from commit 9f2cddd261d09b736893454cb8b7aa0651ac5211) --- sbin/ping/main.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sbin/ping/main.c b/sbin/ping/main.c index 2f94b5d3227d..bfe19e0ff442 100644 --- a/sbin/ping/main.c +++ b/sbin/ping/main.c @@ -102,7 +102,7 @@ main(int argc, char *argv[]) */ if (inet_pton(AF_INET, optarg, &a) == 1) ipv4 = true; - else if (inet_pton(AF_INET6, optarg, &a) == 1) + else if (inet_pton(AF_INET6, optarg, &a6) == 1) ipv6 = true; break; #endif From nobody Wed Aug 16 17:56:41 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RQwn55LbDz4qtqG; Wed, 16 Aug 2023 17:56: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RQwn54dX3z3TZW; Wed, 16 Aug 2023 17:56:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692208601; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=epUQ+pCUY0MMIbOHsJfgRTct8/RfEmTf8By74Jn/cwc=; b=A+B4OxxJenhFC40KeSDihFgCTsxnrzUV2amGdmlTXRGdzVUd+lQMxvFEL9/VNwAoeBJocq PJaDdWs5BWMRnKSUWIhDqjN+92Wk6RX3jsyDwN1H0PwZUmYeQInFwbh67J/wrqX8QAttwb H3bZxbrXT5h2vV3iMcTBeU5zUOsPO41ZNkTPn21zTOf+0Xan7xYvwtkvHT4WKkZ4VYvb2T TeFjUm6cQDTXSJFx3GHULidrjwpKOj+XoQmQ0P60urxn7R0jSrfWIl1uVD0LWZTjArFnFX VgcoLfIiSBdEs8rc5D3RmemitFGLfiC2uek4CJq7ocX++3gN1lwXSr83H75nvA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692208601; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=epUQ+pCUY0MMIbOHsJfgRTct8/RfEmTf8By74Jn/cwc=; b=Wq81Bwc3LQhM6SJCk0YAhvT2+MtBqhkFaaxj0OWZnJr66FpEhY9LrCr+rh5OThIbd0Gxi/ DNzfggZK6I7qI0CIPUE5k035xmPF+vub+K62x0tVg/u5nK1oEMljismszAoKv95+5kc7Pn 4H/rhGgnhau1MUyGpXenFBl/KS4ckE0HDDSqrFGzTz7+L9kjINHukuT7Qfn968pqAsPFXN QgJCjEHrsvvu3FHkBuVIU7zAE+efzrhXOUO5ooqYOa0U+lW0UZ6Tqn+ilZmwGP7tk47MT6 NMV0Uyfjvnh65ZxcVE562DH9TSX5fIAPHwD7WlvmNVogLqbEmyUDq4lbkPRmHQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692208601; a=rsa-sha256; cv=none; b=svksAM1Nhh4xWCbgT6fEQ48Vkg4mWaOAGKwH6OwqlJOWan6UXNV6L1BFDpOpqfPmZpbkfU VjmhNRKd6pmC71NUsXhGLsjCcDVqTVmB7yk6igTRVtyKvWs1xtSCgCYT/XLOLKtpFfiWiC Hg4qnVVTVWdfTznwRVKO7LrvA64GyLrFoiBacWGPNCqBn6+Tm85a+Mi2LXnuZmysLIK7ho gKB7ujhGb6NoyPcZMmh7+2LXFbE34rys02VVhz9CqpZZb2ZsbLHYt1Rk9ll3OdkgKTxZc3 5nahLRWTWQIzK2qOqR3gyUoo7GwiLbsBzBJxftx062Up7cybs+MfOtaKa9YYEA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RQwn53kj6z11gb; Wed, 16 Aug 2023 17:56:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37GHufcJ058801; Wed, 16 Aug 2023 17:56:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37GHufPp058798; Wed, 16 Aug 2023 17:56:41 GMT (envelope-from git) Date: Wed, 16 Aug 2023 17:56:41 GMT Message-Id: <202308161756.37GHufPp058798@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: 82a265ad9bad - main - sys: Remove $FreeBSD$: sound driver version List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 82a265ad9bad315000a2d60b853c4669f1600cd0 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=82a265ad9bad315000a2d60b853c4669f1600cd0 commit 82a265ad9bad315000a2d60b853c4669f1600cd0 Author: Warner Losh AuthorDate: 2023-08-16 17:53:59 +0000 Commit: Warner Losh CommitDate: 2023-08-16 17:53:59 +0000 sys: Remove $FreeBSD$: sound driver version Remove /SND_DECLARE_FILE\("\$FreeBSD\$"\);/ --- sys/arm/broadcom/bcm2835/bcm2835_audio.c | 2 +- sys/dev/sound/pci/als4000.c | 2 +- sys/dev/sound/pci/atiixp.c | 2 +- sys/dev/sound/pci/cmi.c | 2 +- sys/dev/sound/pci/cs4281.c | 2 +- sys/dev/sound/pci/csa.c | 2 +- sys/dev/sound/pci/csamidi.c | 2 +- sys/dev/sound/pci/csapcm.c | 2 +- sys/dev/sound/pci/emu10k1.c | 2 +- sys/dev/sound/pci/envy24.c | 2 +- sys/dev/sound/pci/envy24ht.c | 2 +- sys/dev/sound/pci/es137x.c | 2 +- sys/dev/sound/pci/fm801.c | 2 +- sys/dev/sound/pci/hda/hdaa.c | 2 +- sys/dev/sound/pci/hda/hdaa_patches.c | 2 +- sys/dev/sound/pci/hda/hdac.c | 2 +- sys/dev/sound/pci/hda/hdacc.c | 2 +- sys/dev/sound/pci/hdspe-pcm.c | 2 +- sys/dev/sound/pci/hdspe.c | 2 +- sys/dev/sound/pci/ich.c | 2 +- sys/dev/sound/pci/maestro3.c | 2 +- sys/dev/sound/pci/neomagic.c | 2 +- sys/dev/sound/pci/solo.c | 2 +- sys/dev/sound/pci/t4dwave.c | 2 +- sys/dev/sound/pci/via8233.c | 2 +- sys/dev/sound/pci/via82c686.c | 2 +- sys/dev/sound/pci/vibes.c | 2 +- sys/dev/sound/pcm/ac97.c | 2 +- sys/dev/sound/pcm/ac97_patch.c | 2 +- sys/dev/sound/pcm/buffer.c | 2 +- sys/dev/sound/pcm/channel.c | 2 +- sys/dev/sound/pcm/dsp.c | 2 +- sys/dev/sound/pcm/feeder.c | 2 +- sys/dev/sound/pcm/feeder_chain.c | 2 +- sys/dev/sound/pcm/feeder_eq.c | 2 +- sys/dev/sound/pcm/feeder_format.c | 2 +- sys/dev/sound/pcm/feeder_matrix.c | 2 +- sys/dev/sound/pcm/feeder_mixer.c | 2 +- sys/dev/sound/pcm/feeder_rate.c | 2 +- sys/dev/sound/pcm/feeder_volume.c | 2 +- sys/dev/sound/pcm/mixer.c | 2 +- sys/dev/sound/pcm/sndstat.c | 2 +- sys/dev/sound/pcm/sound.c | 2 +- sys/dev/sound/pcm/vchan.c | 2 +- 44 files changed, 44 insertions(+), 44 deletions(-) diff --git a/sys/arm/broadcom/bcm2835/bcm2835_audio.c b/sys/arm/broadcom/bcm2835/bcm2835_audio.c index 36b1dc86535b..0d430cf19df7 100644 --- a/sys/arm/broadcom/bcm2835/bcm2835_audio.c +++ b/sys/arm/broadcom/bcm2835/bcm2835_audio.c @@ -38,7 +38,7 @@ #include "vc_vchi_audioserv_defs.h" -SND_DECLARE_FILE("$FreeBSD$"); +SND_DECLARE_FILE(""); /* Audio destination */ #define DEST_AUTO 0 diff --git a/sys/dev/sound/pci/als4000.c b/sys/dev/sound/pci/als4000.c index 71f6c4f909c7..89f7d6385493 100644 --- a/sys/dev/sound/pci/als4000.c +++ b/sys/dev/sound/pci/als4000.c @@ -48,7 +48,7 @@ #include "mixer_if.h" -SND_DECLARE_FILE("$FreeBSD$"); +SND_DECLARE_FILE(""); /* Debugging macro's */ #undef DEB diff --git a/sys/dev/sound/pci/atiixp.c b/sys/dev/sound/pci/atiixp.c index 83eee21a333e..99468367c998 100644 --- a/sys/dev/sound/pci/atiixp.c +++ b/sys/dev/sound/pci/atiixp.c @@ -69,7 +69,7 @@ #include -SND_DECLARE_FILE("$FreeBSD$"); +SND_DECLARE_FILE(""); #define ATI_IXP_DMA_RETRY_MAX 100 diff --git a/sys/dev/sound/pci/cmi.c b/sys/dev/sound/pci/cmi.c index 6b4acbb4ddae..89a1eb24d878 100644 --- a/sys/dev/sound/pci/cmi.c +++ b/sys/dev/sound/pci/cmi.c @@ -61,7 +61,7 @@ #include "mixer_if.h" #include "mpufoi_if.h" -SND_DECLARE_FILE("$FreeBSD$"); +SND_DECLARE_FILE(""); /* Supported chip ID's */ #define CMI8338A_PCI_ID 0x010013f6 diff --git a/sys/dev/sound/pci/cs4281.c b/sys/dev/sound/pci/cs4281.c index b011f67e763e..fccbf807d965 100644 --- a/sys/dev/sound/pci/cs4281.c +++ b/sys/dev/sound/pci/cs4281.c @@ -45,7 +45,7 @@ #include -SND_DECLARE_FILE("$FreeBSD$"); +SND_DECLARE_FILE(""); #define CS4281_DEFAULT_BUFSZ 16384 diff --git a/sys/dev/sound/pci/csa.c b/sys/dev/sound/pci/csa.c index a03f319d85d5..68edfd9338c2 100644 --- a/sys/dev/sound/pci/csa.c +++ b/sys/dev/sound/pci/csa.c @@ -54,7 +54,7 @@ #include -SND_DECLARE_FILE("$FreeBSD$"); +SND_DECLARE_FILE(""); /* This is the pci device id. */ #define CS4610_PCI_ID 0x60011013 diff --git a/sys/dev/sound/pci/csamidi.c b/sys/dev/sound/pci/csamidi.c index e9d6006544b3..cc4b41f86af9 100644 --- a/sys/dev/sound/pci/csamidi.c +++ b/sys/dev/sound/pci/csamidi.c @@ -54,7 +54,7 @@ #include "mpufoi_if.h" -SND_DECLARE_FILE("$FreeBSD$"); +SND_DECLARE_FILE(""); /* pulled from mpu401.c */ #define MPU_DATAPORT 0 diff --git a/sys/dev/sound/pci/csapcm.c b/sys/dev/sound/pci/csapcm.c index d915a14a536f..14820a9c2216 100644 --- a/sys/dev/sound/pci/csapcm.c +++ b/sys/dev/sound/pci/csapcm.c @@ -43,7 +43,7 @@ #include #include -SND_DECLARE_FILE("$FreeBSD$"); +SND_DECLARE_FILE(""); /* Buffer size on dma transfer. Fixed for CS416x. */ #define CS461x_BUFFSIZE (4 * 1024) diff --git a/sys/dev/sound/pci/emu10k1.c b/sys/dev/sound/pci/emu10k1.c index abb586e34525..d4624a549e42 100644 --- a/sys/dev/sound/pci/emu10k1.c +++ b/sys/dev/sound/pci/emu10k1.c @@ -43,7 +43,7 @@ #include #include "mpufoi_if.h" -SND_DECLARE_FILE("$FreeBSD$"); +SND_DECLARE_FILE(""); /* -------------------------------------------------------------------- */ diff --git a/sys/dev/sound/pci/envy24.c b/sys/dev/sound/pci/envy24.c index b95a3438ce79..8039d4e3186c 100644 --- a/sys/dev/sound/pci/envy24.c +++ b/sys/dev/sound/pci/envy24.c @@ -41,7 +41,7 @@ #include "mixer_if.h" -SND_DECLARE_FILE("$FreeBSD$"); +SND_DECLARE_FILE(""); static MALLOC_DEFINE(M_ENVY24, "envy24", "envy24 audio"); diff --git a/sys/dev/sound/pci/envy24ht.c b/sys/dev/sound/pci/envy24ht.c index 4bfef99f600f..e9b6771e2162 100644 --- a/sys/dev/sound/pci/envy24ht.c +++ b/sys/dev/sound/pci/envy24ht.c @@ -53,7 +53,7 @@ #include "mixer_if.h" -SND_DECLARE_FILE("$FreeBSD$"); +SND_DECLARE_FILE(""); static MALLOC_DEFINE(M_ENVY24HT, "envy24ht", "envy24ht audio"); diff --git a/sys/dev/sound/pci/es137x.c b/sys/dev/sound/pci/es137x.c index f1c94f16a123..a11a106fee2f 100644 --- a/sys/dev/sound/pci/es137x.c +++ b/sys/dev/sound/pci/es137x.c @@ -90,7 +90,7 @@ #include "mixer_if.h" -SND_DECLARE_FILE("$FreeBSD$"); +SND_DECLARE_FILE(""); #define MEM_MAP_REG 0x14 diff --git a/sys/dev/sound/pci/fm801.c b/sys/dev/sound/pci/fm801.c index 2469fdba967f..34fb1f6f1bf6 100644 --- a/sys/dev/sound/pci/fm801.c +++ b/sys/dev/sound/pci/fm801.c @@ -35,7 +35,7 @@ #include #include -SND_DECLARE_FILE("$FreeBSD$"); +SND_DECLARE_FILE(""); #define PCI_VENDOR_FORTEMEDIA 0x1319 #define PCI_DEVICE_FORTEMEDIA1 0x08011319 /* Audio controller */ diff --git a/sys/dev/sound/pci/hda/hdaa.c b/sys/dev/sound/pci/hda/hdaa.c index c7706d2bd967..ef8f634ac8e8 100644 --- a/sys/dev/sound/pci/hda/hdaa.c +++ b/sys/dev/sound/pci/hda/hdaa.c @@ -47,7 +47,7 @@ #include "mixer_if.h" -SND_DECLARE_FILE("$FreeBSD$"); +SND_DECLARE_FILE(""); #define hdaa_lock(devinfo) snd_mtxlock((devinfo)->lock) #define hdaa_unlock(devinfo) snd_mtxunlock((devinfo)->lock) diff --git a/sys/dev/sound/pci/hda/hdaa_patches.c b/sys/dev/sound/pci/hda/hdaa_patches.c index bec8590745c5..8331312b69c9 100644 --- a/sys/dev/sound/pci/hda/hdaa_patches.c +++ b/sys/dev/sound/pci/hda/hdaa_patches.c @@ -47,7 +47,7 @@ #include "pin_patch.h" #include "pin_patch_realtek.h" -SND_DECLARE_FILE("$FreeBSD$"); +SND_DECLARE_FILE(""); static const struct { uint32_t model; diff --git a/sys/dev/sound/pci/hda/hdac.c b/sys/dev/sound/pci/hda/hdac.c index aca9bd7ac9ab..79ab71516cd9 100644 --- a/sys/dev/sound/pci/hda/hdac.c +++ b/sys/dev/sound/pci/hda/hdac.c @@ -51,7 +51,7 @@ #define HDA_DRV_TEST_REV "20120126_0002" -SND_DECLARE_FILE("$FreeBSD$"); +SND_DECLARE_FILE(""); #define hdac_lock(sc) snd_mtxlock((sc)->lock) #define hdac_unlock(sc) snd_mtxunlock((sc)->lock) diff --git a/sys/dev/sound/pci/hda/hdacc.c b/sys/dev/sound/pci/hda/hdacc.c index 33eea6ef67c5..4616b3b23a48 100644 --- a/sys/dev/sound/pci/hda/hdacc.c +++ b/sys/dev/sound/pci/hda/hdacc.c @@ -43,7 +43,7 @@ #include #include -SND_DECLARE_FILE("$FreeBSD$"); +SND_DECLARE_FILE(""); struct hdacc_fg { device_t dev; diff --git a/sys/dev/sound/pci/hdspe-pcm.c b/sys/dev/sound/pci/hdspe-pcm.c index 6de5b353ab5b..b23304d32fc7 100644 --- a/sys/dev/sound/pci/hdspe-pcm.c +++ b/sys/dev/sound/pci/hdspe-pcm.c @@ -40,7 +40,7 @@ #include -SND_DECLARE_FILE("$FreeBSD$"); +SND_DECLARE_FILE(""); struct hdspe_latency { uint32_t n; diff --git a/sys/dev/sound/pci/hdspe.c b/sys/dev/sound/pci/hdspe.c index 943c20bba4f1..ac253b28df3a 100644 --- a/sys/dev/sound/pci/hdspe.c +++ b/sys/dev/sound/pci/hdspe.c @@ -40,7 +40,7 @@ #include -SND_DECLARE_FILE("$FreeBSD$"); +SND_DECLARE_FILE(""); static struct hdspe_channel chan_map_aio[] = { { 0, 1, "line", 1, 1 }, diff --git a/sys/dev/sound/pci/ich.c b/sys/dev/sound/pci/ich.c index feb0175d2839..d5e8a48a186c 100644 --- a/sys/dev/sound/pci/ich.c +++ b/sys/dev/sound/pci/ich.c @@ -38,7 +38,7 @@ #include #include -SND_DECLARE_FILE("$FreeBSD$"); +SND_DECLARE_FILE(""); /* -------------------------------------------------------------------- */ diff --git a/sys/dev/sound/pci/maestro3.c b/sys/dev/sound/pci/maestro3.c index f46b587daf7c..c60c69b6baf5 100644 --- a/sys/dev/sound/pci/maestro3.c +++ b/sys/dev/sound/pci/maestro3.c @@ -69,7 +69,7 @@ #include #include -SND_DECLARE_FILE("$FreeBSD$"); +SND_DECLARE_FILE(""); /* -------------------------------------------------------------------- */ diff --git a/sys/dev/sound/pci/neomagic.c b/sys/dev/sound/pci/neomagic.c index 5616223b7590..162d99b57c70 100644 --- a/sys/dev/sound/pci/neomagic.c +++ b/sys/dev/sound/pci/neomagic.c @@ -40,7 +40,7 @@ #include #include -SND_DECLARE_FILE("$FreeBSD$"); +SND_DECLARE_FILE(""); /* -------------------------------------------------------------------- */ diff --git a/sys/dev/sound/pci/solo.c b/sys/dev/sound/pci/solo.c index dc8351e9c117..1788929811ed 100644 --- a/sys/dev/sound/pci/solo.c +++ b/sys/dev/sound/pci/solo.c @@ -39,7 +39,7 @@ #include "mixer_if.h" -SND_DECLARE_FILE("$FreeBSD$"); +SND_DECLARE_FILE(""); #define SOLO_DEFAULT_BUFSZ 16384 #define ABS(x) (((x) < 0)? -(x) : (x)) diff --git a/sys/dev/sound/pci/t4dwave.c b/sys/dev/sound/pci/t4dwave.c index fc99a90b94e7..b7363402ba8b 100644 --- a/sys/dev/sound/pci/t4dwave.c +++ b/sys/dev/sound/pci/t4dwave.c @@ -37,7 +37,7 @@ #include #include -SND_DECLARE_FILE("$FreeBSD$"); +SND_DECLARE_FILE(""); /* -------------------------------------------------------------------- */ diff --git a/sys/dev/sound/pci/via8233.c b/sys/dev/sound/pci/via8233.c index 9de5b18cd031..6656670c9e1c 100644 --- a/sys/dev/sound/pci/via8233.c +++ b/sys/dev/sound/pci/via8233.c @@ -50,7 +50,7 @@ #include -SND_DECLARE_FILE("$FreeBSD$"); +SND_DECLARE_FILE(""); #define VIA8233_PCI_ID 0x30591106 diff --git a/sys/dev/sound/pci/via82c686.c b/sys/dev/sound/pci/via82c686.c index 6bd604941cf8..076df8c81aa0 100644 --- a/sys/dev/sound/pci/via82c686.c +++ b/sys/dev/sound/pci/via82c686.c @@ -39,7 +39,7 @@ #include -SND_DECLARE_FILE("$FreeBSD$"); +SND_DECLARE_FILE(""); #define VIA_PCI_ID 0x30581106 #define NSEGS 4 /* Number of segments in SGD table */ diff --git a/sys/dev/sound/pci/vibes.c b/sys/dev/sound/pci/vibes.c index 81401796d68c..1299f15dc814 100644 --- a/sys/dev/sound/pci/vibes.c +++ b/sys/dev/sound/pci/vibes.c @@ -44,7 +44,7 @@ #include "mixer_if.h" -SND_DECLARE_FILE("$FreeBSD$"); +SND_DECLARE_FILE(""); /* ------------------------------------------------------------------------- */ /* Constants */ diff --git a/sys/dev/sound/pcm/ac97.c b/sys/dev/sound/pcm/ac97.c index 763188291009..d83e3f2fefa5 100644 --- a/sys/dev/sound/pcm/ac97.c +++ b/sys/dev/sound/pcm/ac97.c @@ -38,7 +38,7 @@ #include "mixer_if.h" -SND_DECLARE_FILE("$FreeBSD$"); +SND_DECLARE_FILE(""); static MALLOC_DEFINE(M_AC97, "ac97", "ac97 codec"); diff --git a/sys/dev/sound/pcm/ac97_patch.c b/sys/dev/sound/pcm/ac97_patch.c index f1a358b50958..aff8075fe96c 100644 --- a/sys/dev/sound/pcm/ac97_patch.c +++ b/sys/dev/sound/pcm/ac97_patch.c @@ -34,7 +34,7 @@ #include #include -SND_DECLARE_FILE("$FreeBSD$"); +SND_DECLARE_FILE(""); void ad1886_patch(struct ac97_info* codec) { diff --git a/sys/dev/sound/pcm/buffer.c b/sys/dev/sound/pcm/buffer.c index d75890eaddfb..d5a519362c5e 100644 --- a/sys/dev/sound/pcm/buffer.c +++ b/sys/dev/sound/pcm/buffer.c @@ -40,7 +40,7 @@ #define SND_DECLARE_FXDIV #include "snd_fxdiv_gen.h" -SND_DECLARE_FILE("$FreeBSD$"); +SND_DECLARE_FILE(""); struct snd_dbuf * sndbuf_create(device_t dev, char *drv, char *desc, struct pcm_channel *channel) diff --git a/sys/dev/sound/pcm/channel.c b/sys/dev/sound/pcm/channel.c index 1d192de54712..d56f5fb51dc9 100644 --- a/sys/dev/sound/pcm/channel.c +++ b/sys/dev/sound/pcm/channel.c @@ -38,7 +38,7 @@ #include "feeder_if.h" -SND_DECLARE_FILE("$FreeBSD$"); +SND_DECLARE_FILE(""); int report_soft_formats = 1; SYSCTL_INT(_hw_snd, OID_AUTO, report_soft_formats, CTLFLAG_RW, diff --git a/sys/dev/sound/pcm/dsp.c b/sys/dev/sound/pcm/dsp.c index bb435bc3925c..98d241e65a52 100644 --- a/sys/dev/sound/pcm/dsp.c +++ b/sys/dev/sound/pcm/dsp.c @@ -43,7 +43,7 @@ #include #include -SND_DECLARE_FILE("$FreeBSD$"); +SND_DECLARE_FILE(""); static int dsp_mmap_allow_prot_exec = 0; SYSCTL_INT(_hw_snd, OID_AUTO, compat_linux_mmap, CTLFLAG_RWTUN, diff --git a/sys/dev/sound/pcm/feeder.c b/sys/dev/sound/pcm/feeder.c index d379d06b8664..8fb377533907 100644 --- a/sys/dev/sound/pcm/feeder.c +++ b/sys/dev/sound/pcm/feeder.c @@ -35,7 +35,7 @@ #include "feeder_if.h" -SND_DECLARE_FILE("$FreeBSD$"); +SND_DECLARE_FILE(""); static MALLOC_DEFINE(M_FEEDER, "feeder", "pcm feeder"); diff --git a/sys/dev/sound/pcm/feeder_chain.c b/sys/dev/sound/pcm/feeder_chain.c index 9c3baaf282b5..01def5f6e9cb 100644 --- a/sys/dev/sound/pcm/feeder_chain.c +++ b/sys/dev/sound/pcm/feeder_chain.c @@ -34,7 +34,7 @@ #include "feeder_if.h" -SND_DECLARE_FILE("$FreeBSD$"); +SND_DECLARE_FILE(""); /* chain state */ struct feeder_chain_state { diff --git a/sys/dev/sound/pcm/feeder_eq.c b/sys/dev/sound/pcm/feeder_eq.c index bc39d33c03fb..70797a706367 100644 --- a/sys/dev/sound/pcm/feeder_eq.c +++ b/sys/dev/sound/pcm/feeder_eq.c @@ -46,7 +46,7 @@ #define SND_USE_FXDIV #include "snd_fxdiv_gen.h" -SND_DECLARE_FILE("$FreeBSD$"); +SND_DECLARE_FILE(""); #endif #include "feeder_eq_gen.h" diff --git a/sys/dev/sound/pcm/feeder_format.c b/sys/dev/sound/pcm/feeder_format.c index 8a9054561b2b..3a741430e0ca 100644 --- a/sys/dev/sound/pcm/feeder_format.c +++ b/sys/dev/sound/pcm/feeder_format.c @@ -44,7 +44,7 @@ #define SND_USE_FXDIV #include "snd_fxdiv_gen.h" -SND_DECLARE_FILE("$FreeBSD$"); +SND_DECLARE_FILE(""); #endif #define FEEDFORMAT_RESERVOIR (SND_CHN_MAX * PCM_32_BPS) diff --git a/sys/dev/sound/pcm/feeder_matrix.c b/sys/dev/sound/pcm/feeder_matrix.c index 33bf3ec11ee0..0afdb47c04d8 100644 --- a/sys/dev/sound/pcm/feeder_matrix.c +++ b/sys/dev/sound/pcm/feeder_matrix.c @@ -54,7 +54,7 @@ #define SND_USE_FXDIV #include "snd_fxdiv_gen.h" -SND_DECLARE_FILE("$FreeBSD$"); +SND_DECLARE_FILE(""); #endif #define FEEDMATRIX_RESERVOIR (SND_CHN_MAX * PCM_32_BPS) diff --git a/sys/dev/sound/pcm/feeder_mixer.c b/sys/dev/sound/pcm/feeder_mixer.c index 13afceabf28e..42ebe89d7c09 100644 --- a/sys/dev/sound/pcm/feeder_mixer.c +++ b/sys/dev/sound/pcm/feeder_mixer.c @@ -38,7 +38,7 @@ #define SND_USE_FXDIV #include "snd_fxdiv_gen.h" -SND_DECLARE_FILE("$FreeBSD$"); +SND_DECLARE_FILE(""); #endif #undef SND_FEEDER_MULTIFORMAT diff --git a/sys/dev/sound/pcm/feeder_rate.c b/sys/dev/sound/pcm/feeder_rate.c index 0784c477197a..b2afe0651bf5 100644 --- a/sys/dev/sound/pcm/feeder_rate.c +++ b/sys/dev/sound/pcm/feeder_rate.c @@ -61,7 +61,7 @@ #define SND_USE_FXDIV #include "snd_fxdiv_gen.h" -SND_DECLARE_FILE("$FreeBSD$"); +SND_DECLARE_FILE(""); #endif #include "feeder_rate_gen.h" diff --git a/sys/dev/sound/pcm/feeder_volume.c b/sys/dev/sound/pcm/feeder_volume.c index 724d5a0922e8..fa11a089af76 100644 --- a/sys/dev/sound/pcm/feeder_volume.c +++ b/sys/dev/sound/pcm/feeder_volume.c @@ -39,7 +39,7 @@ #define SND_USE_FXDIV #include "snd_fxdiv_gen.h" -SND_DECLARE_FILE("$FreeBSD$"); +SND_DECLARE_FILE(""); #endif typedef void (*feed_volume_t)(int *, int *, uint32_t, uint8_t *, uint32_t); diff --git a/sys/dev/sound/pcm/mixer.c b/sys/dev/sound/pcm/mixer.c index 080daeced12d..0c7576390b72 100644 --- a/sys/dev/sound/pcm/mixer.c +++ b/sys/dev/sound/pcm/mixer.c @@ -37,7 +37,7 @@ #include "feeder_if.h" #include "mixer_if.h" -SND_DECLARE_FILE("$FreeBSD$"); +SND_DECLARE_FILE(""); static MALLOC_DEFINE(M_MIXER, "mixer", "mixer"); diff --git a/sys/dev/sound/pcm/sndstat.c b/sys/dev/sound/pcm/sndstat.c index 64e0a1ca5d82..fc92bd783587 100644 --- a/sys/dev/sound/pcm/sndstat.c +++ b/sys/dev/sound/pcm/sndstat.c @@ -50,7 +50,7 @@ #include -SND_DECLARE_FILE("$FreeBSD$"); +SND_DECLARE_FILE(""); #define SS_TYPE_MODULE 0 #define SS_TYPE_PCM 1 diff --git a/sys/dev/sound/pcm/sound.c b/sys/dev/sound/pcm/sound.c index 1a7f8dc2fa68..17dc8d968b3c 100644 --- a/sys/dev/sound/pcm/sound.c +++ b/sys/dev/sound/pcm/sound.c @@ -44,7 +44,7 @@ #include "feeder_if.h" -SND_DECLARE_FILE("$FreeBSD$"); +SND_DECLARE_FILE(""); devclass_t pcm_devclass; diff --git a/sys/dev/sound/pcm/vchan.c b/sys/dev/sound/pcm/vchan.c index 0b0ddc224094..c84d8f14e075 100644 --- a/sys/dev/sound/pcm/vchan.c +++ b/sys/dev/sound/pcm/vchan.c @@ -36,7 +36,7 @@ #include #include -SND_DECLARE_FILE("$FreeBSD$"); +SND_DECLARE_FILE(""); /* * [ac3 , dts , linear , 0, linear, 0] From nobody Wed Aug 16 17:56:42 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RQwn671LVz4qvTH; Wed, 16 Aug 2023 17:56: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RQwn65sjnz3TqN; Wed, 16 Aug 2023 17:56:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692208602; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=lPfufoC1B6oJPAxPKyQVnfWd4mmxZfQ24bSLE0diEns=; b=qHSabc0nRQDGWBRj+LhQXl2CMC+2bBVfS5yNBefGNkUo4YdZpaPmkJ6sLy0I02I+eZA8Rv HfWzZpd5BvB0qumerhORUf5ieqdvJX8h3Nfts2H/kS+Ps5ETsK4mpEq4ndyQmn1WmnSGXK P4vA135tiK/rZLibW2n6cXNSCgM2aZuKq+0bXLu86CumDFrPq1XDc+eV2FzwPSNNsodpZ4 Li7LtXdCVFggy0g8FVA3FqP6QHYHoueXElshPrnBlaOmS1oHiYj+ARly4NYFoHTU+EQeXf ++VXCQuUE6r8oe5A2AD54A47E9oP5HX/yX9u1RRE77VHolVSbTo+Q9b5TiDTDA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692208602; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=lPfufoC1B6oJPAxPKyQVnfWd4mmxZfQ24bSLE0diEns=; b=wN23NnlGtqxtXIa8XwC0U2oG+IJgiu7Bha8P0fvIAG3FUk1BLHeprIk/dZ7tr3jZfILlic ObfsfqLB0dXFe5X0HmYNnvNG09uCXWxysQZNaFPJbWAcGQsnTd9gzB84yl5FyrtWWEytUk jF1wUnkIZSrL2Yd7wmQFWtPf5mSDH9PuUI5E12d8o7HuqjE2hqSX3B8+wnStcs5BUUnxqR fN/+F7nMTNLwSmCnd3ehkJQSeKgedNQaPEfKZGXiXCuLxGD5ipJ79gqO2+6FAFDH8P12OL Kf1Y+Ty00CQmIXZ7AUGdD/z6MLe9Eg2q1yCH8blrA1Taa72loN6SuB7H6udBug== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692208602; a=rsa-sha256; cv=none; b=r51hL9ZGShUacC0zWxwX9vof3hmcWf2WFQ/XvYxQ30xw+lqGlcacqGDYFYXYhpSMc+/3ME RotsaHDTLdGh7XcjgIKJ30qGnU3bnSjGalCZY5V/UFK46ChE1A6+tmZIevd0MvO6oyqLeA SCaDUTNUhGD7h1uQVC+DpHvapArsR150wx2YrfPCuCnTqR1aaR9y+wv9bgat+3iNDeDY2S FNqP3m8C5/5yHfXUvC1VOTqWVaGNKND1Yi4pujTZ8FgBx/OEY0ga0SGrvgwIqbOFB7Xq73 w5GWQyP0wURgMoj17DSXC9LsVLSkxqCA7+KpRrUdM5HTjyFJIyd8vJPH43Ls+w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RQwn64jdqz11gc; Wed, 16 Aug 2023 17:56:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37GHug3t058844; Wed, 16 Aug 2023 17:56:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37GHugWo058841; Wed, 16 Aug 2023 17:56:42 GMT (envelope-from git) Date: Wed, 16 Aug 2023 17:56:42 GMT Message-Id: <202308161756.37GHugWo058841@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: d54a7d337331 - main - Remove $FreeBSD$: one-line m4 tag List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d54a7d337331d991e039e4f42f6b4dc64aedce08 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=d54a7d337331d991e039e4f42f6b4dc64aedce08 commit d54a7d337331d991e039e4f42f6b4dc64aedce08 Author: Warner Losh AuthorDate: 2023-08-16 17:54:09 +0000 Commit: Warner Losh CommitDate: 2023-08-16 17:54:09 +0000 Remove $FreeBSD$: one-line m4 tag Remove /^dnl\s*\$FreeBSD\$.*$\n/ --- usr.bin/m4/TEST/math.m4 | 1 - usr.bin/m4/tests/args.m4 | 1 - usr.bin/m4/tests/args2.m4 | 1 - usr.bin/m4/tests/comments.m4 | 1 - usr.bin/m4/tests/esyscmd.m4 | 1 - usr.bin/m4/tests/eval.m4 | 1 - usr.bin/m4/tests/gnueval.m4 | 1 - usr.bin/m4/tests/gnuformat.m4 | 1 - usr.bin/m4/tests/gnupatterns.m4 | 1 - usr.bin/m4/tests/gnupatterns2.m4 | 1 - usr.bin/m4/tests/gnusofterror.m4 | 1 - usr.bin/m4/tests/includes.aux | 1 - usr.bin/m4/tests/includes.m4 | 1 - usr.bin/m4/tests/m4wrap3.m4 | 1 - usr.bin/m4/tests/patterns.m4 | 1 - usr.bin/m4/tests/quotes.m4 | 1 - usr.bin/m4/tests/redef.m4 | 1 - usr.bin/m4/tests/translit.m4 | 1 - usr.bin/m4/tests/translit2.m4 | 1 - 19 files changed, 19 deletions(-) diff --git a/usr.bin/m4/TEST/math.m4 b/usr.bin/m4/TEST/math.m4 index 0262af66e253..e8cae3333b4e 100644 --- a/usr.bin/m4/TEST/math.m4 +++ b/usr.bin/m4/TEST/math.m4 @@ -1,4 +1,3 @@ -dnl $FreeBSD$ dnl A regression test for m4 C operators (ksb,petef) dnl If you think you have a short-circuiting m4, run us m4 -DSHORCIRCUIT=yes dnl diff --git a/usr.bin/m4/tests/args.m4 b/usr.bin/m4/tests/args.m4 index 3ad30f2442ec..2be7c3fd51fc 100644 --- a/usr.bin/m4/tests/args.m4 +++ b/usr.bin/m4/tests/args.m4 @@ -1,4 +1,3 @@ -dnl $FreeBSD$ dnl $OpenBSD: src/regress/usr.bin/m4/args.m4,v 1.1 2001/10/10 23:23:59 espie Exp $ dnl Expanding all arguments define(`A', `first form: $@, second form $*')dnl diff --git a/usr.bin/m4/tests/args2.m4 b/usr.bin/m4/tests/args2.m4 index 3f9ed600fca7..22f75a0e13af 100644 --- a/usr.bin/m4/tests/args2.m4 +++ b/usr.bin/m4/tests/args2.m4 @@ -1,4 +1,3 @@ -dnl $FreeBSD$ dnl $OpenBSD: src/regress/usr.bin/m4/args2.m4,v 1.1 2008/08/16 09:57:12 espie Exp $ dnl Preserving spaces within nested parentheses define(`foo',`$1')dnl diff --git a/usr.bin/m4/tests/comments.m4 b/usr.bin/m4/tests/comments.m4 index d7038c4f636e..e94165a19079 100644 --- a/usr.bin/m4/tests/comments.m4 +++ b/usr.bin/m4/tests/comments.m4 @@ -1,4 +1,3 @@ -dnl $FreeBSD$ dnl $OpenBSD: src/regress/usr.bin/m4/comments.m4,v 1.1 2005/09/06 15:33:21 espie Exp $ dnl checking the way changecom works. 1: normal diff --git a/usr.bin/m4/tests/esyscmd.m4 b/usr.bin/m4/tests/esyscmd.m4 index 7b1342d39d85..a9b83c478e48 100644 --- a/usr.bin/m4/tests/esyscmd.m4 +++ b/usr.bin/m4/tests/esyscmd.m4 @@ -1,4 +1,3 @@ -dnl $FreeBSD$ changequote(`{',`}')dnl dnl esyscmd({sh -c "m4< To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: 95ee2897e98f - main - sys: Remove $FreeBSD$: two-line .h pattern List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 95ee2897e98f5d444f26ed2334cc7c439f9c16c6 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=95ee2897e98f5d444f26ed2334cc7c439f9c16c6 commit 95ee2897e98f5d444f26ed2334cc7c439f9c16c6 Author: Warner Losh AuthorDate: 2023-08-16 17:54:11 +0000 Commit: Warner Losh CommitDate: 2023-08-16 17:54:11 +0000 sys: Remove $FreeBSD$: two-line .h pattern Remove /^\s*\*\n \*\s+\$FreeBSD\$$\n/ --- sys/amd64/acpica/acpi_wakecode.S | 2 -- sys/amd64/amd64/bpf_jit_machdep.h | 2 -- sys/amd64/amd64/cpu_switch.S | 2 -- sys/amd64/amd64/efirt_support.S | 2 -- sys/amd64/amd64/exception.S | 2 -- sys/amd64/amd64/locore.S | 2 -- sys/amd64/amd64/mpboot.S | 2 -- sys/amd64/amd64/sigtramp.S | 2 -- sys/amd64/amd64/support.S | 2 -- sys/amd64/amd64/xen-locore.S | 2 -- sys/amd64/ia32/ia32_exception.S | 2 -- sys/amd64/ia32/ia32_reg.c | 2 -- sys/amd64/ia32/ia32_sigtramp.S | 2 -- sys/amd64/include/_bus.h | 2 -- sys/amd64/include/asmacros.h | 2 -- sys/amd64/include/atomic.h | 2 -- sys/amd64/include/bus_dma.h | 2 -- sys/amd64/include/counter.h | 2 -- sys/amd64/include/cpufunc.h | 2 -- sys/amd64/include/csan.h | 2 -- sys/amd64/include/db_machdep.h | 2 -- sys/amd64/include/efi.h | 2 -- sys/amd64/include/frame.h | 2 -- sys/amd64/include/gdb_machdep.h | 2 -- sys/amd64/include/intr_machdep.h | 2 -- sys/amd64/include/iodev.h | 2 -- sys/amd64/include/kdb.h | 2 -- sys/amd64/include/md_var.h | 2 -- sys/amd64/include/memdev.h | 2 -- sys/amd64/include/minidump.h | 2 -- sys/amd64/include/nexusvar.h | 2 -- sys/amd64/include/pc/bios.h | 2 -- sys/amd64/include/pc/display.h | 2 -- sys/amd64/include/pcpu.h | 2 -- sys/amd64/include/pcpu_aux.h | 2 -- sys/amd64/include/pmc_mdep.h | 2 -- sys/amd64/include/runq.h | 2 -- sys/amd64/include/sf_buf.h | 2 -- sys/amd64/include/sgx.h | 2 -- sys/amd64/include/sgxreg.h | 2 -- sys/amd64/include/smp.h | 2 -- sys/amd64/include/vm.h | 2 -- sys/amd64/include/vmm.h | 2 -- sys/amd64/include/vmm_dev.h | 2 -- sys/amd64/include/vmm_instruction_emul.h | 2 -- sys/amd64/include/vmm_snapshot.h | 2 -- sys/amd64/include/xen/hypercall.h | 2 -- sys/amd64/linux/linux.h | 2 -- sys/amd64/linux/linux_locore.asm | 2 -- sys/amd64/linux/linux_support.S | 2 -- sys/amd64/linux/linux_vdso.lds.s | 2 -- sys/amd64/linux32/linux.h | 2 -- sys/amd64/linux32/linux32_support.S | 2 -- sys/amd64/linux32/linux32_vdso.lds.s | 2 -- sys/amd64/sgx/sgx_support.S | 2 -- sys/amd64/sgx/sgxvar.h | 2 -- sys/amd64/vmm/amd/amdv.c | 2 -- sys/amd64/vmm/amd/amdvi_priv.h | 2 -- sys/amd64/vmm/amd/npt.h | 2 -- sys/amd64/vmm/amd/svm.h | 2 -- sys/amd64/vmm/amd/svm_msr.h | 2 -- sys/amd64/vmm/amd/svm_softc.h | 2 -- sys/amd64/vmm/amd/svm_support.S | 2 -- sys/amd64/vmm/amd/vmcb.h | 2 -- sys/amd64/vmm/intel/ept.c | 2 -- sys/amd64/vmm/intel/ept.h | 2 -- sys/amd64/vmm/intel/vmcs.c | 2 -- sys/amd64/vmm/intel/vmcs.h | 2 -- sys/amd64/vmm/intel/vmx.c | 2 -- sys/amd64/vmm/intel/vmx.h | 2 -- sys/amd64/vmm/intel/vmx_controls.h | 2 -- sys/amd64/vmm/intel/vmx_cpufunc.h | 2 -- sys/amd64/vmm/intel/vmx_genassym.c | 2 -- sys/amd64/vmm/intel/vmx_msr.c | 2 -- sys/amd64/vmm/intel/vmx_msr.h | 2 -- sys/amd64/vmm/intel/vmx_support.S | 2 -- sys/amd64/vmm/intel/vtd.c | 2 -- sys/amd64/vmm/io/iommu.c | 2 -- sys/amd64/vmm/io/iommu.h | 2 -- sys/amd64/vmm/io/ppt.c | 2 -- sys/amd64/vmm/io/ppt.h | 2 -- sys/amd64/vmm/io/vatpic.h | 2 -- sys/amd64/vmm/io/vatpit.h | 2 -- sys/amd64/vmm/io/vhpet.c | 2 -- sys/amd64/vmm/io/vhpet.h | 2 -- sys/amd64/vmm/io/vioapic.c | 2 -- sys/amd64/vmm/io/vioapic.h | 2 -- sys/amd64/vmm/io/vlapic.c | 2 -- sys/amd64/vmm/io/vlapic.h | 2 -- sys/amd64/vmm/io/vlapic_priv.h | 2 -- sys/amd64/vmm/io/vpmtmr.h | 2 -- sys/amd64/vmm/io/vrtc.h | 2 -- sys/amd64/vmm/vmm.c | 2 -- sys/amd64/vmm/vmm_dev.c | 2 -- sys/amd64/vmm/vmm_host.c | 2 -- sys/amd64/vmm/vmm_host.h | 2 -- sys/amd64/vmm/vmm_instruction_emul.c | 2 -- sys/amd64/vmm/vmm_ioport.h | 2 -- sys/amd64/vmm/vmm_ktr.h | 2 -- sys/amd64/vmm/vmm_lapic.c | 2 -- sys/amd64/vmm/vmm_lapic.h | 2 -- sys/amd64/vmm/vmm_mem.c | 2 -- sys/amd64/vmm/vmm_mem.h | 2 -- sys/amd64/vmm/vmm_stat.c | 2 -- sys/amd64/vmm/vmm_stat.h | 2 -- sys/amd64/vmm/vmm_util.c | 2 -- sys/amd64/vmm/vmm_util.h | 2 -- sys/amd64/vmm/x86.c | 2 -- sys/amd64/vmm/x86.h | 2 -- sys/arm/allwinner/a10_codec.c | 2 -- sys/arm/allwinner/a10_dmac.h | 2 -- sys/arm/allwinner/a10_sramc.c | 2 -- sys/arm/allwinner/a10_sramc.h | 2 -- sys/arm/allwinner/a20/a20_cpu_cfg.h | 2 -- sys/arm/allwinner/a33_codec.c | 2 -- sys/arm/allwinner/a64/a64_padconf.c | 2 -- sys/arm/allwinner/a64/a64_r_padconf.c | 2 -- sys/arm/allwinner/a64/sun50i_a64_acodec.c | 2 -- sys/arm/allwinner/a83t/a83t_padconf.c | 2 -- sys/arm/allwinner/a83t/a83t_r_padconf.c | 2 -- sys/arm/allwinner/allwinner_pinctrl.h | 2 -- sys/arm/allwinner/aw_ccu.c | 2 -- sys/arm/allwinner/aw_gmacclk.c | 2 -- sys/arm/allwinner/aw_i2s.c | 2 -- sys/arm/allwinner/aw_machdep.h | 2 -- sys/arm/allwinner/aw_mmc.h | 2 -- sys/arm/allwinner/aw_mp.h | 2 -- sys/arm/allwinner/aw_pwm.c | 2 -- sys/arm/allwinner/aw_reset.c | 2 -- sys/arm/allwinner/aw_rsb.c | 2 -- sys/arm/allwinner/aw_sid.c | 2 -- sys/arm/allwinner/aw_sid.h | 2 -- sys/arm/allwinner/aw_spi.c | 2 -- sys/arm/allwinner/aw_thermal.c | 2 -- sys/arm/allwinner/aw_usbphy.c | 2 -- sys/arm/allwinner/aw_wdog.h | 2 -- sys/arm/allwinner/axp209reg.h | 2 -- sys/arm/allwinner/axp81x.c | 2 -- sys/arm/allwinner/clkng/aw_ccung.c | 2 -- sys/arm/allwinner/clkng/aw_ccung.h | 2 -- sys/arm/allwinner/clkng/aw_clk.h | 2 -- sys/arm/allwinner/clkng/aw_clk_frac.c | 2 -- sys/arm/allwinner/clkng/aw_clk_frac.h | 2 -- sys/arm/allwinner/clkng/aw_clk_m.c | 2 -- sys/arm/allwinner/clkng/aw_clk_m.h | 2 -- sys/arm/allwinner/clkng/aw_clk_mipi.c | 2 -- sys/arm/allwinner/clkng/aw_clk_mipi.h | 2 -- sys/arm/allwinner/clkng/aw_clk_nkmp.c | 2 -- sys/arm/allwinner/clkng/aw_clk_nkmp.h | 2 -- sys/arm/allwinner/clkng/aw_clk_nm.c | 2 -- sys/arm/allwinner/clkng/aw_clk_nm.h | 2 -- sys/arm/allwinner/clkng/aw_clk_nmm.c | 2 -- sys/arm/allwinner/clkng/aw_clk_nmm.h | 2 -- sys/arm/allwinner/clkng/aw_clk_np.c | 2 -- sys/arm/allwinner/clkng/aw_clk_np.h | 2 -- sys/arm/allwinner/clkng/aw_clk_prediv_mux.c | 2 -- sys/arm/allwinner/clkng/aw_clk_prediv_mux.h | 2 -- sys/arm/allwinner/clkng/ccu_a10.c | 2 -- sys/arm/allwinner/clkng/ccu_a13.c | 2 -- sys/arm/allwinner/clkng/ccu_a31.c | 2 -- sys/arm/allwinner/clkng/ccu_a64.c | 2 -- sys/arm/allwinner/clkng/ccu_a83t.c | 2 -- sys/arm/allwinner/clkng/ccu_de2.c | 2 -- sys/arm/allwinner/clkng/ccu_h3.c | 2 -- sys/arm/allwinner/clkng/ccu_h6.c | 2 -- sys/arm/allwinner/clkng/ccu_h6_r.c | 2 -- sys/arm/allwinner/clkng/ccu_sun8i_r.c | 2 -- sys/arm/allwinner/if_awg.c | 2 -- sys/arm/allwinner/if_awgreg.h | 2 -- sys/arm/allwinner/if_emac.c | 2 -- sys/arm/allwinner/if_emacreg.h | 2 -- sys/arm/altera/socfpga/socfpga_common.h | 2 -- sys/arm/altera/socfpga/socfpga_l3regs.h | 2 -- sys/arm/altera/socfpga/socfpga_mp.h | 2 -- sys/arm/altera/socfpga/socfpga_rstmgr.h | 2 -- sys/arm/annapurna/alpine/alpine_mp.h | 2 -- sys/arm/annapurna/alpine/alpine_serdes.h | 2 -- sys/arm/arm/cpu_asm-v6.S | 2 -- sys/arm/arm/gic.h | 2 -- sys/arm/arm/gic_common.h | 2 -- sys/arm/arm/locore.S | 2 -- sys/arm/arm/mpcore_timervar.h | 2 -- sys/arm/arm/nexusvar.h | 2 -- sys/arm/arm/pmu.h | 2 -- sys/arm/broadcom/bcm2835/bcm2835_bscreg.h | 2 -- sys/arm/broadcom/bcm2835/bcm2835_bscvar.h | 2 -- sys/arm/broadcom/bcm2835/bcm2835_clkman.h | 2 -- sys/arm/broadcom/bcm2835/bcm2835_dma.h | 2 -- sys/arm/broadcom/bcm2835/bcm2835_firmware.h | 2 -- sys/arm/broadcom/bcm2835/bcm2835_mbox.h | 2 -- sys/arm/broadcom/bcm2835/bcm2835_mbox_prop.h | 2 -- sys/arm/broadcom/bcm2835/bcm2835_spireg.h | 2 -- sys/arm/broadcom/bcm2835/bcm2835_spivar.h | 2 -- sys/arm/broadcom/bcm2835/bcm2835_vcbus.c | 2 -- sys/arm/broadcom/bcm2835/bcm2835_vcbus.h | 2 -- sys/arm/broadcom/bcm2835/bcm2836_mp.h | 2 -- sys/arm/broadcom/bcm2835/bcm2838_pci.c | 2 -- sys/arm/broadcom/bcm2835/bcm2838_xhci.c | 2 -- sys/arm/broadcom/bcm2835/vc_vchi_audioserv_defs.h | 2 -- sys/arm/freescale/fsl_ocotpreg.h | 2 -- sys/arm/freescale/fsl_ocotpvar.h | 2 -- sys/arm/freescale/imx/imx51_ccmreg.h | 2 -- sys/arm/freescale/imx/imx51_ccmvar.h | 2 -- sys/arm/freescale/imx/imx51_dpllreg.h | 2 -- sys/arm/freescale/imx/imx51_ipuv3reg.h | 2 -- sys/arm/freescale/imx/imx51_sdmareg.h | 2 -- sys/arm/freescale/imx/imx51_ssireg.h | 2 -- sys/arm/freescale/imx/imx51_tzicreg.h | 2 -- sys/arm/freescale/imx/imx6_anatopreg.h | 2 -- sys/arm/freescale/imx/imx6_anatopvar.h | 2 -- sys/arm/freescale/imx/imx6_ccmreg.h | 2 -- sys/arm/freescale/imx/imx6_machdep.h | 2 -- sys/arm/freescale/imx/imx6_sdma.h | 2 -- sys/arm/freescale/imx/imx6_src.h | 2 -- sys/arm/freescale/imx/imx_ccmvar.h | 2 -- sys/arm/freescale/imx/imx_gptreg.h | 2 -- sys/arm/freescale/imx/imx_iomux.c | 2 -- sys/arm/freescale/imx/imx_iomuxreg.h | 2 -- sys/arm/freescale/imx/imx_iomuxvar.h | 2 -- sys/arm/freescale/imx/imx_machdep.h | 2 -- sys/arm/freescale/imx/imx_wdogreg.h | 2 -- sys/arm/freescale/vybrid/vf_adc.h | 2 -- sys/arm/freescale/vybrid/vf_common.h | 2 -- sys/arm/freescale/vybrid/vf_dmamux.h | 2 -- sys/arm/freescale/vybrid/vf_edma.h | 2 -- sys/arm/freescale/vybrid/vf_iomuxc.h | 2 -- sys/arm/freescale/vybrid/vf_port.h | 2 -- sys/arm/freescale/vybrid/vf_src.h | 2 -- sys/arm/include/_bus.h | 2 -- sys/arm/include/_stdint.h | 2 -- sys/arm/include/acle-compat.h | 2 -- sys/arm/include/armreg.h | 2 -- sys/arm/include/asm.h | 2 -- sys/arm/include/asmacros.h | 2 -- sys/arm/include/atags.h | 2 -- sys/arm/include/atomic.h | 2 -- sys/arm/include/blockio.h | 2 -- sys/arm/include/bus.h | 2 -- sys/arm/include/bus_dma.h | 2 -- sys/arm/include/clock.h | 2 -- sys/arm/include/counter.h | 2 -- sys/arm/include/cpufunc.h | 2 -- sys/arm/include/cpuinfo.h | 2 -- sys/arm/include/debug_monitor.h | 2 -- sys/arm/include/disassem.h | 2 -- sys/arm/include/dump.h | 2 -- sys/arm/include/efi.h | 2 -- sys/arm/include/elf.h | 2 -- sys/arm/include/exec.h | 2 -- sys/arm/include/fdt.h | 2 -- sys/arm/include/fiq.h | 2 -- sys/arm/include/fpu.h | 2 -- sys/arm/include/frame.h | 2 -- sys/arm/include/gdb_machdep.h | 2 -- sys/arm/include/ieee.h | 2 -- sys/arm/include/intr.h | 2 -- sys/arm/include/kdb.h | 2 -- sys/arm/include/memdev.h | 2 -- sys/arm/include/metadata.h | 2 -- sys/arm/include/ofw_machdep.h | 2 -- sys/arm/include/pcb.h | 2 -- sys/arm/include/pcpu_aux.h | 2 -- sys/arm/include/platform.h | 2 -- sys/arm/include/platformvar.h | 2 -- sys/arm/include/pmap.h | 2 -- sys/arm/include/pmap_var.h | 2 -- sys/arm/include/pmc_mdep.h | 2 -- sys/arm/include/psl.h | 2 -- sys/arm/include/pte.h | 2 -- sys/arm/include/resource.h | 2 -- sys/arm/include/runq.h | 2 -- sys/arm/include/sc_machdep.h | 2 -- sys/arm/include/sf_buf.h | 2 -- sys/arm/include/stack.h | 2 -- sys/arm/include/stdarg.h | 2 -- sys/arm/include/sysreg.h | 2 -- sys/arm/include/ucontext.h | 2 -- sys/arm/include/undefined.h | 2 -- sys/arm/include/vdso.h | 2 -- sys/arm/include/vm.h | 2 -- sys/arm/include/vmparam.h | 2 -- sys/arm/mv/a37x0_iicreg.h | 2 -- sys/arm/mv/armada38x/armada38x_pl310.h | 2 -- sys/arm/mv/armada38x/pmsu.h | 2 -- sys/arm/mv/armadaxp/armadaxp_mp.c | 2 -- sys/arm/mv/clk/a37x0_tbg_pll.h | 2 -- sys/arm/mv/clk/periph.h | 2 -- sys/arm/mv/mv_ap806_clock.c | 2 -- sys/arm/mv/mv_ap806_gicp.c | 2 -- sys/arm/mv/mv_cp110_clock.c | 2 -- sys/arm/mv/mv_cp110_clock.h | 2 -- sys/arm/mv/mv_cp110_icu.c | 2 -- sys/arm/mv/mv_thermal.c | 2 -- sys/arm/mv/mvebu_pinctrl.c | 2 -- sys/arm/mv/mvreg.h | 2 -- sys/arm/mv/mvvar.h | 2 -- sys/arm/mv/mvwin.h | 2 -- sys/arm/nvidia/as3722.h | 2 -- sys/arm/nvidia/drm2/hdmi.h | 2 -- sys/arm/nvidia/drm2/tegra_dc_reg.h | 2 -- sys/arm/nvidia/drm2/tegra_drm.h | 2 -- sys/arm/nvidia/drm2/tegra_hdmi_reg.h | 2 -- sys/arm/nvidia/tegra124/tegra124_car.h | 2 -- sys/arm/nvidia/tegra124/tegra124_mp.h | 2 -- sys/arm/nvidia/tegra124/tegra124_pmc.c | 2 -- sys/arm/nvidia/tegra_efuse.h | 2 -- sys/arm/nvidia/tegra_pmc.h | 2 -- sys/arm/qemu/virt_mp.h | 2 -- sys/arm/qualcomm/ipq4018_machdep.h | 2 -- sys/arm/qualcomm/ipq4018_reg.h | 2 -- sys/arm/qualcomm/qcom_cpu_kpssv2.h | 2 -- sys/arm/qualcomm/qcom_cpu_kpssv2_reg.h | 2 -- sys/arm/qualcomm/qcom_scm_defs.h | 2 -- sys/arm/qualcomm/qcom_scm_legacy.h | 2 -- sys/arm/qualcomm/qcom_scm_legacy_defs.h | 2 -- sys/arm/rockchip/rk32xx_mp.h | 2 -- sys/arm/ti/am335x/am3359_cppi41.c | 2 -- sys/arm/ti/am335x/am335x_dmtreg.h | 2 -- sys/arm/ti/am335x/am335x_lcd.h | 2 -- sys/arm/ti/am335x/am335x_pwm.h | 2 -- sys/arm/ti/am335x/am335x_reg.h | 2 -- sys/arm/ti/am335x/am335x_rtcreg.h | 2 -- sys/arm/ti/am335x/am335x_rtcvar.h | 2 -- sys/arm/ti/am335x/am335x_scm.h | 2 -- sys/arm/ti/am335x/am335x_scm_padconf.h | 2 -- sys/arm/ti/am335x/am335x_usb_phy.c | 2 -- sys/arm/ti/am335x/tps65217x.h | 2 -- sys/arm/ti/clk/clock_common.c | 2 -- sys/arm/ti/clk/clock_common.h | 2 -- sys/arm/ti/clk/ti_clk_clkctrl.c | 2 -- sys/arm/ti/clk/ti_clk_clkctrl.h | 2 -- sys/arm/ti/clk/ti_clk_dpll.c | 2 -- sys/arm/ti/clk/ti_clk_dpll.h | 2 -- sys/arm/ti/clk/ti_clkctrl.c | 2 -- sys/arm/ti/clk/ti_divider_clock.c | 2 -- sys/arm/ti/clk/ti_dpll_clock.c | 2 -- sys/arm/ti/clk/ti_gate_clock.c | 2 -- sys/arm/ti/clk/ti_mux_clock.c | 2 -- sys/arm/ti/cpsw/if_cpswreg.h | 2 -- sys/arm/ti/cpsw/if_cpswvar.h | 2 -- sys/arm/ti/omap4/omap4_machdep.h | 2 -- sys/arm/ti/omap4/omap4_reg.h | 2 -- sys/arm/ti/omap4/omap4_scm_padconf.h | 2 -- sys/arm/ti/omap4/pandaboard/pandaboard.h | 2 -- sys/arm/ti/ti_adcreg.h | 2 -- sys/arm/ti/ti_adcvar.h | 2 -- sys/arm/ti/ti_cpuid.h | 2 -- sys/arm/ti/ti_edma3.h | 2 -- sys/arm/ti/ti_gpio.h | 2 -- sys/arm/ti/ti_i2c.h | 2 -- sys/arm/ti/ti_mbox.h | 2 -- sys/arm/ti/ti_omap4_cm.c | 2 -- sys/arm/ti/ti_omap4_cm.h | 2 -- sys/arm/ti/ti_pinmux.h | 2 -- sys/arm/ti/ti_prcm.c | 2 -- sys/arm/ti/ti_prcm.h | 2 -- sys/arm/ti/ti_prm.c | 2 -- sys/arm/ti/ti_prm.h | 2 -- sys/arm/ti/ti_pruss.h | 2 -- sys/arm/ti/ti_scm.c | 2 -- sys/arm/ti/ti_scm.h | 2 -- sys/arm/ti/ti_scm_syscon.c | 2 -- sys/arm/ti/ti_sdma.h | 2 -- sys/arm/ti/ti_sdmareg.h | 2 -- sys/arm/ti/ti_spireg.h | 2 -- sys/arm/ti/ti_spivar.h | 2 -- sys/arm/ti/ti_sysc.c | 2 -- sys/arm/ti/ti_sysc.h | 2 -- sys/arm/ti/ti_wdt.h | 2 -- sys/arm/ti/tivar.h | 2 -- sys/arm/ti/twl/twl.h | 2 -- sys/arm/ti/twl/twl_clks.h | 2 -- sys/arm/ti/twl/twl_vreg.h | 2 -- sys/arm/ti/usb/omap_usb.h | 2 -- sys/arm/xilinx/zy7_devcfg.c | 2 -- sys/arm/xilinx/zy7_ehci.c | 2 -- sys/arm/xilinx/zy7_gpio.c | 2 -- sys/arm/xilinx/zy7_l2cache.c | 2 -- sys/arm/xilinx/zy7_machdep.c | 2 -- sys/arm/xilinx/zy7_machdep.h | 2 -- sys/arm/xilinx/zy7_reg.h | 2 -- sys/arm/xilinx/zy7_slcr.c | 2 -- sys/arm/xilinx/zy7_slcr.h | 2 -- sys/arm/xilinx/zy7_spi.c | 2 -- sys/arm64/arm64/cmn600.c | 2 -- sys/arm64/arm64/gic_v3_reg.h | 2 -- sys/arm64/arm64/gic_v3_var.h | 2 -- sys/arm64/arm64/locore.S | 2 -- sys/arm64/broadcom/genet/if_genet.c | 2 -- sys/arm64/broadcom/genet/if_genetreg.h | 2 -- sys/arm64/cavium/thunder_pcie_common.h | 2 -- sys/arm64/cavium/thunder_pcie_pem.h | 2 -- sys/arm64/coresight/coresight.h | 2 -- sys/arm64/coresight/coresight_etm4x.h | 2 -- sys/arm64/coresight/coresight_funnel.h | 2 -- sys/arm64/coresight/coresight_replicator.h | 2 -- sys/arm64/coresight/coresight_tmc.h | 2 -- sys/arm64/freescale/imx/clk/imx_clk_composite.c | 2 -- sys/arm64/freescale/imx/clk/imx_clk_composite.h | 2 -- sys/arm64/freescale/imx/clk/imx_clk_frac_pll.c | 2 -- sys/arm64/freescale/imx/clk/imx_clk_frac_pll.h | 2 -- sys/arm64/freescale/imx/clk/imx_clk_gate.h | 2 -- sys/arm64/freescale/imx/clk/imx_clk_mux.h | 2 -- sys/arm64/freescale/imx/clk/imx_clk_sscg_pll.c | 2 -- sys/arm64/freescale/imx/clk/imx_clk_sscg_pll.h | 2 -- sys/arm64/freescale/imx/imx_ccm_clk.h | 2 -- sys/arm64/include/_bus.h | 2 -- sys/arm64/include/_stdint.h | 2 -- sys/arm64/include/acpica_machdep.h | 2 -- sys/arm64/include/armreg.h | 2 -- sys/arm64/include/asm.h | 2 -- sys/arm64/include/atomic.h | 2 -- sys/arm64/include/bus.h | 2 -- sys/arm64/include/bus_dma_impl.h | 2 -- sys/arm64/include/cmn600_reg.h | 2 -- sys/arm64/include/counter.h | 2 -- sys/arm64/include/cpufunc.h | 2 -- sys/arm64/include/csan.h | 2 -- sys/arm64/include/db_machdep.h | 2 -- sys/arm64/include/debug_monitor.h | 2 -- sys/arm64/include/disassem.h | 2 -- sys/arm64/include/dump.h | 2 -- sys/arm64/include/efi.h | 2 -- sys/arm64/include/elf.h | 2 -- sys/arm64/include/fpu.h | 2 -- sys/arm64/include/frame.h | 2 -- sys/arm64/include/hypervisor.h | 2 -- sys/arm64/include/ifunc.h | 2 -- sys/arm64/include/intr.h | 2 -- sys/arm64/include/iodev.h | 2 -- sys/arm64/include/kdb.h | 2 -- sys/arm64/include/machdep.h | 2 -- sys/arm64/include/memdev.h | 2 -- sys/arm64/include/metadata.h | 2 -- sys/arm64/include/ofw_machdep.h | 2 -- sys/arm64/include/pcb.h | 2 -- sys/arm64/include/pci_cfgreg.h | 2 -- sys/arm64/include/pcpu_aux.h | 2 -- sys/arm64/include/pmap.h | 2 -- sys/arm64/include/pmc_mdep.h | 2 -- sys/arm64/include/pte.h | 2 -- sys/arm64/include/reg.h | 2 -- sys/arm64/include/resource.h | 2 -- sys/arm64/include/runq.h | 2 -- sys/arm64/include/setjmp.h | 2 -- sys/arm64/include/sf_buf.h | 2 -- sys/arm64/include/smp.h | 2 -- sys/arm64/include/stack.h | 2 -- sys/arm64/include/stdarg.h | 2 -- sys/arm64/include/ucontext.h | 2 -- sys/arm64/include/undefined.h | 2 -- sys/arm64/include/vdso.h | 2 -- sys/arm64/include/vfp.h | 2 -- sys/arm64/include/vm.h | 2 -- sys/arm64/intel/intel-smc.h | 2 -- sys/arm64/intel/stratix10-svc.h | 2 -- sys/arm64/iommu/iommu.h | 2 -- sys/arm64/iommu/iommu_pmap.h | 2 -- sys/arm64/iommu/iommu_pte.h | 2 -- sys/arm64/iommu/smmureg.h | 2 -- sys/arm64/iommu/smmuvar.h | 2 -- sys/arm64/linux/linux_locore.asm | 2 -- sys/arm64/linux/linux_machdep.c | 2 -- sys/arm64/linux/linux_sigframe.h | 2 -- sys/arm64/linux/linux_support.S | 2 -- sys/arm64/linux/linux_vdso.lds.s | 2 -- sys/arm64/nvidia/tegra210/max77620.h | 2 -- sys/arm64/nvidia/tegra210/tegra210_car.h | 2 -- sys/arm64/qoriq/clk/qoriq_clk_pll.h | 2 -- sys/arm64/qoriq/clk/qoriq_clkgen.h | 2 -- sys/arm64/rockchip/clk/rk3288_cru.c | 2 -- sys/arm64/rockchip/clk/rk3328_cru.c | 2 -- sys/arm64/rockchip/clk/rk3399_cru.c | 2 -- sys/arm64/rockchip/clk/rk3399_pmucru.c | 2 -- sys/arm64/rockchip/clk/rk_clk_armclk.c | 2 -- sys/arm64/rockchip/clk/rk_clk_armclk.h | 2 -- sys/arm64/rockchip/clk/rk_clk_composite.c | 2 -- sys/arm64/rockchip/clk/rk_clk_composite.h | 2 -- sys/arm64/rockchip/clk/rk_clk_fract.h | 2 -- sys/arm64/rockchip/clk/rk_clk_gate.h | 2 -- sys/arm64/rockchip/clk/rk_clk_mux.h | 2 -- sys/arm64/rockchip/clk/rk_clk_pll.c | 2 -- sys/arm64/rockchip/clk/rk_clk_pll.h | 2 -- sys/arm64/rockchip/clk/rk_cru.c | 2 -- sys/arm64/rockchip/clk/rk_cru.h | 2 -- sys/arm64/rockchip/rk3328_codec.c | 2 -- sys/arm64/rockchip/rk_i2s.c | 2 -- sys/arm64/rockchip/rk_pwm.c | 2 -- sys/arm64/rockchip/rk_spi.c | 2 -- sys/bsm/audit.h | 2 -- sys/bsm/audit_domain.h | 2 -- sys/bsm/audit_errno.h | 2 -- sys/bsm/audit_fcntl.h | 2 -- sys/bsm/audit_internal.h | 2 -- sys/bsm/audit_kevents.h | 2 -- sys/bsm/audit_record.h | 2 -- sys/bsm/audit_socket_type.h | 2 -- sys/cam/ata/ata_all.h | 2 -- sys/cam/cam.h | 2 -- sys/cam/cam_ccb.h | 2 -- sys/cam/cam_compat.h | 2 -- sys/cam/cam_debug.h | 2 -- sys/cam/cam_iosched.c | 2 -- sys/cam/cam_iosched.h | 2 -- sys/cam/cam_periph.h | 2 -- sys/cam/cam_queue.h | 2 -- sys/cam/cam_sim.h | 2 -- sys/cam/cam_xpt.h | 2 -- sys/cam/cam_xpt_internal.h | 2 -- sys/cam/cam_xpt_periph.h | 2 -- sys/cam/cam_xpt_sim.h | 2 -- sys/cam/ctl/ctl_frontend_iscsi.c | 2 -- sys/cam/ctl/ctl_frontend_iscsi.h | 2 -- sys/cam/ctl/ctl_tpc.h | 2 -- sys/cam/mmc/mmc.h | 2 -- sys/cam/mmc/mmc_all.h | 2 -- sys/cam/mmc/mmc_sim.c | 2 -- sys/cam/mmc/mmc_sim.h | 2 -- sys/cam/nvme/nvme_all.h | 2 -- sys/cam/scsi/scsi_all.h | 2 -- sys/cam/scsi/scsi_da.h | 2 -- sys/cam/scsi/scsi_enc_internal.h | 2 -- sys/cam/scsi/scsi_pass.h | 2 -- sys/cam/scsi/scsi_pt.h | 2 -- sys/cam/scsi/scsi_sa.h | 2 -- sys/cam/scsi/scsi_sg.h | 2 -- sys/cam/scsi/scsi_targetio.h | 2 -- sys/cddl/boot/zfs/skein_zfs.c | 2 -- sys/cddl/compat/opensolaris/kern/opensolaris.c | 2 -- sys/cddl/compat/opensolaris/kern/opensolaris_cmn_err.c | 2 -- sys/cddl/compat/opensolaris/kern/opensolaris_string.c | 2 -- sys/cddl/compat/opensolaris/sys/assfail.h | 2 -- sys/cddl/compat/opensolaris/sys/atomic.h | 2 -- sys/cddl/compat/opensolaris/sys/bitmap.h | 2 -- sys/cddl/compat/opensolaris/sys/byteorder.h | 2 -- sys/cddl/compat/opensolaris/sys/callo.h | 2 -- sys/cddl/compat/opensolaris/sys/cmn_err.h | 2 -- sys/cddl/compat/opensolaris/sys/cpupart.h | 2 -- sys/cddl/compat/opensolaris/sys/cpuvar.h | 2 -- sys/cddl/compat/opensolaris/sys/cred.h | 2 -- sys/cddl/compat/opensolaris/sys/debug.h | 2 -- sys/cddl/compat/opensolaris/sys/debug_compat.h | 2 -- sys/cddl/compat/opensolaris/sys/dirent.h | 2 -- sys/cddl/compat/opensolaris/sys/disp.h | 2 -- sys/cddl/compat/opensolaris/sys/dkio.h | 2 -- sys/cddl/compat/opensolaris/sys/dnlc.h | 2 -- sys/cddl/compat/opensolaris/sys/elf.h | 2 -- sys/cddl/compat/opensolaris/sys/feature_tests.h | 2 -- sys/cddl/compat/opensolaris/sys/freebsd_rwlock.h | 2 -- sys/cddl/compat/opensolaris/sys/kcondvar.h | 2 -- sys/cddl/compat/opensolaris/sys/kidmap.h | 2 -- sys/cddl/compat/opensolaris/sys/kmem.h | 2 -- sys/cddl/compat/opensolaris/sys/kstat.h | 2 -- sys/cddl/compat/opensolaris/sys/misc.h | 2 -- sys/cddl/compat/opensolaris/sys/mntent.h | 2 -- sys/cddl/compat/opensolaris/sys/mnttab.h | 2 -- sys/cddl/compat/opensolaris/sys/modctl.h | 2 -- sys/cddl/compat/opensolaris/sys/objfs.h | 2 -- sys/cddl/compat/opensolaris/sys/pathname.h | 2 -- sys/cddl/compat/opensolaris/sys/pcpu.h | 2 -- sys/cddl/compat/opensolaris/sys/random.h | 2 -- sys/cddl/compat/opensolaris/sys/rwlock.h | 2 -- sys/cddl/compat/opensolaris/sys/sema.h | 2 -- sys/cddl/compat/opensolaris/sys/sid.h | 2 -- sys/cddl/compat/opensolaris/sys/sig.h | 2 -- sys/cddl/compat/opensolaris/sys/string.h | 2 -- sys/cddl/compat/opensolaris/sys/sunddi.h | 2 -- sys/cddl/compat/opensolaris/sys/varargs.h | 2 -- sys/cddl/compat/opensolaris/sys/vfs.h | 2 -- sys/cddl/compat/opensolaris/sys/vm.h | 2 -- sys/cddl/compat/opensolaris/sys/zone.h | 2 -- sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c | 2 -- sys/cddl/contrib/opensolaris/uts/common/dtrace/fasttrap.c | 2 -- sys/cddl/contrib/opensolaris/uts/common/sys/dtrace_impl.h | 2 -- sys/cddl/contrib/opensolaris/uts/intel/dtrace/fasttrap_isa.c | 2 -- sys/cddl/dev/dtmalloc/dtmalloc.c | 2 -- sys/cddl/dev/dtrace/aarch64/dtrace_asm.S | 2 -- sys/cddl/dev/dtrace/aarch64/dtrace_isa.c | 2 -- sys/cddl/dev/dtrace/aarch64/dtrace_subr.c | 2 -- sys/cddl/dev/dtrace/amd64/dtrace_asm.S | 2 -- sys/cddl/dev/dtrace/amd64/dtrace_isa.c | 2 -- sys/cddl/dev/dtrace/amd64/dtrace_subr.c | 2 -- sys/cddl/dev/dtrace/arm/dtrace_asm.S | 2 -- sys/cddl/dev/dtrace/arm/dtrace_isa.c | 2 -- sys/cddl/dev/dtrace/arm/dtrace_subr.c | 2 -- sys/cddl/dev/dtrace/dtrace_anon.c | 2 -- sys/cddl/dev/dtrace/dtrace_cddl.h | 2 -- sys/cddl/dev/dtrace/dtrace_debug.c | 2 -- sys/cddl/dev/dtrace/dtrace_ioctl.c | 2 -- sys/cddl/dev/dtrace/dtrace_load.c | 2 -- sys/cddl/dev/dtrace/dtrace_modevent.c | 2 -- sys/cddl/dev/dtrace/dtrace_sysctl.c | 2 -- sys/cddl/dev/dtrace/dtrace_test.c | 2 -- sys/cddl/dev/dtrace/dtrace_unload.c | 2 -- sys/cddl/dev/dtrace/dtrace_vtime.c | 2 -- sys/cddl/dev/dtrace/i386/dtrace_asm.S | 2 -- sys/cddl/dev/dtrace/i386/dtrace_isa.c | 2 -- sys/cddl/dev/dtrace/i386/dtrace_subr.c | 2 -- sys/cddl/dev/dtrace/powerpc/dtrace_asm.S | 2 -- sys/cddl/dev/dtrace/powerpc/dtrace_isa.c | 2 -- sys/cddl/dev/dtrace/powerpc/dtrace_subr.c | 2 -- sys/cddl/dev/dtrace/riscv/dtrace_asm.S | 2 -- sys/cddl/dev/dtrace/riscv/dtrace_isa.c | 2 -- sys/cddl/dev/dtrace/riscv/dtrace_subr.c | 2 -- sys/cddl/dev/dtrace/x86/instr_size.c | 2 -- sys/cddl/dev/fbt/aarch64/fbt_isa.c | 2 -- sys/cddl/dev/fbt/aarch64/fbt_isa.h | 2 -- sys/cddl/dev/fbt/arm/fbt_isa.c | 2 -- sys/cddl/dev/fbt/arm/fbt_isa.h | 2 -- sys/cddl/dev/fbt/fbt.c | 2 -- sys/cddl/dev/fbt/fbt.h | 2 -- sys/cddl/dev/fbt/powerpc/fbt_isa.c | 2 -- sys/cddl/dev/fbt/powerpc/fbt_isa.h | 2 -- sys/cddl/dev/fbt/riscv/fbt_isa.c | 2 -- sys/cddl/dev/fbt/riscv/fbt_isa.h | 2 -- sys/cddl/dev/fbt/x86/fbt_isa.c | 2 -- sys/cddl/dev/fbt/x86/fbt_isa.h | 2 -- sys/cddl/dev/profile/profile.c | 2 -- sys/cddl/dev/prototype.c | 2 -- sys/cddl/dev/sdt/sdt.c | 2 -- sys/compat/freebsd32/freebsd32.h | 2 -- sys/compat/freebsd32/freebsd32_ioctl.h | 2 -- sys/compat/freebsd32/freebsd32_ipc.h | 2 -- sys/compat/freebsd32/freebsd32_misc.h | 2 -- sys/compat/freebsd32/freebsd32_signal.h | 2 -- sys/compat/freebsd32/freebsd32_util.h | 2 -- sys/compat/ia32/ia32_signal.h | 2 -- sys/compat/ia32/ia32_util.h | 2 -- sys/compat/linux/check_error.d | 2 -- sys/compat/linux/check_internal_locks.d | 2 -- sys/compat/linux/linux.h | 2 -- sys/compat/linux/linux_common.h | 2 -- sys/compat/linux/linux_dtrace.h | 2 -- sys/compat/linux/linux_emul.h | 2 -- sys/compat/linux/linux_errno.h | 2 -- sys/compat/linux/linux_errno.inc | 2 -- sys/compat/linux/linux_event.h | 2 -- sys/compat/linux/linux_file.h | 2 -- sys/compat/linux/linux_fork.h | 2 -- sys/compat/linux/linux_futex.h | 2 -- sys/compat/linux/linux_ioctl.h | 2 -- sys/compat/linux/linux_ipc.h | 2 -- sys/compat/linux/linux_ipc64.h | 2 -- sys/compat/linux/linux_mib.h | 2 -- sys/compat/linux/linux_misc.h | 2 -- sys/compat/linux/linux_mmap.c | 2 -- sys/compat/linux/linux_mmap.h | 2 -- sys/compat/linux/linux_siginfo.h | 2 -- sys/compat/linux/linux_signal.h | 2 -- sys/compat/linux/linux_socket.h | 2 -- sys/compat/linux/linux_sysproto.h | 2 -- sys/compat/linux/linux_time.h | 2 -- sys/compat/linux/linux_vdso.h | 2 -- sys/compat/linux/stats_timing.d | 2 -- sys/compat/linux/trace_futexes.d | 2 -- sys/compat/linuxkpi/common/include/acpi/acpi.h | 2 -- sys/compat/linuxkpi/common/include/acpi/acpi_bus.h | 2 -- sys/compat/linuxkpi/common/include/acpi/video.h | 2 -- sys/compat/linuxkpi/common/include/asm/atomic-long.h | 2 -- sys/compat/linuxkpi/common/include/asm/atomic.h | 2 -- sys/compat/linuxkpi/common/include/asm/atomic64.h | 2 -- sys/compat/linuxkpi/common/include/asm/byteorder.h | 2 -- sys/compat/linuxkpi/common/include/asm/fcntl.h | 2 -- sys/compat/linuxkpi/common/include/asm/io.h | 2 -- sys/compat/linuxkpi/common/include/asm/msr.h | 2 -- sys/compat/linuxkpi/common/include/asm/pgtable.h | 2 -- sys/compat/linuxkpi/common/include/asm/smp.h | 2 -- sys/compat/linuxkpi/common/include/asm/types.h | 2 -- sys/compat/linuxkpi/common/include/asm/uaccess.h | 2 -- sys/compat/linuxkpi/common/include/asm/unaligned.h | 2 -- sys/compat/linuxkpi/common/include/linux/acpi.h | 2 -- sys/compat/linuxkpi/common/include/linux/atomic.h | 2 -- sys/compat/linuxkpi/common/include/linux/average.h | 2 -- sys/compat/linuxkpi/common/include/linux/backlight.h | 2 -- sys/compat/linuxkpi/common/include/linux/bcd.h | 2 -- sys/compat/linuxkpi/common/include/linux/bitfield.h | 2 -- sys/compat/linuxkpi/common/include/linux/bitmap.h | 2 -- sys/compat/linuxkpi/common/include/linux/bitops.h | 2 -- sys/compat/linuxkpi/common/include/linux/bottom_half.h | 2 -- sys/compat/linuxkpi/common/include/linux/bsearch.h | 2 -- sys/compat/linuxkpi/common/include/linux/cache.h | 2 -- sys/compat/linuxkpi/common/include/linux/cdev.h | 2 -- sys/compat/linuxkpi/common/include/linux/clocksource.h | 2 -- sys/compat/linuxkpi/common/include/linux/compat.h | 2 -- sys/compat/linuxkpi/common/include/linux/compiler.h | 2 -- sys/compat/linuxkpi/common/include/linux/completion.h | 2 -- sys/compat/linuxkpi/common/include/linux/cpu.h | 2 -- sys/compat/linuxkpi/common/include/linux/crc32.h | 2 -- sys/compat/linuxkpi/common/include/linux/dcache.h | 2 -- sys/compat/linuxkpi/common/include/linux/debugfs.h | 2 -- sys/compat/linuxkpi/common/include/linux/delay.h | 2 -- sys/compat/linuxkpi/common/include/linux/devcoredump.h | 2 -- sys/compat/linuxkpi/common/include/linux/device.h | 2 -- sys/compat/linuxkpi/common/include/linux/dma-attrs.h | 2 -- sys/compat/linuxkpi/common/include/linux/dma-mapping.h | 2 -- sys/compat/linuxkpi/common/include/linux/dmapool.h | 2 -- sys/compat/linuxkpi/common/include/linux/dmi.h | 2 -- sys/compat/linuxkpi/common/include/linux/err.h | 2 -- sys/compat/linuxkpi/common/include/linux/errno.h | 2 -- sys/compat/linuxkpi/common/include/linux/etherdevice.h | 2 -- sys/compat/linuxkpi/common/include/linux/ethtool.h | 2 -- sys/compat/linuxkpi/common/include/linux/export.h | 2 -- sys/compat/linuxkpi/common/include/linux/file.h | 2 -- sys/compat/linuxkpi/common/include/linux/firmware.h | 2 -- sys/compat/linuxkpi/common/include/linux/fs.h | 2 -- sys/compat/linuxkpi/common/include/linux/gcd.h | 2 -- sys/compat/linuxkpi/common/include/linux/gfp.h | 2 -- sys/compat/linuxkpi/common/include/linux/hardirq.h | 2 -- sys/compat/linuxkpi/common/include/linux/hashtable.h | 2 -- sys/compat/linuxkpi/common/include/linux/hrtimer.h | 2 -- sys/compat/linuxkpi/common/include/linux/idr.h | 2 -- sys/compat/linuxkpi/common/include/linux/ieee80211.h | 2 -- sys/compat/linuxkpi/common/include/linux/if_arp.h | 2 -- sys/compat/linuxkpi/common/include/linux/if_ether.h | 2 -- sys/compat/linuxkpi/common/include/linux/if_vlan.h | 2 -- sys/compat/linuxkpi/common/include/linux/in.h | 2 -- sys/compat/linuxkpi/common/include/linux/in6.h | 2 -- sys/compat/linuxkpi/common/include/linux/interrupt.h | 2 -- sys/compat/linuxkpi/common/include/linux/io-mapping.h | 2 -- sys/compat/linuxkpi/common/include/linux/io.h | 2 -- sys/compat/linuxkpi/common/include/linux/ioctl.h | 2 -- sys/compat/linuxkpi/common/include/linux/iopoll.h | 2 -- sys/compat/linuxkpi/common/include/linux/ip.h | 2 -- sys/compat/linuxkpi/common/include/linux/irq_work.h | 2 -- sys/compat/linuxkpi/common/include/linux/irqreturn.h | 2 -- sys/compat/linuxkpi/common/include/linux/jhash.h | 2 -- sys/compat/linuxkpi/common/include/linux/jiffies.h | 2 -- sys/compat/linuxkpi/common/include/linux/kconfig.h | 2 -- sys/compat/linuxkpi/common/include/linux/kdev_t.h | 2 -- sys/compat/linuxkpi/common/include/linux/kernel.h | 2 -- sys/compat/linuxkpi/common/include/linux/kmod.h | 2 -- sys/compat/linuxkpi/common/include/linux/kobject.h | 2 -- sys/compat/linuxkpi/common/include/linux/kref.h | 2 -- sys/compat/linuxkpi/common/include/linux/kthread.h | 2 -- sys/compat/linuxkpi/common/include/linux/ktime.h | 2 -- sys/compat/linuxkpi/common/include/linux/list.h | 2 -- sys/compat/linuxkpi/common/include/linux/lockdep.h | 2 -- sys/compat/linuxkpi/common/include/linux/log2.h | 2 -- sys/compat/linuxkpi/common/include/linux/math64.h | 2 -- sys/compat/linuxkpi/common/include/linux/mhi.h | 2 -- sys/compat/linuxkpi/common/include/linux/miscdevice.h | 2 -- sys/compat/linuxkpi/common/include/linux/mm.h | 2 -- sys/compat/linuxkpi/common/include/linux/mm_types.h | 2 -- sys/compat/linuxkpi/common/include/linux/mmu_context.h | 2 -- sys/compat/linuxkpi/common/include/linux/mmu_notifier.h | 2 -- sys/compat/linuxkpi/common/include/linux/mod_devicetable.h | 2 -- sys/compat/linuxkpi/common/include/linux/module.h | 2 -- sys/compat/linuxkpi/common/include/linux/moduleparam.h | 2 -- sys/compat/linuxkpi/common/include/linux/mutex.h | 2 -- sys/compat/linuxkpi/common/include/linux/net.h | 2 -- sys/compat/linuxkpi/common/include/linux/net_dim.h | 2 -- sys/compat/linuxkpi/common/include/linux/netdev_features.h | 2 -- sys/compat/linuxkpi/common/include/linux/netdevice.h | 2 -- sys/compat/linuxkpi/common/include/linux/nl80211.h | 2 -- sys/compat/linuxkpi/common/include/linux/notifier.h | 2 -- sys/compat/linuxkpi/common/include/linux/numa.h | 2 -- sys/compat/linuxkpi/common/include/linux/overflow.h | 2 -- sys/compat/linuxkpi/common/include/linux/page.h | 2 -- sys/compat/linuxkpi/common/include/linux/pagemap.h | 2 -- sys/compat/linuxkpi/common/include/linux/pci.h | 2 -- sys/compat/linuxkpi/common/include/linux/pci_ids.h | 2 -- sys/compat/linuxkpi/common/include/linux/pfn.h | 2 -- sys/compat/linuxkpi/common/include/linux/pfn_t.h | 2 -- sys/compat/linuxkpi/common/include/linux/pid.h | 2 -- sys/compat/linuxkpi/common/include/linux/platform_device.h | 2 -- sys/compat/linuxkpi/common/include/linux/pm.h | 2 -- sys/compat/linuxkpi/common/include/linux/pm_qos.h | 2 -- sys/compat/linuxkpi/common/include/linux/poll.h | 2 -- sys/compat/linuxkpi/common/include/linux/power_supply.h | 2 -- sys/compat/linuxkpi/common/include/linux/preempt.h | 2 -- sys/compat/linuxkpi/common/include/linux/prefetch.h | 2 -- sys/compat/linuxkpi/common/include/linux/printk.h | 2 -- sys/compat/linuxkpi/common/include/linux/ptp_clock_kernel.h | 2 -- sys/compat/linuxkpi/common/include/linux/radix-tree.h | 2 -- sys/compat/linuxkpi/common/include/linux/random.h | 2 -- sys/compat/linuxkpi/common/include/linux/rbtree.h | 2 -- sys/compat/linuxkpi/common/include/linux/rculist.h | 2 -- sys/compat/linuxkpi/common/include/linux/rcupdate.h | 2 -- sys/compat/linuxkpi/common/include/linux/refcount.h | 2 -- sys/compat/linuxkpi/common/include/linux/rhashtable.h | 2 -- sys/compat/linuxkpi/common/include/linux/rwlock.h | 2 -- sys/compat/linuxkpi/common/include/linux/rwsem.h | 2 -- sys/compat/linuxkpi/common/include/linux/scatterlist.h | 2 -- sys/compat/linuxkpi/common/include/linux/sched.h | 2 -- sys/compat/linuxkpi/common/include/linux/semaphore.h | 2 -- sys/compat/linuxkpi/common/include/linux/seq_file.h | 2 -- sys/compat/linuxkpi/common/include/linux/shmem_fs.h | 2 -- sys/compat/linuxkpi/common/include/linux/shrinker.h | 2 -- sys/compat/linuxkpi/common/include/linux/sizes.h | 2 -- sys/compat/linuxkpi/common/include/linux/skbuff.h | 2 -- sys/compat/linuxkpi/common/include/linux/slab.h | 2 -- sys/compat/linuxkpi/common/include/linux/smp.h | 2 -- sys/compat/linuxkpi/common/include/linux/soc/mediatek/mtk_wed.h | 2 -- sys/compat/linuxkpi/common/include/linux/soc/qcom/qmi.h | 2 -- sys/compat/linuxkpi/common/include/linux/socket.h | 2 -- sys/compat/linuxkpi/common/include/linux/spinlock.h | 2 -- sys/compat/linuxkpi/common/include/linux/srcu.h | 2 -- sys/compat/linuxkpi/common/include/linux/string.h | 2 -- sys/compat/linuxkpi/common/include/linux/stringify.h | 2 -- sys/compat/linuxkpi/common/include/linux/swap.h | 2 -- sys/compat/linuxkpi/common/include/linux/sysfs.h | 2 -- sys/compat/linuxkpi/common/include/linux/tcp.h | 2 -- sys/compat/linuxkpi/common/include/linux/time.h | 2 -- sys/compat/linuxkpi/common/include/linux/timer.h | 2 -- sys/compat/linuxkpi/common/include/linux/tracepoint.h | 2 -- sys/compat/linuxkpi/common/include/linux/types.h | 2 -- sys/compat/linuxkpi/common/include/linux/uaccess.h | 2 -- sys/compat/linuxkpi/common/include/linux/udp.h | 2 -- sys/compat/linuxkpi/common/include/linux/utsname.h | 2 -- sys/compat/linuxkpi/common/include/linux/uuid.h | 2 -- sys/compat/linuxkpi/common/include/linux/vmalloc.h | 2 -- sys/compat/linuxkpi/common/include/linux/wait.h | 2 -- sys/compat/linuxkpi/common/include/linux/wait_bit.h | 2 -- sys/compat/linuxkpi/common/include/linux/workqueue.h | 2 -- sys/compat/linuxkpi/common/include/linux/ww_mutex.h | 2 -- sys/compat/linuxkpi/common/include/linux/xarray.h | 2 -- sys/compat/linuxkpi/common/include/net/addrconf.h | 2 -- sys/compat/linuxkpi/common/include/net/cfg80211.h | 2 -- sys/compat/linuxkpi/common/include/net/ieee80211_radiotap.h | 2 -- sys/compat/linuxkpi/common/include/net/if_inet6.h | 2 -- sys/compat/linuxkpi/common/include/net/ip.h | 2 -- sys/compat/linuxkpi/common/include/net/ipv6.h | 2 -- sys/compat/linuxkpi/common/include/net/mac80211.h | 2 -- sys/compat/linuxkpi/common/include/net/netevent.h | 2 -- sys/compat/linuxkpi/common/include/net/page_pool.h | 2 -- sys/compat/linuxkpi/common/include/net/regulatory.h | 2 -- sys/compat/linuxkpi/common/include/net/tcp.h | 2 -- sys/compat/linuxkpi/common/src/linux_acpi.c | 2 -- sys/compat/linuxkpi/common/src/linux_dmi.c | 2 -- sys/compat/linuxkpi/common/src/linux_firmware.c | 2 -- sys/compat/linuxkpi/common/src/linux_interrupt.c | 2 -- sys/compat/linuxkpi/common/src/linux_lock.c | 2 -- sys/compat/linuxkpi/common/src/linux_mhi.c | 2 -- sys/compat/linuxkpi/common/src/linux_shrinker.c | 2 -- sys/compat/linuxkpi/common/src/linux_skbuff.c | 2 -- sys/compat/x86bios/x86bios.h | 2 -- sys/conf/ldscript.kmod.amd64 | 2 -- sys/conf/ldscript.kmod.i386 | 2 -- sys/crypto/aesni/aesencdec.h | 2 -- sys/crypto/aesni/aesni.h | 2 -- sys/crypto/aesni/aesni_ccm.c | 2 -- sys/crypto/aesni/aesni_ghash.c | 2 -- sys/crypto/aesni/aesni_os.h | 2 -- sys/crypto/aesni/sha_sse.h | 2 -- sys/crypto/armv8/armv8_crypto.h | 2 -- sys/crypto/camellia/camellia-api.c | 2 -- sys/crypto/camellia/camellia.c | 2 -- sys/crypto/camellia/camellia.h | 2 -- sys/crypto/ccp/ccp.h | 2 -- sys/crypto/ccp/ccp_hardware.h | 2 -- sys/crypto/ccp/ccp_lsb.h | 2 -- sys/crypto/intake.h | 2 -- sys/crypto/openssl/ossl.h | 2 -- sys/crypto/openssl/ossl_aarch64.c | 2 -- sys/crypto/openssl/ossl_hash.h | 2 -- sys/crypto/openssl/ossl_sha.h | 2 -- sys/crypto/openssl/ossl_x86.c | 2 -- sys/crypto/rc4/rc4.h | 2 -- sys/crypto/rijndael/test00.c | 2 -- sys/crypto/sha2/sha224.h | 2 -- sys/crypto/sha2/sha256.h | 2 -- sys/crypto/sha2/sha384.h | 2 -- sys/crypto/sha2/sha512.h | 2 -- sys/crypto/sha2/sha512t.h | 2 -- sys/crypto/siphash/siphash.h | 2 -- sys/crypto/skein/skein_freebsd.h | 2 -- sys/crypto/via/padlock.h | 2 -- sys/ddb/db_access.h | 2 -- sys/ddb/db_break.h | 2 -- sys/ddb/db_command.h | 2 -- sys/ddb/db_lex.h | 2 -- sys/ddb/db_output.h | 2 -- sys/ddb/db_sym.h | 2 -- sys/ddb/db_variables.h | 2 -- sys/ddb/db_watch.h | 2 -- sys/ddb/ddb.h | 2 -- sys/dev/aac/aac_tables.h | 2 -- sys/dev/aac/aacreg.h | 2 -- sys/dev/aac/aacvar.h | 2 -- sys/dev/aacraid/aacraid_debug.h | 2 -- sys/dev/aacraid/aacraid_endian.h | 2 -- sys/dev/aacraid/aacraid_reg.h | 2 -- sys/dev/aacraid/aacraid_var.h | 2 -- sys/dev/acpica/acpi_dock.c | 2 -- sys/dev/acpica/acpi_hpet.h | 2 -- sys/dev/acpica/acpi_pcibvar.h | 2 -- sys/dev/acpica/acpi_pcivar.h | 2 -- sys/dev/acpica/acpi_smbus.h | 2 -- sys/dev/acpica/acpiio.h | 2 -- sys/dev/acpica/acpivar.h | 2 -- sys/dev/adb/adb.h | 2 -- sys/dev/adb/adb_bus.c | 2 -- sys/dev/adb/adb_buttons.c | 2 -- sys/dev/adb/adb_kbd.c | 2 -- sys/dev/adb/adb_mouse.c | 2 -- sys/dev/adb/adbvar.h | 2 -- sys/dev/ae/if_aereg.h | 2 -- sys/dev/ae/if_aevar.h | 2 -- sys/dev/age/if_agereg.h | 2 -- sys/dev/age/if_agevar.h | 2 -- sys/dev/agp/agp_i810.h | 2 -- sys/dev/agp/agppriv.h | 2 -- sys/dev/agp/agpreg.h | 2 -- sys/dev/agp/agpvar.h | 2 -- sys/dev/ahci/ahci.h | 2 -- sys/dev/aic7xxx/aic79xx.h | 2 -- sys/dev/aic7xxx/aic79xx.reg | 2 -- sys/dev/aic7xxx/aic79xx.seq | 2 -- sys/dev/aic7xxx/aic79xx_inline.h | 2 -- sys/dev/aic7xxx/aic79xx_osm.h | 2 -- sys/dev/aic7xxx/aic79xx_reg.h | 2 -- sys/dev/aic7xxx/aic79xx_seq.h | 2 -- sys/dev/aic7xxx/aic7xxx.h | 2 -- sys/dev/aic7xxx/aic7xxx.reg | 2 -- sys/dev/aic7xxx/aic7xxx.seq | 2 -- sys/dev/aic7xxx/aic7xxx_93cx6.h | 2 -- sys/dev/aic7xxx/aic7xxx_inline.h | 2 -- sys/dev/aic7xxx/aic7xxx_osm.h | 2 -- sys/dev/aic7xxx/aic7xxx_reg.h | 2 -- sys/dev/aic7xxx/aic7xxx_seq.h | 2 -- sys/dev/aic7xxx/aic_osm_lib.h | 2 -- sys/dev/aic7xxx/aicasm/aicasm.c | 2 -- sys/dev/aic7xxx/aicasm/aicasm.h | 2 -- sys/dev/aic7xxx/aicasm/aicasm_gram.y | 2 -- sys/dev/aic7xxx/aicasm/aicasm_insformat.h | 2 -- sys/dev/aic7xxx/aicasm/aicasm_macro_gram.y | 2 -- sys/dev/aic7xxx/aicasm/aicasm_macro_scan.l | 2 -- sys/dev/aic7xxx/aicasm/aicasm_scan.l | 2 -- sys/dev/aic7xxx/aicasm/aicasm_symbol.c | 2 -- sys/dev/aic7xxx/aicasm/aicasm_symbol.h | 2 -- sys/dev/al_eth/al_eth.h | 2 -- sys/dev/al_eth/al_init_eth_kr.h | 2 -- sys/dev/al_eth/al_init_eth_lm.h | 2 -- sys/dev/alc/if_alcreg.h | 2 -- sys/dev/alc/if_alcvar.h | 2 -- sys/dev/ale/if_alereg.h | 2 -- sys/dev/ale/if_alevar.h | 2 -- sys/dev/altera/atse/if_atsereg.h | 2 -- sys/dev/altera/avgen/altera_avgen.h | 2 -- sys/dev/altera/jtag_uart/altera_jtag_uart.h | 2 -- sys/dev/altera/msgdma/msgdma.h | 2 -- sys/dev/altera/pio/pio.h | 2 -- sys/dev/altera/sdcard/altera_sdcard.h | 2 -- sys/dev/altera/softdma/a_api.h | 2 -- sys/dev/amd_ecc_inject/ecc_inject.c | 2 -- sys/dev/amdgpio/amdgpio.h | 2 -- sys/dev/amdsbwd/amd_chipset.h | 2 -- sys/dev/amdsmn/amdsmn.h | 2 -- sys/dev/asmc/asmcvar.h | 2 -- sys/dev/ata/ata-all.h | 2 -- sys/dev/ata/ata-pci.h | 2 -- sys/dev/ath/ah_osdep.c | 2 -- sys/dev/ath/ah_osdep.h | 2 -- sys/dev/ath/ah_osdep_ar5210.c | 2 -- sys/dev/ath/ah_osdep_ar5211.c | 2 -- sys/dev/ath/ah_osdep_ar5212.c | 2 -- sys/dev/ath/ah_osdep_ar5416.c | 2 -- sys/dev/ath/ah_osdep_ar9300.c | 2 -- sys/dev/ath/ath_dfs/null/dfs_null.c | 2 -- sys/dev/ath/ath_hal/ah.c | 2 -- sys/dev/ath/ath_hal/ah.h | 2 -- sys/dev/ath/ath_hal/ah_btcoex.h | 2 -- sys/dev/ath/ath_hal/ah_debug.h | 2 -- sys/dev/ath/ath_hal/ah_decode.h | 2 -- sys/dev/ath/ath_hal/ah_desc.h | 2 -- sys/dev/ath/ath_hal/ah_devid.h | 2 -- sys/dev/ath/ath_hal/ah_diagcodes.h | 2 -- sys/dev/ath/ath_hal/ah_eeprom.h | 2 -- sys/dev/ath/ath_hal/ah_eeprom_9287.c | 2 -- sys/dev/ath/ath_hal/ah_eeprom_9287.h | 2 -- sys/dev/ath/ath_hal/ah_eeprom_v1.c | 2 -- sys/dev/ath/ath_hal/ah_eeprom_v1.h | 2 -- *** 49391 LINES SKIPPED *** From nobody Wed Aug 16 17:56:46 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RQwnC1rnCz4qtqM; Wed, 16 Aug 2023 17:56:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RQwnB63xFz3Ty9; Wed, 16 Aug 2023 17:56:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692208606; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=dlVxQjGJi1e8iYxCxcw6jsOwVLDM0svvJI19WlOWSRY=; b=S93BJJJUc0MtZVLeTRXPxKvJSDOXHtXN1AUl0gYa4OzibhjMMuS+/TCnsPRW/xHnWZU8I5 lpdIsoXUhqBWC6MadJlJC3X2S5kGpHmHw/a00/vKp+nwqM46ZY0AlmoBK7w+/2gCToE2cZ s7uhVYYO7usZg0DyUwE6KfHxFLSetF8my4tqgZuvhYgyZJIItNgpU+EAtMJzUHz1DiJjVa nmWAi+8iWxENVOdIO/fgtnnW12YewvDSOwFiyFE9UA7Gy6R/ZSdTkBVrnIkcnyqRHomkSk FddgI/iVwsqi5m0P+UlTBoDTtirO57UJMeyjD5/wfXto+yF1pk32e0o8TMr5qw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692208606; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=dlVxQjGJi1e8iYxCxcw6jsOwVLDM0svvJI19WlOWSRY=; b=ueJQ17lE3QKEZ1brFK6rB5dyd10r++io5vr9MgTcQPPWmjDlOMlcyRyri13tliV7b1Iu7g sHXTbBtmU4d+CSeOeKDcypKNmMoeomDDEreXfn7NYBpkpu5Omoo8BuYAVqMVnIMkA2ZDs2 yhR0xxcu3sz5CqX/UUiU/Bp44jjNucgmKHGWxSxbODIacfQikFzPHYB30n0pxlVSI1qSU4 +5u35qPABUWgH3W4+pYWfZSf10aXmaa2DH5CZgFa+gF6yuz9GF0f5NiiSljxBhy6d10Erm XuuC1vltww+0mPJlT+HrK6d9ZDr0awFmdqLcjxwMONS5LjaoFkE8sxxpdf4STA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692208606; a=rsa-sha256; cv=none; b=EWXyUYioc5JCj4mVj/2AsAlHa0G9hTR1FXxpJD1KBrROEzJ3Rb/DIIWIh/LPmikzjMvERM shKYWD6Yh7wQ/f3fyZPSYfdmYCvQI0L87l6C19CKUZFnyvhWVAbZNwOHkihi/EqncbDHDK A+NHy4dxAzj4k2lxl0U/Yhe2SruTCRAMJoAtuvC17hd6VK18kJ9NabC4ZO/kGz4ZWXEqmz 3ypAg5guSa4bGYr7DoRUOUEq+pSffmTohogaEhY8iFHjLCcgVVKAFu7L9ASLdZ3zJ45KyY SXVBFY7KHF7MLTzWlrqIkufHqq+mY44yExbcaMdioP36wl1L3AkvZscwcY+2BA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RQwnB58k0z11KH; Wed, 16 Aug 2023 17:56:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37GHuk06058943; Wed, 16 Aug 2023 17:56:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37GHukMr058935; Wed, 16 Aug 2023 17:56:46 GMT (envelope-from git) Date: Wed, 16 Aug 2023 17:56:46 GMT Message-Id: <202308161756.37GHukMr058935@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: b3e7694832e8 - main - Remove $FreeBSD$: two-line .h pattern List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b3e7694832e81d7a904a10f525f8797b753bf0d3 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=b3e7694832e81d7a904a10f525f8797b753bf0d3 commit b3e7694832e81d7a904a10f525f8797b753bf0d3 Author: Warner Losh AuthorDate: 2023-08-16 17:54:16 +0000 Commit: Warner Losh CommitDate: 2023-08-16 17:54:16 +0000 Remove $FreeBSD$: two-line .h pattern Remove /^\s*\*\n \*\s+\$FreeBSD\$$\n/ --- bin/csh/iconv_stub.c | 2 -- bin/csh/iconv_stub.h | 2 -- bin/date/vary.h | 2 -- bin/dd/gen.c | 2 -- bin/expr/expr.y | 2 -- bin/setfacl/setfacl.h | 2 -- bin/sh/arith_yacc.h | 2 -- bin/sh/cd.h | 2 -- cddl/compat/opensolaris/include/alloca.h | 2 -- cddl/compat/opensolaris/include/assert.h | 2 -- cddl/compat/opensolaris/include/devid.h | 2 -- cddl/compat/opensolaris/include/dtrace.h | 2 -- cddl/compat/opensolaris/include/fcntl.h | 2 -- cddl/compat/opensolaris/include/fsshare.h | 2 -- cddl/compat/opensolaris/include/libproc.h | 2 -- cddl/compat/opensolaris/include/libshare.h | 2 -- cddl/compat/opensolaris/include/sha2.h | 2 -- cddl/compat/opensolaris/include/stdio.h | 2 -- cddl/compat/opensolaris/include/strings.h | 2 -- cddl/compat/opensolaris/include/unistd.h | 2 -- cddl/compat/opensolaris/lib/libumem/umem.c | 2 -- cddl/compat/opensolaris/lib/libumem/umem.h | 2 -- cddl/lib/libdtrace/errno.d | 2 -- cddl/lib/libdtrace/io.d | 2 -- cddl/lib/libdtrace/ip.d | 2 -- cddl/lib/libdtrace/libproc_compat.h | 2 -- cddl/lib/libdtrace/net.d | 2 -- cddl/lib/libdtrace/nfs.d | 2 -- cddl/lib/libdtrace/nfssrv.d | 2 -- cddl/lib/libdtrace/psinfo.d | 2 -- cddl/lib/libdtrace/regs_x86.d | 2 -- cddl/lib/libdtrace/sched.d | 2 -- cddl/lib/libdtrace/sctp.d | 2 -- cddl/lib/libdtrace/siftr.d | 2 -- cddl/lib/libdtrace/signal.d | 2 -- cddl/lib/libdtrace/socket.d | 2 -- cddl/lib/libdtrace/tcp.d | 2 -- cddl/lib/libdtrace/udp.d | 2 -- cddl/lib/libdtrace/udplite.d | 2 -- cddl/lib/libdtrace/unistd.d | 2 -- cddl/usr.sbin/zfsd/callout.cc | 2 -- cddl/usr.sbin/zfsd/callout.h | 2 -- cddl/usr.sbin/zfsd/case_file.h | 2 -- cddl/usr.sbin/zfsd/tests/libmocks.c | 2 -- cddl/usr.sbin/zfsd/tests/libmocks.h | 2 -- cddl/usr.sbin/zfsd/vdev.cc | 2 -- cddl/usr.sbin/zfsd/vdev.h | 2 -- cddl/usr.sbin/zfsd/vdev_iterator.cc | 2 -- cddl/usr.sbin/zfsd/vdev_iterator.h | 2 -- cddl/usr.sbin/zfsd/zfsd.h | 2 -- cddl/usr.sbin/zfsd/zfsd_event.h | 2 -- cddl/usr.sbin/zfsd/zfsd_exception.h | 2 -- cddl/usr.sbin/zfsd/zpool_list.cc | 2 -- cddl/usr.sbin/zfsd/zpool_list.h | 2 -- gnu/lib/libdialog/dlg_config.h | 2 -- include/ar.h | 2 -- include/arpa/ftp.h | 2 -- include/bitstring.h | 2 -- include/complex.h | 2 -- include/cpio.h | 2 -- include/dlfcn.h | 2 -- include/elf-hints.h | 2 -- include/elf.h | 2 -- include/fmtmsg.h | 2 -- include/fnmatch.h | 2 -- include/ftw.h | 2 -- include/gssapi/gssapi.h | 2 -- include/inttypes.h | 2 -- include/iso646.h | 2 -- include/kenv.h | 2 -- include/langinfo.h | 2 -- include/link.h | 2 -- include/malloc_np.h | 2 -- include/memory.h | 2 -- include/monetary.h | 2 -- include/mqueue.h | 2 -- include/nl_types.h | 2 -- include/nlist.h | 2 -- include/nss.h | 2 -- include/printf.h | 2 -- include/proc_service.h | 2 -- include/protocols/dumprestore.h | 2 -- include/protocols/routed.h | 2 -- include/protocols/rwhod.h | 2 -- include/protocols/talkd.h | 2 -- include/protocols/timed.h | 2 -- include/pthread.h | 2 -- include/pthread_np.h | 2 -- include/ranlib.h | 2 -- include/rpc/rpcsec_gss.h | 2 -- include/rpcsvc/nis_db.h | 2 -- include/rpcsvc/nislib.h | 2 -- include/rpcsvc/yp_prot.h | 2 -- include/rpcsvc/ypclnt.h | 2 -- include/semaphore.h | 2 -- include/spawn.h | 2 -- include/stab.h | 2 -- include/stdalign.h | 2 -- include/stdbool.h | 2 -- include/stddef.h | 2 -- include/stdnoreturn.h | 2 -- include/stringlist.h | 2 -- include/strings.h | 2 -- include/sysexits.h | 2 -- include/tar.h | 2 -- include/tgmath.h | 2 -- include/timers.h | 2 -- include/uchar.h | 2 -- include/ulimit.h | 2 -- include/utmpx.h | 2 -- include/uuid.h | 2 -- include/varargs.h | 2 -- include/wchar.h | 2 -- include/wordexp.h | 2 -- include/xlocale.h | 2 -- include/xlocale/_ctype.h | 2 -- include/xlocale/_inttypes.h | 2 -- include/xlocale/_langinfo.h | 2 -- include/xlocale/_locale.h | 2 -- include/xlocale/_monetary.h | 2 -- include/xlocale/_stdio.h | 2 -- include/xlocale/_stdlib.h | 2 -- include/xlocale/_string.h | 2 -- include/xlocale/_strings.h | 2 -- include/xlocale/_time.h | 2 -- include/xlocale/_uchar.h | 2 -- include/xlocale/_wchar.h | 2 -- kerberos5/lib/libgssapi_krb5/gss_krb5.c | 2 -- kerberos5/lib/libgssapi_krb5/prefix.c | 2 -- kerberos5/lib/libgssapi_ntlm/prefix.c | 2 -- kerberos5/lib/libgssapi_spnego/freebsd_compat.c | 2 -- lib/csu/amd64/crt.h | 2 -- lib/csu/common/notes.h | 2 -- lib/csu/i386/crt.h | 2 -- lib/csu/i386/crt1_c.c | 2 -- lib/csu/i386/crt1_s.S | 2 -- lib/csu/powerpc/crt.h | 2 -- lib/csu/powerpc64/crt.h | 2 -- lib/flua/libjail/lua_jail.c | 2 -- lib/geom/journal/geom_journal.h | 2 -- lib/lib80211/lib80211_ioctl.c | 2 -- lib/lib80211/lib80211_ioctl.h | 2 -- lib/lib80211/lib80211_regdomain.h | 2 -- lib/libarchive/config_freebsd.h | 2 -- lib/libbe/be.h | 2 -- lib/libbe/be_impl.h | 2 -- lib/libbluetooth/dev.c | 2 -- lib/libbluetooth/hci.c | 2 -- lib/libbsdstat/bsdstat.c | 2 -- lib/libbsdstat/bsdstat.h | 2 -- lib/libbsnmp/tests/bsnmpd_test.c | 2 -- lib/libc/aarch64/SYS.h | 2 -- lib/libc/aarch64/_fpmath.h | 2 -- lib/libc/aarch64/arith.h | 2 -- lib/libc/aarch64/gd_qnan.h | 2 -- lib/libc/aarch64/static_tls.h | 2 -- lib/libc/amd64/_fpmath.h | 2 -- lib/libc/amd64/arith.h | 2 -- lib/libc/amd64/gd_qnan.h | 2 -- lib/libc/amd64/static_tls.h | 2 -- lib/libc/amd64/string/memcmp.S | 2 -- lib/libc/amd64/string/memset.S | 2 -- lib/libc/arm/_fpmath.h | 2 -- lib/libc/arm/aeabi/aeabi_vfp.h | 2 -- lib/libc/arm/static_tls.h | 2 -- lib/libc/gdtoa/glue.c | 2 -- lib/libc/gen/arc4random-compat.c | 2 -- lib/libc/gen/arc4random.h | 2 -- lib/libc/gen/arc4random_uniform.c | 2 -- lib/libc/gen/dirfd.c | 2 -- lib/libc/gen/elf_utils.c | 2 -- lib/libc/gen/fpclassify.c | 2 -- lib/libc/gen/frexp.c | 2 -- lib/libc/gen/gen-compat.h | 2 -- lib/libc/gen/gen-private.h | 2 -- lib/libc/gen/isinf.c | 2 -- lib/libc/gen/isnan.c | 2 -- lib/libc/gen/libc_dlopen.c | 2 -- lib/libc/gen/rand48.h | 2 -- lib/libc/gen/scandir_b.c | 2 -- lib/libc/gen/sem.c | 2 -- lib/libc/gen/sem_new.c | 2 -- lib/libc/gen/telldir.h | 2 -- lib/libc/gen/tls.c | 2 -- lib/libc/gen/ulimit.c | 2 -- lib/libc/gen/unvis-compat.c | 2 -- lib/libc/gen/utxdb.h | 2 -- lib/libc/i386/_fpmath.h | 2 -- lib/libc/i386/arith.h | 2 -- lib/libc/i386/gd_qnan.h | 2 -- lib/libc/i386/static_tls.h | 2 -- lib/libc/iconv/__iconv.c | 2 -- lib/libc/iconv/__iconv_free_list.c | 2 -- lib/libc/iconv/__iconv_get_list.c | 2 -- lib/libc/iconv/iconv-internal.h | 2 -- lib/libc/iconv/iconv.c | 2 -- lib/libc/iconv/iconv_canonicalize.c | 2 -- lib/libc/iconv/iconv_close.c | 2 -- lib/libc/iconv/iconv_compat.c | 2 -- lib/libc/iconv/iconv_open.c | 2 -- lib/libc/iconv/iconv_open_into.c | 2 -- lib/libc/iconv/iconv_set_relocation_prefix.c | 2 -- lib/libc/iconv/iconvctl.c | 2 -- lib/libc/iconv/iconvlist.c | 2 -- lib/libc/include/block_abi.h | 2 -- lib/libc/include/compat.h | 2 -- lib/libc/include/errlst.h | 2 -- lib/libc/include/fpmath.h | 2 -- lib/libc/include/libc_private.h | 2 -- lib/libc/include/namespace.h | 2 -- lib/libc/include/nscache.h | 2 -- lib/libc/include/nscachedcli.h | 2 -- lib/libc/include/nss_tls.h | 2 -- lib/libc/include/reentrant.h | 2 -- lib/libc/include/spinlock.h | 2 -- lib/libc/include/un-namespace.h | 2 -- lib/libc/locale/collate.h | 2 -- lib/libc/locale/ctype.c | 2 -- lib/libc/locale/ldpart.h | 2 -- lib/libc/locale/lmessages.h | 2 -- lib/libc/locale/lmonetary.h | 2 -- lib/libc/locale/lnumeric.h | 2 -- lib/libc/locale/mblocal.h | 2 -- lib/libc/locale/runefile.h | 2 -- lib/libc/locale/setlocale.h | 2 -- lib/libc/locale/xlocale.c | 2 -- lib/libc/locale/xlocale_private.h | 2 -- lib/libc/net/netdb_private.h | 2 -- lib/libc/net/nss_backends.h | 2 -- lib/libc/net/sockatmark.c | 2 -- lib/libc/posix1e/acl_support.h | 2 -- lib/libc/powerpc/_fpmath.h | 2 -- lib/libc/powerpc/arith.h | 2 -- lib/libc/powerpc/gd_qnan.h | 2 -- lib/libc/powerpc/gen/fpgetsticky.c | 2 -- lib/libc/powerpc/static_tls.h | 2 -- lib/libc/powerpc64/_fpmath.h | 2 -- lib/libc/powerpc64/arith.h | 2 -- lib/libc/powerpc64/gd_qnan.h | 2 -- lib/libc/powerpc64/gen/fpgetsticky.c | 2 -- lib/libc/powerpc64/static_tls.h | 2 -- lib/libc/powerpc64/string/bcopy_vsx.S | 2 -- lib/libc/powerpc64/string/memcpy_vsx.S | 2 -- lib/libc/powerpcspe/gen/fpgetsticky.c | 2 -- lib/libc/resolv/h_errno.c | 2 -- lib/libc/resolv/res_debug.h | 2 -- lib/libc/resolv/res_state.c | 2 -- lib/libc/riscv/SYS.h | 2 -- lib/libc/riscv/_fpmath.h | 2 -- lib/libc/riscv/arith.h | 2 -- lib/libc/riscv/gd_qnan.h | 2 -- lib/libc/riscv/static_tls.h | 2 -- lib/libc/rpc/mt_misc.h | 2 -- lib/libc/rpc/rpc_com.h | 2 -- lib/libc/rpc/rpcsec_gss_stub.c | 2 -- lib/libc/stdio/printfcommon.h | 2 -- lib/libc/stdio/printflocal.h | 2 -- lib/libc/stdio/xprintf.c | 2 -- lib/libc/stdio/xprintf_errno.c | 2 -- lib/libc/stdio/xprintf_float.c | 2 -- lib/libc/stdio/xprintf_hexdump.c | 2 -- lib/libc/stdio/xprintf_int.c | 2 -- lib/libc/stdio/xprintf_quote.c | 2 -- lib/libc/stdio/xprintf_str.c | 2 -- lib/libc/stdio/xprintf_time.c | 2 -- lib/libc/stdio/xprintf_vis.c | 2 -- lib/libc/stdlib/_Exit.c | 2 -- lib/libc/stdlib/bsearch_b.c | 2 -- lib/libc/stdlib/heapsort_b.c | 2 -- lib/libc/stdlib/hsearch.h | 2 -- lib/libc/stdlib/mergesort_b.c | 2 -- lib/libc/stdlib/qsort_r.c | 2 -- lib/libc/stdlib/qsort_r_compat.c | 2 -- lib/libc/stdlib/qsort_s.c | 2 -- lib/libc/stdlib/quick_exit.c | 2 -- lib/libc/stdlib/random.h | 2 -- lib/libc/stdlib/tsearch_path.h | 2 -- lib/libc/stdtime/timelocal.h | 2 -- lib/libc/string/memrchr.c | 2 -- lib/libc/sys/compat-ino64.h | 2 -- lib/libc/sys/compat-stub.c | 2 -- lib/libc/sys/pipe.c | 2 -- lib/libc/sys/vadvise.c | 2 -- lib/libc/tests/gen/fpclassify2_test.c | 2 -- lib/libc/tests/net/ether_test.c | 2 -- lib/libc/tests/net/eui64_aton_test.c | 2 -- lib/libc/tests/net/eui64_ntoa_test.c | 2 -- lib/libc/tests/net/test-eui64.h | 2 -- lib/libc/tests/nss/testutil.h | 2 -- lib/libc/tests/stdlib/test-sort.h | 2 -- lib/libc/tests/string/strerror_test.c | 2 -- lib/libc/uuid/uuid_compare.c | 2 -- lib/libc/uuid/uuid_create.c | 2 -- lib/libc/uuid/uuid_create_nil.c | 2 -- lib/libc/uuid/uuid_equal.c | 2 -- lib/libc/uuid/uuid_from_string.c | 2 -- lib/libc/uuid/uuid_hash.c | 2 -- lib/libc/uuid/uuid_is_nil.c | 2 -- lib/libc/uuid/uuid_to_string.c | 2 -- lib/libc_nonshared/__stub.c | 2 -- lib/libcalendar/calendar.h | 2 -- lib/libcam/camlib.h | 2 -- lib/libcam/scsi_wrap.h | 2 -- lib/libcapsicum/capsicum_helpers.h | 2 -- lib/libcasper/libcasper/libcasper.h | 2 -- lib/libcasper/libcasper/libcasper_impl.c | 2 -- lib/libcasper/libcasper/libcasper_impl.h | 2 -- lib/libcasper/libcasper/libcasper_service.h | 2 -- lib/libcasper/libcasper/zygote.h | 2 -- lib/libcasper/services/cap_dns/cap_dns.h | 2 -- lib/libcasper/services/cap_fileargs/cap_fileargs.h | 2 -- lib/libcasper/services/cap_grp/cap_grp.h | 2 -- lib/libcasper/services/cap_net/cap_net.h | 2 -- lib/libcasper/services/cap_netdb/cap_netdb.h | 2 -- lib/libcasper/services/cap_pwd/cap_pwd.h | 2 -- lib/libcasper/services/cap_sysctl/cap_sysctl.h | 2 -- lib/libcasper/services/cap_syslog/cap_syslog.h | 2 -- lib/libcrypt/crypt.h | 2 -- lib/libdevctl/devctl.h | 2 -- lib/libdevdctl/consumer.h | 2 -- lib/libdevdctl/event.h | 2 -- lib/libdevdctl/event_factory.h | 2 -- lib/libdevdctl/exception.h | 2 -- lib/libdevdctl/guid.cc | 2 -- lib/libdevdctl/guid.h | 2 -- lib/libdevdctl/tests/libdevdctl_unittest.cc | 2 -- lib/libdevinfo/devinfo.h | 2 -- lib/libdevinfo/devinfo_var.h | 2 -- lib/libdevstat/devstat.h | 2 -- lib/libdpv/dialog_util.h | 2 -- lib/libdpv/dialogrc.h | 2 -- lib/libdpv/dprompt.h | 2 -- lib/libdpv/dpv.h | 2 -- lib/libdpv/dpv_private.h | 2 -- lib/libdpv/status.h | 2 -- lib/libdpv/util.h | 2 -- lib/libedit/readline/history.h | 2 -- lib/libedit/readline/tilde.h | 2 -- lib/libefivar/efi-osdep.h | 2 -- lib/libefivar/efivar-dp.h | 2 -- lib/libefivar/efivar.h | 2 -- lib/libefivar/uefi-dplib.h | 2 -- lib/libfetch/common.h | 2 -- lib/libfetch/fetch.h | 2 -- lib/libfigpar/figpar.h | 2 -- lib/libfigpar/string_m.h | 2 -- lib/libgeom/geom_ctl.c | 2 -- lib/libgeom/geom_getxml.c | 2 -- lib/libgeom/geom_stats.c | 2 -- lib/libgeom/geom_xml2tree.c | 2 -- lib/libgeom/libgeom.h | 2 -- lib/libgpio/gpio.c | 2 -- lib/libgpio/libgpio.h | 2 -- lib/libgssapi/context.h | 2 -- lib/libgssapi/cred.h | 2 -- lib/libgssapi/gss_accept_sec_context.c | 2 -- lib/libgssapi/gss_acquire_cred.c | 2 -- lib/libgssapi/gss_add_cred.c | 2 -- lib/libgssapi/gss_add_oid_set_member.c | 2 -- lib/libgssapi/gss_canonicalize_name.c | 2 -- lib/libgssapi/gss_compare_name.c | 2 -- lib/libgssapi/gss_context_time.c | 2 -- lib/libgssapi/gss_create_empty_oid_set.c | 2 -- lib/libgssapi/gss_decapsulate_token.c | 2 -- lib/libgssapi/gss_delete_sec_context.c | 2 -- lib/libgssapi/gss_display_name.c | 2 -- lib/libgssapi/gss_display_status.c | 2 -- lib/libgssapi/gss_duplicate_name.c | 2 -- lib/libgssapi/gss_duplicate_oid.c | 2 -- lib/libgssapi/gss_encapsulate_token.c | 2 -- lib/libgssapi/gss_export_name.c | 2 -- lib/libgssapi/gss_export_sec_context.c | 2 -- lib/libgssapi/gss_get_mic.c | 2 -- lib/libgssapi/gss_import_name.c | 2 -- lib/libgssapi/gss_import_sec_context.c | 2 -- lib/libgssapi/gss_indicate_mechs.c | 2 -- lib/libgssapi/gss_init_sec_context.c | 2 -- lib/libgssapi/gss_inquire_context.c | 2 -- lib/libgssapi/gss_inquire_cred.c | 2 -- lib/libgssapi/gss_inquire_cred_by_mech.c | 2 -- lib/libgssapi/gss_inquire_mechs_for_name.c | 2 -- lib/libgssapi/gss_inquire_names_for_mech.c | 2 -- lib/libgssapi/gss_inquire_sec_context_by_oid.c | 2 -- lib/libgssapi/gss_krb5.c | 2 -- lib/libgssapi/gss_mech_switch.c | 2 -- lib/libgssapi/gss_names.c | 2 -- lib/libgssapi/gss_process_context_token.c | 2 -- lib/libgssapi/gss_release_buffer.c | 2 -- lib/libgssapi/gss_release_cred.c | 2 -- lib/libgssapi/gss_release_name.c | 2 -- lib/libgssapi/gss_release_oid_set.c | 2 -- lib/libgssapi/gss_seal.c | 2 -- lib/libgssapi/gss_sign.c | 2 -- lib/libgssapi/gss_test_oid_set_member.c | 2 -- lib/libgssapi/gss_unseal.c | 2 -- lib/libgssapi/gss_unwrap.c | 2 -- lib/libgssapi/gss_utils.c | 2 -- lib/libgssapi/gss_verify.c | 2 -- lib/libgssapi/gss_verify_mic.c | 2 -- lib/libgssapi/gss_wrap.c | 2 -- lib/libgssapi/gss_wrap_size_limit.c | 2 -- lib/libgssapi/mech_switch.h | 2 -- lib/libgssapi/name.h | 2 -- lib/libgssapi/spnego.h | 2 -- lib/libgssapi/utils.h | 2 -- lib/libifconfig/libifconfig.c | 2 -- lib/libifconfig/libifconfig.h | 2 -- lib/libifconfig/libifconfig_bridge.c | 2 -- lib/libifconfig/libifconfig_carp.c | 2 -- lib/libifconfig/libifconfig_inet.c | 2 -- lib/libifconfig/libifconfig_inet6.c | 2 -- lib/libifconfig/libifconfig_internal.c | 2 -- lib/libifconfig/libifconfig_internal.h | 2 -- lib/libifconfig/libifconfig_lagg.c | 2 -- lib/libifconfig/libifconfig_media.c | 2 -- lib/libifconfig/libifconfig_sfp.c | 2 -- lib/libifconfig/libifconfig_sfp.h | 2 -- lib/libifconfig/libifconfig_sfp_tables.tpl.c | 2 -- lib/libifconfig/libifconfig_sfp_tables.tpl.h | 2 -- lib/libifconfig/libifconfig_sfp_tables_internal.tpl.h | 2 -- lib/libifconfig/sfp.lua | 2 -- lib/libjail/jail.h | 2 -- lib/libkiconv/kiconv_sysctl.c | 2 -- lib/libkiconv/quirks.c | 2 -- lib/libkiconv/quirks.h | 2 -- lib/libkiconv/xlat16_iconv.c | 2 -- lib/libkiconv/xlat16_sysctl.c | 2 -- lib/libkvm/kvm_aarch64.h | 2 -- lib/libkvm/kvm_amd64.h | 2 -- lib/libkvm/kvm_arm.h | 2 -- lib/libkvm/kvm_i386.h | 2 -- lib/libkvm/kvm_powerpc64.h | 2 -- lib/libkvm/kvm_riscv.h | 2 -- lib/libkvm/tests/kvm_test_common.h | 2 -- lib/libmd/sha.h | 2 -- lib/libmemstat/memstat.c | 2 -- lib/libmemstat/memstat.h | 2 -- lib/libmemstat/memstat_all.c | 2 -- lib/libmemstat/memstat_internal.h | 2 -- lib/libmemstat/memstat_malloc.c | 2 -- lib/libmemstat/memstat_uma.c | 2 -- lib/libmixer/mixer.c | 2 -- lib/libmixer/mixer.h | 2 -- lib/libmt/mtlib.h | 2 -- lib/libnetbsd/glob.h | 2 -- lib/libnetbsd/pthread.h | 2 -- lib/libnetbsd/util.c | 2 -- lib/libnetgraph/internal.h | 2 -- lib/libnetgraph/netgraph.h | 2 -- lib/libnetmap/nmctx-pthreads.c | 2 -- lib/libnetmap/nmctx.c | 2 -- lib/libnetmap/nmport.c | 2 -- lib/libnetmap/nmreq.c | 2 -- lib/libnv/common_impl.h | 2 -- lib/libnv/msgio.h | 2 -- lib/libnv/tests/cnv_tests.cc | 2 -- lib/libnv/tests/nvlist_add_test.c | 2 -- lib/libnv/tests/nvlist_append_test.c | 2 -- lib/libnv/tests/nvlist_exists_test.c | 2 -- lib/libnv/tests/nvlist_free_test.c | 2 -- lib/libnv/tests/nvlist_get_test.c | 2 -- lib/libnv/tests/nvlist_move_test.c | 2 -- lib/libopenbsd/imsg-buffer.c | 2 -- lib/libopenbsd/imsg.c | 2 -- lib/libopenbsd/imsg.h | 2 -- lib/libopenbsd/ohash.h | 2 -- lib/libopenbsd/sys/sysctl.h | 2 -- lib/libopenbsd/unistd.h | 2 -- lib/libpam/libpam/security/pam_mod_misc.h | 2 -- lib/libpam/modules/pam_login_access/pam_login_access.h | 2 -- lib/libpathconv/abs2rel.c | 2 -- lib/libpathconv/pathconv.h | 2 -- lib/libpathconv/rel2abs.c | 2 -- lib/libpathconv/tests/abs2rel.c | 2 -- lib/libpathconv/tests/rel2abs.c | 2 -- lib/libpfctl/libpfctl.c | 2 -- lib/libpfctl/libpfctl.h | 2 -- lib/libpjdlog/pjdlog.h | 2 -- lib/libpmc/libpmc_json.cc | 2 -- lib/libpmc/libpmc_pmu_util.c | 2 -- lib/libpmc/libpmcinternal.h | 2 -- lib/libpmc/pmc.h | 2 -- lib/libpmc/pmcformat.h | 2 -- lib/libpmc/pmclog.h | 2 -- lib/libpmc/pmu-events/jsmn.c | 2 -- lib/libpmc/pmu-events/json.c | 2 -- lib/libpmc/pmu-events/list.h | 2 -- lib/libpmcstat/libpmcstat.h | 2 -- lib/libproc/_libproc.h | 2 -- lib/libproc/libproc.h | 2 -- lib/libprocstat/common_kvm.h | 2 -- lib/libprocstat/core.h | 2 -- lib/libprocstat/libprocstat.h | 2 -- lib/libprocstat/libprocstat_compat.c | 2 -- lib/libprocstat/libprocstat_internal.h | 2 -- lib/libprocstat/zfs.c | 2 -- lib/libprocstat/zfs_defs.h | 2 -- lib/libradius/radlib.h | 2 -- lib/libradius/radlib_private.h | 2 -- lib/libradius/radlib_vs.h | 2 -- lib/librpcsec_gss/rpcsec_gss.c | 2 -- lib/librpcsec_gss/rpcsec_gss_conf.c | 2 -- lib/librpcsec_gss/rpcsec_gss_misc.c | 2 -- lib/librpcsec_gss/svc_rpcsec_gss.c | 2 -- lib/librss/librss.h | 2 -- lib/librt/aio.c | 2 -- lib/librt/mq.c | 2 -- lib/librt/sigev_thread.c | 2 -- lib/librt/sigev_thread.h | 2 -- lib/librt/timer.c | 2 -- lib/librtld_db/rtld_db.h | 2 -- lib/libsbuf/tests/sbuf_test_common.h | 2 -- lib/libsecureboot/efi/efi_variables.c | 2 -- lib/libsecureboot/pass_manifest.c | 2 -- lib/libstdbuf/stdbuf.c | 2 -- lib/libstdthreads/call_once.c | 2 -- lib/libstdthreads/cnd.c | 2 -- lib/libstdthreads/mtx.c | 2 -- lib/libstdthreads/thrd.c | 2 -- lib/libstdthreads/threads.h | 2 -- lib/libstdthreads/tss.c | 2 -- lib/libsysdecode/sysdecode.h | 2 -- lib/libtacplus/taclib.h | 2 -- lib/libtacplus/taclib_private.h | 2 -- lib/libthr/arch/aarch64/include/pthread_md.h | 2 -- lib/libthr/arch/aarch64/include/pthread_tls.h | 2 -- lib/libthr/arch/amd64/amd64/_umtx_op_err.S | 2 -- lib/libthr/arch/amd64/include/pthread_md.h | 2 -- lib/libthr/arch/amd64/include/pthread_tls.h | 2 -- lib/libthr/arch/arm/include/pthread_md.h | 2 -- lib/libthr/arch/arm/include/pthread_tls.h | 2 -- lib/libthr/arch/i386/i386/_umtx_op_err.S | 2 -- lib/libthr/arch/i386/include/pthread_md.h | 2 -- lib/libthr/arch/i386/include/pthread_tls.h | 2 -- lib/libthr/arch/powerpc/include/pthread_md.h | 2 -- lib/libthr/arch/powerpc/include/pthread_tls.h | 2 -- lib/libthr/arch/powerpc/powerpc/_umtx_op_err.S | 2 -- lib/libthr/arch/riscv/include/pthread_md.h | 2 -- lib/libthr/arch/riscv/include/pthread_tls.h | 2 -- lib/libthr/plockstat.d | 2 -- lib/libthr/sys/thr_error.c | 2 -- lib/libthr/thread/thr_private.h | 2 -- lib/libthr/thread/thr_umtx.h | 2 -- lib/libthread_db/kse.h | 2 -- lib/libthread_db/libpthread_db.h | 2 -- lib/libthread_db/thread_db.h | 2 -- lib/libthread_db/thread_db_int.h | 2 -- lib/libufs/libufs.h | 2 -- lib/libugidfw/ugidfw.c | 2 -- lib/libugidfw/ugidfw.h | 2 -- lib/libulog/ulog.h | 2 -- lib/libulog/utempter.h | 2 -- lib/libusbhid/usbhid.h | 2 -- lib/libusbhid/usbvar.h | 2 -- lib/libutil/kinfo_getallproc.c | 2 -- lib/libutil/kinfo_getproc.c | 2 -- lib/libutil/kld.c | 2 -- lib/libutil/libutil.h | 2 -- lib/libutil/quotafile.c | 2 -- lib/libutil/tests/humanize_number_test.c | 2 -- lib/libvgl/vgl.h | 2 -- lib/libvmmapi/vmmapi.c | 2 -- lib/libvmmapi/vmmapi.h | 2 -- lib/libvmmapi/vmmapi_freebsd.c | 2 -- lib/liby/yyerror.h | 2 -- lib/libypclnt/ypclnt.h | 2 -- lib/libypclnt/ypclnt_connect.c | 2 -- lib/libypclnt/ypclnt_error.c | 2 -- lib/libypclnt/ypclnt_free.c | 2 -- lib/libypclnt/ypclnt_get.c | 2 -- lib/libypclnt/ypclnt_new.c | 2 -- lib/libypclnt/ypclnt_passwd.c | 2 -- lib/msun/aarch64/fenv.c | 2 -- lib/msun/aarch64/fenv.h | 2 -- lib/msun/amd64/fenv.c | 2 -- lib/msun/amd64/s_rintl.S | 2 -- lib/msun/arm/fenv-mangle.h | 2 -- lib/msun/arm/fenv-softfp.c | 2 -- lib/msun/arm/fenv-vfp.c | 2 -- lib/msun/arm/fenv.c | 2 -- lib/msun/arm/fenv.h | 2 -- lib/msun/i387/fenv.c | 2 -- lib/msun/ld128/b_tgammal.c | 2 -- lib/msun/ld128/invtrig.h | 2 -- lib/msun/ld128/s_nanl.c | 2 -- lib/msun/ld80/invtrig.h | 2 -- lib/msun/ld80/s_nanl.c | 2 -- lib/msun/powerpc/fenv.c | 2 -- lib/msun/powerpc/fenv.h | 2 -- lib/msun/riscv/fenv.c | 2 -- lib/msun/riscv/fenv.h | 2 -- lib/msun/src/fenv-softfloat.h | 2 -- lib/msun/src/s_cimag.c | 2 -- lib/msun/src/s_cimagf.c | 2 -- lib/msun/src/s_cimagl.c | 2 -- lib/msun/src/s_conj.c | 2 -- lib/msun/src/s_conjf.c | 2 -- lib/msun/src/s_conjl.c | 2 -- lib/msun/src/s_copysignl.c | 2 -- lib/msun/src/s_creal.c | 2 -- lib/msun/src/s_crealf.c | 2 -- lib/msun/src/s_creall.c | 2 -- lib/msun/src/s_fabsl.c | 2 -- lib/msun/src/s_frexpl.c | 2 -- lib/msun/src/s_isfinite.c | 2 -- lib/msun/src/s_isnan.c | 2 -- lib/msun/src/s_isnormal.c | 2 -- lib/msun/src/s_modfl.c | 2 -- lib/msun/src/s_nan.c | 2 -- lib/msun/src/s_signbit.c | 2 -- lib/msun/tests/ilogb_test.c | 2 -- lib/msun/tests/test-utils.h | 2 -- lib/msun/x86/fenv.h | 2 -- libexec/bootpd/bootp.h | 2 -- libexec/bootpd/bootpd.h | 2 -- libexec/bootpd/dovend.c | 2 -- libexec/bootpd/dumptab.c | 2 -- libexec/bootpd/getether.c | 2 -- libexec/bootpd/getif.c | 2 -- libexec/bootpd/hwaddr.c | 2 -- libexec/bootpd/hwaddr.h | 2 -- libexec/bootpd/lookup.c | 2 -- libexec/bootpd/patchlevel.h | 2 -- libexec/bootpd/tools/bootptest/print-bootp.c | 2 -- libexec/bootpd/trygetea.c | 2 -- libexec/bootpd/trygetif.c | 2 -- libexec/bootpd/trylook.c | 2 -- libexec/bootpd/tzone.c | 2 -- libexec/fingerd/pathnames.h | 2 -- libexec/flua/modules/lfs.h | 2 -- libexec/mknetid/hash.h | 2 -- libexec/pppoed/pppoed.c | 2 -- libexec/rbootd/defs.h | 2 -- libexec/rbootd/pathnames.h | 2 -- libexec/rbootd/rmp.h | 2 -- libexec/rbootd/rmp_var.h | 2 -- libexec/revnetgroup/hash.h | 2 -- libexec/rpc.rusersd/extern.h | 2 -- libexec/rtld-elf/aarch64/rtld_machdep.h | 2 -- libexec/rtld-elf/amd64/reloc.c | 2 -- libexec/rtld-elf/amd64/rtld_machdep.h | 2 -- libexec/rtld-elf/amd64/rtld_start.S | 2 -- libexec/rtld-elf/arm/rtld_machdep.h | 2 -- libexec/rtld-elf/debug.c | 2 -- libexec/rtld-elf/debug.h | 2 -- libexec/rtld-elf/i386/reloc.c | 2 -- libexec/rtld-elf/i386/rtld_machdep.h | 2 -- libexec/rtld-elf/i386/rtld_start.S | 2 -- libexec/rtld-elf/map_object.c | 2 -- libexec/rtld-elf/powerpc/reloc.c | 2 -- libexec/rtld-elf/powerpc/rtld_machdep.h | 2 -- libexec/rtld-elf/powerpc/rtld_start.S | 2 -- libexec/rtld-elf/powerpc64/reloc.c | 2 -- libexec/rtld-elf/powerpc64/rtld_machdep.h | 2 -- libexec/rtld-elf/powerpc64/rtld_start.S | 2 -- libexec/rtld-elf/riscv/rtld_machdep.h | 2 -- libexec/rtld-elf/rtld-libc/libc_private.h | 2 -- libexec/rtld-elf/rtld-libc/namespace.h | 2 -- libexec/rtld-elf/rtld-libc/rtld_libc.c | 2 -- libexec/rtld-elf/rtld-libc/rtld_libc.h | 2 -- libexec/rtld-elf/rtld-libc/un-namespace.h | 2 -- libexec/rtld-elf/rtld.h | 2 -- libexec/rtld-elf/rtld_lock.h | 2 -- libexec/rtld-elf/rtld_malloc.h | 2 -- libexec/rtld-elf/rtld_paths.h | 2 -- libexec/rtld-elf/rtld_printf.c | 2 -- libexec/rtld-elf/rtld_printf.h | 2 -- libexec/rtld-elf/rtld_tls.h | 2 -- libexec/rtld-elf/rtld_utrace.h | 2 -- libexec/rtld-elf/tests/common.c | 2 -- libexec/rtld-elf/tests/common.h | 2 -- libexec/rtld-elf/tests/ld_library_pathfds.c | 2 -- libexec/rtld-elf/tests/ld_preload_fds.c | 2 -- libexec/rtld-elf/tests/libpythagoras/pythagoras.c | 2 -- libexec/rtld-elf/tests/libpythagoras/pythagoras.h | 2 -- libexec/rtld-elf/tests/target/target.c | 2 -- libexec/rtld-elf/xmalloc.c | 2 -- libexec/talkd/extern.h | 2 -- libexec/ypxfr/ypxfr_extern.h | 2 -- sbin/adjkerntz/pathnames.h | 2 -- sbin/bectl/bectl.h | 2 -- sbin/camcontrol/camcontrol.h | 2 -- sbin/camcontrol/progress.h | 2 -- sbin/ddb/ddb.h | 2 -- sbin/devd/devd.h | 2 -- sbin/devd/devd.hh | 2 -- sbin/devd/parse.y | 2 -- sbin/devd/token.l | 2 -- sbin/devfs/extern.h | 2 -- sbin/dhclient/dhcpd.h | 2 -- sbin/dhclient/dhctoken.h | 2 -- sbin/dhclient/privsep.h | 2 -- sbin/dhclient/tree.h | 2 -- sbin/dump/cache.c | 2 -- sbin/dump/dump.h | 2 -- sbin/etherswitchcfg/etherswitchcfg.c | 2 -- sbin/fdisk/fdisk_mbr_enc.h | 2 -- sbin/fsck/fsutil.h | 2 -- sbin/fsck/preen.c | 2 -- sbin/fsdb/fsdb.h | 2 -- sbin/gbde/gbde.c | 2 -- sbin/geom/core/geom.h | 2 -- sbin/geom/misc/subr.h | 2 -- sbin/ggate/ggatec/ggatec.c | 2 -- sbin/ggate/ggated/ggated.c | 2 -- sbin/ggate/ggatel/ggatel.c | 2 -- sbin/ggate/shared/ggate.c | 2 -- sbin/ggate/shared/ggate.h | 2 -- sbin/gvinum/gvinum.c | 2 -- sbin/hastd/activemap.h | 2 -- sbin/hastd/control.h | 2 -- sbin/hastd/ebuf.h | 2 -- sbin/hastd/event.h | 2 -- sbin/hastd/hast.h | 2 -- sbin/hastd/hast_checksum.h | 2 -- sbin/hastd/hast_compression.h | 2 -- sbin/hastd/hast_proto.h | 2 -- sbin/hastd/hastd.h | 2 -- sbin/hastd/hooks.h | 2 -- sbin/hastd/metadata.h | 2 -- sbin/hastd/nv.h | 2 -- sbin/hastd/parse.y | 2 -- sbin/hastd/pjdlog.h | 2 -- sbin/hastd/proto.h | 2 -- sbin/hastd/proto_impl.h | 2 -- sbin/hastd/rangelock.h | 2 -- sbin/hastd/refcnt.h | 2 -- sbin/hastd/subr.h | 2 -- sbin/hastd/synch.h | 2 -- sbin/hastd/token.l | 2 -- sbin/ifconfig/ifconfig.h | 2 -- sbin/ifconfig/iffib.c | 2 -- sbin/ifconfig/ifieee80211.c | 2 -- sbin/ifconfig/ifmac.c | 2 -- sbin/ifconfig/ifpfsync.c | 2 -- sbin/ipfw/altq.c | 2 -- sbin/ipfw/dummynet.c | 2 -- sbin/ipfw/ipfw2.c | 2 -- sbin/ipfw/ipfw2.h | 2 -- sbin/ipfw/ipv6.c | 2 -- sbin/ipfw/main.c | 2 -- sbin/ipfw/nat.c | 2 -- sbin/ipfw/tables.c | 2 -- sbin/ldconfig/elfhints.c | 2 -- sbin/ldconfig/ldconfig.h | 2 -- sbin/mdconfig/mdconfig.c | 2 -- sbin/mksnap_ffs/mksnap_ffs.c | 2 -- sbin/mount/extern.h | 2 -- sbin/mount_udf/mount_udf.c | 2 -- sbin/natd/icmp.c | 2 -- sbin/natd/natd.h | 2 -- sbin/newfs/newfs.h | 2 -- sbin/nvmecontrol/comnd.h | 2 -- sbin/nvmecontrol/nvmecontrol.h | 2 -- sbin/nvmecontrol/nvmecontrol_ext.h | 2 -- sbin/pfctl/pfctl.h | 2 -- sbin/pfctl/pfctl_parser.h | 2 -- sbin/pfctl/tests/pfctl_test_list.inc | 2 -- sbin/ping/main.h | 2 -- sbin/ping/ping.h | 2 -- sbin/ping/ping6.h | 2 -- sbin/ping/utils.h | 2 -- sbin/quotacheck/preen.c | 2 -- sbin/quotacheck/quotacheck.h | 2 -- sbin/recoverdisk/recoverdisk.c | 2 -- sbin/routed/defs.h | 2 -- sbin/routed/if.c | 2 -- sbin/routed/input.c | 2 -- sbin/routed/main.c | 2 -- sbin/routed/output.c | 2 -- sbin/routed/parms.c | 2 -- sbin/routed/pathnames.h | 2 -- sbin/routed/radix.c | 2 -- sbin/routed/radix.h | 2 -- sbin/routed/rdisc.c | 2 -- sbin/routed/rtquery/rtquery.c | 2 -- sbin/routed/table.c | 2 -- sbin/routed/trace.c | 2 -- sbin/setkey/test-policy.c | 2 -- sbin/veriexec/manifest_lexer.l | 2 -- sbin/veriexec/manifest_parser.y | 2 -- sbin/veriexec/veriexec.h | 2 -- secure/lib/libcrypt/blowfish.h | 2 -- share/dtrace/blocking | 2 -- share/dtrace/disklatency | 2 -- share/dtrace/disklatencycmd | 2 -- share/dtrace/hotopen | 2 -- share/dtrace/ipfw.d | 2 -- share/dtrace/mbuf.d | 2 -- share/dtrace/nfsattrstats | 2 -- share/dtrace/nfsclienttime | 2 -- share/dtrace/retval | 2 -- share/dtrace/siftr | 2 -- share/dtrace/tcpconn | 2 -- share/dtrace/tcpdebug | 2 -- share/dtrace/tcpstate | 2 -- share/dtrace/tcptrack | 2 -- share/dtrace/udptrack | 2 -- share/examples/find_interface/find_interface.c | 2 -- share/examples/flua/libjail.lua | 2 -- share/examples/hwpmc/overhead.c | 2 -- share/examples/kld/cdev/module/cdev.c | 2 -- share/examples/kld/cdev/module/cdev.h | 2 -- share/examples/kld/cdev/module/cdevmod.c | 2 -- share/examples/kld/cdev/test/testcdev.c | 2 -- share/examples/kld/dyn_sysctl/dyn_sysctl.c | 2 -- share/examples/kld/syscall/module/syscall.c | 2 -- share/examples/kld/syscall/test/call.c | 2 -- share/examples/libifconfig/ifchangevlan.c | 2 -- share/examples/libifconfig/ifcreate.c | 2 -- share/examples/libifconfig/ifcreatevlan.c | 2 -- share/examples/libifconfig/ifdestroy.c | 2 -- share/examples/libifconfig/setdescription.c | 2 -- share/examples/libifconfig/setmtu.c | 2 -- share/examples/libifconfig/status.c | 2 -- share/examples/libusb20/bulk.c | 2 -- share/examples/libusb20/control.c | 2 -- share/examples/libusb20/util.c | 2 -- share/examples/libusb20/util.h | 2 -- share/examples/libvgl/demo.c | 2 -- share/examples/perfmon/perfmon.c | 2 -- share/examples/ppi/ppilcd.c | 2 -- share/examples/scsi_target/scsi_cmds.c | 2 -- share/examples/scsi_target/scsi_target.c | 2 -- share/examples/scsi_target/scsi_target.h | 2 -- share/syscons/scrnmaps/armscii8-2haik8 | 2 -- share/syscons/scrnmaps/iso-8859-1_to_cp437 | 2 -- share/syscons/scrnmaps/iso-8859-4_for_vga9 | 2 -- share/syscons/scrnmaps/koi8-r2cp866 | 2 -- share/syscons/scrnmaps/koi8-u2cp866u | 2 -- share/syscons/scrnmaps/mkscrfil.c | 2 -- stand/arm64/libarm64/cache.h | 2 -- stand/common/bootstrap.h | 2 -- stand/common/dev_net.h | 2 -- stand/common/disk.h | 2 -- stand/common/gfx_fb.c | 2 -- stand/common/gfx_fb.h | 2 -- stand/common/isapnp.h | 2 -- stand/common/part.h | 2 -- stand/common/paths.h | 2 -- stand/common/rbx.h | 2 -- stand/common/readin.h | 2 -- stand/efi/boot1/boot_module.h | 2 -- stand/efi/boot1/proto.h | 2 -- stand/efi/boot1/ufs_module.c | 2 -- stand/efi/boot1/zfs_module.c | 2 -- stand/efi/gptboot/drv.h | 2 -- stand/efi/include/efi_driver_utils.h | 2 -- stand/efi/include/efi_drivers.h | 2 -- stand/efi/include/efichar.h | 2 -- stand/efi/include/efilib.h | 2 -- stand/efi/include/efizfs.h | 2 -- stand/efi/libefi/efi_driver_utils.c | 2 -- stand/efi/libefi/efihttp.c | 2 -- stand/efi/loader/arch/amd64/amd64_tramp.S | 2 -- stand/efi/loader/arch/amd64/exc.S | 2 -- stand/efi/loader/arch/arm/start.S | 2 -- stand/efi/loader/arch/arm64/start.S | 2 -- stand/efi/loader/arch/riscv/start.S | 2 -- stand/efi/loader/framebuffer.h | 2 -- stand/efi/loader/loader_efi.h | 2 -- stand/fdt/fdt_platform.h | 2 -- stand/ficl/loader.c | 2 -- stand/i386/boot0/boot0.S | 2 -- stand/i386/boot2/boot1.S | 2 -- stand/i386/boot2/sio.S | 2 -- stand/i386/btx/btx/btx.S | 2 -- stand/i386/btx/btxldr/btxldr.S | 2 -- stand/i386/common/bootargs.h | 2 -- stand/i386/common/cons.h | 2 -- stand/i386/common/drv.h | 2 -- stand/i386/common/edd.h | 2 -- stand/i386/gptboot/gptldr.S | 2 -- stand/i386/libi386/amd64_tramp.S | 2 -- stand/i386/libi386/libi386.h | 2 -- stand/i386/libi386/multiboot_tramp.S | 2 -- stand/i386/libi386/pxe.h | 2 -- stand/i386/libi386/relocater_tramp.S | 2 -- stand/i386/libi386/vbe.c | 2 -- stand/i386/pxeldr/pxeldr.S | 2 -- stand/i386/zfsboot/zfsldr.S | 2 -- stand/kboot/host_syscall.h | 2 -- stand/liblua/float.h | 2 -- stand/liblua/lerrno.h | 2 -- stand/liblua/locale.h | 2 -- stand/liblua/lstd.h | 2 -- stand/liblua/lutils.h | 2 -- stand/liblua/math.h | 2 -- stand/libofw/libofw.h | 2 -- stand/libofw/openfirm.h | 2 -- stand/libsa/bootp.h | 2 -- stand/libsa/dosfs.h | 2 -- stand/libsa/geli/geli_metadata.c | 2 -- stand/libsa/geli/geliboot.c | 2 -- stand/libsa/geli/geliboot.h | 2 -- stand/libsa/geli/geliboot_crypto.c | 2 -- stand/libsa/geli/geliboot_internal.h | 2 -- stand/libsa/geli/gelidev.c | 2 -- stand/libsa/gpt.h | 2 -- stand/libsa/iodesc.h | 2 -- stand/libsa/net.h | 2 -- stand/libsa/rpc.h | 2 -- stand/libsa/rpcv2.h | 2 -- stand/libsa/saioctl.h | 2 -- stand/libsa/smbios.h | 2 -- stand/libsa/stand.h | 2 -- stand/libsa/tftp.h | 2 -- stand/libsa/uuid_from_string.c | 2 -- stand/libsa/uuid_to_string.c | 2 -- stand/libsa/xlocale_private.h | 2 -- stand/libsa/zalloc_defs.h | 2 -- stand/libsa/zalloc_mem.h | 2 -- stand/libsa/zalloc_protos.h | 2 -- stand/libsa/zfs/libzfs.h | 2 -- stand/libsa/zfs/zfs.c | 2 -- stand/powerpc/ofw/trampolineLE.S | 2 -- stand/uboot/api_public.h | 2 -- stand/uboot/arch/arm/start.S | 2 -- stand/uboot/arch/powerpc/start.S | 2 -- stand/uboot/glue.h | 2 -- stand/uboot/libuboot.h | 2 -- stand/userboot/test/test.c | 2 -- stand/userboot/userboot.h | 2 -- stand/userboot/userboot/libuserboot.h | 2 -- tests/freebsd_test_suite/macros.h | 2 -- tests/sys/aio/aio_kqueue_test.c | 2 -- tests/sys/aio/aio_test.c | 2 -- tests/sys/aio/lio_kqueue_test.c | 2 -- tests/sys/aio/lio_test.c | 2 -- tests/sys/aio/local.h | 2 -- tests/sys/audit/administrative.c | 2 -- tests/sys/audit/file-attribute-access.c | 2 -- tests/sys/audit/file-attribute-modify.c | 2 -- tests/sys/audit/file-close.c | 2 -- tests/sys/audit/file-create.c | 2 -- tests/sys/audit/file-delete.c | 2 -- tests/sys/audit/file-read.c | 2 -- tests/sys/audit/file-write.c | 2 -- tests/sys/audit/inter-process.c | 2 -- tests/sys/audit/ioctl.c | 2 -- tests/sys/audit/miscellaneous.c | 2 -- tests/sys/audit/network.c | 2 -- tests/sys/audit/open.c | 2 -- tests/sys/audit/process-control.c | 2 -- tests/sys/audit/utils.c | 2 -- tests/sys/audit/utils.h | 2 -- tests/sys/auditpipe/auditpipe_test.c | 2 -- tests/sys/cddl/zfs/bin/mkfile.c | 2 -- tests/sys/cddl/zfs/tests/txg_integrity/txg_integrity.d | 2 -- tests/sys/fifo/fifo_create.c | 2 -- tests/sys/fifo/fifo_io.c | 2 -- tests/sys/fifo/fifo_misc.c | 2 -- tests/sys/fifo/fifo_open.c | 2 -- tests/sys/file/dup_test.c | 2 -- tests/sys/file/fcntlflags_test.c | 2 -- tests/sys/file/flock_helper.c | 2 -- tests/sys/file/ftruncate_test.c | 2 -- tests/sys/file/newfileops_on_fork_test.c | 2 -- tests/sys/fs/fusefs/access.cc | 2 -- tests/sys/fs/fusefs/allow_other.cc | 2 -- tests/sys/fs/fusefs/bad_server.cc | 2 -- tests/sys/fs/fusefs/bmap.cc | 2 -- tests/sys/fs/fusefs/cache.cc | 2 -- tests/sys/fs/fusefs/copy_file_range.cc | 2 -- tests/sys/fs/fusefs/create.cc | 2 -- tests/sys/fs/fusefs/default_permissions.cc | 2 -- tests/sys/fs/fusefs/default_permissions_privileged.cc | 2 -- tests/sys/fs/fusefs/destroy.cc | 2 -- tests/sys/fs/fusefs/dev_fuse_poll.cc | 2 -- tests/sys/fs/fusefs/fallocate.cc | 2 -- tests/sys/fs/fusefs/fifo.cc | 2 -- tests/sys/fs/fusefs/flush.cc | 2 -- *** 27940 LINES SKIPPED *** From nobody Wed Aug 16 17:56:47 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RQwnD3lsrz4qvCB; Wed, 16 Aug 2023 17:56:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RQwnD2dfvz3TjM; Wed, 16 Aug 2023 17:56:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692208608; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Tn/JxsTErEby7Qg+jRj7rOCNXoHoKlG1c278qtKAQuA=; b=N7dH8yOVIwUdojydaWWIHCFvK4GfDI1J+nZqfZd9PSNlqVhhMDiCiBWF2MYf9CQCEGjhKJ ma7kxMJujqrgusVGCwIvve4xNE05paHP+qWw1xWaBZii0IwbYSiTvqYTbU4edBa/bMrnDl mCMZN6viAwQbXqpLgmaJhTN5vqq9X4xqtJMTOiY6tOdklfItzQfCdoU/cFfbYdU1fieOTl O4LaGMLDIE5XjSVPiktIfvCDQgocfmBqWH42p+niQT1eG/BmnC2FkVADLhvzhDQhFqUd6O X2oGCDs29OKqnaipBGqvQ/xCjhZ7MBmTHfy1DvAu9sEI44SCDtrR8WZ17o0W3g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692208608; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Tn/JxsTErEby7Qg+jRj7rOCNXoHoKlG1c278qtKAQuA=; b=HgSkh2C+MXGWX3ps1m2qKGj5zs0/UXgRrorvcKXx8vxLOhiCBm/FuYxaIMGfynEwlcV61o 12CNW11RqQA21gq9OsnkN9NItfw9+b2ANb7fhtVHuP0NyInn72aU8Vi7mBvbAfptzDJgrB tfroyaztL4a3mPBAiWDAE1agc7LY3DjQnanpcGYY/XdZ6zmZ9y0GFH/uso7fe3zhJaDLGQ d0gFhYmKxaBVfiiH7K71YjUd5nZpO6RV1eaixioivqfEX0ZgYRoczAl2QKN7Ybz4Nk0PGq UxtcbR6g+9J9iXvl7INb5rFa16V+3ddkE5NB0kzVNczV7ftXl3BV4UON30pw2A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692208608; a=rsa-sha256; cv=none; b=ERExVqFVf964Fn0e3YrrjSidQpxylxC89JsDrblj+qbuGB8rAc0/E60TJ5ANiWhgork0Wj 9v8GlWVJEf1hToiTKcNK9Ry0QzskJKzZ2XwZR383VuFqa+kOjNCUSZtfykGmIscuamTpNK aa27IhhkkLTwd392DvCwoGDBaqT92fNeh8OMtgH+di8DioXvgYAb/o+NmUgt3nsLIe9OkM T50r6MLP6T8N7vqFbKdaTLbkApqXT8YDOuLVyU7w/hA7H/6ysZh02+gkvj6xE0dCxuWhhD jOuZ6ylG7A1vJaYVPnanCqjkvwdXeyLP4vZtcg+4g7z9MshPJTU5Gs7gfJoL+Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RQwnD1Sbkz11KJ; Wed, 16 Aug 2023 17:56:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37GHumlM058988; Wed, 16 Aug 2023 17:56:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37GHulpr058985; Wed, 16 Aug 2023 17:56:47 GMT (envelope-from git) Date: Wed, 16 Aug 2023 17:56:47 GMT Message-Id: <202308161756.37GHulpr058985@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: 2ff63af9b88c - main - sys: Remove $FreeBSD$: one-line .h pattern List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2ff63af9b88c7413b7d71715b5532625752a248e Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=2ff63af9b88c7413b7d71715b5532625752a248e commit 2ff63af9b88c7413b7d71715b5532625752a248e Author: Warner Losh AuthorDate: 2023-08-16 17:54:18 +0000 Commit: Warner Losh CommitDate: 2023-08-16 17:54:18 +0000 sys: Remove $FreeBSD$: one-line .h pattern Remove /^\s*\*+\s*\$FreeBSD\$.*$\n/ --- sys/amd64/amd64/apic_vector.S | 1 - sys/amd64/amd64/atpic_vector.S | 1 - sys/amd64/include/asm.h | 1 - sys/amd64/include/cpu.h | 1 - sys/amd64/include/exec.h | 1 - sys/amd64/include/floatingpoint.h | 1 - sys/amd64/include/fpu.h | 1 - sys/amd64/include/ieeefp.h | 1 - sys/amd64/include/in_cksum.h | 1 - sys/amd64/include/limits.h | 1 - sys/amd64/include/param.h | 1 - sys/amd64/include/pcb.h | 1 - sys/amd64/include/pmap.h | 1 - sys/amd64/include/proc.h | 1 - sys/amd64/include/profile.h | 1 - sys/amd64/include/reloc.h | 1 - sys/amd64/include/segments.h | 1 - sys/amd64/include/tss.h | 1 - sys/amd64/include/vmparam.h | 1 - sys/arm/broadcom/bcm2835/bcm2835_wdog.h | 1 - sys/arm/include/_align.h | 1 - sys/arm/include/_inttypes.h | 1 - sys/arm/include/_limits.h | 1 - sys/arm/include/_types.h | 1 - sys/arm/include/db_machdep.h | 1 - sys/arm/include/endian.h | 1 - sys/arm/include/float.h | 1 - sys/arm/include/floatingpoint.h | 1 - sys/arm/include/in_cksum.h | 1 - sys/arm/include/limits.h | 1 - sys/arm/include/md_var.h | 1 - sys/arm/include/minidump.h | 1 - sys/arm/include/param.h | 1 - sys/arm/include/pcpu.h | 1 - sys/arm/include/pl310.h | 1 - sys/arm/include/proc.h | 1 - sys/arm/include/profile.h | 1 - sys/arm/include/reloc.h | 1 - sys/arm/include/signal.h | 1 - sys/arm/include/vfp.h | 1 - sys/arm/ti/omap4/omap4_smc.h | 1 - sys/arm/ti/ti_smc.h | 1 - sys/arm64/freescale/imx/imx8mq_ccm.h | 1 - sys/arm64/include/_align.h | 1 - sys/arm64/include/_inttypes.h | 1 - sys/arm64/include/_limits.h | 1 - sys/arm64/include/_types.h | 1 - sys/arm64/include/cpu.h | 1 - sys/arm64/include/endian.h | 1 - sys/arm64/include/float.h | 1 - sys/arm64/include/ieeefp.h | 1 - sys/arm64/include/in_cksum.h | 1 - sys/arm64/include/md_var.h | 1 - sys/arm64/include/minidump.h | 1 - sys/arm64/include/param.h | 1 - sys/arm64/include/pcpu.h | 1 - sys/arm64/include/proc.h | 1 - sys/arm64/include/profile.h | 1 - sys/arm64/include/signal.h | 1 - sys/arm64/include/sysarch.h | 1 - sys/arm64/include/vmparam.h | 1 - sys/arm64/linux/linux.h | 1 - sys/cam/ctl/ctl.h | 1 - sys/cam/ctl/ctl_backend.h | 1 - sys/cam/ctl/ctl_cmd_table.c | 1 - sys/cam/ctl/ctl_debug.h | 1 - sys/cam/ctl/ctl_error.h | 1 - sys/cam/ctl/ctl_frontend.h | 1 - sys/cam/ctl/ctl_ha.h | 1 - sys/cam/ctl/ctl_io.h | 1 - sys/cam/ctl/ctl_ioctl.h | 1 - sys/cam/ctl/ctl_private.h | 1 - sys/cam/ctl/ctl_ser_table.c | 1 - sys/cam/ctl/ctl_util.h | 1 - sys/cam/mmc/mmc_bus.h | 1 - sys/cam/scsi/scsi_cd.h | 1 - sys/cam/scsi/scsi_iu.h | 1 - sys/cam/scsi/scsi_message.h | 1 - sys/cam/scsi/smp_all.h | 1 - sys/cddl/compat/opensolaris/kern/opensolaris_uio.c | 1 - sys/cddl/dev/dtrace/aarch64/regset.h | 1 - sys/cddl/dev/dtrace/arm/regset.h | 1 - sys/cddl/dev/dtrace/powerpc/regset.h | 1 - sys/cddl/dev/dtrace/riscv/regset.h | 1 - sys/cddl/dev/dtrace/x86/dis_tables.c | 1 - sys/cddl/dev/dtrace/x86/dis_tables.h | 1 - sys/cddl/dev/dtrace/x86/regset.h | 1 - sys/compat/linux/linux_persona.h | 1 - sys/compat/linux/linux_util.h | 1 - sys/compat/linux/linux_videodev2_compat.h | 1 - sys/compat/linux/linux_videodev_compat.h | 1 - sys/dev/arcmsr/arcmsr.h | 1 - sys/dev/atkbdc/atkbdc_subr.h | 1 - sys/dev/atkbdc/psm.h | 1 - sys/dev/bhnd/bcma/bcma.h | 1 - sys/dev/bhnd/bcma/bcma_dmp.h | 1 - sys/dev/bhnd/bcma/bcma_eromreg.h | 1 - sys/dev/bhnd/bcma/bcma_eromvar.h | 1 - sys/dev/bhnd/bcma/bcmavar.h | 1 - sys/dev/bhnd/bhnd.h | 1 - sys/dev/bhnd/bhnd_erom.h | 1 - sys/dev/bhnd/bhnd_erom_types.h | 1 - sys/dev/bhnd/bhnd_eromvar.h | 1 - sys/dev/bhnd/bhnd_match.h | 1 - sys/dev/bhnd/bhnd_types.h | 1 - sys/dev/bhnd/bhndb/bhndb.h | 1 - sys/dev/bhnd/bhndb/bhndb_hwdata.h | 1 - sys/dev/bhnd/bhndb/bhndb_pci_hwdata.h | 1 - sys/dev/bhnd/bhndb/bhndb_pcireg.h | 1 - sys/dev/bhnd/bhndb/bhndb_pcivar.h | 1 - sys/dev/bhnd/bhndb/bhndb_private.h | 1 - sys/dev/bhnd/bhndb/bhndbvar.h | 1 - sys/dev/bhnd/bhndvar.h | 1 - sys/dev/bhnd/cores/chipc/chipc.h | 1 - sys/dev/bhnd/cores/chipc/chipc_gpiovar.h | 1 - sys/dev/bhnd/cores/chipc/chipc_private.h | 1 - sys/dev/bhnd/cores/chipc/chipc_spi.h | 1 - sys/dev/bhnd/cores/chipc/chipcvar.h | 1 - sys/dev/bhnd/cores/chipc/pwrctl/bhnd_pwrctl_private.h | 1 - sys/dev/bhnd/cores/chipc/pwrctl/bhnd_pwrctlvar.h | 1 - sys/dev/bhnd/cores/pci/bhnd_pci_hostbvar.h | 1 - sys/dev/bhnd/cores/pci/bhnd_pcibvar.h | 1 - sys/dev/bhnd/cores/pci/bhnd_pcivar.h | 1 - sys/dev/bhnd/cores/pcie2/bhnd_pcie2_hostbvar.h | 1 - sys/dev/bhnd/cores/pcie2/bhnd_pcie2_var.h | 1 - sys/dev/bhnd/cores/pcie2/bhnd_pcie2b_var.h | 1 - sys/dev/bhnd/cores/pmu/bhnd_pmu.h | 1 - sys/dev/bhnd/cores/pmu/bhnd_pmu_private.h | 1 - sys/dev/bhnd/cores/pmu/bhnd_pmuvar.h | 1 - sys/dev/bhnd/nvram/bhnd_nvram.h | 1 - sys/dev/bhnd/nvram/bhnd_nvram_data.h | 1 - sys/dev/bhnd/nvram/bhnd_nvram_data_spromvar.h | 1 - sys/dev/bhnd/nvram/bhnd_nvram_data_tlvreg.h | 1 - sys/dev/bhnd/nvram/bhnd_nvram_datavar.h | 1 - sys/dev/bhnd/nvram/bhnd_nvram_io.h | 1 - sys/dev/bhnd/nvram/bhnd_nvram_iovar.h | 1 - sys/dev/bhnd/nvram/bhnd_nvram_plist.h | 1 - sys/dev/bhnd/nvram/bhnd_nvram_plistvar.h | 1 - sys/dev/bhnd/nvram/bhnd_nvram_private.h | 1 - sys/dev/bhnd/nvram/bhnd_nvram_store.h | 1 - sys/dev/bhnd/nvram/bhnd_nvram_storevar.h | 1 - sys/dev/bhnd/nvram/bhnd_nvram_value.h | 1 - sys/dev/bhnd/nvram/bhnd_nvram_valuevar.h | 1 - sys/dev/bhnd/nvram/bhnd_spromvar.h | 1 - sys/dev/bhnd/siba/siba.h | 1 - sys/dev/bhnd/siba/siba_eromvar.h | 1 - sys/dev/bhnd/siba/sibareg.h | 1 - sys/dev/bhnd/siba/sibavar.h | 1 - sys/dev/bwi/bitops.h | 1 - sys/dev/bwi/bwimac.h | 1 - sys/dev/bwi/bwiphy.h | 1 - sys/dev/bwi/bwirf.h | 1 - sys/dev/bwi/if_bwireg.h | 1 - sys/dev/bwi/if_bwivar.h | 1 - sys/dev/bwn/if_bwn_pcivar.h | 1 - sys/dev/cxgb/cxgb_include.h | 1 - sys/dev/dcons/dcons.c | 1 - sys/dev/dcons/dcons.h | 1 - sys/dev/dcons/dcons_crom.c | 1 - sys/dev/dcons/dcons_os.h | 1 - sys/dev/drm2/drm_pciids.h | 1 - sys/dev/et/if_etreg.h | 1 - sys/dev/et/if_etvar.h | 1 - sys/dev/etherswitch/etherswitch.h | 1 - sys/dev/firewire/fwmem.h | 1 - sys/dev/firewire/fwohcireg.h | 1 - sys/dev/firewire/fwohcivar.h | 1 - sys/dev/firewire/fwphyreg.h | 1 - sys/dev/firewire/iec13213.h | 1 - sys/dev/firewire/iec68113.h | 1 - sys/dev/firewire/if_fwevar.h | 1 - sys/dev/firewire/if_fwip.c | 1 - sys/dev/firewire/if_fwipvar.h | 1 - sys/dev/firewire/sbp.h | 1 - sys/dev/fxp/rcvbundl.h | 1 - sys/dev/hptnr/array.h | 1 - sys/dev/ic/i8253reg.h | 1 - sys/dev/ic/nec765.h | 1 - sys/dev/ic/ns16550.h | 1 - sys/dev/ida/idaio.h | 1 - sys/dev/iwm/if_iwm_config.h | 1 - sys/dev/iwm/if_iwm_fw.h | 1 - sys/dev/kbdmux/kbdmux.c | 1 - sys/dev/mii/truephy.c | 1 - sys/dev/mii/truephyreg.h | 1 - sys/dev/netmap/if_re_netmap.h | 1 - sys/dev/netmap/if_vtnet_netmap.h | 1 - sys/dev/netmap/netmap.c | 1 - sys/dev/netmap/netmap_kern.h | 1 - sys/dev/netmap/netmap_mbq.c | 1 - sys/dev/netmap/netmap_mbq.h | 1 - sys/dev/netmap/netmap_mem2.h | 1 - sys/dev/netmap/netmap_monitor.c | 1 - sys/dev/pms/RefTisa/discovery/api/dm.h | 1 - sys/dev/pms/RefTisa/discovery/api/dmapi.h | 1 - sys/dev/pms/RefTisa/discovery/api/tddmapi.h | 1 - sys/dev/pms/RefTisa/discovery/dm/dmdefs.h | 1 - sys/dev/pms/RefTisa/discovery/dm/dmlist.h | 1 - sys/dev/pms/RefTisa/discovery/dm/dmproto.h | 1 - sys/dev/pms/RefTisa/discovery/dm/dmtypes.h | 1 - sys/dev/pms/RefTisa/sallsdk/api/sa.h | 1 - sys/dev/pms/RefTisa/sallsdk/api/sa_err.h | 1 - sys/dev/pms/RefTisa/sallsdk/api/sa_spec.h | 1 - sys/dev/pms/RefTisa/sallsdk/api/saapi.h | 1 - sys/dev/pms/RefTisa/sallsdk/api/saosapi.h | 1 - sys/dev/pms/RefTisa/sallsdk/hda/64k/aap18008.h | 1 - sys/dev/pms/RefTisa/sallsdk/hda/64k/aap1img.h | 1 - sys/dev/pms/RefTisa/sallsdk/hda/64k/ila8008.h | 1 - sys/dev/pms/RefTisa/sallsdk/hda/64k/ila8070.h | 1 - sys/dev/pms/RefTisa/sallsdk/hda/64k/ilaimg.h | 1 - sys/dev/pms/RefTisa/sallsdk/hda/64k/iop8008.h | 1 - sys/dev/pms/RefTisa/sallsdk/hda/64k/iop8070.h | 1 - sys/dev/pms/RefTisa/sallsdk/hda/64k/iopimg.h | 1 - sys/dev/pms/RefTisa/sallsdk/hda/64k/istrimg.h | 1 - sys/dev/pms/RefTisa/sallsdk/hda/64k/raae8070.h | 1 - sys/dev/pms/RefTisa/sallsdk/spc/mpi.h | 1 - sys/dev/pms/RefTisa/sallsdk/spc/mpidebug.h | 1 - sys/dev/pms/RefTisa/sallsdk/spc/sadefs.h | 1 - sys/dev/pms/RefTisa/sallsdk/spc/saglobal.h | 1 - sys/dev/pms/RefTisa/sallsdk/spc/sahwreg.h | 1 - sys/dev/pms/RefTisa/sallsdk/spc/sallist.h | 1 - sys/dev/pms/RefTisa/sallsdk/spc/samacro.h | 1 - sys/dev/pms/RefTisa/sallsdk/spc/sampidefs.h | 1 - sys/dev/pms/RefTisa/sallsdk/spc/saproto.h | 1 - sys/dev/pms/RefTisa/sallsdk/spc/satypes.h | 1 - sys/dev/pms/RefTisa/sallsdk/spc/spcdefs.h | 1 - sys/dev/pms/RefTisa/sat/api/sm.h | 1 - sys/dev/pms/RefTisa/sat/api/smapi.h | 1 - sys/dev/pms/RefTisa/sat/api/tdsmapi.h | 1 - sys/dev/pms/RefTisa/sat/src/smdefs.h | 1 - sys/dev/pms/RefTisa/sat/src/smlist.h | 1 - sys/dev/pms/RefTisa/sat/src/smproto.h | 1 - sys/dev/pms/RefTisa/sat/src/smtypes.h | 1 - sys/dev/pms/RefTisa/tisa/api/ostiapi.h | 1 - sys/dev/pms/RefTisa/tisa/api/tiapi.h | 1 - sys/dev/pms/RefTisa/tisa/api/tidefs.h | 1 - sys/dev/pms/RefTisa/tisa/api/tiglobal.h | 1 - sys/dev/pms/RefTisa/tisa/api/tiscsi.h | 1 - sys/dev/pms/RefTisa/tisa/api/titypes.h | 1 - sys/dev/pms/RefTisa/tisa/sassata/common/ossa.h | 1 - sys/dev/pms/RefTisa/tisa/sassata/common/tddefs.h | 1 - sys/dev/pms/RefTisa/tisa/sassata/common/tdioctl.h | 1 - sys/dev/pms/RefTisa/tisa/sassata/common/tdlist.h | 1 - sys/dev/pms/RefTisa/tisa/sassata/common/tdproto.h | 1 - sys/dev/pms/RefTisa/tisa/sassata/common/tdsatypes.h | 1 - sys/dev/pms/RefTisa/tisa/sassata/common/tdutil.h | 1 - sys/dev/pms/RefTisa/tisa/sassata/common/wcs.h | 1 - sys/dev/pms/RefTisa/tisa/sassata/sas/common/tdtypes.h | 1 - sys/dev/pms/RefTisa/tisa/sassata/sas/ini/itddefs.h | 1 - sys/dev/pms/RefTisa/tisa/sassata/sas/ini/itdglobl.h | 1 - sys/dev/pms/RefTisa/tisa/sassata/sas/ini/itdtypes.h | 1 - sys/dev/pms/RefTisa/tisa/sassata/sata/host/sat.h | 1 - sys/dev/pms/RefTisa/tisa/sassata/sata/host/satproto.h | 1 - sys/dev/pms/config.h | 1 - sys/dev/pms/freebsd/driver/common/encrypt_ioctl.h | 1 - sys/dev/pms/freebsd/driver/common/lxcommon.h | 1 - sys/dev/pms/freebsd/driver/common/lxencrypt.c | 1 - sys/dev/pms/freebsd/driver/common/lxencrypt.h | 1 - sys/dev/pms/freebsd/driver/common/lxproto.h | 1 - sys/dev/pms/freebsd/driver/common/osdebug.h | 1 - sys/dev/pms/freebsd/driver/common/osenv.h | 1 - sys/dev/pms/freebsd/driver/common/osstring.h | 1 - sys/dev/pms/freebsd/driver/common/ostypes.h | 1 - sys/dev/pms/freebsd/driver/ini/src/agdef.h | 1 - sys/dev/pms/freebsd/driver/ini/src/agtiapi.h | 1 - sys/dev/pms/freebsd/driver/ini/src/agtiproto.h | 1 - sys/dev/pms/freebsd/driver/ini/src/osapi.c | 1 - sys/dev/qlnx/qlnxr/qlnxr_verbs.h | 1 - sys/dev/ral/rt2860reg.h | 1 - sys/dev/ral/rt2860var.h | 1 - sys/dev/rtwn/if_rtwn_fw.h | 1 - sys/dev/rtwn/if_rtwnreg.h | 1 - sys/dev/rtwn/if_rtwnvar.h | 1 - sys/dev/rtwn/pci/rtwn_pci_attach.h | 1 - sys/dev/rtwn/pci/rtwn_pci_var.h | 1 - sys/dev/rtwn/rtl8188e/r88e.h | 1 - sys/dev/rtwn/rtl8188e/r88e_fw_cmd.h | 1 - sys/dev/rtwn/rtl8188e/r88e_priv.h | 1 - sys/dev/rtwn/rtl8188e/r88e_reg.h | 1 - sys/dev/rtwn/rtl8188e/r88e_rx_desc.h | 1 - sys/dev/rtwn/rtl8188e/r88e_tx_desc.h | 1 - sys/dev/rtwn/rtl8188e/usb/r88eu.h | 1 - sys/dev/rtwn/rtl8188e/usb/r88eu_reg.h | 1 - sys/dev/rtwn/rtl8192c/pci/r92ce.h | 1 - sys/dev/rtwn/rtl8192c/pci/r92ce_priv.h | 1 - sys/dev/rtwn/rtl8192c/pci/r92ce_reg.h | 1 - sys/dev/rtwn/rtl8192c/pci/r92ce_rx_desc.h | 1 - sys/dev/rtwn/rtl8192c/pci/r92ce_tx_desc.h | 1 - sys/dev/rtwn/rtl8192c/r92c.h | 1 - sys/dev/rtwn/rtl8192c/r92c_fw_cmd.h | 1 - sys/dev/rtwn/rtl8192c/r92c_priv.h | 1 - sys/dev/rtwn/rtl8192c/r92c_reg.h | 1 - sys/dev/rtwn/rtl8192c/r92c_rom_defs.h | 1 - sys/dev/rtwn/rtl8192c/r92c_rom_image.h | 1 - sys/dev/rtwn/rtl8192c/r92c_rx_desc.h | 1 - sys/dev/rtwn/rtl8192c/r92c_tx_desc.h | 1 - sys/dev/rtwn/rtl8192c/r92c_var.h | 1 - sys/dev/rtwn/rtl8192c/usb/r92cu.h | 1 - sys/dev/rtwn/rtl8192c/usb/r92cu_priv.h | 1 - sys/dev/rtwn/rtl8192c/usb/r92cu_reg.h | 1 - sys/dev/rtwn/rtl8192c/usb/r92cu_tx_desc.h | 1 - sys/dev/rtwn/usb/rtwn_usb_var.h | 1 - sys/dev/ti/ti_fw2.h | 1 - sys/dev/usb/uftdiio.h | 1 - sys/dev/usb/wlan/if_rsureg.h | 1 - sys/dev/veriexec/veriexec_ioctl.h | 1 - sys/dev/veriexec/verified_exec.c | 1 - sys/dev/vkbd/vkbd.c | 1 - sys/dev/vkbd/vkbd_var.h | 1 - sys/dev/zlib/zcalloc.c | 1 - sys/dev/zlib/zcalloc.h | 1 - sys/dts/arm/tegra20-paz00.dts | 1 - sys/dts/arm/tegra20.dtsi | 1 - sys/dts/arm/trimslice.dts | 1 - sys/dts/arm/ufw.dts | 1 - sys/dts/arm/versatilepb.dts | 1 - sys/dts/arm/zedboard.dts | 1 - sys/dts/arm/zybo.dts | 1 - sys/dts/arm/zynq-7000.dtsi | 1 - sys/fs/cd9660/cd9660_mount.h | 1 - sys/fs/cd9660/cd9660_node.h | 1 - sys/fs/cd9660/cd9660_rrip.h | 1 - sys/fs/cd9660/iso.h | 1 - sys/fs/cd9660/iso_rrip.h | 1 - sys/fs/deadfs/dead_vnops.c | 1 - sys/fs/ext2fs/ext2_alloc.c | 1 - sys/fs/ext2fs/ext2_balloc.c | 1 - sys/fs/ext2fs/ext2_bmap.c | 1 - sys/fs/ext2fs/ext2_extern.h | 1 - sys/fs/ext2fs/ext2_inode.c | 1 - sys/fs/ext2fs/ext2_inode_cnv.c | 1 - sys/fs/ext2fs/ext2_lookup.c | 1 - sys/fs/ext2fs/ext2_mount.h | 1 - sys/fs/ext2fs/ext2_subr.c | 1 - sys/fs/ext2fs/ext2_vfsops.c | 1 - sys/fs/ext2fs/ext2_vnops.c | 1 - sys/fs/ext2fs/fs.h | 1 - sys/fs/ext2fs/inode.h | 1 - sys/fs/fifofs/fifo_vnops.c | 1 - sys/fs/nullfs/null_vfsops.c | 1 - sys/fs/procfs/procfs.h | 1 - sys/fs/procfs/procfs_dbregs.c | 1 - sys/fs/procfs/procfs_fpregs.c | 1 - sys/fs/procfs/procfs_regs.c | 1 - sys/fs/procfs/procfs_status.c | 1 - sys/fs/unionfs/union.h | 1 - sys/fs/unionfs/union_subr.c | 1 - sys/fs/unionfs/union_vfsops.c | 1 - sys/fs/unionfs/union_vnops.c | 1 - sys/geom/vinum/geom_vinum_var.h | 1 - sys/gnu/dev/bwn/phy_n/if_bwn_phy_n_core.h | 1 - sys/gnu/dev/bwn/phy_n/if_bwn_phy_n_ppr.h | 1 - sys/gnu/dev/bwn/phy_n/if_bwn_phy_n_regs.h | 1 - sys/gnu/dev/bwn/phy_n/if_bwn_phy_n_tables.h | 1 - sys/gnu/dev/bwn/phy_n/if_bwn_radio_2055.h | 1 - sys/gnu/dev/bwn/phy_n/if_bwn_radio_2056.h | 1 - sys/gnu/dev/bwn/phy_n/if_bwn_radio_2057.h | 1 - sys/i386/i386/apic_vector.S | 1 - sys/i386/i386/atpic_vector.S | 1 - sys/i386/i386/locore.S | 1 - sys/i386/i386/sigtramp.S | 1 - sys/i386/include/asm.h | 1 - sys/i386/include/cpu.h | 1 - sys/i386/include/exec.h | 1 - sys/i386/include/floatingpoint.h | 1 - sys/i386/include/ieeefp.h | 1 - sys/i386/include/in_cksum.h | 1 - sys/i386/include/limits.h | 1 - sys/i386/include/npx.h | 1 - sys/i386/include/param.h | 1 - sys/i386/include/pcb.h | 1 - sys/i386/include/pmap.h | 1 - sys/i386/include/pmap_nopae.h | 1 - sys/i386/include/pmap_pae.h | 1 - sys/i386/include/proc.h | 1 - sys/i386/include/profile.h | 1 - sys/i386/include/reloc.h | 1 - sys/i386/include/segments.h | 1 - sys/i386/include/signal.h | 1 - sys/i386/include/speaker.h | 1 - sys/i386/include/tss.h | 1 - sys/i386/include/vmparam.h | 1 - sys/i386/linux/linux.h | 1 - sys/isa/isareg.h | 1 - sys/isa/rtc.h | 1 - sys/libkern/jenkins_hash.c | 1 - sys/libkern/quad.h | 1 - sys/modules/zfs/static_ccompile.h | 1 - sys/modules/zfs/zfs_config.h | 1 - sys/net/altq/altq.h | 1 - sys/net/altq/altq_cbq.c | 1 - sys/net/altq/altq_cbq.h | 1 - sys/net/altq/altq_cdnr.h | 1 - sys/net/altq/altq_classq.h | 1 - sys/net/altq/altq_fairq.c | 1 - sys/net/altq/altq_fairq.h | 1 - sys/net/altq/altq_hfsc.c | 1 - sys/net/altq/altq_hfsc.h | 1 - sys/net/altq/altq_priq.c | 1 - sys/net/altq/altq_priq.h | 1 - sys/net/altq/altq_red.c | 1 - sys/net/altq/altq_red.h | 1 - sys/net/altq/altq_rio.c | 1 - sys/net/altq/altq_rio.h | 1 - sys/net/altq/altq_rmclass.c | 1 - sys/net/altq/altq_rmclass.h | 1 - sys/net/altq/altq_rmclass_debug.h | 1 - sys/net/altq/altq_subr.c | 1 - sys/net/altq/altq_var.h | 1 - sys/net/altq/if_altq.h | 1 - sys/net/if.c | 1 - sys/net/if.h | 1 - sys/net/if_arp.h | 1 - sys/net/if_clone.c | 1 - sys/net/if_clone.h | 1 - sys/net/if_disc.c | 1 - sys/net/if_dl.h | 1 - sys/net/if_edsc.c | 1 - sys/net/if_ethersubr.c | 1 - sys/net/if_gre.h | 1 - sys/net/if_llc.h | 1 - sys/net/if_loop.c | 1 - sys/net/if_pfsync.h | 1 - sys/net/if_tap.h | 1 - sys/net/if_types.h | 1 - sys/net/if_var.h | 1 - sys/net/ifq.h | 1 - sys/net/netmap.h | 1 - sys/net/netmap_legacy.h | 1 - sys/net/netmap_user.h | 1 - sys/net/paravirt.h | 1 - sys/net/pfvar.h | 1 - sys/net/radix.c | 1 - sys/net/radix.h | 1 - sys/net/route.c | 1 - sys/net/route.h | 1 - sys/net/route/route_ifaddrs.c | 1 - sys/net/rtsock.c | 1 - sys/net/slcompress.c | 1 - sys/net/slcompress.h | 1 - sys/net80211/ieee80211_mesh.h | 1 - sys/netgraph/bluetooth/common/ng_bluetooth.c | 1 - sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c | 1 - sys/netgraph/bluetooth/drivers/ubt/ng_ubt_var.h | 1 - sys/netgraph/bluetooth/drivers/ubtbcmfw/ubtbcmfw.c | 1 - sys/netgraph/bluetooth/hci/ng_hci_cmds.c | 1 - sys/netgraph/bluetooth/hci/ng_hci_cmds.h | 1 - sys/netgraph/bluetooth/hci/ng_hci_evnt.c | 1 - sys/netgraph/bluetooth/hci/ng_hci_evnt.h | 1 - sys/netgraph/bluetooth/hci/ng_hci_main.c | 1 - sys/netgraph/bluetooth/hci/ng_hci_misc.c | 1 - sys/netgraph/bluetooth/hci/ng_hci_misc.h | 1 - sys/netgraph/bluetooth/hci/ng_hci_prse.h | 1 - sys/netgraph/bluetooth/hci/ng_hci_ulpi.c | 1 - sys/netgraph/bluetooth/hci/ng_hci_ulpi.h | 1 - sys/netgraph/bluetooth/hci/ng_hci_var.h | 1 - sys/netgraph/bluetooth/include/ng_bluetooth.h | 1 - sys/netgraph/bluetooth/include/ng_btsocket.h | 1 - sys/netgraph/bluetooth/include/ng_btsocket_hci_raw.h | 1 - sys/netgraph/bluetooth/include/ng_btsocket_l2cap.h | 1 - sys/netgraph/bluetooth/include/ng_btsocket_rfcomm.h | 1 - sys/netgraph/bluetooth/include/ng_btsocket_sco.h | 1 - sys/netgraph/bluetooth/include/ng_hci.h | 1 - sys/netgraph/bluetooth/include/ng_l2cap.h | 1 - sys/netgraph/bluetooth/include/ng_ubt.h | 1 - sys/netgraph/bluetooth/l2cap/ng_l2cap_cmds.c | 1 - sys/netgraph/bluetooth/l2cap/ng_l2cap_cmds.h | 1 - sys/netgraph/bluetooth/l2cap/ng_l2cap_evnt.c | 1 - sys/netgraph/bluetooth/l2cap/ng_l2cap_evnt.h | 1 - sys/netgraph/bluetooth/l2cap/ng_l2cap_llpi.c | 1 - sys/netgraph/bluetooth/l2cap/ng_l2cap_llpi.h | 1 - sys/netgraph/bluetooth/l2cap/ng_l2cap_main.c | 1 - sys/netgraph/bluetooth/l2cap/ng_l2cap_misc.c | 1 - sys/netgraph/bluetooth/l2cap/ng_l2cap_misc.h | 1 - sys/netgraph/bluetooth/l2cap/ng_l2cap_prse.h | 1 - sys/netgraph/bluetooth/l2cap/ng_l2cap_ulpi.c | 1 - sys/netgraph/bluetooth/l2cap/ng_l2cap_ulpi.h | 1 - sys/netgraph/bluetooth/l2cap/ng_l2cap_var.h | 1 - sys/netgraph/bluetooth/socket/ng_btsocket.c | 1 - sys/netgraph/bluetooth/socket/ng_btsocket_hci_raw.c | 1 - sys/netgraph/bluetooth/socket/ng_btsocket_l2cap.c | 1 - sys/netgraph/bluetooth/socket/ng_btsocket_l2cap_raw.c | 1 - sys/netgraph/bluetooth/socket/ng_btsocket_rfcomm.c | 1 - sys/netgraph/bluetooth/socket/ng_btsocket_sco.c | 1 - sys/netgraph/netflow/netflow.h | 1 - sys/netgraph/netflow/ng_netflow.h | 1 - sys/netgraph/ng_mppc.c | 1 - sys/netgraph/ng_mppc.h | 1 - sys/netgraph/ng_parse.c | 1 - sys/netgraph/ng_parse.h | 1 - sys/netinet/icmp_var.h | 1 - sys/netinet/if_ether.h | 1 - sys/netinet/igmp.h | 1 - sys/netinet/igmp_var.h | 1 - sys/netinet/in.h | 1 - sys/netinet/in_pcb.h | 1 - sys/netinet/in_pcb_var.h | 1 - sys/netinet/in_systm.h | 1 - sys/netinet/in_var.h | 1 - sys/netinet/ip.h | 1 - sys/netinet/ip_icmp.h | 1 - sys/netinet/ip_mroute.h | 1 - sys/netinet/ip_var.h | 1 - sys/netinet/tcp.h | 1 - sys/netinet/tcp_ecn.h | 1 - sys/netinet/tcp_fsm.h | 1 - sys/netinet/tcp_seq.h | 1 - sys/netinet/tcp_syncache.h | 1 - sys/netinet/tcp_timer.h | 1 - sys/netinet/tcp_var.h | 1 - sys/netinet/tcpip.h | 1 - sys/netinet/udp.h | 1 - sys/netinet/udp_var.h | 1 - sys/netinet6/in6.h | 1 - sys/netinet6/in6_ifattach.h | 1 - sys/netinet6/in6_pcb.h | 1 - sys/netinet6/in6_var.h | 1 - sys/netinet6/ip6_ecn.h | 1 - sys/netinet6/ip6_mroute.h | 1 - sys/netinet6/ip6_var.h | 1 - sys/netinet6/nd6.h | 1 - sys/netinet6/pim6.h | 1 - sys/netinet6/pim6_var.h | 1 - sys/netinet6/raw_ip6.h | 1 - sys/netinet6/scope6_var.h | 1 - sys/netinet6/tcp6_var.h | 1 - sys/netinet6/udp6_var.h | 1 - sys/netpfil/ipfilter/netinet/ip_compat.h | 1 - sys/netpfil/ipfilter/netinet/ip_fil.h | 1 - sys/netpfil/ipfilter/netinet/ip_frag.h | 1 - sys/netpfil/ipfilter/netinet/ip_nat.h | 1 - sys/netpfil/ipfilter/netinet/ip_rcmd_pxy.c | 1 - sys/netpfil/ipfilter/netinet/ip_state.h | 1 - sys/netpfil/ipfilter/netinet/ipl.h | 1 - sys/netpfil/ipfw/dn_sched_fifo.c | 1 - sys/netpfil/ipfw/dn_sched_prio.c | 1 - sys/netpfil/ipfw/dn_sched_qfq.c | 1 - sys/netpfil/ipfw/dn_sched_rr.c | 1 - sys/netpfil/ipfw/dn_sched_wf2q.c | 1 - sys/netpfil/ipfw/ip_dn_glue.c | 1 - sys/netpfil/ipfw/test/dn_test.h | 1 - sys/netpfil/ipfw/test/main.c | 1 - sys/netpfil/ipfw/test/mylist.h | 1 - sys/netpfil/ipfw/test/test_dn_sched.c | 1 - sys/netpfil/pf/pf.h | 1 - sys/netpfil/pf/pf_altq.h | 1 - sys/nfs/nfs_lock.h | 1 - sys/nfs/nfsdiskless.h | 1 - sys/nfs/nfsproto.h | 1 - sys/nfs/xdr_subs.h | 1 - sys/nfsclient/nfs.h | 1 - sys/nfsclient/nfsargs.h | 1 - sys/nfsclient/nfsmount.h | 1 - sys/nfsclient/nfsnode.h | 1 - sys/nfsclient/nfsstats.h | 1 - sys/nfsserver/nfs.h | 1 - sys/nfsserver/nfsrvstats.h | 1 - sys/opencrypto/_cryptodev.h | 1 - sys/powerpc/include/_align.h | 1 - sys/powerpc/include/_inttypes.h | 1 - sys/powerpc/include/_limits.h | 1 - sys/powerpc/include/_types.h | 1 - sys/powerpc/include/asm.h | 1 - sys/powerpc/include/bat.h | 1 - sys/powerpc/include/cpu.h | 1 - sys/powerpc/include/db_machdep.h | 1 - sys/powerpc/include/endian.h | 1 - sys/powerpc/include/float.h | 1 - sys/powerpc/include/fpu.h | 1 - sys/powerpc/include/frame.h | 1 - sys/powerpc/include/hid.h | 1 - sys/powerpc/include/ieee.h | 1 - sys/powerpc/include/ieeefp.h | 1 - sys/powerpc/include/in_cksum.h | 1 - sys/powerpc/include/limits.h | 1 - sys/powerpc/include/minidump.h | 1 - sys/powerpc/include/openpicreg.h | 1 - sys/powerpc/include/param.h | 1 - sys/powerpc/include/pcb.h | 1 - sys/powerpc/include/pio.h | 1 - sys/powerpc/include/platform.h | 1 - sys/powerpc/include/proc.h | 1 - sys/powerpc/include/profile.h | 1 - sys/powerpc/include/psl.h | 1 - sys/powerpc/include/pte.h | 1 - sys/powerpc/include/ptrace.h | 1 - sys/powerpc/include/setjmp.h | 1 - sys/powerpc/include/signal.h | 1 - sys/powerpc/include/spr.h | 1 - sys/powerpc/include/trap.h | 1 - sys/powerpc/include/ucontext.h | 1 - sys/powerpc/include/vmparam.h | 1 - sys/powerpc/powerpc/cpu.c | 1 - sys/powerpc/powerpc/genassym.c | 1 - sys/powerpc/powerpc/minidump_machdep.c | 1 - sys/powerpc/powerpc/support.S | 1 - sys/powerpc/powerpc/vm_machdep.c | 1 - sys/riscv/include/_align.h | 1 - sys/riscv/include/_inttypes.h | 1 - sys/riscv/include/_limits.h | 1 - sys/riscv/include/_types.h | 1 - sys/riscv/include/endian.h | 1 - sys/riscv/include/float.h | 1 - sys/riscv/include/in_cksum.h | 1 - sys/riscv/include/md_var.h | 1 - sys/riscv/include/minidump.h | 1 - sys/riscv/include/param.h | 1 - sys/riscv/include/pcpu.h | 1 - sys/riscv/include/proc.h | 1 - sys/riscv/include/profile.h | 1 - sys/riscv/include/signal.h | 1 - sys/riscv/include/sysarch.h | 1 - sys/riscv/include/vmparam.h | 1 - sys/rpc/auth.h | 1 - sys/rpc/clnt.h | 1 - sys/rpc/pmap_prot.h | 1 - sys/rpc/rpc.h | 1 - sys/rpc/rpc_msg.h | 1 - sys/rpc/svc.h | 1 - sys/rpc/svc_auth.h | 1 - sys/rpc/types.h | 1 - sys/rpc/xdr.h | 1 - sys/sys/_callout.h | 1 - sys/sys/_iovec.h | 1 - sys/sys/_sigset.h | 1 - sys/sys/_sockaddr_storage.h | 1 - sys/sys/_termios.h | 1 - sys/sys/_timespec.h | 1 - sys/sys/_uio.h | 1 - sys/sys/_winsize.h | 1 - sys/sys/acct.h | 1 - sys/sys/bio.h | 1 - sys/sys/bitcount.h | 1 - sys/sys/buf.h | 1 - sys/sys/busdma_bufalloc.h | 1 - sys/sys/callout.h | 1 - sys/sys/cdefs.h | 1 - sys/sys/ck.h | 1 - sys/sys/conf.h | 1 - sys/sys/cons.h | 1 - sys/sys/dirent.h | 1 - sys/sys/disk/bsd.h | 1 - sys/sys/disk/mbr.h | 1 - sys/sys/disklabel.h | 1 - sys/sys/diskmbr.h | 1 - sys/sys/dkstat.h | 1 - sys/sys/domain.h | 1 - sys/sys/errno.h | 1 - sys/sys/exec.h | 1 - sys/sys/fcntl.h | 1 - sys/sys/file.h | 1 - sys/sys/filedesc.h | 1 - sys/sys/filio.h | 1 - sys/sys/gmon.h | 1 - sys/sys/hash.h | 1 - sys/sys/imgact_aout.h | 1 - sys/sys/ioccom.h | 1 - sys/sys/ioctl.h | 1 - sys/sys/ioctl_compat.h | 1 - sys/sys/ipc.h | 1 - sys/sys/kbio.h | 1 - sys/sys/kernel.h | 1 - sys/sys/ktr.h | 1 - sys/sys/ktr_class.h | 1 - sys/sys/ktrace.h | 1 - sys/sys/libkern.h | 1 - sys/sys/lock.h | 1 - sys/sys/lockf.h | 1 - sys/sys/malloc.h | 1 - sys/sys/mbuf.h | 1 - sys/sys/md4.h | 1 - sys/sys/md5.h | 1 - sys/sys/mman.h | 1 - sys/sys/mount.h | 1 - sys/sys/msgbuf.h | 1 - sys/sys/mtio.h | 1 - sys/sys/mutex.h | 1 - sys/sys/namei.h | 1 - sys/sys/param.h | 1 - sys/sys/proc.h | 1 - sys/sys/protosw.h | 1 - sys/sys/ptrace.h | 1 - sys/sys/queue.h | 1 - sys/sys/reboot.h | 1 - sys/sys/resource.h | 1 - sys/sys/resourcevar.h | 1 - sys/sys/selinfo.h | 1 - sys/sys/sigio.h | 1 - sys/sys/signal.h | 1 - sys/sys/signalvar.h | 1 - sys/sys/socket.h | 1 - sys/sys/sockio.h | 1 - sys/sys/stat.h | 1 - sys/sys/sysctl.h | 1 - sys/sys/syslimits.h | 1 - sys/sys/syslog.h | 1 - sys/sys/systm.h | 1 - sys/sys/time.h | 1 - sys/sys/timeb.h | 1 - sys/sys/times.h | 1 - sys/sys/timespec.h | 1 - sys/sys/ttycom.h | 1 - sys/sys/ttydefaults.h | 1 - sys/sys/types.h | 1 - sys/sys/ucred.h | 1 - sys/sys/uio.h | 1 - sys/sys/un.h | 1 - sys/sys/unistd.h | 1 - sys/sys/unpcb.h | 1 - sys/sys/user.h | 1 - sys/sys/utsname.h | 1 - sys/sys/vmmeter.h | 1 - sys/sys/vnode.h | 1 - sys/sys/wait.h | 1 - sys/teken/libteken/Symbol.map | 1 - sys/ufs/ffs/ffs_extern.h | 1 - sys/ufs/ffs/fs.h | 1 - sys/ufs/ffs/softdep.h | 1 - sys/ufs/ufs/dinode.h | 1 - sys/ufs/ufs/dir.h | 1 - sys/ufs/ufs/inode.h | 1 - sys/ufs/ufs/quota.h | 1 - sys/ufs/ufs/ufs_extern.h | 1 - sys/ufs/ufs/ufsmount.h | 1 - sys/vm/swap_pager.h | 1 - sys/vm/vm_extern.h | 1 - sys/vm/vm_pager.h | 1 - sys/vm/vnode_pager.h | 1 - sys/x86/include/_align.h | 1 - sys/x86/include/_inttypes.h | 1 - sys/x86/include/_limits.h | 1 - sys/x86/include/_types.h | 1 - sys/x86/include/endian.h | 1 - sys/x86/include/float.h | 1 - sys/x86/include/fpu.h | 1 - sys/x86/include/frame.h | 1 - sys/x86/include/psl.h | 1 - sys/x86/include/ptrace.h | 1 - sys/x86/include/reg.h | 1 - sys/x86/include/segments.h | 1 - sys/x86/include/signal.h | 1 - sys/x86/include/specialreg.h | 1 - sys/x86/include/trap.h | 1 - sys/x86/include/x86_ieeefp.h | 1 - sys/x86/isa/icu.h | 1 - 745 files changed, 745 deletions(-) diff --git a/sys/amd64/amd64/apic_vector.S b/sys/amd64/amd64/apic_vector.S index 5515213cd154..6e51ebff298a 100644 --- a/sys/amd64/amd64/apic_vector.S +++ b/sys/amd64/amd64/apic_vector.S @@ -34,7 +34,6 @@ * SUCH DAMAGE. * * from: vector.s, 386BSD 0.1 unknown origin - * $FreeBSD$ */ /* diff --git a/sys/amd64/amd64/atpic_vector.S b/sys/amd64/amd64/atpic_vector.S index c6471999c238..938235e866bd 100644 --- a/sys/amd64/amd64/atpic_vector.S +++ b/sys/amd64/amd64/atpic_vector.S @@ -28,7 +28,6 @@ * SUCH DAMAGE. * * from: vector.s, 386BSD 0.1 unknown origin - * $FreeBSD$ */ /* diff --git a/sys/amd64/include/asm.h b/sys/amd64/include/asm.h index a0f886443e52..29bac1212228 100644 --- a/sys/amd64/include/asm.h +++ b/sys/amd64/include/asm.h @@ -32,7 +32,6 @@ * SUCH DAMAGE. * * from: @(#)DEFS.h 5.1 (Berkeley) 4/23/90 - * $FreeBSD$ */ #ifdef __i386__ diff --git a/sys/amd64/include/cpu.h b/sys/amd64/include/cpu.h index f7732435fc39..530ba746e0b2 100644 --- a/sys/amd64/include/cpu.h +++ b/sys/amd64/include/cpu.h @@ -32,7 +32,6 @@ * SUCH DAMAGE. * * from: @(#)cpu.h 5.4 (Berkeley) 5/9/91 - * $FreeBSD$ */ #ifndef _MACHINE_CPU_H_ diff --git a/sys/amd64/include/exec.h b/sys/amd64/include/exec.h index 099ea263e202..f3a8caa5b88d 100644 --- a/sys/amd64/include/exec.h +++ b/sys/amd64/include/exec.h @@ -29,7 +29,6 @@ * SUCH DAMAGE. * * @(#)exec.h 8.1 (Berkeley) 6/11/93 - * $FreeBSD$ */ #ifndef _MACHINE_EXEC_H_ diff --git a/sys/amd64/include/floatingpoint.h b/sys/amd64/include/floatingpoint.h index b7c154743d0c..392fb1957fa1 100644 --- a/sys/amd64/include/floatingpoint.h +++ b/sys/amd64/include/floatingpoint.h @@ -33,7 +33,6 @@ * SUCH DAMAGE. * * from: @(#) floatingpoint.h 1.0 (Berkeley) 9/23/93 - * $FreeBSD$ */ #ifndef _FLOATINGPOINT_H_ diff --git a/sys/amd64/include/fpu.h b/sys/amd64/include/fpu.h index 8f957eede39b..cb46325d70bc 100644 --- a/sys/amd64/include/fpu.h +++ b/sys/amd64/include/fpu.h @@ -32,7 +32,6 @@ * SUCH DAMAGE. * * from: @(#)npx.h 5.3 (Berkeley) 1/18/91 - * $FreeBSD$ */ /* diff --git a/sys/amd64/include/ieeefp.h b/sys/amd64/include/ieeefp.h index 48d879f0b80b..4de2dd8db614 100644 --- a/sys/amd64/include/ieeefp.h +++ b/sys/amd64/include/ieeefp.h @@ -34,7 +34,6 @@ * SUCH DAMAGE. * * from: @(#) ieeefp.h 1.0 (Berkeley) 9/23/93 - * $FreeBSD$ */ #ifndef _MACHINE_IEEEFP_H_ diff --git a/sys/amd64/include/in_cksum.h b/sys/amd64/include/in_cksum.h index d9830168f5ab..356c7c564f3a 100644 --- a/sys/amd64/include/in_cksum.h +++ b/sys/amd64/include/in_cksum.h @@ -31,7 +31,6 @@ * from tahoe: in_cksum.c 1.2 86/01/05 * from: @(#)in_cksum.c 1.3 (Berkeley) 1/19/91 * from: Id: in_cksum.c,v 1.8 1995/12/03 18:35:19 bde Exp - * $FreeBSD$ */ #ifndef _MACHINE_IN_CKSUM_H_ diff --git a/sys/amd64/include/limits.h b/sys/amd64/include/limits.h index f2a4bf75fe2c..c6da8ec92fdb 100644 --- a/sys/amd64/include/limits.h +++ b/sys/amd64/include/limits.h @@ -29,7 +29,6 @@ * SUCH DAMAGE. * * @(#)limits.h 8.3 (Berkeley) 1/4/94 - * $FreeBSD$ */ #ifndef _MACHINE_LIMITS_H_ diff --git a/sys/amd64/include/param.h b/sys/amd64/include/param.h index c7e5a5c7fc42..2478ef8d037c 100644 --- a/sys/amd64/include/param.h +++ b/sys/amd64/include/param.h @@ -38,7 +38,6 @@ * SUCH DAMAGE. * * @(#)param.h 8.1 (Berkeley) 6/10/93 - * $FreeBSD$ */ #ifndef _AMD64_INCLUDE_PARAM_H_ diff --git a/sys/amd64/include/pcb.h b/sys/amd64/include/pcb.h index 6ce6d9728366..f98e5f68dd96 100644 --- a/sys/amd64/include/pcb.h +++ b/sys/amd64/include/pcb.h @@ -33,7 +33,6 @@ * SUCH DAMAGE. * * from: @(#)pcb.h 5.10 (Berkeley) 5/12/91 - * $FreeBSD$ */ #ifndef _AMD64_PCB_H_ diff --git a/sys/amd64/include/pmap.h b/sys/amd64/include/pmap.h index 08da0ccdfb8a..09bfc7aa5685 100644 --- a/sys/amd64/include/pmap.h +++ b/sys/amd64/include/pmap.h @@ -41,7 +41,6 @@ * * from: hp300: @(#)pmap.h 7.2 (Berkeley) 12/16/90 * from: @(#)pmap.h 7.4 (Berkeley) 5/12/91 - * $FreeBSD$ */ #ifdef __i386__ diff --git a/sys/amd64/include/proc.h b/sys/amd64/include/proc.h index 8015fe5da81a..e9ed7f5182bc 100644 --- a/sys/amd64/include/proc.h +++ b/sys/amd64/include/proc.h @@ -29,7 +29,6 @@ * SUCH DAMAGE. * * from: @(#)proc.h 7.1 (Berkeley) 5/15/91 - * $FreeBSD$ */ #ifdef __i386__ diff --git a/sys/amd64/include/profile.h b/sys/amd64/include/profile.h index 31b6379d4735..80130911e5d7 100644 --- a/sys/amd64/include/profile.h +++ b/sys/amd64/include/profile.h @@ -29,7 +29,6 @@ * SUCH DAMAGE. * * @(#)profile.h 8.1 (Berkeley) 6/11/93 - * $FreeBSD$ */ #ifdef __i386__ diff --git a/sys/amd64/include/reloc.h b/sys/amd64/include/reloc.h index ea5ed128ef86..777cafe1d6b8 100644 --- a/sys/amd64/include/reloc.h +++ b/sys/amd64/include/reloc.h @@ -29,7 +29,6 @@ * SUCH DAMAGE. * * @(#)reloc.h 8.1 (Berkeley) 6/10/93 - * $FreeBSD$ */ #ifndef _I386_MACHINE_RELOC_H_ diff --git a/sys/amd64/include/segments.h b/sys/amd64/include/segments.h index 1a04774e9868..6cb8b385c22f 100644 --- a/sys/amd64/include/segments.h +++ b/sys/amd64/include/segments.h @@ -33,7 +33,6 @@ * SUCH DAMAGE. * * from: @(#)segments.h 7.1 (Berkeley) 5/9/91 - * $FreeBSD$ */ #ifdef __i386__ diff --git a/sys/amd64/include/tss.h b/sys/amd64/include/tss.h index 12cb3a22e0e4..585a49704397 100644 --- a/sys/amd64/include/tss.h +++ b/sys/amd64/include/tss.h @@ -32,7 +32,6 @@ * SUCH DAMAGE. * * from: @(#)tss.h 5.4 (Berkeley) 1/18/91 - * $FreeBSD$ */ #ifndef _MACHINE_TSS_H_ diff --git a/sys/amd64/include/vmparam.h b/sys/amd64/include/vmparam.h index 880c46bba84d..0d23ff34e96d 100644 --- a/sys/amd64/include/vmparam.h +++ b/sys/amd64/include/vmparam.h @@ -40,7 +40,6 @@ * SUCH DAMAGE. * * from: @(#)vmparam.h 5.9 (Berkeley) 5/12/91 - * $FreeBSD$ *** 8663 LINES SKIPPED *** From nobody Wed Aug 16 17:56:49 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RQwnF4sffz4qvCC; Wed, 16 Aug 2023 17:56: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RQwnF4FXGz3Tyn; Wed, 16 Aug 2023 17:56:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692208609; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MnDT1ysV2OxSfqHKFwY0n0fwuWpYEqNWKbjcEcRGjDI=; b=RUTQ1P8NdhkGRCdCOieEtxJ1WKglhRBYWmHVfvHvAfJG4iD2CD3Ul09Omi8RAJz5nW0W/r WBvudQcYfiUOHTrzj3C9BwO65SmGKzvaY+oLboplB2m1dgEBAWBa0QYfrzQTBRTnV3EJJy zERR++aGlyUyrXps4WsLcS05XrDJSdRHItF1ssk8eJ0gZH2Y5IrNSOd3hsTPZbMeRM8Hb5 klUak6yh1qaqFfLQiJNzbeAYAVFMAuVZAqgFXxyucrSAoVH81sXtCiyX8TQmijo49aNm0Q 1h7M5kBKjD+5A9EvAt81BUwLYzciJHlavv04Q+heAVXeT70yI5AQZTZvLQ+u0g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692208609; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MnDT1ysV2OxSfqHKFwY0n0fwuWpYEqNWKbjcEcRGjDI=; b=y0DkkrvamF8xyv0Rn4p8pBIH3qQ7WjTNiOwGrDbml9DFpe0/h+XfeHbwaXuli0QowR2juZ rl9cpz9Hiy0FP279S+PTNq6eKkirOO91L8+3TRDsENdwojkJ1JMVcC1zINqbPNWwtQCn+S oDpr71EI1hiaYFy8DDX4Ti5cL4qLPO0hyxRDpBuAtiXeZOIxFiRjjPzdg2sPEOWZRqBke4 FL0CBiDkFbqDuSqsBu5fmUg/B3gbpITsJwu5E/p0R0TqLZgThkPpqA3WbcFfeILtcwQh/l 4v5kdMIdrfCxAKDKUVxU8MQ/jGo+nyzzlOuWbuFoZm7r/eBnFYLhGfWogYTqHA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692208609; a=rsa-sha256; cv=none; b=hS1MSvVNDpRqFRXPsr5wWfsI4Kel3RdYORmy7kWaqpgBOBT+rUywMrBGvls/zcrVnSvOLk AdxfxgO4U+zpE5qhxyXitZX7MC4lhkZbBSlTEjFJ8HljtORunGalHXJf+w5mn8iRzcoyRs 1pUPdsqfUNm81uKy/LJeakjNvrfU1K7l8LOBRxq27PP37Pdgp4Zgm/kSNW0HFaMNsAHgtI s1dCCeiyksA18AfUV+JQkyrqXwFSVBI9+4gZDo6kh23zb/qOed2Jd6HFPlyt0xWzngF/wm 0P97qBErcDan8ycINi8VkD2fM1iSuyjdxCB1Mz5COG7E2LDnbvD8t/otIpkk5Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RQwnF2lZBz11Gn; Wed, 16 Aug 2023 17:56:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37GHunhg059032; Wed, 16 Aug 2023 17:56:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37GHun12059029; Wed, 16 Aug 2023 17:56:49 GMT (envelope-from git) Date: Wed, 16 Aug 2023 17:56:49 GMT Message-Id: <202308161756.37GHun12059029@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: 42b388439bd3 - main - Remove $FreeBSD$: one-line .h pattern List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 42b388439bd3795e09258c57a74ce9eec3651c7b Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=42b388439bd3795e09258c57a74ce9eec3651c7b commit 42b388439bd3795e09258c57a74ce9eec3651c7b Author: Warner Losh AuthorDate: 2023-08-16 17:54:23 +0000 Commit: Warner Losh CommitDate: 2023-08-16 17:54:23 +0000 Remove $FreeBSD$: one-line .h pattern Remove /^\s*\*+\s*\$FreeBSD\$.*$\n/ --- bin/cp/extern.h | 1 - bin/dd/dd.h | 1 - bin/dd/extern.h | 1 - bin/ed/ed.h | 1 - bin/ls/extern.h | 1 - bin/ls/ls.h | 1 - bin/pax/cache.h | 1 - bin/pax/cpio.h | 1 - bin/pax/extern.h | 1 - bin/pax/ftree.h | 1 - bin/pax/options.h | 1 - bin/pax/pat_rep.h | 1 - bin/pax/pax.h | 1 - bin/pax/sel_subs.h | 1 - bin/pax/tables.h | 1 - bin/pax/tar.h | 1 - bin/ps/extern.h | 1 - bin/ps/ps.h | 1 - bin/sh/alias.h | 1 - bin/sh/arith.h | 1 - bin/sh/bltin/bltin.h | 1 - bin/sh/error.h | 1 - bin/sh/eval.h | 1 - bin/sh/exec.h | 1 - bin/sh/expand.h | 1 - bin/sh/input.h | 1 - bin/sh/jobs.h | 1 - bin/sh/mail.h | 1 - bin/sh/main.h | 1 - bin/sh/memalloc.h | 1 - bin/sh/myhistedit.h | 1 - bin/sh/mystring.h | 1 - bin/sh/nodes.c.pat | 1 - bin/sh/options.h | 1 - bin/sh/output.h | 1 - bin/sh/parser.h | 1 - bin/sh/redir.h | 1 - bin/sh/shell.h | 1 - bin/sh/show.h | 1 - bin/sh/trap.h | 1 - bin/sh/var.h | 1 - bin/stty/extern.h | 1 - bin/stty/stty.h | 1 - cddl/compat/opensolaris/include/thread_pool.h | 1 - include/_ctype.h | 1 - include/a.out.h | 1 - include/arpa/inet.h | 1 - include/arpa/nameser.h | 1 - include/arpa/nameser_compat.h | 1 - include/arpa/telnet.h | 1 - include/arpa/tftp.h | 1 - include/assert.h | 1 - include/ctype.h | 1 - include/db.h | 1 - include/dirent.h | 1 - include/err.h | 1 - include/fstab.h | 1 - include/fts.h | 1 - include/glob.h | 1 - include/grp.h | 1 - include/limits.h | 1 - include/locale.h | 1 - include/malloc.h | 1 - include/mpool.h | 1 - include/ndbm.h | 1 - include/netdb.h | 1 - include/paths.h | 1 - include/pwd.h | 1 - include/regex.h | 1 - include/res_update.h | 1 - include/resolv.h | 1 - include/rpc/auth.h | 1 - include/rpc/auth_unix.h | 1 - include/rpc/clnt.h | 1 - include/rpc/des_crypt.h | 1 - include/rpc/pmap_clnt.h | 1 - include/rpc/pmap_prot.h | 1 - include/rpc/pmap_rmt.h | 1 - include/rpc/rpc.h | 1 - include/rpc/rpc_msg.h | 1 - include/rpc/svc.h | 1 - include/rpc/svc_auth.h | 1 - include/rpc/xdr.h | 1 - include/runetype.h | 1 - include/search.h | 1 - include/setjmp.h | 1 - include/signal.h | 1 - include/stdio.h | 1 - include/stdlib.h | 1 - include/string.h | 1 - include/termios.h | 1 - include/time.h | 1 - include/timeconv.h | 1 - include/ttyent.h | 1 - include/unistd.h | 1 - include/utime.h | 1 - include/wctype.h | 1 - lib/libbluetooth/bluetooth.c | 1 - lib/libbluetooth/bluetooth.h | 1 - lib/libc/aarch64/Symbol.map | 1 - lib/libc/amd64/SYS.h | 1 - lib/libc/amd64/Symbol.map | 1 - lib/libc/arm/SYS.h | 1 - lib/libc/arm/Symbol.map | 1 - lib/libc/arm/Symbol_vfp.map | 1 - lib/libc/arm/aeabi/Symbol.map | 1 - lib/libc/capability/Symbol.map | 1 - lib/libc/compat-43/Symbol.map | 1 - lib/libc/db/Symbol.map | 1 - lib/libc/db/btree/btree.h | 1 - lib/libc/db/btree/extern.h | 1 - lib/libc/db/hash/extern.h | 1 - lib/libc/db/hash/hash.h | 1 - lib/libc/db/hash/page.h | 1 - lib/libc/db/recno/extern.h | 1 - lib/libc/db/recno/recno.h | 1 - lib/libc/gdtoa/Symbol.map | 1 - lib/libc/gen/Symbol.map | 1 - lib/libc/gen/fts-compat.h | 1 - lib/libc/gen/fts-compat11.h | 1 - lib/libc/gen/pw_scan.h | 1 - lib/libc/gmon/Symbol.map | 1 - lib/libc/i386/SYS.h | 1 - lib/libc/i386/Symbol.map | 1 - lib/libc/iconv/Symbol.map | 1 - lib/libc/inet/Symbol.map | 1 - lib/libc/isc/eventlib_p.h | 1 - lib/libc/locale/Symbol.map | 1 - lib/libc/nameser/Symbol.map | 1 - lib/libc/net/Symbol.map | 1 - lib/libc/nls/Symbol.map | 1 - lib/libc/posix1e/Symbol.map | 1 - lib/libc/powerpc/SYS.h | 1 - lib/libc/powerpc/Symbol.map | 1 - lib/libc/powerpc64/SYS.h | 1 - lib/libc/powerpc64/Symbol.map | 1 - lib/libc/quad/Symbol.map | 1 - lib/libc/quad/quad.h | 1 - lib/libc/regex/Symbol.map | 1 - lib/libc/regex/cname.h | 1 - lib/libc/regex/regex2.h | 1 - lib/libc/regex/utils.h | 1 - lib/libc/resolv/Symbol.map | 1 - lib/libc/riscv/Symbol.map | 1 - lib/libc/rpc/Symbol.map | 1 - lib/libc/secure/Symbol.map | 1 - lib/libc/softfloat/Symbol.map | 1 - lib/libc/stdio/Symbol.map | 1 - lib/libc/stdio/floatio.h | 1 - lib/libc/stdio/fvwrite.h | 1 - lib/libc/stdio/glue.h | 1 - lib/libc/stdio/local.h | 1 - lib/libc/stdlib/Symbol.map | 1 - lib/libc/stdlib/atexit.h | 1 - lib/libc/stdlib/jemalloc/Symbol.map | 1 - lib/libc/stdtime/Symbol.map | 1 - lib/libc/string/Symbol.map | 1 - lib/libc/sys/Symbol.map | 1 - lib/libc/uuid/Symbol.map | 1 - lib/libc/xdr/Symbol.map | 1 - lib/libc/yp/Symbol.map | 1 - lib/libdl/Symbol.map | 1 - lib/libgcc_s/Symbol.map | 1 - lib/libgcc_s/SymbolDefault.map | 1 - lib/libgcc_s/arm/Symbol.map | 1 - lib/libgssapi/Symbol.map | 1 - lib/libkvm/kvm.h | 1 - lib/libkvm/kvm_private.h | 1 - lib/libmd/md4.h | 1 - lib/libmd/ripemd.h | 1 - lib/libmixer/Symbol.map | 1 - lib/libmp/Symbol.map | 1 - lib/libnetbsd/sys/event.h | 1 - lib/libnetbsd/sys/types.h | 1 - lib/libnetbsd/sys/wait.h | 1 - lib/libnetmap/libnetmap.h | 1 - lib/libpmc/pmu-events/pmu-events.h | 1 - lib/libprocstat/Symbol.map | 1 - lib/libregex/Symbol.map | 1 - lib/librpcsec_gss/Symbol.map | 1 - lib/librt/Symbol.map | 1 - lib/libsbuf/Symbol.map | 1 - lib/libsdp/sdp-int.h | 1 - lib/libsdp/sdp.h | 1 - lib/libsdp/search.c | 1 - lib/libsdp/service.c | 1 - lib/libsdp/session.c | 1 - lib/libsdp/util.c | 1 - lib/libsecureboot/h/libsecureboot.h | 1 - lib/libsecureboot/libsecureboot-priv.h | 1 - lib/libsecureboot/openpgp/decode.h | 1 - lib/libsecureboot/openpgp/packet.h | 1 - lib/libssp/Symbol.map | 1 - lib/libstdthreads/Symbol.map | 1 - lib/libthr/pthread.map | 1 - lib/libthread_db/Symbol.map | 1 - lib/libulog/Symbol.map | 1 - lib/libutil/login_cap.h | 1 - lib/libz/Symbol.map | 1 - lib/msun/Symbol.map | 1 - lib/msun/amd64/Symbol.map | 1 - lib/msun/arm/Symbol.map | 1 - lib/msun/bsdsrc/mathimpl.h | 1 - lib/msun/i387/Symbol.map | 1 - lib/msun/powerpc/Symbol.map | 1 - lib/msun/riscv/Symbol.map | 1 - lib/msun/src/math.h | 1 - lib/msun/src/math_private.h | 1 - lib/ncurses/ncurses/pathnames.h | 1 - lib/ncurses/tinfo/pathnames.h | 1 - libexec/bootpd/hash.h | 1 - libexec/ftpd/extern.h | 1 - libexec/ftpd/pathnames.h | 1 - libexec/getty/extern.h | 1 - libexec/getty/gettytab.h | 1 - libexec/getty/pathnames.h | 1 - libexec/rtld-elf/Symbol.map | 1 - libexec/rtld-elf/i386/Symbol.map | 1 - libexec/rtld-elf/libmap.c | 1 - libexec/rtld-elf/libmap.h | 1 - libexec/rtld-elf/rtld_lock.c | 1 - sbin/bsdlabel/pathnames.h | 1 - sbin/ccdconfig/pathnames.h | 1 - sbin/dump/pathnames.h | 1 - sbin/fsck_ffs/fsck.h | 1 - sbin/fsck_msdosfs/dosfs.h | 1 - sbin/fsck_msdosfs/ext.h | 1 - sbin/growfs/debug.h | 1 - sbin/init/pathnames.h | 1 - sbin/ipf/iplang/iplang_y.y | 1 - sbin/mount/mntopts.h | 1 - sbin/mount/pathnames.h | 1 - sbin/rcorder/sprite.h | 1 - sbin/restore/extern.h | 1 - sbin/restore/restore.h | 1 - share/syscons/scrnmaps/iso-8859-7_to_cp437 | 1 - share/syscons/scrnmaps/us-ascii_to_cp437 | 1 - stand/efi/loader/arch/amd64/start.S | 1 - stand/ficl/aarch64/sysdep.h | 1 - stand/ficl/arm/sysdep.h | 1 - stand/ficl/mips/sysdep.h | 1 - stand/ficl/mips64/sysdep.h | 1 - stand/ficl/powerpc/sysdep.h | 1 - stand/ficl/riscv/sysdep.h | 1 - stand/i386/boot2/lib.h | 1 - stand/i386/btx/lib/btxv86.h | 1 - stand/i386/libi386/multiboot.h | 1 - stand/kboot/arch/powerpc64/kerneltramp.S | 1 - tests/sys/cddl/zfs/bin/chg_usr_exec.c | 1 - tests/sys/cddl/zfs/bin/devname2devid.c | 1 - tests/sys/cddl/zfs/bin/dir_rd_update.c | 1 - tests/sys/cddl/zfs/bin/file_check.c | 1 - tests/sys/cddl/zfs/bin/file_common.h | 1 - tests/sys/cddl/zfs/bin/file_trunc.c | 1 - tests/sys/cddl/zfs/bin/file_write.c | 1 - tests/sys/cddl/zfs/bin/largest_file.c | 1 - tests/sys/cddl/zfs/bin/mktree.c | 1 - tests/sys/cddl/zfs/bin/mmapwrite.c | 1 - tests/sys/cddl/zfs/bin/randfree_file.c | 1 - tests/sys/cddl/zfs/bin/readmmap.c | 1 - tests/sys/cddl/zfs/bin/rename_dir.c | 1 - tests/sys/cddl/zfs/bin/rm_lnkcnt_zero_file.c | 1 - tests/sys/cddl/zfs/tests/ctime/ctime_001_pos.c | 1 - tests/sys/cddl/zfs/tests/exec/mmap_exec.c | 1 - tests/sys/cddl/zfs/tests/threadsappend/threadsappend.c | 1 - tests/sys/cddl/zfs/tests/txg_integrity/fsync_integrity.c | 1 - tests/sys/cddl/zfs/tests/txg_integrity/txg_integrity.c | 1 - tests/sys/geom/class/eli/hmac_test.c | 1 - tests/sys/kern/pipe/pipe_fstat_bug_test.c | 1 - tests/sys/kern/pipe/pipe_ino_test.c | 1 - tests/sys/kern/pipe/pipe_overcommit1_test.c | 1 - tests/sys/kern/pipe/pipe_overcommit2_test.c | 1 - tests/sys/kern/pipe/pipe_reverse_test.c | 1 - tests/sys/kern/pipe/pipe_wraparound_test.c | 1 - tools/build/dummy.c | 1 - tools/regression/p1003_1b/prutil.c | 1 - tools/regression/p1003_1b/prutil.h | 1 - tools/regression/p1003_1b/sched.c | 1 - tools/regression/p1003_1b/yield.c | 1 - tools/regression/pthread/unwind/cond_wait_cancel2.cpp | 1 - tools/regression/sysvmsg/msgtest.c | 1 - tools/regression/sysvsem/semtest.c | 1 - tools/regression/sysvshm/shmtest.c | 1 - tools/test/popss/popss.c | 1 - tools/tools/cxgbtool/reg_defs.c | 1 - tools/tools/cxgbtool/reg_defs_t3.c | 1 - tools/tools/cxgbtool/reg_defs_t3b.c | 1 - tools/tools/cxgbtool/reg_defs_t3c.c | 1 - tools/tools/cxgbtool/version.h | 1 - tools/tools/netmap/pkt-gen.c | 1 - tools/tools/shlib-compat/test/libtest1/Symbol.map | 1 - tools/tools/shlib-compat/test/libtest1/test.c | 1 - tools/tools/shlib-compat/test/libtest2/Symbol.map | 1 - tools/tools/shlib-compat/test/libtest2/test.c | 1 - tools/tools/shlib-compat/test/libtest3/Symbol.map | 1 - tools/tools/shlib-compat/test/libtest3/test.c | 1 - tools/tools/shlib-compat/test/libtestsys/Symbol.map | 1 - usr.bin/bluetooth/bthost/bthost.c | 1 - usr.bin/bluetooth/btsockstat/btsockstat.c | 1 - usr.bin/bluetooth/rfcomm_sppd/rfcomm_sdp.c | 1 - usr.bin/bluetooth/rfcomm_sppd/rfcomm_sppd.c | 1 - usr.bin/calendar/pathnames.h | 1 - usr.bin/chpass/chpass.h | 1 - usr.bin/cksum/extern.h | 1 - usr.bin/diff/diff.h | 1 - usr.bin/find/extern.h | 1 - usr.bin/find/find.h | 1 - usr.bin/finger/extern.h | 1 - usr.bin/finger/finger.h | 1 - usr.bin/fortune/fortune/pathnames.h | 1 - usr.bin/gcore/extern.h | 1 - usr.bin/gprof/gprof.h | 1 - usr.bin/gprof/pathnames.h | 1 - usr.bin/gzip/zuncompress.c | 1 - usr.bin/hexdump/hexdump.h | 1 - usr.bin/indent/indent_codes.h | 1 - usr.bin/indent/indent_globs.h | 1 - usr.bin/ktrace/ktrace.h | 1 - usr.bin/locate/locate/locate.h | 1 - usr.bin/locate/locate/pathnames.h | 1 - usr.bin/login/pathnames.h | 1 - usr.bin/m4/extern.h | 1 - usr.bin/m4/mdef.h | 1 - usr.bin/m4/pathnames.h | 1 - usr.bin/m4/stdd.h | 1 - usr.bin/netstat/common.h | 1 - usr.bin/netstat/netstat.h | 1 - usr.bin/patch/backupfile.c | 1 - usr.bin/patch/backupfile.h | 1 - usr.bin/patch/common.h | 1 - usr.bin/patch/inp.c | 1 - usr.bin/patch/inp.h | 1 - usr.bin/patch/mkpath.c | 1 - usr.bin/patch/patch.c | 1 - usr.bin/patch/pathnames.h | 1 - usr.bin/patch/pch.c | 1 - usr.bin/patch/pch.h | 1 - usr.bin/patch/util.c | 1 - usr.bin/patch/util.h | 1 - usr.bin/pr/extern.h | 1 - usr.bin/pr/pr.h | 1 - usr.bin/primes/primes.h | 1 - usr.bin/rpcgen/rpc_parse.h | 1 - usr.bin/rpcgen/rpc_scan.h | 1 - usr.bin/rpcgen/rpc_util.h | 1 - usr.bin/sed/defs.h | 1 - usr.bin/sed/extern.h | 1 - usr.bin/systat/extern.h | 1 - usr.bin/systat/systat.h | 1 - usr.bin/talk/talk.h | 1 - usr.bin/tftp/tftp.h | 1 - usr.bin/top/machine.h | 1 - usr.bin/top/utils.h | 1 - usr.bin/tr/extern.h | 1 - usr.bin/vgrind/extern.h | 1 - usr.bin/w/extern.h | 1 - usr.sbin/acpi/acpiconf/acpiconf.c | 1 - usr.sbin/bluetooth/bcmfw/bcmfw.c | 1 - usr.sbin/bluetooth/bthidcontrol/bthidcontrol.c | 1 - usr.sbin/bluetooth/bthidcontrol/bthidcontrol.h | 1 - usr.sbin/bluetooth/bthidcontrol/hid.c | 1 - usr.sbin/bluetooth/bthidcontrol/sdp.c | 1 - usr.sbin/bluetooth/bthidd/bthid_config.h | 1 - usr.sbin/bluetooth/bthidd/bthidd.c | 1 - usr.sbin/bluetooth/bthidd/bthidd.h | 1 - usr.sbin/bluetooth/bthidd/client.c | 1 - usr.sbin/bluetooth/bthidd/hid.c | 1 - usr.sbin/bluetooth/bthidd/kbd.c | 1 - usr.sbin/bluetooth/bthidd/kbd.h | 1 - usr.sbin/bluetooth/bthidd/lexer.l | 1 - usr.sbin/bluetooth/bthidd/parser.y | 1 - usr.sbin/bluetooth/bthidd/server.c | 1 - usr.sbin/bluetooth/bthidd/session.c | 1 - usr.sbin/bluetooth/hccontrol/adv_data.c | 1 - usr.sbin/bluetooth/hccontrol/hccontrol.c | 1 - usr.sbin/bluetooth/hccontrol/hccontrol.h | 1 - usr.sbin/bluetooth/hccontrol/host_controller_baseband.c | 1 - usr.sbin/bluetooth/hccontrol/info.c | 1 - usr.sbin/bluetooth/hccontrol/le.c | 1 - usr.sbin/bluetooth/hccontrol/link_control.c | 1 - usr.sbin/bluetooth/hccontrol/link_policy.c | 1 - usr.sbin/bluetooth/hccontrol/node.c | 1 - usr.sbin/bluetooth/hccontrol/send_recv.c | 1 - usr.sbin/bluetooth/hccontrol/status.c | 1 - usr.sbin/bluetooth/hccontrol/util.c | 1 - usr.sbin/bluetooth/hcsecd/hcsecd.c | 1 - usr.sbin/bluetooth/hcsecd/hcsecd.h | 1 - usr.sbin/bluetooth/hcsecd/lexer.l | 1 - usr.sbin/bluetooth/hcsecd/parser.y | 1 - usr.sbin/bluetooth/l2control/l2cap.c | 1 - usr.sbin/bluetooth/l2control/l2control.c | 1 - usr.sbin/bluetooth/l2control/l2control.h | 1 - usr.sbin/bluetooth/l2ping/l2ping.c | 1 - usr.sbin/bluetooth/rfcomm_pppd/rfcomm_pppd.c | 1 - usr.sbin/bluetooth/sdpcontrol/sdpcontrol.c | 1 - usr.sbin/bluetooth/sdpcontrol/sdpcontrol.h | 1 - usr.sbin/bluetooth/sdpcontrol/search.c | 1 - usr.sbin/bluetooth/sdpd/bgd.c | 1 - usr.sbin/bluetooth/sdpd/dun.c | 1 - usr.sbin/bluetooth/sdpd/ftrn.c | 1 - usr.sbin/bluetooth/sdpd/gn.c | 1 - usr.sbin/bluetooth/sdpd/irmc.c | 1 - usr.sbin/bluetooth/sdpd/irmc_command.c | 1 - usr.sbin/bluetooth/sdpd/lan.c | 1 - usr.sbin/bluetooth/sdpd/log.c | 1 - usr.sbin/bluetooth/sdpd/log.h | 1 - usr.sbin/bluetooth/sdpd/main.c | 1 - usr.sbin/bluetooth/sdpd/nap.c | 1 - usr.sbin/bluetooth/sdpd/opush.c | 1 - usr.sbin/bluetooth/sdpd/panu.c | 1 - usr.sbin/bluetooth/sdpd/profile.c | 1 - usr.sbin/bluetooth/sdpd/profile.h | 1 - usr.sbin/bluetooth/sdpd/provider.c | 1 - usr.sbin/bluetooth/sdpd/provider.h | 1 - usr.sbin/bluetooth/sdpd/sar.c | 1 - usr.sbin/bluetooth/sdpd/scr.c | 1 - usr.sbin/bluetooth/sdpd/sd.c | 1 - usr.sbin/bluetooth/sdpd/server.c | 1 - usr.sbin/bluetooth/sdpd/server.h | 1 - usr.sbin/bluetooth/sdpd/sp.c | 1 - usr.sbin/bluetooth/sdpd/srr.c | 1 - usr.sbin/bluetooth/sdpd/ssar.c | 1 - usr.sbin/bluetooth/sdpd/ssr.c | 1 - usr.sbin/bluetooth/sdpd/sur.c | 1 - usr.sbin/bluetooth/sdpd/uuid-private.h | 1 - usr.sbin/bluetooth/sdpd/uuid.c | 1 - usr.sbin/config/config.h | 1 - usr.sbin/config/config.y | 1 - usr.sbin/config/lang.l | 1 - usr.sbin/dconschat/dconschat.c | 1 - usr.sbin/edquota/pathnames.h | 1 - usr.sbin/fifolog/lib/getdate.y | 1 - usr.sbin/fstyp/hammer_disk.h | 1 - usr.sbin/fwcontrol/fwmpegts.c | 1 - usr.sbin/inetd/pathnames.h | 1 - usr.sbin/keyserv/keyserv.h | 1 - usr.sbin/lpr/chkprintcap/skimprintcap.h | 1 - usr.sbin/lpr/common_source/ctlinfo.h | 1 - usr.sbin/lpr/common_source/lp.cdefs.h | 1 - usr.sbin/lpr/common_source/lp.h | 1 - usr.sbin/lpr/common_source/lp.local.h | 1 - usr.sbin/lpr/common_source/matchjobs.h | 1 - usr.sbin/lpr/lpd/extern.h | 1 - usr.sbin/makefs/ffs/ffs_extern.h | 1 - usr.sbin/makefs/ffs/ufs_inode.h | 1 - usr.sbin/mountd/pathnames.h | 1 - usr.sbin/newsyslog/extern.h | 1 - usr.sbin/ntp/libntpevent/event2/event-config.h | 1 - usr.sbin/rpc.ypupdated/ypupdated_extern.h | 1 - usr.sbin/rpcbind/rpcb_stat.c | 1 - usr.sbin/rpcbind/rpcb_svc_4.c | 1 - usr.sbin/rpcbind/util.c | 1 - usr.sbin/rpcbind/warmstart.c | 1 - usr.sbin/syslogd/pathnames.h | 1 - usr.sbin/ypbind/yp_ping.h | 1 - 455 files changed, 455 deletions(-) diff --git a/bin/cp/extern.h b/bin/cp/extern.h index f42315f07390..a5b86c12b2f9 100644 --- a/bin/cp/extern.h +++ b/bin/cp/extern.h @@ -29,7 +29,6 @@ * SUCH DAMAGE. * * @(#)extern.h 8.2 (Berkeley) 4/1/94 - * $FreeBSD$ */ typedef struct { diff --git a/bin/dd/dd.h b/bin/dd/dd.h index ea606f288f3f..ce00412073e3 100644 --- a/bin/dd/dd.h +++ b/bin/dd/dd.h @@ -33,7 +33,6 @@ * SUCH DAMAGE. * * @(#)dd.h 8.3 (Berkeley) 4/2/94 - * $FreeBSD$ */ /* Input/output stream state. */ diff --git a/bin/dd/extern.h b/bin/dd/extern.h index c9de42a152d5..760eecb14b59 100644 --- a/bin/dd/extern.h +++ b/bin/dd/extern.h @@ -33,7 +33,6 @@ * SUCH DAMAGE. * * @(#)extern.h 8.3 (Berkeley) 4/2/94 - * $FreeBSD$ */ void block(void); diff --git a/bin/ed/ed.h b/bin/ed/ed.h index 4dcf5eb36f37..e4562be8d331 100644 --- a/bin/ed/ed.h +++ b/bin/ed/ed.h @@ -25,7 +25,6 @@ * SUCH DAMAGE. * * @(#)ed.h,v 1.5 1994/02/01 00:34:39 alm Exp - * $FreeBSD$ */ #include diff --git a/bin/ls/extern.h b/bin/ls/extern.h index 0e577a885474..c3a4eafc353d 100644 --- a/bin/ls/extern.h +++ b/bin/ls/extern.h @@ -29,7 +29,6 @@ * SUCH DAMAGE. * * from: @(#)extern.h 8.1 (Berkeley) 5/31/93 - * $FreeBSD$ */ #include diff --git a/bin/ls/ls.h b/bin/ls/ls.h index 1f19858720bf..79e917545386 100644 --- a/bin/ls/ls.h +++ b/bin/ls/ls.h @@ -32,7 +32,6 @@ * SUCH DAMAGE. * * from: @(#)ls.h 8.1 (Berkeley) 5/31/93 - * $FreeBSD$ */ #define NO_PRINT 1 diff --git a/bin/pax/cache.h b/bin/pax/cache.h index 8a7cca9f457a..d2045f51516a 100644 --- a/bin/pax/cache.h +++ b/bin/pax/cache.h @@ -33,7 +33,6 @@ * SUCH DAMAGE. * * @(#)cache.h 8.1 (Berkeley) 5/31/93 - * $FreeBSD$ */ /* diff --git a/bin/pax/cpio.h b/bin/pax/cpio.h index e5d61dea36fb..a5976d9b7a63 100644 --- a/bin/pax/cpio.h +++ b/bin/pax/cpio.h @@ -33,7 +33,6 @@ * SUCH DAMAGE. * * @(#)cpio.h 8.1 (Berkeley) 5/31/93 - * $FreeBSD$ */ /* diff --git a/bin/pax/extern.h b/bin/pax/extern.h index 12b7fe162a6e..44d0ab0b40fb 100644 --- a/bin/pax/extern.h +++ b/bin/pax/extern.h @@ -33,7 +33,6 @@ * SUCH DAMAGE. * * @(#)extern.h 8.2 (Berkeley) 4/18/94 - * $FreeBSD$ */ /* diff --git a/bin/pax/ftree.h b/bin/pax/ftree.h index 8e0a710e4ca9..39d08afad0a3 100644 --- a/bin/pax/ftree.h +++ b/bin/pax/ftree.h @@ -33,7 +33,6 @@ * SUCH DAMAGE. * * @(#)ftree.h 8.1 (Berkeley) 5/31/93 - * $FreeBSD$ */ /* diff --git a/bin/pax/options.h b/bin/pax/options.h index 973ea0bd5467..637fd4049974 100644 --- a/bin/pax/options.h +++ b/bin/pax/options.h @@ -33,7 +33,6 @@ * SUCH DAMAGE. * * @(#)options.h 8.2 (Berkeley) 4/18/94 - * $FreeBSD$ */ /* diff --git a/bin/pax/pat_rep.h b/bin/pax/pat_rep.h index e28064e6a08e..897d50a1a325 100644 --- a/bin/pax/pat_rep.h +++ b/bin/pax/pat_rep.h @@ -33,7 +33,6 @@ * SUCH DAMAGE. * * @(#)pat_rep.h 8.1 (Berkeley) 5/31/93 - * $FreeBSD$ */ /* diff --git a/bin/pax/pax.h b/bin/pax/pax.h index 530f8aa0d33d..d48a267fbca1 100644 --- a/bin/pax/pax.h +++ b/bin/pax/pax.h @@ -33,7 +33,6 @@ * SUCH DAMAGE. * * @(#)pax.h 8.2 (Berkeley) 4/18/94 - * $FreeBSD$ */ /* diff --git a/bin/pax/sel_subs.h b/bin/pax/sel_subs.h index a628e6981b1a..e2ffae52a50a 100644 --- a/bin/pax/sel_subs.h +++ b/bin/pax/sel_subs.h @@ -33,7 +33,6 @@ * SUCH DAMAGE. * * @(#)sel_subs.h 8.1 (Berkeley) 5/31/93 - * $FreeBSD$ */ /* diff --git a/bin/pax/tables.h b/bin/pax/tables.h index fb5bc437b0a0..eaa48066f70d 100644 --- a/bin/pax/tables.h +++ b/bin/pax/tables.h @@ -33,7 +33,6 @@ * SUCH DAMAGE. * * @(#)tables.h 8.1 (Berkeley) 5/31/93 - * $FreeBSD$ */ /* diff --git a/bin/pax/tar.h b/bin/pax/tar.h index 91c2400e35ca..0b95bddc1fee 100644 --- a/bin/pax/tar.h +++ b/bin/pax/tar.h @@ -33,7 +33,6 @@ * SUCH DAMAGE. * * @(#)tar.h 8.2 (Berkeley) 4/18/94 - * $FreeBSD$ */ /* diff --git a/bin/ps/extern.h b/bin/ps/extern.h index ea4362eeadd9..6b07a79fbc20 100644 --- a/bin/ps/extern.h +++ b/bin/ps/extern.h @@ -29,7 +29,6 @@ * SUCH DAMAGE. * * @(#)extern.h 8.3 (Berkeley) 4/2/94 - * $FreeBSD$ */ struct kinfo; diff --git a/bin/ps/ps.h b/bin/ps/ps.h index 03e38af9d517..429dff632872 100644 --- a/bin/ps/ps.h +++ b/bin/ps/ps.h @@ -29,7 +29,6 @@ * SUCH DAMAGE. * * @(#)ps.h 8.1 (Berkeley) 5/31/93 - * $FreeBSD$ */ #include diff --git a/bin/sh/alias.h b/bin/sh/alias.h index 92de705bc963..0c6ea99e8b60 100644 --- a/bin/sh/alias.h +++ b/bin/sh/alias.h @@ -30,7 +30,6 @@ * SUCH DAMAGE. * * @(#)alias.h 8.2 (Berkeley) 5/4/95 - * $FreeBSD$ */ #define ALIASINUSE 1 diff --git a/bin/sh/arith.h b/bin/sh/arith.h index 569d0c58651f..124fd5944a56 100644 --- a/bin/sh/arith.h +++ b/bin/sh/arith.h @@ -27,7 +27,6 @@ * SUCH DAMAGE. * * @(#)arith.h 1.1 (Berkeley) 5/4/95 - * $FreeBSD$ */ #include "shell.h" diff --git a/bin/sh/bltin/bltin.h b/bin/sh/bltin/bltin.h index 8149895815dd..226d630694b5 100644 --- a/bin/sh/bltin/bltin.h +++ b/bin/sh/bltin/bltin.h @@ -32,7 +32,6 @@ * SUCH DAMAGE. * * @(#)bltin.h 8.2 (Berkeley) 5/4/95 - * $FreeBSD$ */ /* diff --git a/bin/sh/error.h b/bin/sh/error.h index 3a79dec81b9d..c097c529dc01 100644 --- a/bin/sh/error.h +++ b/bin/sh/error.h @@ -30,7 +30,6 @@ * SUCH DAMAGE. * * @(#)error.h 8.2 (Berkeley) 5/4/95 - * $FreeBSD$ */ /* diff --git a/bin/sh/eval.h b/bin/sh/eval.h index d8a12eb79c7f..361e0f2ba269 100644 --- a/bin/sh/eval.h +++ b/bin/sh/eval.h @@ -30,7 +30,6 @@ * SUCH DAMAGE. * * @(#)eval.h 8.2 (Berkeley) 5/4/95 - * $FreeBSD$ */ extern char *commandname; /* currently executing command */ diff --git a/bin/sh/exec.h b/bin/sh/exec.h index 03e7e6ab0b0c..04d1b97d7386 100644 --- a/bin/sh/exec.h +++ b/bin/sh/exec.h @@ -30,7 +30,6 @@ * SUCH DAMAGE. * * @(#)exec.h 8.3 (Berkeley) 6/8/95 - * $FreeBSD$ */ /* values of cmdtype */ diff --git a/bin/sh/expand.h b/bin/sh/expand.h index a60ea29514d2..2cf6d2ee0972 100644 --- a/bin/sh/expand.h +++ b/bin/sh/expand.h @@ -30,7 +30,6 @@ * SUCH DAMAGE. * * @(#)expand.h 8.2 (Berkeley) 5/4/95 - * $FreeBSD$ */ struct arglist { diff --git a/bin/sh/input.h b/bin/sh/input.h index edb622b6ec2e..b46e2c021e70 100644 --- a/bin/sh/input.h +++ b/bin/sh/input.h @@ -30,7 +30,6 @@ * SUCH DAMAGE. * * @(#)input.h 8.2 (Berkeley) 5/4/95 - * $FreeBSD$ */ /* PEOF (the end of file marker) is defined in syntax.h */ diff --git a/bin/sh/jobs.h b/bin/sh/jobs.h index 411d08f27a67..050c86a91ff8 100644 --- a/bin/sh/jobs.h +++ b/bin/sh/jobs.h @@ -30,7 +30,6 @@ * SUCH DAMAGE. * * @(#)jobs.h 8.2 (Berkeley) 5/4/95 - * $FreeBSD$ */ /* Mode argument to forkshell. Don't change FORK_FG or FORK_BG. */ diff --git a/bin/sh/mail.h b/bin/sh/mail.h index 0bb565209c7f..0a52e9f198a1 100644 --- a/bin/sh/mail.h +++ b/bin/sh/mail.h @@ -32,7 +32,6 @@ * SUCH DAMAGE. * * @(#)mail.h 8.2 (Berkeley) 5/4/95 - * $FreeBSD$ */ void chkmail(int); diff --git a/bin/sh/main.h b/bin/sh/main.h index d12c7ab77fed..38f9b271c309 100644 --- a/bin/sh/main.h +++ b/bin/sh/main.h @@ -32,7 +32,6 @@ * SUCH DAMAGE. * * @(#)main.h 8.2 (Berkeley) 5/4/95 - * $FreeBSD$ */ extern int rootpid; /* pid of main shell */ diff --git a/bin/sh/memalloc.h b/bin/sh/memalloc.h index 6cb7bd818fb5..038d18173c7b 100644 --- a/bin/sh/memalloc.h +++ b/bin/sh/memalloc.h @@ -32,7 +32,6 @@ * SUCH DAMAGE. * * @(#)memalloc.h 8.2 (Berkeley) 5/4/95 - * $FreeBSD$ */ #include diff --git a/bin/sh/myhistedit.h b/bin/sh/myhistedit.h index 1f513f0ae206..ef84a90bf5b0 100644 --- a/bin/sh/myhistedit.h +++ b/bin/sh/myhistedit.h @@ -29,7 +29,6 @@ * SUCH DAMAGE. * * @(#)myhistedit.h 8.2 (Berkeley) 5/4/95 - * $FreeBSD$ */ #include diff --git a/bin/sh/mystring.h b/bin/sh/mystring.h index ff4384d21c35..dcbdc91cb5d5 100644 --- a/bin/sh/mystring.h +++ b/bin/sh/mystring.h @@ -32,7 +32,6 @@ * SUCH DAMAGE. * * @(#)mystring.h 8.2 (Berkeley) 5/4/95 - * $FreeBSD$ */ #include diff --git a/bin/sh/nodes.c.pat b/bin/sh/nodes.c.pat index 43fa515fe905..9172c544de3d 100644 --- a/bin/sh/nodes.c.pat +++ b/bin/sh/nodes.c.pat @@ -30,7 +30,6 @@ * SUCH DAMAGE. * * @(#)nodes.c.pat 8.2 (Berkeley) 5/4/95 - * $FreeBSD$ */ #include diff --git a/bin/sh/options.h b/bin/sh/options.h index 7c9c4513aa33..9c516b07ad23 100644 --- a/bin/sh/options.h +++ b/bin/sh/options.h @@ -32,7 +32,6 @@ * SUCH DAMAGE. * * @(#)options.h 8.2 (Berkeley) 5/4/95 - * $FreeBSD$ */ struct shparam { diff --git a/bin/sh/output.h b/bin/sh/output.h index 62f006d32a36..409cc16df75e 100644 --- a/bin/sh/output.h +++ b/bin/sh/output.h @@ -32,7 +32,6 @@ * SUCH DAMAGE. * * @(#)output.h 8.2 (Berkeley) 5/4/95 - * $FreeBSD$ */ #ifndef OUTPUT_INCL diff --git a/bin/sh/parser.h b/bin/sh/parser.h index aee8244ecf09..5f5249866b0a 100644 --- a/bin/sh/parser.h +++ b/bin/sh/parser.h @@ -32,7 +32,6 @@ * SUCH DAMAGE. * * @(#)parser.h 8.3 (Berkeley) 5/4/95 - * $FreeBSD$ */ /* control characters in argument strings */ diff --git a/bin/sh/redir.h b/bin/sh/redir.h index 08c52359c59e..f49d0ddc9a73 100644 --- a/bin/sh/redir.h +++ b/bin/sh/redir.h @@ -32,7 +32,6 @@ * SUCH DAMAGE. * * @(#)redir.h 8.2 (Berkeley) 5/4/95 - * $FreeBSD$ */ /* flags passed to redirect */ diff --git a/bin/sh/shell.h b/bin/sh/shell.h index 536efe6ce228..64a2be86b4f7 100644 --- a/bin/sh/shell.h +++ b/bin/sh/shell.h @@ -32,7 +32,6 @@ * SUCH DAMAGE. * * @(#)shell.h 8.2 (Berkeley) 5/4/95 - * $FreeBSD$ */ #ifndef SHELL_H_ diff --git a/bin/sh/show.h b/bin/sh/show.h index 790a62e2942c..9dc77c6857d6 100644 --- a/bin/sh/show.h +++ b/bin/sh/show.h @@ -29,7 +29,6 @@ * SUCH DAMAGE. * * @(#)show.h 1.1 (Berkeley) 5/4/95 - * $FreeBSD$ */ void showtree(union node *); diff --git a/bin/sh/trap.h b/bin/sh/trap.h index fdc4b7a9683a..f7985e8e70a1 100644 --- a/bin/sh/trap.h +++ b/bin/sh/trap.h @@ -32,7 +32,6 @@ * SUCH DAMAGE. * * @(#)trap.h 8.3 (Berkeley) 6/5/95 - * $FreeBSD$ */ extern volatile sig_atomic_t pendingsig; diff --git a/bin/sh/var.h b/bin/sh/var.h index eaf4f427f63b..abd2a47c1979 100644 --- a/bin/sh/var.h +++ b/bin/sh/var.h @@ -32,7 +32,6 @@ * SUCH DAMAGE. * * @(#)var.h 8.2 (Berkeley) 5/4/95 - * $FreeBSD$ */ /* diff --git a/bin/stty/extern.h b/bin/stty/extern.h index 88b58890f7d1..40aa92c35de1 100644 --- a/bin/stty/extern.h +++ b/bin/stty/extern.h @@ -27,7 +27,6 @@ * SUCH DAMAGE. * * @(#)extern.h 8.1 (Berkeley) 5/31/93 - * $FreeBSD$ */ int c_cchars(const void *, const void *); diff --git a/bin/stty/stty.h b/bin/stty/stty.h index d48ccaa20b6e..d4236b09cb6a 100644 --- a/bin/stty/stty.h +++ b/bin/stty/stty.h @@ -27,7 +27,6 @@ * SUCH DAMAGE. * * @(#)stty.h 8.1 (Berkeley) 5/31/93 - * $FreeBSD$ */ *** 4756 LINES SKIPPED *** From nobody Wed Aug 16 17:56:50 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RQwnH6x4gz4qvPS; Wed, 16 Aug 2023 17:56: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RQwnH3Y1bz3VCm; Wed, 16 Aug 2023 17:56:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692208611; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9PjiBjmZ88B28VX2oLIC0Ez8QEGaArhh0L2rgXp9MG0=; b=Rnov4J6gcgENv5n97zJLewTICmhXIZubDkRpqnyu44BGF+6FJqqj3FkOnCKMimbPv8wWQq bVavXR/wtLEbVW1XwtP/uTVThWIPUHrATF9iK4oRue1/dtSKlYe0rSXGa8s00S4YSqX7gK owMOvUw3/vnQTe/BwP+ktby6pC3dXE6C8G/ZynSZ+5IA52i66BHIYLl6GsndmtqEkHbntZ 1z4Szi/ysgaHxrLs0VPk77iRpRpfwm5u09mYOUYFU8sxfb/zDxkoRZMXkKg+rTUY5JS19k VgEdcJmH93g0e4eX5CwTtgCcU6n81NOyn7IgZz37qNZ8lC6qDddfXvdUw1+JWg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692208611; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9PjiBjmZ88B28VX2oLIC0Ez8QEGaArhh0L2rgXp9MG0=; b=bjaWGi3lOi+l4JhFMgAofRCR6Po0u4ylIAHta2vA5cdxDXZMip8ByLNyrQ83DvazXo3eMx aX6RbDWp1c8PlKXi/BM1YE2qg7GwTlfcmiuOR6OcIkQDk/AnLVpH08Batcc4TF2VZ/8QYL mRCG5mPsJCFhCuM/5LyxLGviAftf+kc0+LQwFiqT3eqO5ZkuYUnXqRpgPxhy9wgBWqlzp/ VaE27u4s9mCEWtIjwhER4ruYTJVnvErjp8ILCPUQldrroGRT7bElBzbAFcDcEc6A40fXX5 Tw/7s6O5J2zAbNr4oADJvFmXVuDyRPa38Oba5iQQkAZU4QYKQIP8h949MUiwvw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692208611; a=rsa-sha256; cv=none; b=afx+WfZMnyjV8qijPFQn2sw5DA9GBP7UgNOINRwk7MPmGX7M13xrMfwt6cO0nQqJbSc2XX F/kzNo7Msn5rPorlk+vrejcUFikSnapE7HakIKmHLS4uSz3aHJ3h7v/qNDUpudbvNWJrF5 XykfHjSnYa2owukkK0buXyLTAtYJvazjp36yZcRCAthePh2pImk145Ik+QmYVflYrUya/J MdbAg6rVUO5NwHywnH5lgxQopFJhh9EQFBl5WxXRxGXNCiNebSS/A05sftsefrqau7dbe0 EFganXNWYXzM36khdlyk5yuhxRDKSyk8WgMAWuy1EbLa+bExgi2Qx7kj9FMRIw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RQwnH126Sz11gf; Wed, 16 Aug 2023 17:56:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37GHupdl059082; Wed, 16 Aug 2023 17:56:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37GHuohU059079; Wed, 16 Aug 2023 17:56:50 GMT (envelope-from git) Date: Wed, 16 Aug 2023 17:56:50 GMT Message-Id: <202308161756.37GHuohU059079@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: 71625ec9ad2a - main - sys: Remove $FreeBSD$: one-line .c comment pattern List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 71625ec9ad2a9bc8c09784fbd23b759830e0ee5f Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=71625ec9ad2a9bc8c09784fbd23b759830e0ee5f commit 71625ec9ad2a9bc8c09784fbd23b759830e0ee5f Author: Warner Losh AuthorDate: 2023-08-16 17:54:24 +0000 Commit: Warner Losh CommitDate: 2023-08-16 17:54:24 +0000 sys: Remove $FreeBSD$: one-line .c comment pattern Remove /^/[*/]\s*\$FreeBSD\$.*\n/ --- sys/amd64/include/_align.h | 1 - sys/amd64/include/_inttypes.h | 1 - sys/amd64/include/_limits.h | 1 - sys/amd64/include/_stdint.h | 1 - sys/amd64/include/_types.h | 1 - sys/amd64/include/acpica_machdep.h | 1 - sys/amd64/include/apm_bios.h | 1 - sys/amd64/include/bus.h | 1 - sys/amd64/include/cputypes.h | 1 - sys/amd64/include/dump.h | 1 - sys/amd64/include/elf.h | 1 - sys/amd64/include/endian.h | 1 - sys/amd64/include/fdt.h | 1 - sys/amd64/include/float.h | 1 - sys/amd64/include/iommu.h | 1 - sys/amd64/include/metadata.h | 1 - sys/amd64/include/npx.h | 1 - sys/amd64/include/ofw_machdep.h | 1 - sys/amd64/include/pci_cfgreg.h | 1 - sys/amd64/include/procctl.h | 1 - sys/amd64/include/psl.h | 1 - sys/amd64/include/ptrace.h | 1 - sys/amd64/include/pvclock.h | 1 - sys/amd64/include/reg.h | 1 - sys/amd64/include/resource.h | 1 - sys/amd64/include/setjmp.h | 1 - sys/amd64/include/sigframe.h | 1 - sys/amd64/include/signal.h | 1 - sys/amd64/include/specialreg.h | 1 - sys/amd64/include/stack.h | 1 - sys/amd64/include/stdarg.h | 1 - sys/amd64/include/sysarch.h | 1 - sys/amd64/include/trap.h | 1 - sys/amd64/include/ucontext.h | 1 - sys/amd64/include/vdso.h | 1 - sys/amd64/include/xen/xen-os.h | 1 - sys/amd64/linux32/linux32_locore.asm | 1 - sys/arm/include/ieeefp.h | 1 - sys/arm/include/machdep.h | 1 - sys/arm/include/procctl.h | 1 - sys/arm/include/ptrace.h | 1 - sys/arm/include/reg.h | 1 - sys/arm/include/setjmp.h | 1 - sys/arm/include/sigframe.h | 1 - sys/arm/include/smp.h | 1 - sys/arm/include/sysarch.h | 1 - sys/arm/include/trap.h | 1 - sys/arm64/include/bus_dma.h | 1 - sys/arm64/include/clock.h | 1 - sys/arm64/include/exec.h | 1 - sys/arm64/include/floatingpoint.h | 1 - sys/arm64/include/iommu.h | 1 - sys/arm64/include/procctl.h | 1 - sys/arm64/include/psl.h | 1 - sys/arm64/include/ptrace.h | 1 - sys/arm64/include/reloc.h | 1 - sys/arm64/include/sigframe.h | 1 - sys/arm64/include/trap.h | 1 - sys/cam/README.quirks | 1 - sys/cam/ctl/README.ctl.txt | 1 - sys/cam/scsi/scsi_ch.h | 1 - sys/cam/scsi/scsi_enc.h | 1 - sys/cam/scsi/scsi_ses.h | 1 - sys/cddl/dev/dtrace/dtrace_hacks.c | 1 - sys/compat/linux/linux_errno.c | 1 - sys/compat/linuxkpi/common/include/linux/usb.h | 1 - sys/compat/linuxkpi/common/src/linux_usb.c | 1 - sys/conf/ldscript.amd64 | 1 - sys/conf/ldscript.arm | 1 - sys/conf/ldscript.arm64 | 1 - sys/conf/ldscript.i386 | 1 - sys/conf/ldscript.powerpc | 1 - sys/conf/ldscript.powerpc64 | 1 - sys/conf/ldscript.powerpc64le | 1 - sys/conf/ldscript.powerpcspe | 1 - sys/conf/ldscript.riscv | 1 - sys/crypto/armv8/stdint.h | 1 - sys/crypto/blake2/blake2_kfreebsd.h | 1 - sys/crypto/blake2/blake2b-avx.c | 1 - sys/crypto/blake2/blake2b-sse2.c | 1 - sys/crypto/blake2/blake2b-sse41.c | 1 - sys/crypto/blake2/blake2b-ssse3.c | 1 - sys/crypto/blake2/blake2b-xop.c | 1 - sys/crypto/blake2/blake2s-avx.c | 1 - sys/crypto/blake2/blake2s-sse2.c | 1 - sys/crypto/blake2/blake2s-sse41.c | 1 - sys/crypto/blake2/blake2s-ssse3.c | 1 - sys/crypto/blake2/blake2s-xop.c | 1 - sys/crypto/blake2/config.h | 1 - sys/crypto/blake2/stddef.h | 1 - sys/crypto/blake2/stdint.h | 1 - sys/crypto/blake2/stdio.h | 1 - sys/crypto/blake2/stdlib.h | 1 - sys/crypto/blake2/string.h | 1 - sys/crypto/chacha20/_chacha.h | 1 - sys/crypto/des/arch/i386/des_enc.S | 1 - sys/crypto/des/des.h | 1 - sys/crypto/des/des_locl.h | 1 - sys/crypto/des/podd.h | 1 - sys/crypto/des/sk.h | 1 - sys/crypto/des/spr.h | 1 - sys/crypto/libsodium/limits.h | 1 - sys/crypto/libsodium/stddef.h | 1 - sys/crypto/libsodium/stdint.h | 1 - sys/crypto/libsodium/stdio.h | 1 - sys/crypto/libsodium/stdlib.h | 1 - sys/crypto/libsodium/string.h | 1 - sys/crypto/openssl/aarch64/aesv8-armx.S | 1 - sys/crypto/openssl/aarch64/arm64cpuid.S | 1 - sys/crypto/openssl/aarch64/armv8-mont.S | 1 - sys/crypto/openssl/aarch64/chacha-armv8.S | 1 - sys/crypto/openssl/aarch64/ecp_nistz256-armv8.S | 1 - sys/crypto/openssl/aarch64/ghashv8-armx.S | 1 - sys/crypto/openssl/aarch64/keccak1600-armv8.S | 1 - sys/crypto/openssl/aarch64/poly1305-armv8.S | 1 - sys/crypto/openssl/aarch64/sha1-armv8.S | 1 - sys/crypto/openssl/aarch64/sha256-armv8.S | 1 - sys/crypto/openssl/aarch64/sha512-armv8.S | 1 - sys/crypto/openssl/aarch64/vpaes-armv8.S | 1 - sys/crypto/openssl/amd64/aes-gcm-avx512.S | 1 - sys/crypto/openssl/amd64/aesni-gcm-x86_64.S | 1 - sys/crypto/openssl/amd64/aesni-mb-x86_64.S | 1 - sys/crypto/openssl/amd64/aesni-sha1-x86_64.S | 1 - sys/crypto/openssl/amd64/aesni-sha256-x86_64.S | 1 - sys/crypto/openssl/amd64/aesni-x86_64.S | 1 - sys/crypto/openssl/amd64/chacha-x86_64.S | 1 - sys/crypto/openssl/amd64/cmll-x86_64.S | 1 - sys/crypto/openssl/amd64/e_padlock-x86_64.S | 1 - sys/crypto/openssl/amd64/ecp_nistz256-x86_64.S | 1 - sys/crypto/openssl/amd64/ghash-x86_64.S | 1 - sys/crypto/openssl/amd64/keccak1600-x86_64.S | 1 - sys/crypto/openssl/amd64/md5-x86_64.S | 1 - sys/crypto/openssl/amd64/poly1305-x86_64.S | 1 - sys/crypto/openssl/amd64/rc4-md5-x86_64.S | 1 - sys/crypto/openssl/amd64/rc4-x86_64.S | 1 - sys/crypto/openssl/amd64/rsaz-avx2.S | 1 - sys/crypto/openssl/amd64/rsaz-x86_64.S | 1 - sys/crypto/openssl/amd64/sha1-mb-x86_64.S | 1 - sys/crypto/openssl/amd64/sha1-x86_64.S | 1 - sys/crypto/openssl/amd64/sha256-mb-x86_64.S | 1 - sys/crypto/openssl/amd64/sha256-x86_64.S | 1 - sys/crypto/openssl/amd64/sha512-x86_64.S | 1 - sys/crypto/openssl/amd64/vpaes-x86_64.S | 1 - sys/crypto/openssl/amd64/wp-x86_64.S | 1 - sys/crypto/openssl/amd64/x25519-x86_64.S | 1 - sys/crypto/openssl/amd64/x86_64-gf2m.S | 1 - sys/crypto/openssl/amd64/x86_64-mont.S | 1 - sys/crypto/openssl/amd64/x86_64-mont5.S | 1 - sys/crypto/openssl/amd64/x86_64cpuid.S | 1 - sys/crypto/openssl/arm/aes-armv4.S | 1 - sys/crypto/openssl/arm/aesv8-armx.S | 1 - sys/crypto/openssl/arm/armv4-gf2m.S | 1 - sys/crypto/openssl/arm/armv4-mont.S | 1 - sys/crypto/openssl/arm/armv4cpuid.S | 1 - sys/crypto/openssl/arm/bsaes-armv7.S | 1 - sys/crypto/openssl/arm/chacha-armv4.S | 1 - sys/crypto/openssl/arm/ecp_nistz256-armv4.S | 1 - sys/crypto/openssl/arm/ghash-armv4.S | 1 - sys/crypto/openssl/arm/ghashv8-armx.S | 1 - sys/crypto/openssl/arm/keccak1600-armv4.S | 1 - sys/crypto/openssl/arm/poly1305-armv4.S | 1 - sys/crypto/openssl/arm/sha1-armv4-large.S | 1 - sys/crypto/openssl/arm/sha256-armv4.S | 1 - sys/crypto/openssl/arm/sha512-armv4.S | 1 - sys/crypto/openssl/i386/aesni-x86.S | 1 - sys/crypto/openssl/i386/bf-586.S | 1 - sys/crypto/openssl/i386/bn-586.S | 1 - sys/crypto/openssl/i386/cast-586.S | 1 - sys/crypto/openssl/i386/chacha-x86.S | 1 - sys/crypto/openssl/i386/cmll-x86.S | 1 - sys/crypto/openssl/i386/co-586.S | 1 - sys/crypto/openssl/i386/crypt586.S | 1 - sys/crypto/openssl/i386/des-586.S | 1 - sys/crypto/openssl/i386/e_padlock-x86.S | 1 - sys/crypto/openssl/i386/ecp_nistz256-x86.S | 1 - sys/crypto/openssl/i386/ghash-x86.S | 1 - sys/crypto/openssl/i386/md5-586.S | 1 - sys/crypto/openssl/i386/poly1305-x86.S | 1 - sys/crypto/openssl/i386/rc4-586.S | 1 - sys/crypto/openssl/i386/rc5-586.S | 1 - sys/crypto/openssl/i386/rmd-586.S | 1 - sys/crypto/openssl/i386/sha1-586.S | 1 - sys/crypto/openssl/i386/sha256-586.S | 1 - sys/crypto/openssl/i386/sha512-586.S | 1 - sys/crypto/openssl/i386/vpaes-x86.S | 1 - sys/crypto/openssl/i386/wp-mmx.S | 1 - sys/crypto/openssl/i386/x86-gf2m.S | 1 - sys/crypto/openssl/i386/x86-mont.S | 1 - sys/crypto/openssl/i386/x86cpuid.S | 1 - sys/crypto/openssl/powerpc/aes-ppc.S | 1 - sys/crypto/openssl/powerpc/aesp8-ppc.S | 1 - sys/crypto/openssl/powerpc/chacha-ppc.S | 1 - sys/crypto/openssl/powerpc/ghashp8-ppc.S | 1 - sys/crypto/openssl/powerpc/poly1305-ppc.S | 1 - sys/crypto/openssl/powerpc/poly1305-ppcfp.S | 1 - sys/crypto/openssl/powerpc/ppc-mont.S | 1 - sys/crypto/openssl/powerpc/ppc.S | 1 - sys/crypto/openssl/powerpc/ppccpuid.S | 1 - sys/crypto/openssl/powerpc/sha1-ppc.S | 1 - sys/crypto/openssl/powerpc/sha256-ppc.S | 1 - sys/crypto/openssl/powerpc/sha256p8-ppc.S | 1 - sys/crypto/openssl/powerpc/sha512-ppc.S | 1 - sys/crypto/openssl/powerpc/sha512p8-ppc.S | 1 - sys/crypto/openssl/powerpc/vpaes-ppc.S | 1 - sys/crypto/openssl/powerpc64/aes-ppc.S | 1 - sys/crypto/openssl/powerpc64/aesp8-ppc.S | 1 - sys/crypto/openssl/powerpc64/chacha-ppc.S | 1 - sys/crypto/openssl/powerpc64/ecp_nistz256-ppc64.S | 1 - sys/crypto/openssl/powerpc64/ghashp8-ppc.S | 1 - sys/crypto/openssl/powerpc64/keccak1600-ppc64.S | 1 - sys/crypto/openssl/powerpc64/poly1305-ppc.S | 1 - sys/crypto/openssl/powerpc64/poly1305-ppcfp.S | 1 - sys/crypto/openssl/powerpc64/ppc-mont.S | 1 - sys/crypto/openssl/powerpc64/ppc.S | 1 - sys/crypto/openssl/powerpc64/ppccpuid.S | 1 - sys/crypto/openssl/powerpc64/sha1-ppc.S | 1 - sys/crypto/openssl/powerpc64/sha256-ppc.S | 1 - sys/crypto/openssl/powerpc64/sha256p8-ppc.S | 1 - sys/crypto/openssl/powerpc64/sha512-ppc.S | 1 - sys/crypto/openssl/powerpc64/sha512p8-ppc.S | 1 - sys/crypto/openssl/powerpc64/vpaes-ppc.S | 1 - sys/crypto/openssl/powerpc64/x25519-ppc64.S | 1 - sys/crypto/openssl/powerpc64le/aes-ppc.S | 1 - sys/crypto/openssl/powerpc64le/aesp8-ppc.S | 1 - sys/crypto/openssl/powerpc64le/chacha-ppc.S | 1 - sys/crypto/openssl/powerpc64le/ecp_nistz256-ppc64.S | 1 - sys/crypto/openssl/powerpc64le/ghashp8-ppc.S | 1 - sys/crypto/openssl/powerpc64le/keccak1600-ppc64.S | 1 - sys/crypto/openssl/powerpc64le/poly1305-ppc.S | 1 - sys/crypto/openssl/powerpc64le/poly1305-ppcfp.S | 1 - sys/crypto/openssl/powerpc64le/ppc-mont.S | 1 - sys/crypto/openssl/powerpc64le/ppc.S | 1 - sys/crypto/openssl/powerpc64le/ppccpuid.S | 1 - sys/crypto/openssl/powerpc64le/sha1-ppc.S | 1 - sys/crypto/openssl/powerpc64le/sha256-ppc.S | 1 - sys/crypto/openssl/powerpc64le/sha256p8-ppc.S | 1 - sys/crypto/openssl/powerpc64le/sha512-ppc.S | 1 - sys/crypto/openssl/powerpc64le/sha512p8-ppc.S | 1 - sys/crypto/openssl/powerpc64le/vpaes-ppc.S | 1 - sys/crypto/openssl/powerpc64le/x25519-ppc64.S | 1 - sys/crypto/rijndael/rijndael-api-fst.h | 1 - sys/crypto/rijndael/rijndael.h | 1 - sys/crypto/rijndael/rijndael_local.h | 1 - sys/crypto/sha1.h | 1 - sys/crypto/skein/skein.h | 1 - sys/crypto/skein/skein_iv.h | 1 - sys/crypto/skein/skein_port.h | 1 - sys/dev/bfe/if_bfereg.h | 1 - sys/dev/bhnd/bhnd_debug.h | 1 - sys/dev/drm2/drm_global.h | 1 - sys/dev/drm2/ttm/ttm_bo_api.h | 1 - sys/dev/drm2/ttm/ttm_bo_driver.h | 1 - sys/dev/drm2/ttm/ttm_execbuf_util.h | 1 - sys/dev/drm2/ttm/ttm_lock.h | 1 - sys/dev/drm2/ttm/ttm_memory.h | 1 - sys/dev/drm2/ttm/ttm_module.h | 1 - sys/dev/drm2/ttm/ttm_object.h | 1 - sys/dev/drm2/ttm/ttm_page_alloc.h | 1 - sys/dev/drm2/ttm/ttm_placement.h | 1 - sys/dev/e1000/e1000_80003es2lan.c | 1 - sys/dev/e1000/e1000_80003es2lan.h | 1 - sys/dev/e1000/e1000_82540.c | 1 - sys/dev/e1000/e1000_82541.c | 1 - sys/dev/e1000/e1000_82541.h | 1 - sys/dev/e1000/e1000_82542.c | 1 - sys/dev/e1000/e1000_82543.c | 1 - sys/dev/e1000/e1000_82543.h | 1 - sys/dev/e1000/e1000_82571.c | 1 - sys/dev/e1000/e1000_82571.h | 1 - sys/dev/e1000/e1000_82575.c | 1 - sys/dev/e1000/e1000_82575.h | 1 - sys/dev/e1000/e1000_api.c | 1 - sys/dev/e1000/e1000_api.h | 1 - sys/dev/e1000/e1000_base.c | 1 - sys/dev/e1000/e1000_base.h | 1 - sys/dev/e1000/e1000_defines.h | 1 - sys/dev/e1000/e1000_hw.h | 1 - sys/dev/e1000/e1000_i210.c | 1 - sys/dev/e1000/e1000_i210.h | 1 - sys/dev/e1000/e1000_ich8lan.c | 1 - sys/dev/e1000/e1000_ich8lan.h | 1 - sys/dev/e1000/e1000_mac.c | 1 - sys/dev/e1000/e1000_mac.h | 1 - sys/dev/e1000/e1000_manage.c | 1 - sys/dev/e1000/e1000_manage.h | 1 - sys/dev/e1000/e1000_mbx.c | 1 - sys/dev/e1000/e1000_mbx.h | 1 - sys/dev/e1000/e1000_nvm.c | 1 - sys/dev/e1000/e1000_nvm.h | 1 - sys/dev/e1000/e1000_osdep.c | 1 - sys/dev/e1000/e1000_osdep.h | 1 - sys/dev/e1000/e1000_phy.c | 1 - sys/dev/e1000/e1000_phy.h | 1 - sys/dev/e1000/e1000_regs.h | 1 - sys/dev/e1000/e1000_vf.c | 1 - sys/dev/e1000/e1000_vf.h | 1 - sys/dev/e1000/em_txrx.c | 1 - sys/dev/e1000/if_em.c | 1 - sys/dev/e1000/if_em.h | 1 - sys/dev/e1000/igb_txrx.c | 1 - sys/dev/exca/excareg.h | 1 - sys/dev/exca/excavar.h | 1 - sys/dev/hid/hid.c | 1 - sys/dev/hid/hid.h | 1 - sys/dev/hid/hidquirk.c | 1 - sys/dev/hid/hidquirk.h | 1 - sys/dev/hifn/hifn7751reg.h | 1 - sys/dev/hifn/hifn7751var.h | 1 - sys/dev/iavf/iavf_adminq.c | 1 - sys/dev/iavf/iavf_adminq.h | 1 - sys/dev/iavf/iavf_adminq_cmd.h | 1 - sys/dev/iavf/iavf_alloc.h | 1 - sys/dev/iavf/iavf_common.c | 1 - sys/dev/iavf/iavf_debug.h | 1 - sys/dev/iavf/iavf_devids.h | 1 - sys/dev/iavf/iavf_drv_info.h | 1 - sys/dev/iavf/iavf_iflib.h | 1 - sys/dev/iavf/iavf_lib.c | 1 - sys/dev/iavf/iavf_lib.h | 1 - sys/dev/iavf/iavf_opts.h | 1 - sys/dev/iavf/iavf_osdep.c | 1 - sys/dev/iavf/iavf_osdep.h | 1 - sys/dev/iavf/iavf_prototype.h | 1 - sys/dev/iavf/iavf_register.h | 1 - sys/dev/iavf/iavf_status.h | 1 - sys/dev/iavf/iavf_sysctls_common.h | 1 - sys/dev/iavf/iavf_sysctls_iflib.h | 1 - sys/dev/iavf/iavf_txrx_common.h | 1 - sys/dev/iavf/iavf_txrx_iflib.c | 1 - sys/dev/iavf/iavf_type.h | 1 - sys/dev/iavf/iavf_vc_common.c | 1 - sys/dev/iavf/iavf_vc_common.h | 1 - sys/dev/iavf/iavf_vc_iflib.c | 1 - sys/dev/iavf/if_iavf_iflib.c | 1 - sys/dev/iavf/virtchnl.h | 1 - sys/dev/ice/ice_adminq_cmd.h | 1 - sys/dev/ice/ice_alloc.h | 1 - sys/dev/ice/ice_bitops.h | 1 - sys/dev/ice/ice_common.c | 1 - sys/dev/ice/ice_common.h | 1 - sys/dev/ice/ice_common_sysctls.h | 1 - sys/dev/ice/ice_common_txrx.h | 1 - sys/dev/ice/ice_controlq.c | 1 - sys/dev/ice/ice_controlq.h | 1 - sys/dev/ice/ice_dcb.c | 1 - sys/dev/ice/ice_dcb.h | 1 - sys/dev/ice/ice_ddp_common.c | 1 - sys/dev/ice/ice_ddp_common.h | 1 - sys/dev/ice/ice_defs.h | 1 - sys/dev/ice/ice_devids.h | 1 - sys/dev/ice/ice_drv_info.h | 1 - sys/dev/ice/ice_features.h | 1 - sys/dev/ice/ice_flex_pipe.c | 1 - sys/dev/ice/ice_flex_pipe.h | 1 - sys/dev/ice/ice_flex_type.h | 1 - sys/dev/ice/ice_flow.c | 1 - sys/dev/ice/ice_flow.h | 1 - sys/dev/ice/ice_fw_logging.c | 1 - sys/dev/ice/ice_fwlog.c | 1 - sys/dev/ice/ice_fwlog.h | 1 - sys/dev/ice/ice_hw_autogen.h | 1 - sys/dev/ice/ice_iflib.h | 1 - sys/dev/ice/ice_iflib_recovery_txrx.c | 1 - sys/dev/ice/ice_iflib_sysctls.h | 1 - sys/dev/ice/ice_iflib_txrx.c | 1 - sys/dev/ice/ice_lan_tx_rx.h | 1 - sys/dev/ice/ice_lib.c | 1 - sys/dev/ice/ice_lib.h | 1 - sys/dev/ice/ice_nvm.c | 1 - sys/dev/ice/ice_nvm.h | 1 - sys/dev/ice/ice_opts.h | 1 - sys/dev/ice/ice_osdep.c | 1 - sys/dev/ice/ice_osdep.h | 1 - sys/dev/ice/ice_protocol_type.h | 1 - sys/dev/ice/ice_rdma.c | 1 - sys/dev/ice/ice_rdma.h | 1 - sys/dev/ice/ice_rdma_internal.h | 1 - sys/dev/ice/ice_resmgr.c | 1 - sys/dev/ice/ice_resmgr.h | 1 - sys/dev/ice/ice_rss.h | 1 - sys/dev/ice/ice_sbq_cmd.h | 1 - sys/dev/ice/ice_sched.c | 1 - sys/dev/ice/ice_sched.h | 1 - sys/dev/ice/ice_status.h | 1 - sys/dev/ice/ice_strings.c | 1 - sys/dev/ice/ice_switch.c | 1 - sys/dev/ice/ice_switch.h | 1 - sys/dev/ice/ice_type.h | 1 - sys/dev/ice/ice_vlan_mode.c | 1 - sys/dev/ice/ice_vlan_mode.h | 1 - sys/dev/ice/if_ice_iflib.c | 1 - sys/dev/ice/virtchnl.h | 1 - sys/dev/ice/virtchnl_inline_ipsec.h | 1 - sys/dev/ipw/if_ipwreg.h | 1 - sys/dev/ipw/if_ipwvar.h | 1 - sys/dev/irdma/fbsd_kcompat.c | 1 - sys/dev/irdma/fbsd_kcompat.h | 1 - sys/dev/irdma/ice_devids.h | 1 - sys/dev/irdma/icrdma.c | 1 - sys/dev/irdma/icrdma_hw.c | 1 - sys/dev/irdma/icrdma_hw.h | 1 - sys/dev/irdma/irdma-abi.h | 1 - sys/dev/irdma/irdma.h | 1 - sys/dev/irdma/irdma_cm.c | 1 - sys/dev/irdma/irdma_cm.h | 1 - sys/dev/irdma/irdma_ctrl.c | 1 - sys/dev/irdma/irdma_defs.h | 1 - sys/dev/irdma/irdma_hmc.c | 1 - sys/dev/irdma/irdma_hmc.h | 1 - sys/dev/irdma/irdma_hw.c | 1 - sys/dev/irdma/irdma_kcompat.c | 1 - sys/dev/irdma/irdma_main.h | 1 - sys/dev/irdma/irdma_pble.c | 1 - sys/dev/irdma/irdma_pble.h | 1 - sys/dev/irdma/irdma_protos.h | 1 - sys/dev/irdma/irdma_puda.c | 1 - sys/dev/irdma/irdma_puda.h | 1 - sys/dev/irdma/irdma_type.h | 1 - sys/dev/irdma/irdma_uda.c | 1 - sys/dev/irdma/irdma_uda.h | 1 - sys/dev/irdma/irdma_uda_d.h | 1 - sys/dev/irdma/irdma_uk.c | 1 - sys/dev/irdma/irdma_user.h | 1 - sys/dev/irdma/irdma_utils.c | 1 - sys/dev/irdma/irdma_verbs.c | 1 - sys/dev/irdma/irdma_verbs.h | 1 - sys/dev/irdma/irdma_ws.c | 1 - sys/dev/irdma/irdma_ws.h | 1 - sys/dev/irdma/osdep.h | 1 - sys/dev/iser/icl_iser.c | 1 - sys/dev/iser/icl_iser.h | 1 - sys/dev/iser/iser_initiator.c | 1 - sys/dev/iser/iser_memory.c | 1 - sys/dev/iser/iser_verbs.c | 1 - sys/dev/isp/DriverManual.txt | 1 - sys/dev/isp/Hardware.txt | 1 - sys/dev/isp/isp_freebsd.h | 1 - sys/dev/isp/isp_ioctl.h | 1 - sys/dev/isp/isp_library.h | 1 - sys/dev/isp/isp_stds.h | 1 - sys/dev/isp/isp_target.h | 1 - sys/dev/isp/ispmbox.h | 1 - sys/dev/isp/ispreg.h | 1 - sys/dev/isp/ispvar.h | 1 - sys/dev/ispfw/asm_2400.h | 1 - sys/dev/ispfw/asm_2500.h | 1 - sys/dev/iwi/if_iwireg.h | 1 - sys/dev/iwi/if_iwivar.h | 1 - sys/dev/iwm/if_iwm_binding.h | 1 - sys/dev/iwm/if_iwm_constants.h | 1 - sys/dev/iwm/if_iwm_mac_ctxt.h | 1 - sys/dev/iwm/if_iwm_notif_wait.h | 1 - sys/dev/iwm/if_iwm_pcie_trans.h | 1 - sys/dev/iwm/if_iwm_phy_ctxt.h | 1 - sys/dev/iwm/if_iwm_phy_db.h | 1 - sys/dev/iwm/if_iwm_power.h | 1 - sys/dev/iwm/if_iwm_scan.h | 1 - sys/dev/iwm/if_iwm_sta.h | 1 - sys/dev/iwm/if_iwm_time_event.h | 1 - sys/dev/iwm/if_iwm_util.h | 1 - sys/dev/iwm/if_iwmvar.h | 1 - sys/dev/iwn/if_iwnreg.h | 1 - sys/dev/iwn/if_iwnvar.h | 1 - sys/dev/ixgbe/if_bypass.c | 1 - sys/dev/ixgbe/if_fdir.c | 1 - sys/dev/ixgbe/if_ix.c | 1 - sys/dev/ixgbe/if_ixv.c | 1 - sys/dev/ixgbe/if_sriov.c | 1 - sys/dev/ixgbe/ix_txrx.c | 1 - sys/dev/ixgbe/ixgbe.h | 1 - sys/dev/ixgbe/ixgbe_82598.c | 1 - sys/dev/ixgbe/ixgbe_82598.h | 1 - sys/dev/ixgbe/ixgbe_82599.c | 1 - sys/dev/ixgbe/ixgbe_82599.h | 1 - sys/dev/ixgbe/ixgbe_api.c | 1 - sys/dev/ixgbe/ixgbe_api.h | 1 - sys/dev/ixgbe/ixgbe_bypass.h | 1 - sys/dev/ixgbe/ixgbe_common.c | 1 - sys/dev/ixgbe/ixgbe_common.h | 1 - sys/dev/ixgbe/ixgbe_dcb.c | 1 - sys/dev/ixgbe/ixgbe_dcb.h | 1 - sys/dev/ixgbe/ixgbe_dcb_82598.c | 1 - sys/dev/ixgbe/ixgbe_dcb_82598.h | 1 - sys/dev/ixgbe/ixgbe_dcb_82599.c | 1 - sys/dev/ixgbe/ixgbe_dcb_82599.h | 1 - sys/dev/ixgbe/ixgbe_fdir.h | 1 - sys/dev/ixgbe/ixgbe_features.h | 1 - sys/dev/ixgbe/ixgbe_mbx.c | 1 - sys/dev/ixgbe/ixgbe_mbx.h | 1 - sys/dev/ixgbe/ixgbe_osdep.c | 1 - sys/dev/ixgbe/ixgbe_osdep.h | 1 - sys/dev/ixgbe/ixgbe_phy.c | 1 - sys/dev/ixgbe/ixgbe_phy.h | 1 - sys/dev/ixgbe/ixgbe_rss.h | 1 - sys/dev/ixgbe/ixgbe_sriov.h | 1 - sys/dev/ixgbe/ixgbe_type.h | 1 - sys/dev/ixgbe/ixgbe_vf.c | 1 - sys/dev/ixgbe/ixgbe_vf.h | 1 - sys/dev/ixgbe/ixgbe_x540.c | 1 - sys/dev/ixgbe/ixgbe_x540.h | 1 - sys/dev/ixgbe/ixgbe_x550.c | 1 - sys/dev/ixgbe/ixgbe_x550.h | 1 - sys/dev/ixl/i40e_adminq.c | 1 - sys/dev/ixl/i40e_adminq.h | 1 - sys/dev/ixl/i40e_adminq_cmd.h | 1 - sys/dev/ixl/i40e_alloc.h | 1 - sys/dev/ixl/i40e_common.c | 1 - sys/dev/ixl/i40e_dcb.c | 1 - sys/dev/ixl/i40e_dcb.h | 1 - sys/dev/ixl/i40e_devids.h | 1 - sys/dev/ixl/i40e_hmc.c | 1 - sys/dev/ixl/i40e_hmc.h | 1 - sys/dev/ixl/i40e_lan_hmc.c | 1 - sys/dev/ixl/i40e_lan_hmc.h | 1 - sys/dev/ixl/i40e_nvm.c | 1 - sys/dev/ixl/i40e_osdep.c | 1 - sys/dev/ixl/i40e_osdep.h | 1 - sys/dev/ixl/i40e_prototype.h | 1 - sys/dev/ixl/i40e_register.h | 1 - sys/dev/ixl/i40e_status.h | 1 - sys/dev/ixl/i40e_type.h | 1 - sys/dev/ixl/if_ixl.c | 1 - sys/dev/ixl/ixl.h | 1 - sys/dev/ixl/ixl_debug.h | 1 - sys/dev/ixl/ixl_iw.c | 1 - sys/dev/ixl/ixl_iw.h | 1 - sys/dev/ixl/ixl_iw_int.h | 1 - sys/dev/ixl/ixl_pf.h | 1 - sys/dev/ixl/ixl_pf_i2c.c | 1 - sys/dev/ixl/ixl_pf_iflib.c | 1 - sys/dev/ixl/ixl_pf_iov.c | 1 - sys/dev/ixl/ixl_pf_iov.h | 1 - sys/dev/ixl/ixl_pf_main.c | 1 - sys/dev/ixl/ixl_pf_qmgr.c | 1 - sys/dev/ixl/ixl_pf_qmgr.h | 1 - sys/dev/ixl/ixl_txrx.c | 1 - sys/dev/ixl/virtchnl.h | 1 - sys/dev/le/am79900reg.h | 1 - sys/dev/le/am79900var.h | 1 - sys/dev/le/am7990reg.h | 1 - sys/dev/le/am7990var.h | 1 - sys/dev/le/lancereg.h | 1 - sys/dev/le/lancevar.h | 1 - sys/dev/liquidio/base/cn23xx_pf_device.c | 1 - sys/dev/liquidio/base/cn23xx_pf_device.h | 1 - sys/dev/liquidio/base/cn23xx_pf_regs.h | 1 - sys/dev/liquidio/base/lio_common.h | 1 - sys/dev/liquidio/base/lio_config.h | 1 - sys/dev/liquidio/base/lio_console.c | 1 - sys/dev/liquidio/base/lio_ctrl.c | 1 - sys/dev/liquidio/base/lio_ctrl.h | 1 - sys/dev/liquidio/base/lio_device.c | 1 - sys/dev/liquidio/base/lio_device.h | 1 - sys/dev/liquidio/base/lio_droq.c | 1 - sys/dev/liquidio/base/lio_droq.h | 1 - sys/dev/liquidio/base/lio_image.h | 1 - sys/dev/liquidio/base/lio_iq.h | 1 - sys/dev/liquidio/base/lio_mem_ops.c | 1 - sys/dev/liquidio/base/lio_mem_ops.h | 1 - sys/dev/liquidio/base/lio_request_manager.c | 1 - sys/dev/liquidio/base/lio_response_manager.c | 1 - sys/dev/liquidio/base/lio_response_manager.h | 1 - sys/dev/liquidio/lio_bsd.h | 1 - sys/dev/liquidio/lio_core.c | 1 - sys/dev/liquidio/lio_ioctl.c | 1 - sys/dev/liquidio/lio_ioctl.h | 1 - sys/dev/liquidio/lio_main.c | 1 - sys/dev/liquidio/lio_main.h | 1 - sys/dev/liquidio/lio_network.h | 1 - sys/dev/liquidio/lio_rss.c | 1 - sys/dev/liquidio/lio_rss.h | 1 - sys/dev/liquidio/lio_rxtx.c | 1 - sys/dev/liquidio/lio_rxtx.h | 1 - sys/dev/liquidio/lio_sysctl.c | 1 - sys/dev/mii/e1000phyreg.h | 1 - sys/dev/mii/lxtphyreg.h | 1 - sys/dev/mii/qsphyreg.h | 1 - sys/dev/mpt/mpilib/mpi.h | 1 - sys/dev/mpt/mpilib/mpi_cnfg.h | 1 - sys/dev/mpt/mpilib/mpi_fc.h | 1 - sys/dev/mpt/mpilib/mpi_init.h | 1 - sys/dev/mpt/mpilib/mpi_ioc.h | 1 - sys/dev/mpt/mpilib/mpi_lan.h | 1 - sys/dev/mpt/mpilib/mpi_log_fc.h | 1 - sys/dev/mpt/mpilib/mpi_log_sas.h | 1 - sys/dev/mpt/mpilib/mpi_raid.h | 1 - sys/dev/mpt/mpilib/mpi_sas.h | 1 - sys/dev/mpt/mpilib/mpi_targ.h | 1 - sys/dev/mpt/mpilib/mpi_tool.h | 1 - sys/dev/mpt/mpilib/mpi_type.h | 1 - sys/dev/mpt/mpt.h | 1 - sys/dev/mpt/mpt_cam.h | 1 - sys/dev/mpt/mpt_raid.h | 1 - sys/dev/mpt/mpt_reg.h | 1 - sys/dev/msk/if_mskreg.h | 1 - sys/dev/netmap/netmap_freebsd.c | 1 - sys/dev/netmap/netmap_legacy.c | 1 - sys/dev/netmap/netmap_null.c | 1 - sys/dev/netmap/netmap_offloadings.c | 1 - sys/dev/netmap/netmap_pipe.c | 1 - sys/dev/oce/oce_hw.c | 1 - sys/dev/oce/oce_hw.h | 1 - sys/dev/oce/oce_if.c | 1 - sys/dev/oce/oce_if.h | 1 - sys/dev/oce/oce_mbox.c | 1 - sys/dev/oce/oce_queue.c | 1 - sys/dev/oce/oce_sysctl.c | 1 - sys/dev/oce/oce_user.h | 1 - sys/dev/oce/oce_util.c | 1 - sys/dev/pccard/pccard_cis.h | 1 - sys/dev/pccard/pccardreg.h | 1 - sys/dev/pccard/pccardvar.h | 1 - sys/dev/pms/freebsd/driver/common/lxutil.c | 1 - sys/dev/qat/include/adf_cfg_dev_dbg.h | 1 - sys/dev/qat/include/adf_cfg_device.h | 1 - sys/dev/qat/include/adf_cnvnr_freq_counters.h | 1 - sys/dev/qat/include/adf_dev_err.h | 1 - sys/dev/qat/include/adf_freebsd_pfvf_ctrs_dbg.h | 1 - sys/dev/qat/include/adf_fw_counters.h | 1 - sys/dev/qat/include/adf_gen2_pfvf.h | 1 - sys/dev/qat/include/adf_gen4_pfvf.h | 1 - sys/dev/qat/include/adf_gen4_timer.h | 1 - sys/dev/qat/include/adf_gen4vf_hw_csr_data.h | 1 - sys/dev/qat/include/adf_heartbeat.h | 1 - sys/dev/qat/include/adf_heartbeat_dbg.h | 1 - sys/dev/qat/include/adf_pfvf_vf_msg.h | 1 - sys/dev/qat/include/adf_ver_dbg.h | 1 - sys/dev/qat/include/common/adf_accel_devices.h | 1 - sys/dev/qat/include/common/adf_cfg.h | 1 - sys/dev/qat/include/common/adf_cfg_common.h | 1 - sys/dev/qat/include/common/adf_cfg_strings.h | 1 - sys/dev/qat/include/common/adf_cfg_sysctl.h | 1 - sys/dev/qat/include/common/adf_cfg_user.h | 1 - sys/dev/qat/include/common/adf_common_drv.h | 1 - sys/dev/qat/include/common/adf_gen2_hw_data.h | 1 - sys/dev/qat/include/common/adf_gen4_hw_data.h | 1 - sys/dev/qat/include/common/adf_pfvf_msg.h | 1 - sys/dev/qat/include/common/adf_pfvf_utils.h | 1 - sys/dev/qat/include/common/adf_pfvf_vf_proto.h | 1 - sys/dev/qat/include/common/adf_transport.h | 1 - sys/dev/qat/include/common/adf_transport_access_macros.h | 1 - sys/dev/qat/include/common/adf_transport_internal.h | 1 - sys/dev/qat/include/common/adf_uio.h | 1 - sys/dev/qat/include/common/adf_uio_cleanup.h | 1 - sys/dev/qat/include/common/adf_uio_control.h | 1 - sys/dev/qat/include/common/icp_qat_fw_loader_handle.h | 1 - sys/dev/qat/include/common/icp_qat_hal.h | 1 - sys/dev/qat/include/common/icp_qat_uclo.h | 1 - sys/dev/qat/include/common/qat_freebsd.h | 1 - sys/dev/qat/include/common/sal_statistics_strings.h | 1 - sys/dev/qat/include/icp_qat_fw.h | 1 - sys/dev/qat/include/icp_qat_fw_init_admin.h | 1 - sys/dev/qat/include/icp_qat_hw.h | 1 - sys/dev/qat/include/qat_ocf_mem_pool.h | 1 - sys/dev/qat/include/qat_ocf_utils.h | 1 - sys/dev/qat/qat/qat_ocf.c | 1 - sys/dev/qat/qat/qat_ocf_mem_pool.c | 1 - sys/dev/qat/qat/qat_ocf_utils.c | 1 - sys/dev/qat/qat_api/common/compression/dc_buffers.c | 1 - sys/dev/qat/qat_api/common/compression/dc_chain.c | 1 - sys/dev/qat/qat_api/common/compression/dc_datapath.c | 1 - sys/dev/qat/qat_api/common/compression/dc_dp.c | 1 - sys/dev/qat/qat_api/common/compression/dc_header_footer.c | 1 - sys/dev/qat/qat_api/common/compression/dc_ns_datapath.c | 1 - sys/dev/qat/qat_api/common/compression/dc_ns_header_footer.c | 1 - sys/dev/qat/qat_api/common/compression/dc_session.c | 1 - sys/dev/qat/qat_api/common/compression/dc_stats.c | 1 - sys/dev/qat/qat_api/common/compression/icp_sal_dc_err.c | 1 - sys/dev/qat/qat_api/common/compression/include/dc_datapath.h | 1 - sys/dev/qat/qat_api/common/compression/include/dc_error_counter.h | 1 - sys/dev/qat/qat_api/common/compression/include/dc_header_footer.h | 1 - sys/dev/qat/qat_api/common/compression/include/dc_session.h | 1 - sys/dev/qat/qat_api/common/compression/include/dc_stats.h | 1 - sys/dev/qat/qat_api/common/crypto/sym/include/lac_session.h | 1 - sys/dev/qat/qat_api/common/crypto/sym/include/lac_sym.h | 1 - sys/dev/qat/qat_api/common/crypto/sym/include/lac_sym_auth_enc.h | 1 - sys/dev/qat/qat_api/common/crypto/sym/include/lac_sym_cb.h | 1 - sys/dev/qat/qat_api/common/crypto/sym/include/lac_sym_cipher.h | 1 - sys/dev/qat/qat_api/common/crypto/sym/include/lac_sym_cipher_defs.h | 1 - sys/dev/qat/qat_api/common/crypto/sym/include/lac_sym_hash_defs.h | 1 - sys/dev/qat/qat_api/common/crypto/sym/include/lac_sym_hash_precomputes.h | 1 - sys/dev/qat/qat_api/common/crypto/sym/include/lac_sym_partial.h | 1 - sys/dev/qat/qat_api/common/crypto/sym/include/lac_sym_qat.h | 1 - sys/dev/qat/qat_api/common/crypto/sym/include/lac_sym_qat_cipher.h | 1 - .../qat/qat_api/common/crypto/sym/include/lac_sym_qat_constants_table.h | 1 - sys/dev/qat/qat_api/common/crypto/sym/include/lac_sym_qat_hash.h | 1 - .../qat/qat_api/common/crypto/sym/include/lac_sym_qat_hash_defs_lookup.h | 1 - sys/dev/qat/qat_api/common/crypto/sym/include/lac_sym_qat_key.h | 1 - sys/dev/qat/qat_api/common/crypto/sym/include/lac_sym_queue.h | 1 - sys/dev/qat/qat_api/common/crypto/sym/include/lac_sym_stats.h | 1 - sys/dev/qat/qat_api/common/crypto/sym/lac_sym_api.c | 1 - sys/dev/qat/qat_api/common/crypto/sym/lac_sym_auth_enc.c | 1 - sys/dev/qat/qat_api/common/crypto/sym/lac_sym_cb.c | 1 - sys/dev/qat/qat_api/common/crypto/sym/lac_sym_cipher.c | 1 - sys/dev/qat/qat_api/common/crypto/sym/lac_sym_dp.c | 1 - sys/dev/qat/qat_api/common/crypto/sym/lac_sym_hash.c | 1 - sys/dev/qat/qat_api/common/crypto/sym/lac_sym_hash_sw_precomputes.c | 1 - sys/dev/qat/qat_api/common/crypto/sym/lac_sym_partial.c | 1 - sys/dev/qat/qat_api/common/crypto/sym/lac_sym_queue.c | 1 - sys/dev/qat/qat_api/common/crypto/sym/lac_sym_stats.c | 1 - sys/dev/qat/qat_api/common/crypto/sym/qat/lac_sym_qat.c | 1 - sys/dev/qat/qat_api/common/crypto/sym/qat/lac_sym_qat_cipher.c | 1 - sys/dev/qat/qat_api/common/crypto/sym/qat/lac_sym_qat_constants_table.c | 1 - sys/dev/qat/qat_api/common/crypto/sym/qat/lac_sym_qat_hash.c | 1 - sys/dev/qat/qat_api/common/crypto/sym/qat/lac_sym_qat_hash_defs_lookup.c | 1 - sys/dev/qat/qat_api/common/crypto/sym/qat/lac_sym_qat_key.c | 1 - sys/dev/qat/qat_api/common/ctrl/sal_compression.c | 1 - sys/dev/qat/qat_api/common/ctrl/sal_create_services.c | 1 - sys/dev/qat/qat_api/common/ctrl/sal_crypto.c | 1 - sys/dev/qat/qat_api/common/ctrl/sal_ctrl_services.c | 1 - sys/dev/qat/qat_api/common/ctrl/sal_get_instances.c | 1 - sys/dev/qat/qat_api/common/ctrl/sal_list.c | 1 - sys/dev/qat/qat_api/common/include/lac_buffer_desc.h | 1 - sys/dev/qat/qat_api/common/include/lac_common.h | 1 - sys/dev/qat/qat_api/common/include/lac_hooks.h | 1 - sys/dev/qat/qat_api/common/include/lac_list.h | 1 - sys/dev/qat/qat_api/common/include/lac_log.h | 1 - sys/dev/qat/qat_api/common/include/lac_mem.h | 1 - sys/dev/qat/qat_api/common/include/lac_mem_pools.h | 1 - sys/dev/qat/qat_api/common/include/lac_module.h | 1 - sys/dev/qat/qat_api/common/include/lac_sal.h | 1 - sys/dev/qat/qat_api/common/include/lac_sal_ctrl.h | 1 - sys/dev/qat/qat_api/common/include/lac_sal_types.h | 1 - sys/dev/qat/qat_api/common/include/lac_sal_types_crypto.h | 1 - sys/dev/qat/qat_api/common/include/lac_sync.h | 1 - sys/dev/qat/qat_api/common/include/sal_hw_gen.h | 1 - sys/dev/qat/qat_api/common/include/sal_qat_cmn_msg.h | 1 - sys/dev/qat/qat_api/common/include/sal_service_state.h | 1 - sys/dev/qat/qat_api/common/include/sal_statistics.h | 1 - sys/dev/qat/qat_api/common/include/sal_string_parse.h | 1 - sys/dev/qat/qat_api/common/include/sal_types_compression.h | 1 - sys/dev/qat/qat_api/common/qat_comms/sal_qat_cmn_msg.c | 1 - sys/dev/qat/qat_api/common/stubs/lac_stubs.c | 1 - sys/dev/qat/qat_api/common/utils/lac_buffer_desc.c | 1 - sys/dev/qat/qat_api/common/utils/lac_lock_free_stack.h | 1 - sys/dev/qat/qat_api/common/utils/lac_mem.c | 1 - sys/dev/qat/qat_api/common/utils/lac_mem_pools.c | 1 - sys/dev/qat/qat_api/common/utils/lac_sync.c | 1 - sys/dev/qat/qat_api/common/utils/sal_service_state.c | 1 - sys/dev/qat/qat_api/common/utils/sal_statistics.c | 1 - sys/dev/qat/qat_api/common/utils/sal_string_parse.c | 1 - sys/dev/qat/qat_api/common/utils/sal_user_process.c | 1 - sys/dev/qat/qat_api/common/utils/sal_versions.c | 1 - sys/dev/qat/qat_api/device/dev_info.c | 1 - sys/dev/qat/qat_api/firmware/include/icp_qat_fw.h | 1 - sys/dev/qat/qat_api/firmware/include/icp_qat_fw_comp.h | 1 - sys/dev/qat/qat_api/firmware/include/icp_qat_fw_la.h | 1 - sys/dev/qat/qat_api/firmware/include/icp_qat_fw_mmp.h | 1 - sys/dev/qat/qat_api/firmware/include/icp_qat_fw_mmp_ids.h | 1 - sys/dev/qat/qat_api/firmware/include/icp_qat_fw_pke.h | 1 - sys/dev/qat/qat_api/firmware/include/icp_qat_hw.h | 1 - sys/dev/qat/qat_api/firmware/include/icp_qat_hw_20_comp.h | 1 - sys/dev/qat/qat_api/firmware/include/icp_qat_hw_20_comp_defs.h | 1 - sys/dev/qat/qat_api/freebsd_module.c | 1 - sys/dev/qat/qat_api/include/icp_buffer_desc.h | 1 - sys/dev/qat/qat_api/include/icp_sal.h | 1 - sys/dev/qat/qat_api/include/icp_sal_iommu.h | 1 - sys/dev/qat/qat_api/include/icp_sal_nrbg_ht.h | 1 - sys/dev/qat/qat_api/include/icp_sal_poll.h | 1 - sys/dev/qat/qat_api/include/icp_sal_user.h | 1 - sys/dev/qat/qat_api/include/icp_sal_versions.h | 1 - sys/dev/qat/qat_api/qat_direct/include/adf_kernel_types.h | 1 - sys/dev/qat/qat_api/qat_direct/include/icp_accel_devices.h | 1 - sys/dev/qat/qat_api/qat_direct/include/icp_adf_accel_mgr.h | 1 - sys/dev/qat/qat_api/qat_direct/include/icp_adf_cfg.h | 1 - sys/dev/qat/qat_api/qat_direct/include/icp_adf_debug.h | 1 - sys/dev/qat/qat_api/qat_direct/include/icp_adf_esram.h | 1 - sys/dev/qat/qat_api/qat_direct/include/icp_adf_init.h | 1 - sys/dev/qat/qat_api/qat_direct/include/icp_adf_poll.h | 1 - sys/dev/qat/qat_api/qat_direct/include/icp_adf_transport.h | 1 - sys/dev/qat/qat_api/qat_direct/include/icp_adf_transport_dp.h | 1 - sys/dev/qat/qat_api/qat_kernel/src/lac_adf_interface_freebsd.c | 1 - sys/dev/qat/qat_api/qat_kernel/src/lac_symbols.c | 1 - sys/dev/qat/qat_api/qat_kernel/src/qat_transport.c | 1 - sys/dev/qat/qat_api/qat_utils/include/qat_utils.h | 1 - sys/dev/qat/qat_api/qat_utils/src/QatUtilsAtomic.c | 1 - sys/dev/qat/qat_api/qat_utils/src/QatUtilsCrypto.c | 1 - sys/dev/qat/qat_api/qat_utils/src/QatUtilsSemaphore.c | 1 - sys/dev/qat/qat_api/qat_utils/src/QatUtilsServices.c | 1 - sys/dev/qat/qat_api/qat_utils/src/QatUtilsSpinLock.c | 1 - sys/dev/qat/qat_common/adf_accel_engine.c | 1 - sys/dev/qat/qat_common/adf_aer.c | 1 - sys/dev/qat/qat_common/adf_cfg.c | 1 - sys/dev/qat/qat_common/adf_cfg_bundle.c | 1 - sys/dev/qat/qat_common/adf_cfg_bundle.h | 1 - sys/dev/qat/qat_common/adf_cfg_device.c | 1 - sys/dev/qat/qat_common/adf_cfg_instance.c | 1 - sys/dev/qat/qat_common/adf_cfg_instance.h | 1 - sys/dev/qat/qat_common/adf_cfg_section.c | 1 - sys/dev/qat/qat_common/adf_cfg_section.h | 1 - sys/dev/qat/qat_common/adf_cfg_sysctl.c | 1 - sys/dev/qat/qat_common/adf_clock.c | 1 - sys/dev/qat/qat_common/adf_ctl_drv.c | 1 - sys/dev/qat/qat_common/adf_dev_err.c | 1 - sys/dev/qat/qat_common/adf_dev_mgr.c | 1 - sys/dev/qat/qat_common/adf_freebsd_admin.c | 1 - sys/dev/qat/qat_common/adf_freebsd_cfg_dev_dbg.c | 1 - sys/dev/qat/qat_common/adf_freebsd_cnvnr_ctrs_dbg.c | 1 - sys/dev/qat/qat_common/adf_freebsd_dev_processes.c | 1 - sys/dev/qat/qat_common/adf_freebsd_heartbeat_dbg.c | 1 - sys/dev/qat/qat_common/adf_freebsd_pfvf_ctrs_dbg.c | 1 - sys/dev/qat/qat_common/adf_freebsd_transport_debug.c | 1 - sys/dev/qat/qat_common/adf_freebsd_uio.c | 1 - sys/dev/qat/qat_common/adf_freebsd_uio_cleanup.c | 1 - sys/dev/qat/qat_common/adf_freebsd_ver_dbg.c | 1 - sys/dev/qat/qat_common/adf_fw_counters.c | 1 - sys/dev/qat/qat_common/adf_gen2_hw_data.c | 1 - sys/dev/qat/qat_common/adf_gen4_hw_data.c | 1 - sys/dev/qat/qat_common/adf_gen4_pfvf.c | 1 - sys/dev/qat/qat_common/adf_gen4_timer.c | 1 - sys/dev/qat/qat_common/adf_gen4vf_hw_csr_data.c | 1 - sys/dev/qat/qat_common/adf_heartbeat.c | 1 - sys/dev/qat/qat_common/adf_hw_arbiter.c | 1 - sys/dev/qat/qat_common/adf_init.c | 1 - sys/dev/qat/qat_common/adf_isr.c | 1 - sys/dev/qat/qat_common/adf_pfvf_utils.c | 1 - sys/dev/qat/qat_common/adf_pfvf_vf_msg.c | 1 - sys/dev/qat/qat_common/adf_pfvf_vf_proto.c | 1 - sys/dev/qat/qat_common/adf_transport.c | 1 - sys/dev/qat/qat_common/adf_vf_isr.c | 1 - sys/dev/qat/qat_common/qat_common_module.c | 1 - sys/dev/qat/qat_common/qat_freebsd.c | 1 - sys/dev/qat/qat_common/qat_hal.c | 1 - sys/dev/qat/qat_common/qat_uclo.c | 1 - sys/dev/qat/qat_hw/qat_200xx/adf_200xx_hw_data.c | 1 - sys/dev/qat/qat_hw/qat_200xx/adf_200xx_hw_data.h | 1 - sys/dev/qat/qat_hw/qat_200xx/adf_drv.c | 1 - sys/dev/qat/qat_hw/qat_4xxx/adf_4xxx_hw_data.c | 1 - sys/dev/qat/qat_hw/qat_4xxx/adf_4xxx_hw_data.h | 1 - sys/dev/qat/qat_hw/qat_4xxx/adf_drv.c | 1 - sys/dev/qat/qat_hw/qat_4xxxvf/adf_4xxxvf_hw_data.c | 1 - sys/dev/qat/qat_hw/qat_4xxxvf/adf_4xxxvf_hw_data.h | 1 - sys/dev/qat/qat_hw/qat_4xxxvf/adf_drv.c | 1 - sys/dev/qat/qat_hw/qat_c3xxx/adf_c3xxx_hw_data.c | 1 - sys/dev/qat/qat_hw/qat_c3xxx/adf_c3xxx_hw_data.h | 1 - sys/dev/qat/qat_hw/qat_c3xxx/adf_drv.c | 1 - sys/dev/qat/qat_hw/qat_c4xxx/adf_c4xxx_ae_config.c | 1 - sys/dev/qat/qat_hw/qat_c4xxx/adf_c4xxx_hw_data.c | 1 - sys/dev/qat/qat_hw/qat_c4xxx/adf_c4xxx_hw_data.h | 1 - sys/dev/qat/qat_hw/qat_c4xxx/adf_c4xxx_inline.h | 1 - sys/dev/qat/qat_hw/qat_c4xxx/adf_c4xxx_misc_error_stats.c | 1 - sys/dev/qat/qat_hw/qat_c4xxx/adf_c4xxx_misc_error_stats.h | 1 - sys/dev/qat/qat_hw/qat_c4xxx/adf_c4xxx_pke_replay_stats.c | 1 - sys/dev/qat/qat_hw/qat_c4xxx/adf_c4xxx_pke_replay_stats.h | 1 - sys/dev/qat/qat_hw/qat_c4xxx/adf_c4xxx_ras.c | 1 - sys/dev/qat/qat_hw/qat_c4xxx/adf_c4xxx_ras.h | 1 - sys/dev/qat/qat_hw/qat_c4xxx/adf_c4xxx_res_part.c | 1 - sys/dev/qat/qat_hw/qat_c4xxx/adf_c4xxx_reset.c | 1 - sys/dev/qat/qat_hw/qat_c4xxx/adf_c4xxx_reset.h | 1 - sys/dev/qat/qat_hw/qat_c4xxx/adf_drv.c | 1 - sys/dev/qat/qat_hw/qat_c62x/adf_c62x_hw_data.c | 1 - sys/dev/qat/qat_hw/qat_c62x/adf_c62x_hw_data.h | 1 - sys/dev/qat/qat_hw/qat_c62x/adf_drv.c | 1 - sys/dev/qat/qat_hw/qat_dh895xcc/adf_dh895xcc_hw_data.c | 1 - sys/dev/qat/qat_hw/qat_dh895xcc/adf_dh895xcc_hw_data.h | 1 - sys/dev/qat/qat_hw/qat_dh895xcc/adf_drv.c | 1 - sys/dev/qat_c2xxx/qat_aevar.h | 1 - sys/dev/qat_c2xxx/qat_c2xxxreg.h | 1 - sys/dev/qat_c2xxx/qat_hw15reg.h | 1 - sys/dev/qat_c2xxx/qat_hw15var.h | 1 - sys/dev/qat_c2xxx/qatreg.h | 1 - sys/dev/qat_c2xxx/qatvar.h | 1 - sys/dev/ral/rt2560.c | 1 - sys/dev/ral/rt2560reg.h | 1 - sys/dev/ral/rt2560var.h | 1 - sys/dev/ral/rt2661.c | 1 - sys/dev/ral/rt2661reg.h | 1 - sys/dev/ral/rt2661var.h | 1 - sys/dev/rndtest/rndtest.h | 1 - sys/dev/smartpqi/smartpqi_cam.c | 1 - sys/dev/smartpqi/smartpqi_cmd.c | 1 - sys/dev/smartpqi/smartpqi_defines.h | 1 - sys/dev/smartpqi/smartpqi_discovery.c | 1 - sys/dev/smartpqi/smartpqi_event.c | 1 - sys/dev/smartpqi/smartpqi_helper.c | 1 - sys/dev/smartpqi/smartpqi_includes.h | 1 - sys/dev/smartpqi/smartpqi_init.c | 1 - sys/dev/smartpqi/smartpqi_intr.c | 1 - sys/dev/smartpqi/smartpqi_ioctl.c | 1 - sys/dev/smartpqi/smartpqi_ioctl.h | 1 - sys/dev/smartpqi/smartpqi_main.c | 1 - sys/dev/smartpqi/smartpqi_mem.c | 1 - sys/dev/smartpqi/smartpqi_misc.c | 1 - sys/dev/smartpqi/smartpqi_prototypes.h | 1 - sys/dev/smartpqi/smartpqi_queue.c | 1 - sys/dev/smartpqi/smartpqi_request.c | 1 - sys/dev/smartpqi/smartpqi_response.c | 1 - sys/dev/smartpqi/smartpqi_sis.c | 1 - sys/dev/smartpqi/smartpqi_structures.h | 1 - sys/dev/smartpqi/smartpqi_tag.c | 1 - sys/dev/sound/pci/allegro_code.h | 1 - sys/dev/sound/pci/allegro_reg.h | 1 - sys/dev/sound/pci/cs461x_dsp.h | 1 - sys/dev/sound/pci/emuxkireg.h | 1 - sys/dev/sound/usb/uaudio.c | 1 - sys/dev/sound/usb/uaudio.h | 1 - sys/dev/sound/usb/uaudio_pcm.c | 1 - sys/dev/sound/usb/uaudioreg.h | 1 - sys/dev/stge/if_stgereg.h | 1 - sys/dev/sume/adapter.h | 1 - sys/dev/sym/sym_conf.h | 1 - sys/dev/sym/sym_defs.h | 1 - sys/dev/sym/sym_fw.h | 1 - sys/dev/sym/sym_fw1.h | 1 - sys/dev/sym/sym_fw2.h | 1 - sys/dev/syscons/logo/beastie.c | 1 - sys/dev/syscons/logo/logo.c | 1 - sys/dev/usb/controller/atmegadci.c | 1 - sys/dev/usb/controller/atmegadci.h | 1 - sys/dev/usb/controller/avr32dci.c | 1 - sys/dev/usb/controller/avr32dci.h | 1 - sys/dev/usb/controller/dwc_otg.c | 1 - sys/dev/usb/controller/dwc_otg.h | 1 - sys/dev/usb/controller/dwc_otgreg.h | 1 - sys/dev/usb/controller/ehci.c | 1 - sys/dev/usb/controller/ehci.h | 1 - sys/dev/usb/controller/ehcireg.h | 1 - sys/dev/usb/controller/generic_xhci.h | 1 - sys/dev/usb/controller/musb_otg.c | 1 - sys/dev/usb/controller/musb_otg.h | 1 - sys/dev/usb/controller/ohci.c | 1 - sys/dev/usb/controller/ohci.h | 1 - sys/dev/usb/controller/ohcireg.h | 1 - sys/dev/usb/controller/uhci.c | 1 - sys/dev/usb/controller/uhci.h | 1 - sys/dev/usb/controller/uhcireg.h | 1 - sys/dev/usb/controller/usb_controller.c | 1 - sys/dev/usb/controller/uss820dci.c | 1 - sys/dev/usb/controller/uss820dci.h | 1 - sys/dev/usb/controller/xhci.c | 1 - sys/dev/usb/controller/xhci.h | 1 - sys/dev/usb/controller/xhcireg.h | 1 - sys/dev/usb/gadget/g_audio.h | 1 - sys/dev/usb/gadget/g_keyboard.h | 1 - sys/dev/usb/gadget/g_modem.h | 1 - sys/dev/usb/gadget/g_mouse.h | 1 - sys/dev/usb/net/if_iphethvar.h | 1 - sys/dev/usb/net/if_mosreg.h | 1 - sys/dev/usb/net/if_udav.c | 1 - sys/dev/usb/net/if_udavreg.h | 1 - sys/dev/usb/net/if_urndisreg.h | 1 - sys/dev/usb/net/if_usievar.h | 1 - sys/dev/usb/net/usb_ethernet.c | 1 - sys/dev/usb/net/usb_ethernet.h | 1 - sys/dev/usb/quirk/usb_quirk.c | 1 - sys/dev/usb/quirk/usb_quirk.h | 1 - sys/dev/usb/serial/uftdi_reg.h | 1 - sys/dev/usb/serial/ugensa.c | 1 - sys/dev/usb/serial/umcs.h | 1 - sys/dev/usb/serial/umoscom.c | 1 - sys/dev/usb/serial/usb_serial.h | 1 - sys/dev/usb/serial/uvisor.c | 1 - sys/dev/usb/storage/rio500_usb.h | 1 - sys/dev/usb/storage/ustorage_fs.c | 1 - sys/dev/usb/template/usb_template.c | 1 - sys/dev/usb/template/usb_template.h | 1 - sys/dev/usb/template/usb_template_audio.c | 1 - sys/dev/usb/template/usb_template_cdce.c | 1 - sys/dev/usb/template/usb_template_cdceem.c | 1 - sys/dev/usb/template/usb_template_kbd.c | 1 - sys/dev/usb/template/usb_template_midi.c | 1 - sys/dev/usb/template/usb_template_modem.c | 1 - sys/dev/usb/template/usb_template_mouse.c | 1 - sys/dev/usb/template/usb_template_msc.c | 1 - sys/dev/usb/template/usb_template_mtp.c | 1 - sys/dev/usb/template/usb_template_phone.c | 1 - sys/dev/usb/ufm_ioctl.h | 1 - sys/dev/usb/usb.h | 1 - sys/dev/usb/usb_bus.h | 1 - sys/dev/usb/usb_busdma.c | 1 - sys/dev/usb/usb_busdma.h | 1 - sys/dev/usb/usb_cdc.h | 1 - *** 13115 LINES SKIPPED *** From nobody Wed Aug 16 17:56:52 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RQwnJ5lbmz4qvR1; Wed, 16 Aug 2023 17:56: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RQwnJ4cGGz3V9h; Wed, 16 Aug 2023 17:56:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692208612; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4iUeZJRLpnuVddQUa5EJdsSe4fbqLFplaGJmFifbWc8=; b=xRzaU30TSvwpUbumPpK7OVKciJK+R8eooaJNjkBczyTrF8ddLXwwUujTiCeIpwbRnIYq9u UahBrvF51VkKDwqTOmSqhAjHdk6bN8F3IUjfhXyCtnZi8p+wvZDV+RGGNONhlEX8kY3NrJ SqZYnslNVxDgdZi1yHYjiL1ot7PcJrd/Q71ewwPiOSsCjOgYGk9OAsEpCNH6tfSiCpR8oG vJGW0F2pivja7PJKy7zKUuzQTXnFF4mRUlqpbl54ETWm4Vox+qhny52V6DCe7xEBxkB5m+ bwWEgK5TkEik06GXpYRz4xwn8uQ5ZxaqHF6s7Z7RlMsbKZOiKv4jY3/tkRIAxg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692208612; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4iUeZJRLpnuVddQUa5EJdsSe4fbqLFplaGJmFifbWc8=; b=Tb0QThd6cub5mu0/3fSTYNizE+q3wgoHoC7Yb/czy99YuTy1ZIZB7avKRg8dbUAMWVztZL QhUrFaeA/iSxPMvd+GLLYXCqzuSYFRLC7en5DEqFCXvvhmYlW2MH0VdCS8s/OJjl5nBZtL RdUQIC+GwxL0IAf5L42wb1BuIPVpcZfQ1S+ml4Bh7hIPqW3MqIXK89qNTZrfc7U6NZJbEm pRP8ZxgKbKS7DW5IHsDhxYVI19T9rddRJ2Mtdz9DAW5B/V55jl6MzZY0K1/MvcqL4k6Mcy W8Bi4GYfKcpfR35P8yFQhCua3P0wcZ+NT/F2zN61UE7fJ5DtO+37R2CynS1VMA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692208612; a=rsa-sha256; cv=none; b=phLcvm5qwtFzQkE6llpnxY/aRi2Q8KjC8Si9s6Iv7O2//jzfdN68VYQNZLHlCnJR4DxOSx yP+98RZSPv1OpXat10oc5YVtKGK5IjndVGoZ/tf7mnQyAtCaqsC0QHQgSL4vAhuUl5bTA2 pREkKnPco4lYnNG29QZmDeoOC5W9XJMCI93SRCBhfkgE0dFzMxEI4iBuA9d4cuCc8mpAS7 lYVeLRwG/L6FzEJlOSK1ZwQCnbdNwe1H1gqfTeNPI2MfPEBGzlwv7Gr+ImDxtYc8hHaeBs 5VTnt1DPvKSnJ0BGNZNZIJaaKM8rKApPfTsU7Wl70+x9aNZQ+FWYgT9UQ/Cr5w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RQwnJ3h2Sz11KK; Wed, 16 Aug 2023 17:56:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37GHuqmm059127; Wed, 16 Aug 2023 17:56:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37GHuqPE059124; Wed, 16 Aug 2023 17:56:52 GMT (envelope-from git) Date: Wed, 16 Aug 2023 17:56:52 GMT Message-Id: <202308161756.37GHuqPE059124@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: 2a63c3be1582 - main - Remove $FreeBSD$: one-line .c comment pattern List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2a63c3be158216222d89a073dcbd6a72ee4aab5a Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=2a63c3be158216222d89a073dcbd6a72ee4aab5a commit 2a63c3be158216222d89a073dcbd6a72ee4aab5a Author: Warner Losh AuthorDate: 2023-08-16 17:54:29 +0000 Commit: Warner Losh CommitDate: 2023-08-16 17:54:29 +0000 Remove $FreeBSD$: one-line .c comment pattern Remove /^/[*/]\s*\$FreeBSD\$.*\n/ --- bin/chio/defs.h | 1 - bin/chio/pathnames.h | 1 - bin/csh/config.h | 1 - bin/csh/config_p.h | 1 - cddl/compat/opensolaris/include/libintl.h | 1 - cddl/compat/opensolaris/include/priv.h | 1 - cddl/compat/opensolaris/include/solaris.h | 1 - cddl/compat/opensolaris/include/zone.h | 1 - include/getopt.h | 1 - include/gssapi.h | 1 - include/hesiod.h | 1 - include/iconv.h | 1 - include/ieeefp.h | 1 - include/ifaddrs.h | 1 - include/libgen.h | 1 - include/netconfig.h | 1 - include/nsswitch.h | 1 - include/readpassphrase.h | 1 - include/rpc/auth_des.h | 1 - include/rpc/auth_kerb.h | 1 - include/rpc/clnt_soc.h | 1 - include/rpc/clnt_stat.h | 1 - include/rpc/des.h | 1 - include/rpc/nettype.h | 1 - include/rpc/raw.h | 1 - include/rpc/rpc_com.h | 1 - include/rpc/rpcb_clnt.h | 1 - include/rpc/rpcent.h | 1 - include/rpc/svc_dg.h | 1 - include/rpc/svc_soc.h | 1 - include/rpcsvc/nis_object.x | 1 - include/rpcsvc/nis_tags.h | 1 - kerberos5/include/config.h | 1 - kerberos5/include/crypto-headers.h | 1 - kerberos5/include/krb5-types.h | 1 - kerberos5/include/version.h | 1 - kerberos5/lib/libgssapi_krb5/gss_oid.c | 1 - kerberos5/lib/libgssapi_krb5/pname_to_uid.c | 1 - lib/csu/aarch64/crt.h | 1 - lib/csu/arm/crt.h | 1 - lib/csu/riscv/crt.h | 1 - lib/libblocksruntime/config.h | 1 - lib/libc++/libc++.ldscript | 1 - lib/libc/amd64/gen/fpgetmask.c | 1 - lib/libc/amd64/gen/fpgetprec.c | 1 - lib/libc/amd64/gen/fpgetround.c | 1 - lib/libc/amd64/gen/fpgetsticky.c | 1 - lib/libc/amd64/gen/fpsetmask.c | 1 - lib/libc/amd64/gen/fpsetprec.c | 1 - lib/libc/amd64/gen/fpsetround.c | 1 - lib/libc/amd64/string/memcpy.S | 1 - lib/libc/arm/softfloat/arm-gcc.h | 1 - lib/libc/arm/softfloat/milieu.h | 1 - lib/libc/arm/softfloat/softfloat.h | 1 - lib/libc/iconv/_strtol.h | 1 - lib/libc/iconv/_strtoul.h | 1 - lib/libc/iconv/bsd_iconv.c | 1 - lib/libc/iconv/citrus_aliasname_local.h | 1 - lib/libc/iconv/citrus_bcs.c | 1 - lib/libc/iconv/citrus_bcs.h | 1 - lib/libc/iconv/citrus_bcs_strtol.c | 1 - lib/libc/iconv/citrus_bcs_strtoul.c | 1 - lib/libc/iconv/citrus_csmapper.c | 1 - lib/libc/iconv/citrus_csmapper.h | 1 - lib/libc/iconv/citrus_db.c | 1 - lib/libc/iconv/citrus_db.h | 1 - lib/libc/iconv/citrus_db_factory.c | 1 - lib/libc/iconv/citrus_db_factory.h | 1 - lib/libc/iconv/citrus_db_file.h | 1 - lib/libc/iconv/citrus_db_hash.c | 1 - lib/libc/iconv/citrus_db_hash.h | 1 - lib/libc/iconv/citrus_esdb.c | 1 - lib/libc/iconv/citrus_esdb.h | 1 - lib/libc/iconv/citrus_esdb_file.h | 1 - lib/libc/iconv/citrus_fix_grouping.h | 1 - lib/libc/iconv/citrus_hash.c | 1 - lib/libc/iconv/citrus_hash.h | 1 - lib/libc/iconv/citrus_iconv.c | 1 - lib/libc/iconv/citrus_iconv.h | 1 - lib/libc/iconv/citrus_iconv_local.h | 1 - lib/libc/iconv/citrus_lock.h | 1 - lib/libc/iconv/citrus_lookup.c | 1 - lib/libc/iconv/citrus_lookup.h | 1 - lib/libc/iconv/citrus_lookup_factory.c | 1 - lib/libc/iconv/citrus_lookup_factory.h | 1 - lib/libc/iconv/citrus_lookup_file.h | 1 - lib/libc/iconv/citrus_mapper.c | 1 - lib/libc/iconv/citrus_mapper.h | 1 - lib/libc/iconv/citrus_mapper_local.h | 1 - lib/libc/iconv/citrus_memstream.c | 1 - lib/libc/iconv/citrus_memstream.h | 1 - lib/libc/iconv/citrus_mmap.c | 1 - lib/libc/iconv/citrus_mmap.h | 1 - lib/libc/iconv/citrus_module.c | 1 - lib/libc/iconv/citrus_module.h | 1 - lib/libc/iconv/citrus_namespace.h | 1 - lib/libc/iconv/citrus_none.c | 1 - lib/libc/iconv/citrus_none.h | 1 - lib/libc/iconv/citrus_pivot_factory.c | 1 - lib/libc/iconv/citrus_pivot_factory.h | 1 - lib/libc/iconv/citrus_pivot_file.h | 1 - lib/libc/iconv/citrus_prop.c | 1 - lib/libc/iconv/citrus_prop.h | 1 - lib/libc/iconv/citrus_region.h | 1 - lib/libc/iconv/citrus_stdenc.c | 1 - lib/libc/iconv/citrus_stdenc.h | 1 - lib/libc/iconv/citrus_stdenc_local.h | 1 - lib/libc/iconv/citrus_stdenc_template.h | 1 - lib/libc/iconv/citrus_types.h | 1 - lib/libc/include/isc/list.h | 1 - lib/libc/include/isc/platform.h | 1 - lib/libc/include/port_after.h | 1 - lib/libc/include/port_before.h | 1 - lib/libc/libc.ldscript | 1 - lib/libc/libc_nossp.ldscript | 1 - lib/libc/locale/c16rtomb_iconv.c | 1 - lib/libc/locale/c32rtomb_iconv.c | 1 - lib/libc/locale/mbrtoc16_iconv.c | 1 - lib/libc/locale/mbrtoc32_iconv.c | 1 - lib/libc/net/res_config.h | 1 - lib/libc/powerpc/softfloat/milieu.h | 1 - lib/libc/powerpc/softfloat/powerpc-gcc.h | 1 - lib/libc/powerpc/softfloat/softfloat.h | 1 - lib/libc/powerpc64/softfloat/milieu.h | 1 - lib/libc/powerpc64/softfloat/powerpc-gcc.h | 1 - lib/libc/powerpc64/softfloat/softfloat.h | 1 - lib/libc/powerpc64/string/memcpy_resolver.c | 1 - lib/libc/powerpc64/string/memmove.S | 1 - lib/libc/powerpc64/string/memmove_resolver.c | 1 - lib/libc/powerpc64/string/memmove_vsx.S | 1 - lib/libc/powerpcspe/softfloat/milieu.h | 1 - lib/libc/powerpcspe/softfloat/powerpc-gcc.h | 1 - lib/libc/powerpcspe/softfloat/softfloat.h | 1 - lib/libc/resolv/res_private.h | 1 - lib/libc/riscv/softfloat/milieu.h | 1 - lib/libc/riscv/softfloat/riscv-gcc.h | 1 - lib/libc/riscv/softfloat/softfloat.h | 1 - lib/libc/rpc/DISCLAIMER | 1 - lib/libc/softfloat/bits32/softfloat-macros | 1 - lib/libc/softfloat/bits64/softfloat-macros | 1 - lib/libc/softfloat/softfloat-for-gcc.h | 1 - lib/libc/softfloat/softfloat-specialize | 1 - lib/libc/softfloat/templates/milieu.h | 1 - lib/libc/softfloat/templates/softfloat-specialize | 1 - lib/libc/softfloat/templates/softfloat.h | 1 - lib/libc/tests/resolv/resolv_test.c | 1 - lib/libcuse/cuse.h | 1 - lib/libcuse/cuse_lib.c | 1 - lib/libefivar/ProcessorBind.h | 1 - lib/libefivar/uefi-guid.c | 1 - lib/libelftc/elftc_version.c | 1 - lib/libgssapi/gss_buffer_set.c | 1 - lib/libgssapi/gss_inquire_cred_by_oid.c | 1 - lib/libgssapi/gss_oid_to_str.c | 1 - lib/libgssapi/gss_pname_to_uid.c | 1 - lib/libgssapi/gss_pseudo_random.c | 1 - lib/libgssapi/gss_release_oid.c | 1 - lib/libgssapi/gss_set_cred_option.c | 1 - lib/libgssapi/gss_set_sec_context_option.c | 1 - lib/libiconv_modules/BIG5/citrus_big5.c | 1 - lib/libiconv_modules/BIG5/citrus_big5.h | 1 - lib/libiconv_modules/DECHanyu/citrus_dechanyu.c | 1 - lib/libiconv_modules/DECHanyu/citrus_dechanyu.h | 1 - lib/libiconv_modules/EUC/citrus_euc.c | 1 - lib/libiconv_modules/EUC/citrus_euc.h | 1 - lib/libiconv_modules/EUCTW/citrus_euctw.c | 1 - lib/libiconv_modules/EUCTW/citrus_euctw.h | 1 - lib/libiconv_modules/GBK2K/citrus_gbk2k.c | 1 - lib/libiconv_modules/GBK2K/citrus_gbk2k.h | 1 - lib/libiconv_modules/HZ/citrus_hz.c | 1 - lib/libiconv_modules/HZ/citrus_hz.h | 1 - lib/libiconv_modules/ISO2022/citrus_iso2022.c | 1 - lib/libiconv_modules/ISO2022/citrus_iso2022.h | 1 - lib/libiconv_modules/JOHAB/citrus_johab.c | 1 - lib/libiconv_modules/JOHAB/citrus_johab.h | 1 - lib/libiconv_modules/MSKanji/citrus_mskanji.c | 1 - lib/libiconv_modules/MSKanji/citrus_mskanji.h | 1 - lib/libiconv_modules/UES/citrus_ues.c | 1 - lib/libiconv_modules/UES/citrus_ues.h | 1 - lib/libiconv_modules/UTF1632/citrus_utf1632.c | 1 - lib/libiconv_modules/UTF1632/citrus_utf1632.h | 1 - lib/libiconv_modules/UTF7/citrus_utf7.c | 1 - lib/libiconv_modules/UTF7/citrus_utf7.h | 1 - lib/libiconv_modules/UTF8/citrus_utf8.c | 1 - lib/libiconv_modules/UTF8/citrus_utf8.h | 1 - lib/libiconv_modules/VIQR/citrus_viqr.c | 1 - lib/libiconv_modules/VIQR/citrus_viqr.h | 1 - lib/libiconv_modules/ZW/citrus_zw.c | 1 - lib/libiconv_modules/ZW/citrus_zw.h | 1 - lib/libiconv_modules/iconv_none/citrus_iconv_none.c | 1 - lib/libiconv_modules/iconv_none/citrus_iconv_none.h | 1 - lib/libiconv_modules/iconv_std/citrus_iconv_std.c | 1 - lib/libiconv_modules/iconv_std/citrus_iconv_std.h | 1 - lib/libiconv_modules/iconv_std/citrus_iconv_std_local.h | 1 - lib/libiconv_modules/mapper_646/citrus_mapper_646.c | 1 - lib/libiconv_modules/mapper_646/citrus_mapper_646.h | 1 - lib/libiconv_modules/mapper_none/citrus_mapper_none.c | 1 - lib/libiconv_modules/mapper_none/citrus_mapper_none.h | 1 - lib/libiconv_modules/mapper_serial/citrus_mapper_serial.c | 1 - lib/libiconv_modules/mapper_serial/citrus_mapper_serial.h | 1 - lib/libiconv_modules/mapper_std/citrus_mapper_std.c | 1 - lib/libiconv_modules/mapper_std/citrus_mapper_std.h | 1 - lib/libiconv_modules/mapper_std/citrus_mapper_std_file.h | 1 - lib/libiconv_modules/mapper_std/citrus_mapper_std_local.h | 1 - lib/libiconv_modules/mapper_zone/citrus_mapper_zone.c | 1 - lib/libiconv_modules/mapper_zone/citrus_mapper_zone.h | 1 - lib/libipsec/ipsec_strerror.h | 1 - lib/libipsec/libpfkey.h | 1 - lib/libipsec/policy_token.l | 1 - lib/libmd/i386/rmd160.S | 1 - lib/libmd/i386/sha.S | 1 - lib/libmd/md5.h | 1 - lib/libmp/mp.h | 1 - lib/libnetbsd/efun.c | 1 - lib/libnetbsd/netinet/in.h | 1 - lib/libnetbsd/rmd160.h | 1 - lib/libnetbsd/sha1.h | 1 - lib/libnetbsd/sha2.h | 1 - lib/libnetbsd/stdlib.h | 1 - lib/libnetbsd/sys/cdefs.h | 1 - lib/libnetbsd/util.h | 1 - lib/libpcap/config.h | 1 - lib/libpmc/pmu-events/jsmn.h | 1 - lib/libpmc/pmu-events/json.h | 1 - lib/librpcsec_gss/rpcsec_gss_int.h | 1 - lib/librpcsec_gss/rpcsec_gss_prot.c | 1 - lib/libusb/libusb.h | 1 - lib/libusb/libusb01.c | 1 - lib/libusb/libusb10.c | 1 - lib/libusb/libusb10.h | 1 - lib/libusb/libusb10_desc.c | 1 - lib/libusb/libusb10_hotplug.c | 1 - lib/libusb/libusb10_io.c | 1 - lib/libusb/libusb20.c | 1 - lib/libusb/libusb20.h | 1 - lib/libusb/libusb20_desc.c | 1 - lib/libusb/libusb20_desc.h | 1 - lib/libusb/libusb20_int.h | 1 - lib/libusb/libusb20_ugen20.c | 1 - lib/libusb/libusb_global_linux.h | 1 - lib/libusb/usb.h | 1 - lib/libxo/libxo/xo_config.h | 1 - lib/msun/src/w_dremf.c | 1 - lib/ncurses/tinfo/ncurses_cfg.h | 1 - libexec/bootpd/bptypes.h | 1 - libexec/bootpd/dovend.h | 1 - libexec/bootpd/getether.h | 1 - libexec/bootpd/getif.h | 1 - libexec/bootpd/lookup.h | 1 - libexec/bootpd/readfile.h | 1 - libexec/bootpd/report.c | 1 - libexec/bootpd/report.h | 1 - libexec/bootpd/tools/bootptest/bootptest.h | 1 - libexec/flua/linit_flua.c | 1 - libexec/flua/modules/lposix.h | 1 - libexec/ftpd/blacklist.c | 1 - libexec/ftpd/blacklist_client.h | 1 - libexec/ftpd/config.h | 1 - sbin/dhclient/dhcp.h | 1 - sbin/dhclient/tests/fake.c | 1 - sbin/dhclient/tests/option-domain-search.c | 1 - sbin/etherswitchcfg/ifmedia.c | 1 - sbin/gvinum/gvinum.h | 1 - sbin/ifconfig/carp.c | 1 - sbin/ifconfig/ifmedia.c | 1 - sbin/ipf/common/ipf.h | 1 - sbin/ipf/common/ipf_y.y | 1 - sbin/ipf/common/ipmon.h | 1 - sbin/ipf/common/ipt.h | 1 - sbin/ipf/common/kmem.h | 1 - sbin/ipf/common/lexer.c | 1 - sbin/ipf/common/lexer.h | 1 - sbin/ipf/common/opts.h | 1 - sbin/ipf/common/pcap-ipf.h | 1 - sbin/ipf/ipf/bpf-ipf.h | 1 - sbin/ipf/ipf/bpf_filter.c | 1 - sbin/ipf/ipf/ipf.c | 1 - sbin/ipf/ipf/ipfcomp.c | 1 - sbin/ipf/ipfs/ipfs.c | 1 - sbin/ipf/ipfstat/ipfstat.c | 1 - sbin/ipf/ipfsync/ipsyncm.c | 1 - sbin/ipf/ipfsync/ipsyncs.c | 1 - sbin/ipf/ipftest/ip_fil.c | 1 - sbin/ipf/ipftest/ipftest.c | 1 - sbin/ipf/ipftest/md5.c | 1 - sbin/ipf/ipftest/md5.h | 1 - sbin/ipf/iplang/iplang.h | 1 - sbin/ipf/iplang/iplang_l.l | 1 - sbin/ipf/iplang/iplang_y.y | 1 - sbin/ipf/ipmon/ipmon.c | 1 - sbin/ipf/ipmon/ipmon_y.y | 1 - sbin/ipf/ipnat/ipnat.c | 1 - sbin/ipf/ipnat/ipnat_y.y | 1 - sbin/ipf/ippool/ippool.c | 1 - sbin/ipf/ippool/ippool_y.y | 1 - sbin/ipf/ipscan/ipscan_y.y | 1 - sbin/ipf/ipsend/44arp.c | 1 - sbin/ipf/ipsend/arp.c | 1 - sbin/ipf/ipsend/dlcommon.c | 1 - sbin/ipf/ipsend/dltest.h | 1 - sbin/ipf/ipsend/ip.c | 1 - sbin/ipf/ipsend/ipresend.c | 1 - sbin/ipf/ipsend/ipsend.c | 1 - sbin/ipf/ipsend/ipsend.h | 1 - sbin/ipf/ipsend/ipsopt.c | 1 - sbin/ipf/ipsend/iptest.c | 1 - sbin/ipf/ipsend/iptests.c | 1 - sbin/ipf/ipsend/resend.c | 1 - sbin/ipf/ipsend/sbpf.c | 1 - sbin/ipf/ipsend/sdlpi.c | 1 - sbin/ipf/ipsend/snit.c | 1 - sbin/ipf/ipsend/sock.c | 1 - sbin/ipf/ipsend/sockraw.c | 1 - sbin/ipf/libipf/addicmp.c | 1 - sbin/ipf/libipf/addipopt.c | 1 - sbin/ipf/libipf/bcopywrap.c | 1 - sbin/ipf/libipf/binprint.c | 1 - sbin/ipf/libipf/buildopts.c | 1 - sbin/ipf/libipf/checkrev.c | 1 - sbin/ipf/libipf/count4bits.c | 1 - sbin/ipf/libipf/count6bits.c | 1 - sbin/ipf/libipf/debug.c | 1 - sbin/ipf/libipf/facpri.c | 1 - sbin/ipf/libipf/facpri.h | 1 - sbin/ipf/libipf/fill6bits.c | 1 - sbin/ipf/libipf/flags.c | 1 - sbin/ipf/libipf/gethost.c | 1 - sbin/ipf/libipf/getifname.c | 1 - sbin/ipf/libipf/getnattype.c | 1 - sbin/ipf/libipf/getport.c | 1 - sbin/ipf/libipf/getportproto.c | 1 - sbin/ipf/libipf/getproto.c | 1 - sbin/ipf/libipf/getsumd.c | 1 - sbin/ipf/libipf/hostname.c | 1 - sbin/ipf/libipf/icmpcode.c | 1 - sbin/ipf/libipf/inet_addr.c | 1 - sbin/ipf/libipf/initparse.c | 1 - sbin/ipf/libipf/ionames.c | 1 - sbin/ipf/libipf/ipf_dotuning.c | 1 - sbin/ipf/libipf/ipft_hx.c | 1 - sbin/ipf/libipf/ipft_pc.c | 1 - sbin/ipf/libipf/ipft_tx.c | 1 - sbin/ipf/libipf/ipoptsec.c | 1 - sbin/ipf/libipf/kmem.c | 1 - sbin/ipf/libipf/kmem.h | 1 - sbin/ipf/libipf/kmemcpywrap.c | 1 - sbin/ipf/libipf/kvatoname.c | 1 - sbin/ipf/libipf/load_hash.c | 1 - sbin/ipf/libipf/load_hashnode.c | 1 - sbin/ipf/libipf/load_http.c | 1 - sbin/ipf/libipf/load_pool.c | 1 - sbin/ipf/libipf/load_poolnode.c | 1 - sbin/ipf/libipf/mutex_emul.c | 1 - sbin/ipf/libipf/nametokva.c | 1 - sbin/ipf/libipf/nat_setgroupmap.c | 1 - sbin/ipf/libipf/ntomask.c | 1 - sbin/ipf/libipf/optname.c | 1 - sbin/ipf/libipf/optprint.c | 1 - sbin/ipf/libipf/optprintv6.c | 1 - sbin/ipf/libipf/optvalue.c | 1 - sbin/ipf/libipf/portname.c | 1 - sbin/ipf/libipf/print_toif.c | 1 - sbin/ipf/libipf/printactivenat.c | 1 - sbin/ipf/libipf/printaps.c | 1 - sbin/ipf/libipf/printbuf.c | 1 - sbin/ipf/libipf/printfr.c | 1 - sbin/ipf/libipf/printfraginfo.c | 1 - sbin/ipf/libipf/printhash.c | 1 - sbin/ipf/libipf/printhashnode.c | 1 - sbin/ipf/libipf/printhostmap.c | 1 - sbin/ipf/libipf/printhostmask.c | 1 - sbin/ipf/libipf/printifname.c | 1 - sbin/ipf/libipf/printip.c | 1 - sbin/ipf/libipf/printlog.c | 1 - sbin/ipf/libipf/printmask.c | 1 - sbin/ipf/libipf/printnat.c | 1 - sbin/ipf/libipf/printpacket.c | 1 - sbin/ipf/libipf/printpacket6.c | 1 - sbin/ipf/libipf/printpool.c | 1 - sbin/ipf/libipf/printpoolnode.c | 1 - sbin/ipf/libipf/printportcmp.c | 1 - sbin/ipf/libipf/printsbuf.c | 1 - sbin/ipf/libipf/printstate.c | 1 - sbin/ipf/libipf/printtunable.c | 1 - sbin/ipf/libipf/remove_hash.c | 1 - sbin/ipf/libipf/remove_hashnode.c | 1 - sbin/ipf/libipf/remove_pool.c | 1 - sbin/ipf/libipf/remove_poolnode.c | 1 - sbin/ipf/libipf/resetlexer.c | 1 - sbin/ipf/libipf/rwlock_emul.c | 1 - sbin/ipf/libipf/tcp_flags.c | 1 - sbin/ipf/libipf/tcpflags.c | 1 - sbin/ipf/libipf/tcpoptnames.c | 1 - sbin/ipf/libipf/v6ionames.c | 1 - sbin/ipf/libipf/v6optvalue.c | 1 - sbin/ipf/libipf/var.c | 1 - sbin/ipf/libipf/verbose.c | 1 - sbin/newfs_msdos/mkfs_msdos.h | 1 - sbin/rcorder/ealloc.c | 1 - sbin/rcorder/ealloc.h | 1 - sbin/rcorder/hash.c | 1 - sbin/rcorder/hash.h | 1 - sbin/setkey/parse.y | 1 - sbin/setkey/setkey.c | 1 - sbin/setkey/test-pfkey.c | 1 - sbin/setkey/token.l | 1 - sbin/setkey/vchar.h | 1 - secure/lib/libcrypto/arch/aarch64/aes-gcm-armv8_64.S | 1 - secure/lib/libcrypto/arch/aarch64/aesv8-armx.S | 1 - secure/lib/libcrypto/arch/aarch64/arm64cpuid.S | 1 - secure/lib/libcrypto/arch/aarch64/armv8-mont.S | 1 - secure/lib/libcrypto/arch/aarch64/chacha-armv8.S | 1 - secure/lib/libcrypto/arch/aarch64/ecp_nistz256-armv8.S | 1 - secure/lib/libcrypto/arch/aarch64/ghashv8-armx.S | 1 - secure/lib/libcrypto/arch/aarch64/keccak1600-armv8.S | 1 - secure/lib/libcrypto/arch/aarch64/poly1305-armv8.S | 1 - secure/lib/libcrypto/arch/aarch64/sha1-armv8.S | 1 - secure/lib/libcrypto/arch/aarch64/sha256-armv8.S | 1 - secure/lib/libcrypto/arch/aarch64/sha512-armv8.S | 1 - secure/lib/libcrypto/arch/aarch64/vpaes-armv8.S | 1 - secure/lib/libcrypto/arch/amd64/aesni-gcm-x86_64.S | 1 - secure/lib/libcrypto/arch/amd64/aesni-mb-x86_64.S | 1 - secure/lib/libcrypto/arch/amd64/aesni-sha1-x86_64.S | 1 - secure/lib/libcrypto/arch/amd64/aesni-sha256-x86_64.S | 1 - secure/lib/libcrypto/arch/amd64/aesni-x86_64.S | 1 - secure/lib/libcrypto/arch/amd64/chacha-x86_64.S | 1 - secure/lib/libcrypto/arch/amd64/cmll-x86_64.S | 1 - secure/lib/libcrypto/arch/amd64/e_padlock-x86_64.S | 1 - secure/lib/libcrypto/arch/amd64/ecp_nistz256-x86_64.S | 1 - secure/lib/libcrypto/arch/amd64/ghash-x86_64.S | 1 - secure/lib/libcrypto/arch/amd64/keccak1600-x86_64.S | 1 - secure/lib/libcrypto/arch/amd64/md5-x86_64.S | 1 - secure/lib/libcrypto/arch/amd64/poly1305-x86_64.S | 1 - secure/lib/libcrypto/arch/amd64/rc4-md5-x86_64.S | 1 - secure/lib/libcrypto/arch/amd64/rc4-x86_64.S | 1 - secure/lib/libcrypto/arch/amd64/rsaz-avx2.S | 1 - secure/lib/libcrypto/arch/amd64/rsaz-avx512.S | 1 - secure/lib/libcrypto/arch/amd64/rsaz-x86_64.S | 1 - secure/lib/libcrypto/arch/amd64/sha1-mb-x86_64.S | 1 - secure/lib/libcrypto/arch/amd64/sha1-x86_64.S | 1 - secure/lib/libcrypto/arch/amd64/sha256-mb-x86_64.S | 1 - secure/lib/libcrypto/arch/amd64/sha256-x86_64.S | 1 - secure/lib/libcrypto/arch/amd64/sha512-x86_64.S | 1 - secure/lib/libcrypto/arch/amd64/vpaes-x86_64.S | 1 - secure/lib/libcrypto/arch/amd64/wp-x86_64.S | 1 - secure/lib/libcrypto/arch/amd64/x25519-x86_64.S | 1 - secure/lib/libcrypto/arch/amd64/x86_64-gf2m.S | 1 - secure/lib/libcrypto/arch/amd64/x86_64-mont.S | 1 - secure/lib/libcrypto/arch/amd64/x86_64-mont5.S | 1 - secure/lib/libcrypto/arch/amd64/x86_64cpuid.S | 1 - secure/lib/libcrypto/arch/arm/aes-armv4.S | 1 - secure/lib/libcrypto/arch/arm/aesv8-armx.S | 1 - secure/lib/libcrypto/arch/arm/armv4-gf2m.S | 1 - secure/lib/libcrypto/arch/arm/armv4-mont.S | 1 - secure/lib/libcrypto/arch/arm/armv4cpuid.S | 1 - secure/lib/libcrypto/arch/arm/bsaes-armv7.S | 1 - secure/lib/libcrypto/arch/arm/chacha-armv4.S | 1 - secure/lib/libcrypto/arch/arm/ecp_nistz256-armv4.S | 1 - secure/lib/libcrypto/arch/arm/ghash-armv4.S | 1 - secure/lib/libcrypto/arch/arm/ghashv8-armx.S | 1 - secure/lib/libcrypto/arch/arm/keccak1600-armv4.S | 1 - secure/lib/libcrypto/arch/arm/poly1305-armv4.S | 1 - secure/lib/libcrypto/arch/arm/sha1-armv4-large.S | 1 - secure/lib/libcrypto/arch/arm/sha256-armv4.S | 1 - secure/lib/libcrypto/arch/arm/sha512-armv4.S | 1 - secure/lib/libcrypto/arch/i386/aesni-x86.S | 1 - secure/lib/libcrypto/arch/i386/bf-586.S | 1 - secure/lib/libcrypto/arch/i386/bn-586.S | 1 - secure/lib/libcrypto/arch/i386/cast-586.S | 1 - secure/lib/libcrypto/arch/i386/chacha-x86.S | 1 - secure/lib/libcrypto/arch/i386/cmll-x86.S | 1 - secure/lib/libcrypto/arch/i386/co-586.S | 1 - secure/lib/libcrypto/arch/i386/crypt586.S | 1 - secure/lib/libcrypto/arch/i386/des-586.S | 1 - secure/lib/libcrypto/arch/i386/e_padlock-x86.S | 1 - secure/lib/libcrypto/arch/i386/ecp_nistz256-x86.S | 1 - secure/lib/libcrypto/arch/i386/ghash-x86.S | 1 - secure/lib/libcrypto/arch/i386/md5-586.S | 1 - secure/lib/libcrypto/arch/i386/poly1305-x86.S | 1 - secure/lib/libcrypto/arch/i386/rc4-586.S | 1 - secure/lib/libcrypto/arch/i386/rc5-586.S | 1 - secure/lib/libcrypto/arch/i386/rmd-586.S | 1 - secure/lib/libcrypto/arch/i386/sha1-586.S | 1 - secure/lib/libcrypto/arch/i386/sha256-586.S | 1 - secure/lib/libcrypto/arch/i386/sha512-586.S | 1 - secure/lib/libcrypto/arch/i386/vpaes-x86.S | 1 - secure/lib/libcrypto/arch/i386/wp-mmx.S | 1 - secure/lib/libcrypto/arch/i386/x86-gf2m.S | 1 - secure/lib/libcrypto/arch/i386/x86-mont.S | 1 - secure/lib/libcrypto/arch/i386/x86cpuid.S | 1 - secure/lib/libcrypto/arch/powerpc/aes-ppc.S | 1 - secure/lib/libcrypto/arch/powerpc/aesp8-ppc.S | 1 - secure/lib/libcrypto/arch/powerpc/bn-ppc.S | 1 - secure/lib/libcrypto/arch/powerpc/chacha-ppc.S | 1 - secure/lib/libcrypto/arch/powerpc/ghashp8-ppc.S | 1 - secure/lib/libcrypto/arch/powerpc/poly1305-ppc.S | 1 - secure/lib/libcrypto/arch/powerpc/poly1305-ppcfp.S | 1 - secure/lib/libcrypto/arch/powerpc/ppc-mont.S | 1 - secure/lib/libcrypto/arch/powerpc/ppc.S | 1 - secure/lib/libcrypto/arch/powerpc/ppccpuid.S | 1 - secure/lib/libcrypto/arch/powerpc/sha1-ppc.S | 1 - secure/lib/libcrypto/arch/powerpc/sha256-ppc.S | 1 - secure/lib/libcrypto/arch/powerpc/sha256p8-ppc.S | 1 - secure/lib/libcrypto/arch/powerpc/sha512-ppc.S | 1 - secure/lib/libcrypto/arch/powerpc/sha512p8-ppc.S | 1 - secure/lib/libcrypto/arch/powerpc/vpaes-ppc.S | 1 - secure/lib/libcrypto/arch/powerpc64/aes-ppc.S | 1 - secure/lib/libcrypto/arch/powerpc64/aesp8-ppc.S | 1 - secure/lib/libcrypto/arch/powerpc64/bn-ppc.S | 1 - secure/lib/libcrypto/arch/powerpc64/chacha-ppc.S | 1 - secure/lib/libcrypto/arch/powerpc64/ecp_nistp521-ppc64.S | 1 - secure/lib/libcrypto/arch/powerpc64/ecp_nistz256-ppc64.S | 1 - secure/lib/libcrypto/arch/powerpc64/ghashp8-ppc.S | 1 - secure/lib/libcrypto/arch/powerpc64/keccak1600-ppc64.S | 1 - secure/lib/libcrypto/arch/powerpc64/poly1305-ppc.S | 1 - secure/lib/libcrypto/arch/powerpc64/poly1305-ppcfp.S | 1 - secure/lib/libcrypto/arch/powerpc64/ppc-mont.S | 1 - secure/lib/libcrypto/arch/powerpc64/ppc.S | 1 - secure/lib/libcrypto/arch/powerpc64/ppccpuid.S | 1 - secure/lib/libcrypto/arch/powerpc64/sha1-ppc.S | 1 - secure/lib/libcrypto/arch/powerpc64/sha256-ppc.S | 1 - secure/lib/libcrypto/arch/powerpc64/sha256p8-ppc.S | 1 - secure/lib/libcrypto/arch/powerpc64/sha512-ppc.S | 1 - secure/lib/libcrypto/arch/powerpc64/sha512p8-ppc.S | 1 - secure/lib/libcrypto/arch/powerpc64/vpaes-ppc.S | 1 - secure/lib/libcrypto/arch/powerpc64/x25519-ppc64.S | 1 - secure/lib/libcrypto/arch/powerpc64le/aes-ppc.S | 1 - secure/lib/libcrypto/arch/powerpc64le/aesp8-ppc.S | 1 - secure/lib/libcrypto/arch/powerpc64le/bn-ppc.S | 1 - secure/lib/libcrypto/arch/powerpc64le/chacha-ppc.S | 1 - secure/lib/libcrypto/arch/powerpc64le/ecp_nistp521-ppc64.S | 1 - secure/lib/libcrypto/arch/powerpc64le/ecp_nistz256-ppc64.S | 1 - secure/lib/libcrypto/arch/powerpc64le/ghashp8-ppc.S | 1 - secure/lib/libcrypto/arch/powerpc64le/keccak1600-ppc64.S | 1 - secure/lib/libcrypto/arch/powerpc64le/poly1305-ppc.S | 1 - secure/lib/libcrypto/arch/powerpc64le/poly1305-ppcfp.S | 1 - secure/lib/libcrypto/arch/powerpc64le/ppc-mont.S | 1 - secure/lib/libcrypto/arch/powerpc64le/ppc.S | 1 - secure/lib/libcrypto/arch/powerpc64le/ppccpuid.S | 1 - secure/lib/libcrypto/arch/powerpc64le/sha1-ppc.S | 1 - secure/lib/libcrypto/arch/powerpc64le/sha256-ppc.S | 1 - secure/lib/libcrypto/arch/powerpc64le/sha256p8-ppc.S | 1 - secure/lib/libcrypto/arch/powerpc64le/sha512-ppc.S | 1 - secure/lib/libcrypto/arch/powerpc64le/sha512p8-ppc.S | 1 - secure/lib/libcrypto/arch/powerpc64le/vpaes-ppc.S | 1 - secure/lib/libcrypto/arch/powerpc64le/x25519-ppc64.S | 1 - share/examples/FreeBSD_version/FreeBSD_version.c | 1 - share/examples/ipfilter/l4check/l4check.c | 1 - share/examples/ipfilter/mlfk_rule.c | 1 - share/examples/ipfilter/samples/proxy.c | 1 - share/examples/ipfilter/samples/relay.c | 1 - share/examples/ipfilter/samples/userauth.c | 1 - share/examples/ses/srcs/chpmon.c | 1 - share/examples/ses/srcs/eltsub.c | 1 - share/examples/ses/srcs/eltsub.h | 1 - share/examples/ses/srcs/getencstat.c | 1 - share/examples/ses/srcs/getnobj.c | 1 - share/examples/ses/srcs/getobjmap.c | 1 - share/examples/ses/srcs/getobjstat.c | 1 - share/examples/ses/srcs/inienc.c | 1 - share/examples/ses/srcs/sesd.c | 1 - share/examples/ses/srcs/setencstat.c | 1 - share/examples/ses/srcs/setobjstat.c | 1 - share/examples/sunrpc/msg/msg_proc.c | 1 - share/examples/sunrpc/msg/printmsg.c | 1 - share/examples/tests/tests/atf/printf_test.c | 1 - share/examples/tests/tests/plain/printf_test.c | 1 - share/examples/tests/tests/tap/printf_test.c | 1 - stand/efi/include/Guid/MemoryTypeInformation.h | 1 - stand/efi/include/Guid/MtcVendor.h | 1 - stand/efi/include/Guid/ZeroGuid.h | 1 - stand/efi/include/Protocol/EdidActive.h | 1 - stand/efi/include/Protocol/EdidDiscovered.h | 1 - stand/efi/include/Protocol/EdidOverride.h | 1 - stand/efi/include/Protocol/Http.h | 1 - stand/efi/include/Protocol/Ip4Config2.h | 1 - stand/efi/include/Protocol/ServiceBinding.h | 1 - stand/efi/include/README | 1 - stand/efi/include/amd64/efibind.h | 1 - stand/efi/include/amd64/pe.h | 1 - stand/efi/include/arm/efibind.h | 1 - stand/efi/include/arm64/efibind.h | 1 - stand/efi/include/efi.h | 1 - stand/efi/include/efi_nii.h | 1 - stand/efi/include/efiapi.h | 1 - stand/efi/include/eficon.h | 1 - stand/efi/include/eficonsctl.h | 1 - stand/efi/include/efidebug.h | 1 - stand/efi/include/efidef.h | 1 - stand/efi/include/efidevp.h | 1 - stand/efi/include/efierr.h | 1 - stand/efi/include/efifpswa.h | 1 - stand/efi/include/efifs.h | 1 - stand/efi/include/efigop.h | 1 - stand/efi/include/efigpt.h | 1 - stand/efi/include/efiip.h | 1 - stand/efi/include/efinet.h | 1 - stand/efi/include/efipart.h | 1 - stand/efi/include/efipciio.h | 1 - stand/efi/include/efipoint.h | 1 - stand/efi/include/efiprot.h | 1 - stand/efi/include/efipxebc.h | 1 - stand/efi/include/efiser.h | 1 - stand/efi/include/efistdarg.h | 1 - stand/efi/include/efitcp.h | 1 - stand/efi/include/efiudp.h | 1 - stand/efi/include/efiuga.h | 1 - stand/efi/include/i386/efibind.h | 1 - stand/efi/include/i386/pe.h | 1 - stand/efi/include/riscv/efibind.h | 1 - stand/efi/loader/arch/amd64/ldscript.amd64 | 1 - stand/efi/loader/arch/arm/ldscript.arm | 1 - stand/efi/loader/arch/arm64/ldscript.arm64 | 1 - stand/efi/loader/arch/riscv/ldscript.riscv | 1 - stand/ficl/aarch64/sysdep.c | 1 - stand/ficl/amd64/sysdep.c | 1 - stand/ficl/amd64/sysdep.h | 1 - stand/ficl/arm/sysdep.c | 1 - stand/ficl/dict.c | 1 - stand/ficl/ficl.c | 1 - stand/ficl/ficl.h | 1 - stand/ficl/fileaccess.c | 1 - stand/ficl/float.c | 1 - stand/ficl/i386/sysdep.c | 1 - stand/ficl/i386/sysdep.h | 1 - stand/ficl/math64.c | 1 - stand/ficl/math64.h | 1 - stand/ficl/mips/sysdep.c | 1 - stand/ficl/mips64/sysdep.c | 1 - stand/ficl/powerpc/sysdep.c | 1 - stand/ficl/prefix.c | 1 - stand/ficl/riscv/sysdep.c | 1 - stand/ficl/search.c | 1 - stand/ficl/stack.c | 1 - stand/ficl/testmain.c | 1 - stand/ficl/tools.c | 1 - stand/ficl/unix.c | 1 - stand/ficl/vm.c | 1 - stand/ficl/words.c | 1 - stand/ficl/x86/sysdep.c | 1 - stand/i386/boot.ldscript | 1 - stand/kboot/arch/aarch64/ldscript.aarch64 | 1 - stand/kboot/arch/amd64/ldscript.amd64 | 1 - stand/kshim/bsd_busspace.c | 1 - stand/kshim/bsd_global.h | 1 - stand/kshim/bsd_kernel.c | 1 - stand/kshim/bsd_kernel.h | 1 - stand/kshim/sysinit.h | 1 - stand/libsa/bootparam.h | 1 - stand/libsa/crc32_libkern.c | 1 - stand/libsa/netif.h | 1 - stand/libsa/nfsv2.h | 1 - stand/libsa/powerpc/_setjmp.S | 1 - stand/powerpc/ofw/ldscript.powerpc | 1 - stand/powerpc/ofw/ldscript.powerpcle | 1 - stand/uboot/arch/arm/ldscript.arm | 1 - stand/uboot/arch/powerpc/ldscript.powerpc | 1 - stand/usb/storage/umass_common.c | 1 - stand/usb/storage/umass_common.h | 1 - stand/usb/storage/umass_loader.c | 1 - stand/usb/test/bsd_usbloader_test.c | 1 - stand/usb/tools/sysinit.c | 1 - stand/usb/usb_busdma_loader.c | 1 - tests/sys/geom/class/eli/testvect.h | 1 - tests/sys/kqueue/libkqueue/config.h | 1 - tests/sys/mqueue/mqtest1.c | 1 - tests/sys/mqueue/mqtest2.c | 1 - tests/sys/mqueue/mqtest3.c | 1 - tests/sys/mqueue/mqtest4.c | 1 - tests/sys/mqueue/mqtest5.c | 1 - tests/sys/pjdfstest/config.h | 1 - tools/diag/dumpvfscache/dumpvfscache.c | 1 - tools/kerneldoc/subsys/notreviewed.dox | 1 - tools/regression/ccd/layout/a.c | 1 - tools/regression/ccd/layout/b.c | 1 - tools/regression/p1003_1b/main.c | 1 - tools/regression/poll/pipepoll.c | 1 - tools/regression/poll/pipeselect.c | 1 - tools/regression/poll/sockpoll.c | 1 - tools/regression/posixsem2/semtest.c | 1 - tools/regression/pthread/unwind/Test.cpp | 1 - tools/regression/pthread/unwind/catch_pthread_exit.cpp | 1 - tools/regression/pthread/unwind/cond_wait_cancel.cpp | 1 - tools/regression/pthread/unwind/main_thread_exit.cpp | 1 - tools/regression/pthread/unwind/sem_wait_cancel.cpp | 1 - tools/regression/pthread/unwind/thread_normal_exit.cpp | 1 - tools/regression/sigqueue/sigqtest1/sigqtest1.c | 1 - tools/regression/sigqueue/sigqtest2/sigqtest2.c | 1 - tools/regression/tls/libxx/xx.c | 1 - tools/regression/tls/libyy/yy.c | 1 - tools/regression/tls/ttls1/ttls1.c | 1 - tools/regression/tls/ttls2/ttls2.c | 1 - tools/test/malloc/main.c | 1 - tools/tools/ath/ath_ee_9287_print/9287.h | 1 - tools/tools/ath/ath_ee_9287_print/eeprom.h | 1 - tools/tools/ath/ath_ee_v4k_print/eeprom.h | 1 - tools/tools/ath/ath_ee_v4k_print/v4k.h | 1 - tools/tools/iwi/iwistats.c | 1 - tools/tools/kttcp/kttcp.c | 1 - tools/tools/kttcp/sys/kttcp.c | 1 - tools/tools/kttcp/sys/kttcpio.h | 1 - tools/tools/mctest/mctest.h | 1 - tools/tools/ncpus/ncpus.c | 1 - tools/tools/netmap/ctrs.h | 1 - tools/tools/netmap/lb.c | 1 - tools/tools/netmap/pkt_hash.c | 1 - tools/tools/netmap/pkt_hash.h | 1 - tools/tools/usbtest/usb_control_ep_test.c | 1 - tools/tools/usbtest/usb_modem_test.c | 1 - tools/tools/usbtest/usb_msc_test.c | 1 - tools/tools/usbtest/usb_msc_test.h | 1 - tools/tools/usbtest/usbtest.c | 1 - tools/tools/usbtest/usbtest.h | 1 - tools/tools/vhba/faulty/vhba_faulty.c | 1 - tools/tools/vhba/lots/vhba_lots.c | 1 - tools/tools/vhba/medium/vhba_medium.c | 1 - tools/tools/vhba/mptest/vhba_mptest.c | 1 - tools/tools/vhba/opt_cam.h | 1 - tools/tools/vhba/rptluns/vhba_rptluns.c | 1 - tools/tools/vhba/simple/vhba_simple.c | 1 - tools/tools/vhba/vhba.c | 1 - tools/tools/vhba/vhba.h | 1 - tools/tools/zfsboottest/zfsboottest.c | 1 - usr.bin/bc/bc.library | 1 - usr.bin/bc/extern.h | 1 - usr.bin/bc/pathnames.h | 1 - usr.bin/bc/tty.c | 1 - usr.bin/bmake/config.h | 1 - usr.bin/compress/doc/revision.log | 1 - usr.bin/dc/bcode.h | 1 - usr.bin/dc/extern.h | 1 - usr.bin/fortune/strfile/strfile.h | 1 - usr.bin/ftp/tnftp_config.h | 1 - usr.bin/gcore/elf32core.c | 1 - usr.bin/grep/file.c | 1 - usr.bin/grep/grep.c | 1 - usr.bin/grep/grep.h | 1 - usr.bin/grep/queue.c | 1 - usr.bin/grep/util.c | 1 - usr.bin/gzip/unpack.c | 1 - usr.bin/iconv/iconv.c | 1 - usr.bin/indent/tests/binary.0 | 1 - usr.bin/indent/tests/binary.0.stdout | 1 - usr.bin/indent/tests/comments.0 | 1 - usr.bin/indent/tests/comments.0.pro | 1 - usr.bin/indent/tests/comments.0.stdout | 1 - usr.bin/indent/tests/cs.0 | 1 - usr.bin/indent/tests/cs.0.pro | 1 - usr.bin/indent/tests/cs.0.stdout | 1 - usr.bin/indent/tests/declarations.0 | 1 - usr.bin/indent/tests/declarations.0.stdout | 1 - usr.bin/indent/tests/elsecomment.0 | 1 - usr.bin/indent/tests/elsecomment.0.pro | 1 - usr.bin/indent/tests/elsecomment.0.stdout | 1 - usr.bin/indent/tests/f_decls.0 | 1 - usr.bin/indent/tests/f_decls.0.stdout | 1 - usr.bin/indent/tests/float.0 | 1 - usr.bin/indent/tests/float.0.stdout | 1 - usr.bin/indent/tests/label.0 | 1 - usr.bin/indent/tests/label.0.pro | 1 - usr.bin/indent/tests/label.0.stdout | 1 - usr.bin/indent/tests/list_head.0 | 1 - usr.bin/indent/tests/list_head.0.stdout | 1 - usr.bin/indent/tests/ncs.0 | 1 - usr.bin/indent/tests/ncs.0.pro | 1 - usr.bin/indent/tests/ncs.0.stdout | 1 - usr.bin/indent/tests/offsetof.0 | 1 - usr.bin/indent/tests/offsetof.0.stdout | 1 - usr.bin/indent/tests/parens.0 | 1 - usr.bin/indent/tests/parens.0.pro | 1 - usr.bin/indent/tests/parens.0.stdout | 1 - usr.bin/indent/tests/pcs.0 | 1 - usr.bin/indent/tests/pcs.0.pro | 1 - usr.bin/indent/tests/pcs.0.stdout | 1 - usr.bin/indent/tests/struct.0 | 1 - usr.bin/indent/tests/struct.0.stdout | 1 - usr.bin/indent/tests/surplusbad.0 | 1 - usr.bin/indent/tests/surplusbad.0.pro | 1 - usr.bin/indent/tests/surplusbad.0.stdout | 1 - usr.bin/indent/tests/types_from_file.0 | 1 - usr.bin/indent/tests/types_from_file.0.pro | 1 - usr.bin/indent/tests/types_from_file.0.stdout | 1 - usr.bin/indent/tests/wchar.0 | 1 - usr.bin/indent/tests/wchar.0.stdout | 1 - usr.bin/lex/config.h | 1 - usr.bin/mkcsmapper/ldef.h | 1 - usr.bin/mkcsmapper/lex.l | 1 - usr.bin/mkcsmapper/yacc.y | 1 - usr.bin/mkesdb/ldef.h | 1 - usr.bin/mkesdb/lex.l | 1 - usr.bin/mkesdb/yacc.y | 1 - usr.bin/sdiff/extern.h | 1 - usr.bin/sort/bwstring.h | 1 - usr.bin/sort/coll.h | 1 - usr.bin/sort/file.h | 1 - usr.bin/sort/mem.h | 1 - usr.bin/sort/radixsort.h | 1 - usr.bin/sort/sort.h | 1 - usr.bin/sort/vsort.h | 1 - usr.bin/tip/tip/pathnames.h | 1 - usr.bin/tip/tip/tip.h | 1 - usr.bin/top/display.h | 1 - usr.bin/usbhidaction/usbhidaction.c | 1 - usr.bin/usbhidctl/usbhid.c | 1 - usr.bin/vi/config.h | 1 - usr.bin/vi/ex/version.h | 1 - usr.bin/vi/pathnames.h | 1 - usr.bin/wall/ttymsg.h | 1 - usr.bin/yacc/config.h | 1 - usr.sbin/apmd/contrib/pccardq.c | 1 - usr.sbin/bluetooth/btpand/bnep.c | 1 - usr.sbin/bluetooth/btpand/bnep.h | 1 - usr.sbin/bluetooth/btpand/btpand.c | 1 - usr.sbin/bluetooth/btpand/btpand.h | 1 - usr.sbin/bluetooth/btpand/channel.c | 1 - usr.sbin/bluetooth/btpand/client.c | 1 - usr.sbin/bluetooth/btpand/event.c | 1 - usr.sbin/bluetooth/btpand/event.h | 1 - usr.sbin/bluetooth/btpand/packet.c | 1 - usr.sbin/bluetooth/btpand/sdp.c | 1 - usr.sbin/bluetooth/btpand/sdp.h | 1 - usr.sbin/bluetooth/btpand/server.c | 1 - usr.sbin/bluetooth/btpand/tap.c | 1 - usr.sbin/crunch/crunchide/extern.h | 1 - usr.sbin/dumpcis/cardinfo.h | 1 - usr.sbin/kbdcontrol/path.h | 1 - usr.sbin/kldxref/ef.h | 1 - usr.sbin/mailwrapper/pathnames.h | 1 - usr.sbin/makefs/msdos.h | 1 - usr.sbin/makefs/msdos/direntry.h | 1 - usr.sbin/makefs/msdos/msdosfs_fat.c | 1 - usr.sbin/makefs/msdos/msdosfs_lookup.c | 1 - usr.sbin/ndp/ndp.c | 1 - usr.sbin/ntp/config.h | 1 - usr.sbin/ntp/ntpdc/nl.c | 1 - usr.sbin/pciconf/pathnames.h | 1 - usr.sbin/route6d/route6d.c | 1 - usr.sbin/route6d/route6d.h | 1 - usr.sbin/rpc.lockd/lock_proc.c | 1 - usr.sbin/rpc.lockd/lockd.c | 1 - usr.sbin/rpc.lockd/lockd.h | 1 - usr.sbin/rpc.lockd/lockd_lock.h | 1 - usr.sbin/rpcbind/check_bound.c | 1 - usr.sbin/rpcbind/pmap_svc.c | 1 - usr.sbin/rpcbind/rpcb_svc.c | 1 - usr.sbin/rpcbind/rpcb_svc_com.c | 1 - usr.sbin/rpcbind/rpcbind.c | 1 - usr.sbin/rpcbind/rpcbind.h | 1 - usr.sbin/rpcbind/security.c | 1 - usr.sbin/rtadvd/advcap.c | 1 - usr.sbin/rtadvd/advcap.h | 1 - usr.sbin/rtadvd/config.c | 1 - usr.sbin/rtadvd/config.h | 1 - usr.sbin/rtadvd/if.c | 1 - usr.sbin/rtadvd/if.h | 1 - usr.sbin/rtadvd/pathnames.h | 1 - usr.sbin/rtadvd/rrenum.c | 1 - usr.sbin/rtadvd/rrenum.h | 1 - usr.sbin/rtadvd/rtadvd.c | 1 - usr.sbin/rtadvd/rtadvd.h | 1 - usr.sbin/rtadvd/timer.c | 1 - usr.sbin/rtadvd/timer.h | 1 - usr.sbin/rtadvd/timer_subr.c | 1 - usr.sbin/rtadvd/timer_subr.h | 1 - usr.sbin/rtsold/rtsock.c | 1 - usr.sbin/sesutil/eltsub.c | 1 - usr.sbin/sesutil/eltsub.h | 1 - usr.sbin/tcpdump/tcpdump/config.h | 1 - usr.sbin/unbound/config.h | 1 - usr.sbin/usbconfig/dump.c | 1 - usr.sbin/usbconfig/dump.h | 1 - usr.sbin/usbconfig/usbconfig.c | 1 - usr.sbin/valectl/valectl.c | 1 - usr.sbin/vidcontrol/decode.h | 1 - usr.sbin/vidcontrol/path.h | 1 - usr.sbin/ypldap/aldap.c | 1 - usr.sbin/ypldap/aldap.h | 1 - usr.sbin/ypldap/ber.c | 1 - usr.sbin/ypldap/ber.h | 1 - usr.sbin/ypldap/entries.c | 1 - usr.sbin/ypldap/ldapclient.c | 1 - usr.sbin/ypldap/log.c | 1 - usr.sbin/ypldap/parse.y | 1 - usr.sbin/ypldap/yp.c | 1 - usr.sbin/ypldap/ypldap.h | 1 - usr.sbin/ypldap/ypldap_dns.c | 1 - 886 files changed, 886 deletions(-) diff --git a/bin/chio/defs.h b/bin/chio/defs.h index 8f10c9d9243a..6b4381a3d447 100644 --- a/bin/chio/defs.h +++ b/bin/chio/defs.h @@ -1,4 +1,3 @@ -/* $FreeBSD$ */ /*- * Copyright (c) 1996 Jason R. Thorpe diff --git a/bin/chio/pathnames.h b/bin/chio/pathnames.h index 5b9b1e429dc2..a8308ed7b0ac 100644 --- a/bin/chio/pathnames.h +++ b/bin/chio/pathnames.h @@ -1,4 +1,3 @@ -/* $FreeBSD$ */ /*- * Copyright (c) 1996 Jason R. Thorpe diff --git a/bin/csh/config.h b/bin/csh/config.h index 103ceb604062..6705cc58f5bd 100644 --- a/bin/csh/config.h +++ b/bin/csh/config.h @@ -1,4 +1,3 @@ -/* $FreeBSD$ */ /* config.h. Generated from config.h.in by configure. */ /* config.h.in. Generated from configure.in by autoheader. */ diff --git a/bin/csh/config_p.h b/bin/csh/config_p.h index c25e87a903ea..8b7ecd20de19 100644 --- a/bin/csh/config_p.h +++ b/bin/csh/config_p.h @@ -1,4 +1,3 @@ -/* $FreeBSD$ */ /* * config.h -- configure various defines for tcsh * diff --git a/cddl/compat/opensolaris/include/libintl.h b/cddl/compat/opensolaris/include/libintl.h index da13f4749081..5dbc06a75b2f 100644 --- a/cddl/compat/opensolaris/include/libintl.h +++ b/cddl/compat/opensolaris/include/libintl.h @@ -1,4 +1,3 @@ -/* $FreeBSD$ */ #ifndef _LIBINTL_H_ #define _LIBINTL_H_ diff --git a/cddl/compat/opensolaris/include/priv.h b/cddl/compat/opensolaris/include/priv.h index 2fee5b0d40c8..182921a02b3f 100644 --- a/cddl/compat/opensolaris/include/priv.h +++ b/cddl/compat/opensolaris/include/priv.h @@ -1,4 +1,3 @@ -/* $FreeBSD$ */ #ifndef _OPENSOLARIS_PRIV_H_ #define _OPENSOLARIS_PRIV_H_ diff --git a/cddl/compat/opensolaris/include/solaris.h b/cddl/compat/opensolaris/include/solaris.h index 9bead018bcec..b4fb71be92a6 100644 --- a/cddl/compat/opensolaris/include/solaris.h +++ b/cddl/compat/opensolaris/include/solaris.h @@ -1,4 +1,3 @@ -/* $FreeBSD$ */ #ifndef _SOLARIS_H_ #define _SOLARIS_H_ diff --git a/cddl/compat/opensolaris/include/zone.h b/cddl/compat/opensolaris/include/zone.h index 8c377cf6574d..66a041772963 100644 --- a/cddl/compat/opensolaris/include/zone.h +++ b/cddl/compat/opensolaris/include/zone.h @@ -1,4 +1,3 @@ -/* $FreeBSD$ */ #ifndef _ZONE_H_ #define _ZONE_H_ diff --git a/include/getopt.h b/include/getopt.h index 4c0399db8545..caeef8ff5ed7 100644 --- a/include/getopt.h +++ b/include/getopt.h @@ -1,5 +1,4 @@ /* $NetBSD: getopt.h,v 1.4 2000/07/07 10:43:54 ad Exp $ */ -/* $FreeBSD$ */ /*- * SPDX-License-Identifier: BSD-2-Clause diff --git a/include/gssapi.h b/include/gssapi.h index 5557de8f7356..560edb730960 100644 *** 8184 LINES SKIPPED *** From nobody Wed Aug 16 17:56:53 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RQwnK5q59z4qvPX; Wed, 16 Aug 2023 17:56: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RQwnK5K5Xz3VDD; Wed, 16 Aug 2023 17:56:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692208613; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=z/IEkOkSXLJOAo9nPpDELxrgFiEGoV/uG/f+kWEc1mg=; b=WiAAAXkBIq8JG49fQuk64aCzcyYn/Zqxc8mQmi2RIETLy+H+B+CXishP7s1afbg8BgtgVe xpofKOQhs2Ude/V1xc8NRf+K6IxChJ1fedvmSQHzHgeSpNhaGwVz2ulW69ewUiChZK2/g6 gsFZxVvwUFF/NZs0E0mu+Dsmk4o1i+wIz33NXY2Junw5NMJHTy+6xLV6VqGuCWcNvsFYlm ZzIic9Z/5okmWL4vXkJnBCAqZR4inoPWhpRJgbU6xkENGFa6gnzU4kn6ZySdO8c65tuExJ 0cwEto5Uqxb83JGRNP0iSxNfVfxH151JfVGS0gM4vi27qD8x7u+jrXXbKZsO+A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692208613; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=z/IEkOkSXLJOAo9nPpDELxrgFiEGoV/uG/f+kWEc1mg=; b=m6RozBQQpVtWY/3DxJhYGo/d9ZczQIKs+A5nCc2m0M7VMmBxv0u9WAnW22cNNBpmaXPE8F UR85ASG/S+mrjIYvc/Fy46ss6gygZoDqjSFfLgZqnlBAOnAXPEQz/+BCC5X0fAGJvEwNGq Iao0KFg+8MawIXeKxUysW+PcE7nW30Y4+zBarc2qLwdQPiQ57ZW7UKVpslafSqd11xz95v BRCoVyBJq6vXNdw9l6YEu/zJaiOgUfqTEWKw4PYxqP1CF5Nx/YYXN4m9ADOMUnkHL6PBet 9D3QLRc/AqGH0iMmcFV8Ytw/HfMfUCTsiGeTR69G1QQgX+2e2qDgxRJuOtdniQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692208613; a=rsa-sha256; cv=none; b=ADmBwmgjbNhntRgefmHE5351g4VACxmX8HjZrA7Zv6tskMsvfu/ov8DnlaCHM22Ndrh/An U/mvSVcYsd0cfyVy7sgoPZIJRkkdWMxvNr4EGuwyCGAs8XP2aT2QCZnpvqf1SEPFUNzLbS ar0g2nrLceRCGAFMymgaKu23fiUmUvA4NW8tBbNeNPa199ql0oDoKqW19HVdukYbH8m7o0 daaw8SpqSMDhOuTZ5Cx+NpZtERP7QoQV4x5r5FVoxm2ZJAIv0yCtK16XJ9eSPoSfUjYMFy ScumGp8hKdXfu1WeqXXWz1Aa7/y4w7q6lxMV4Dx+mMiuaMIkd+GqI7GkxnbRfQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RQwnK4Qcyz11Vh; Wed, 16 Aug 2023 17:56:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37GHurKl059172; Wed, 16 Aug 2023 17:56:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37GHurWS059169; Wed, 16 Aug 2023 17:56:53 GMT (envelope-from git) Date: Wed, 16 Aug 2023 17:56:53 GMT Message-Id: <202308161756.37GHurWS059169@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: dfc016587a1e - main - sys: Remove $FreeBSD$: two-line .c pattern List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: dfc016587a1e11191676c42672aeeee5eb8cd64b Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=dfc016587a1e11191676c42672aeeee5eb8cd64b commit dfc016587a1e11191676c42672aeeee5eb8cd64b Author: Warner Losh AuthorDate: 2023-08-16 17:54:30 +0000 Commit: Warner Losh CommitDate: 2023-08-16 17:54:30 +0000 sys: Remove $FreeBSD$: two-line .c pattern Remove /^#include\s+.*$\n\s+__FBSDID\("\$FreeBSD\$"\);\n/ --- sys/arm/broadcom/bcm2835/bcm2835_rng.c | 3 --- sys/arm/freescale/imx/imx6_ahci.c | 3 --- sys/dev/gpio/gpiopower.c | 3 --- sys/dev/videomode/vesagtf.c | 3 --- sys/fs/autofs/autofs_vfsops.c | 2 -- sys/fs/tmpfs/tmpfs_fifoops.c | 2 -- sys/net/rss_config.c | 3 --- sys/netinet/in_rss.c | 3 --- sys/netinet6/in6_rss.c | 3 --- 9 files changed, 25 deletions(-) diff --git a/sys/arm/broadcom/bcm2835/bcm2835_rng.c b/sys/arm/broadcom/bcm2835/bcm2835_rng.c index 5067120c80fa..bc13bdba2238 100644 --- a/sys/arm/broadcom/bcm2835/bcm2835_rng.c +++ b/sys/arm/broadcom/bcm2835/bcm2835_rng.c @@ -24,9 +24,6 @@ * SUCH DAMAGE. */ -#include - -__FBSDID("$FreeBSD$"); #include #include diff --git a/sys/arm/freescale/imx/imx6_ahci.c b/sys/arm/freescale/imx/imx6_ahci.c index 9a789049b984..ad46452903a4 100644 --- a/sys/arm/freescale/imx/imx6_ahci.c +++ b/sys/arm/freescale/imx/imx6_ahci.c @@ -24,9 +24,6 @@ * SUCH DAMAGE. */ -#include - -__FBSDID("$FreeBSD$"); #include #include diff --git a/sys/dev/gpio/gpiopower.c b/sys/dev/gpio/gpiopower.c index 28ca9ad36fb6..5c369396813f 100644 --- a/sys/dev/gpio/gpiopower.c +++ b/sys/dev/gpio/gpiopower.c @@ -24,9 +24,6 @@ * SUCH DAMAGE. */ -#include - -__FBSDID("$FreeBSD$"); #include #include diff --git a/sys/dev/videomode/vesagtf.c b/sys/dev/videomode/vesagtf.c index c02c421c14ac..077cf7d1a0ea 100644 --- a/sys/dev/videomode/vesagtf.c +++ b/sys/dev/videomode/vesagtf.c @@ -150,9 +150,6 @@ */ #ifdef _KERNEL -#include - -__FBSDID("$FreeBSD$"); #include #include #include diff --git a/sys/fs/autofs/autofs_vfsops.c b/sys/fs/autofs/autofs_vfsops.c index 07bec01517c8..473a0b2280ac 100644 --- a/sys/fs/autofs/autofs_vfsops.c +++ b/sys/fs/autofs/autofs_vfsops.c @@ -29,8 +29,6 @@ * */ -#include - __FBSDID("$FreeBSD$"); #include #include diff --git a/sys/fs/tmpfs/tmpfs_fifoops.c b/sys/fs/tmpfs/tmpfs_fifoops.c index a8a4949529e9..27f77e5d7f28 100644 --- a/sys/fs/tmpfs/tmpfs_fifoops.c +++ b/sys/fs/tmpfs/tmpfs_fifoops.c @@ -35,8 +35,6 @@ /* * tmpfs vnode interface for named pipes. */ -#include - __FBSDID("$FreeBSD$"); #include #include diff --git a/sys/net/rss_config.c b/sys/net/rss_config.c index ee15ed3da2bf..266ea57b2dc9 100644 --- a/sys/net/rss_config.c +++ b/sys/net/rss_config.c @@ -27,9 +27,6 @@ * SUCH DAMAGE. */ -#include - -__FBSDID("$FreeBSD$"); #include "opt_inet6.h" diff --git a/sys/netinet/in_rss.c b/sys/netinet/in_rss.c index 18cfaf986c4a..698fd86dc7a5 100644 --- a/sys/netinet/in_rss.c +++ b/sys/netinet/in_rss.c @@ -27,9 +27,6 @@ * SUCH DAMAGE. */ -#include - -__FBSDID("$FreeBSD$"); #include "opt_inet6.h" diff --git a/sys/netinet6/in6_rss.c b/sys/netinet6/in6_rss.c index 41916cf41584..79c7bfa6e68c 100644 --- a/sys/netinet6/in6_rss.c +++ b/sys/netinet6/in6_rss.c @@ -27,9 +27,6 @@ * SUCH DAMAGE. */ -#include - -__FBSDID("$FreeBSD$"); #include "opt_inet6.h" From nobody Wed Aug 16 17:56:54 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RQwnL6bNLz4qvPd; Wed, 16 Aug 2023 17:56: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RQwnL6Kxyz3VMG; Wed, 16 Aug 2023 17:56:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692208614; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=YLSMsm15Tf7pQNeyFVMbalvDDIL7ugwO6z2yhOidPbg=; b=Qyf+uZSlrHVxtcxTV7RQSxw/aazyk/MDA2H5d/cM9nxbEua9S8LkSJyA99zTe/w80UTH1Z LvmfN/IcTM6lztij2Tb+Mf1KzjRSWadvxhdrdwyFEg7QJ3a5DhHJXn0mcOXm6pT4MRDYwp dKqVx7bMm4V0IWg6bf9TaWogOgn371dDHMglI568QxkDAsJdAkgi9gDJHkxv0rge7zEL4Y oGTm/sP59fH/ONbN/H+vfYReOtWg4MVy8HQ+SYVgh+cdh6ncYJhnsygIV/YADa6B1Vlp1y VbScpmRs4gQL/oUwvrDsBFFIswxmnaBl3xfm0jyO7lbsIwZR+868BoTx21oJ+g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692208614; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=YLSMsm15Tf7pQNeyFVMbalvDDIL7ugwO6z2yhOidPbg=; b=JBnhAoEitLKdw/mYOGlSJH232TtqkdU8x4jXMsYW7uvsv8BidNnWFB6BgamGyScVXYgyfE cVnOtKhJUrXnT4waBAzPEBs3vxmgzLk+D3CoPMAPTZIrkvFiZPCznXeo9vhyaCl/q9L3YQ shiHzmCzL8+f2Ym98aBtxhXC7+XRlIQcgU0Gscc3fg9Sgq8bg/5ADAUyNbspL1M/TlgExY oKG7MTXkIp/Zi6knwZhgfumoFkJBkljhUB0hlFArJMhAVCo0p6Zo8qdRBaMEJAx17cZkto usfPc7SkcTXlFTheo431VXjcaq4OgDVjGyyXH8QYiVCLnMsh5yiLWTp+tUlwzg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692208614; a=rsa-sha256; cv=none; b=Bf1BzYiZK5aCC8YcJDOAH0CmaNu9aKx2rQF53rUiW8ClITDRwN5+UQjSbTlLE8+7IWZHD8 U5oJlGvAWI/qtEHY51B9AjKqNM+YhtP7pGwZvrGGQgQDAgLyAg+IG1/PQD6mjs2jV7+z+5 0FIfl/ph876J4M2lfuK/ixLl2kATwFV0JVhf4sNFcs3xBf/9Dc0bVRWckWFaayXSZdU3iN u3CQjb8dXh0ca4X0fd2bPlEZE0TfQSfT4QRP+GG9tjTYwUwMoGJybXOY5y+X7VaF7h8MNh w9Z9+q8R1QewJUuonMOd8p5oLd1ucsUgtHTGynBNV1aZkvqoaQS4h0fVf508aQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RQwnL54spz11Qd; Wed, 16 Aug 2023 17:56:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37GHusVA059218; Wed, 16 Aug 2023 17:56:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37GHusls059215; Wed, 16 Aug 2023 17:56:54 GMT (envelope-from git) Date: Wed, 16 Aug 2023 17:56:54 GMT Message-Id: <202308161756.37GHusls059215@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: e5d258c9e599 - main - Remove $FreeBSD$: two-line .c pattern List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e5d258c9e599d2b2fe642e678091cac5da8a10d1 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=e5d258c9e599d2b2fe642e678091cac5da8a10d1 commit e5d258c9e599d2b2fe642e678091cac5da8a10d1 Author: Warner Losh AuthorDate: 2023-08-16 17:54:34 +0000 Commit: Warner Losh CommitDate: 2023-08-16 17:54:34 +0000 Remove $FreeBSD$: two-line .c pattern Remove /^#include\s+.*$\n\s+__FBSDID\("\$FreeBSD\$"\);\n/ --- usr.bin/netstat/netisr.c | 3 --- usr.bin/rup/rup.c | 3 --- usr.bin/rusers/rusers.c | 3 --- usr.bin/systat/cmds.c | 3 --- usr.bin/systat/cmdtab.c | 3 --- usr.bin/systat/devs.c | 3 --- usr.bin/systat/fetch.c | 3 --- usr.bin/systat/icmp.c | 3 --- usr.bin/systat/icmp6.c | 3 --- usr.bin/systat/iostat.c | 3 --- usr.bin/systat/ip.c | 3 --- usr.bin/systat/ip6.c | 3 --- usr.bin/systat/keyboard.c | 3 --- usr.bin/systat/main.c | 3 --- usr.bin/systat/mode.c | 3 --- usr.bin/systat/netcmds.c | 3 --- usr.bin/systat/netstat.c | 3 --- usr.bin/systat/swap.c | 3 --- usr.bin/systat/vmstat.c | 3 --- usr.bin/tail/forward.c | 3 --- usr.bin/tail/misc.c | 3 --- usr.bin/tail/read.c | 3 --- usr.bin/tail/tail.c | 3 --- usr.bin/talk/ctl.c | 3 --- usr.bin/talk/ctl_transact.c | 3 --- usr.bin/talk/display.c | 3 --- usr.bin/talk/get_addrs.c | 3 --- usr.bin/talk/get_iface.c | 3 --- usr.bin/talk/get_names.c | 3 --- usr.bin/talk/init_disp.c | 3 --- usr.bin/talk/invite.c | 3 --- usr.bin/talk/io.c | 3 --- usr.bin/talk/look_up.c | 3 --- usr.bin/talk/msgs.c | 3 --- usr.bin/talk/talk.c | 3 --- usr.bin/tcopy/tcopy.c | 3 --- usr.bin/touch/touch.c | 3 --- usr.bin/tr/str.c | 3 --- usr.bin/tr/tr.c | 3 --- usr.bin/uname/uname.c | 3 --- usr.bin/unexpand/unexpand.c | 3 --- usr.bin/vgrind/regexp.c | 3 --- usr.bin/vgrind/vfontedpr.c | 3 --- usr.bin/w/pr_time.c | 3 --- usr.bin/w/w.c | 3 --- usr.bin/wall/ttymsg.c | 3 --- usr.bin/wall/wall.c | 3 --- usr.bin/what/what.c | 3 --- usr.bin/which/which.c | 3 --- usr.bin/xstr/xstr.c | 3 --- usr.bin/ypcat/ypcat.c | 3 --- usr.bin/ypmatch/ypmatch.c | 3 --- 52 files changed, 156 deletions(-) diff --git a/usr.bin/netstat/netisr.c b/usr.bin/netstat/netisr.c index bcb9351353c5..a3eb976d84bf 100644 --- a/usr.bin/netstat/netisr.c +++ b/usr.bin/netstat/netisr.c @@ -29,9 +29,6 @@ * SUCH DAMAGE. */ -#include - -__FBSDID("$FreeBSD$"); #include #include diff --git a/usr.bin/rup/rup.c b/usr.bin/rup/rup.c index aae3639b64d4..5f605f55b413 100644 --- a/usr.bin/rup/rup.c +++ b/usr.bin/rup/rup.c @@ -33,9 +33,6 @@ * SUCH DAMAGE. */ -#include - -__FBSDID("$FreeBSD$"); #include #include diff --git a/usr.bin/rusers/rusers.c b/usr.bin/rusers/rusers.c index 838e231ca02a..413de53c304b 100644 --- a/usr.bin/rusers/rusers.c +++ b/usr.bin/rusers/rusers.c @@ -33,9 +33,6 @@ * SUCH DAMAGE. */ -#include - -__FBSDID("$FreeBSD$"); #include #include diff --git a/usr.bin/systat/cmds.c b/usr.bin/systat/cmds.c index aa16167c96b5..5d20cd4175de 100644 --- a/usr.bin/systat/cmds.c +++ b/usr.bin/systat/cmds.c @@ -29,9 +29,6 @@ * SUCH DAMAGE. */ -#include - -__FBSDID("$FreeBSD$"); #ifdef lint static const char sccsid[] = "@(#)cmds.c 8.2 (Berkeley) 4/29/95"; diff --git a/usr.bin/systat/cmdtab.c b/usr.bin/systat/cmdtab.c index 068823c73874..36a1823c0edc 100644 --- a/usr.bin/systat/cmdtab.c +++ b/usr.bin/systat/cmdtab.c @@ -29,9 +29,6 @@ * SUCH DAMAGE. */ -#include - -__FBSDID("$FreeBSD$"); #ifdef lint static const char sccsid[] = "@(#)cmdtab.c 8.1 (Berkeley) 6/6/93"; diff --git a/usr.bin/systat/devs.c b/usr.bin/systat/devs.c index 63990bab5f81..f167f6465d20 100644 --- a/usr.bin/systat/devs.c +++ b/usr.bin/systat/devs.c @@ -57,9 +57,6 @@ * SUCH DAMAGE. */ -#include - -__FBSDID("$FreeBSD$"); #ifdef lint static const char sccsid[] = "@(#)disks.c 8.1 (Berkeley) 6/6/93"; diff --git a/usr.bin/systat/fetch.c b/usr.bin/systat/fetch.c index e24d0b8ee6ee..1b7a884159bd 100644 --- a/usr.bin/systat/fetch.c +++ b/usr.bin/systat/fetch.c @@ -29,9 +29,6 @@ * SUCH DAMAGE. */ -#include - -__FBSDID("$FreeBSD$"); #ifdef lint static const char sccsid[] = "@(#)fetch.c 8.1 (Berkeley) 6/6/93"; diff --git a/usr.bin/systat/icmp.c b/usr.bin/systat/icmp.c index 4b3a56640267..a1c25e37ed2a 100644 --- a/usr.bin/systat/icmp.c +++ b/usr.bin/systat/icmp.c @@ -29,9 +29,6 @@ * SUCH DAMAGE. */ -#include - -__FBSDID("$FreeBSD$"); #ifdef lint static char sccsid[] = "@(#)mbufs.c 8.1 (Berkeley) 6/6/93"; diff --git a/usr.bin/systat/icmp6.c b/usr.bin/systat/icmp6.c index 2853b90eff29..d7d612604475 100644 --- a/usr.bin/systat/icmp6.c +++ b/usr.bin/systat/icmp6.c @@ -29,9 +29,6 @@ * SUCH DAMAGE. */ -#include - -__FBSDID("$FreeBSD$"); #ifdef lint static char sccsid[] = "@(#)mbufs.c 8.1 (Berkeley) 6/6/93"; diff --git a/usr.bin/systat/iostat.c b/usr.bin/systat/iostat.c index f6ed026c6a97..d31782d93315 100644 --- a/usr.bin/systat/iostat.c +++ b/usr.bin/systat/iostat.c @@ -56,9 +56,6 @@ * SUCH DAMAGE. */ -#include - -__FBSDID("$FreeBSD$"); #ifdef lint static const char sccsid[] = "@(#)iostat.c 8.1 (Berkeley) 6/6/93"; diff --git a/usr.bin/systat/ip.c b/usr.bin/systat/ip.c index f177a6cd0ff8..bc90ff557e20 100644 --- a/usr.bin/systat/ip.c +++ b/usr.bin/systat/ip.c @@ -29,9 +29,6 @@ * SUCH DAMAGE. */ -#include - -__FBSDID("$FreeBSD$"); #ifdef lint static const char sccsid[] = "@(#)mbufs.c 8.1 (Berkeley) 6/6/93"; diff --git a/usr.bin/systat/ip6.c b/usr.bin/systat/ip6.c index ac9063f48fce..c7d9d477ada9 100644 --- a/usr.bin/systat/ip6.c +++ b/usr.bin/systat/ip6.c @@ -29,9 +29,6 @@ * SUCH DAMAGE. */ -#include - -__FBSDID("$FreeBSD$"); #ifdef lint static const char sccsid[] = "@(#)mbufs.c 8.1 (Berkeley) 6/6/93"; diff --git a/usr.bin/systat/keyboard.c b/usr.bin/systat/keyboard.c index a3401506c5ce..aac7d1a2bb79 100644 --- a/usr.bin/systat/keyboard.c +++ b/usr.bin/systat/keyboard.c @@ -29,9 +29,6 @@ * SUCH DAMAGE. */ -#include - -__FBSDID("$FreeBSD$"); #ifdef lint static const char sccsid[] = "@(#)keyboard.c 8.1 (Berkeley) 6/6/93"; diff --git a/usr.bin/systat/main.c b/usr.bin/systat/main.c index 0f57f9fbf6bc..889ce39a6c32 100644 --- a/usr.bin/systat/main.c +++ b/usr.bin/systat/main.c @@ -29,9 +29,6 @@ * SUCH DAMAGE. */ -#include - -__FBSDID("$FreeBSD$"); #ifdef lint static const char sccsid[] = "@(#)main.c 8.1 (Berkeley) 6/6/93"; diff --git a/usr.bin/systat/mode.c b/usr.bin/systat/mode.c index a3fdf46c3b5d..28bc47a92351 100644 --- a/usr.bin/systat/mode.c +++ b/usr.bin/systat/mode.c @@ -56,9 +56,6 @@ * mode in the command line. */ -#include - -__FBSDID("$FreeBSD$"); #include diff --git a/usr.bin/systat/netcmds.c b/usr.bin/systat/netcmds.c index 8d5e48fdeb52..6320dd21562d 100644 --- a/usr.bin/systat/netcmds.c +++ b/usr.bin/systat/netcmds.c @@ -29,9 +29,6 @@ * SUCH DAMAGE. */ -#include - -__FBSDID("$FreeBSD$"); #ifdef lint static const char sccsid[] = "@(#)netcmds.c 8.1 (Berkeley) 6/6/93"; diff --git a/usr.bin/systat/netstat.c b/usr.bin/systat/netstat.c index 4b602578b077..45b21bfbfd2c 100644 --- a/usr.bin/systat/netstat.c +++ b/usr.bin/systat/netstat.c @@ -29,9 +29,6 @@ * SUCH DAMAGE. */ -#include - -__FBSDID("$FreeBSD$"); #ifdef lint static const char sccsid[] = "@(#)netstat.c 8.1 (Berkeley) 6/6/93"; diff --git a/usr.bin/systat/swap.c b/usr.bin/systat/swap.c index 19374918ff68..5aa9e3fe0363 100644 --- a/usr.bin/systat/swap.c +++ b/usr.bin/systat/swap.c @@ -30,9 +30,6 @@ * SUCH DAMAGE. */ -#include - -__FBSDID("$FreeBSD$"); #ifdef lint static const char sccsid[] = "@(#)swap.c 8.3 (Berkeley) 4/29/95"; diff --git a/usr.bin/systat/vmstat.c b/usr.bin/systat/vmstat.c index 87e006838468..2c68005954aa 100644 --- a/usr.bin/systat/vmstat.c +++ b/usr.bin/systat/vmstat.c @@ -29,9 +29,6 @@ * SUCH DAMAGE. */ -#include - -__FBSDID("$FreeBSD$"); #ifdef lint static const char sccsid[] = "@(#)vmstat.c 8.2 (Berkeley) 1/12/94"; diff --git a/usr.bin/tail/forward.c b/usr.bin/tail/forward.c index 6dbeb9cdd047..e2a3eb77aade 100644 --- a/usr.bin/tail/forward.c +++ b/usr.bin/tail/forward.c @@ -32,9 +32,6 @@ * SUCH DAMAGE. */ -#include - -__FBSDID("$FreeBSD$"); #ifndef lint static const char sccsid[] = "@(#)forward.c 8.1 (Berkeley) 6/6/93"; diff --git a/usr.bin/tail/misc.c b/usr.bin/tail/misc.c index 537cf00ccfe3..21d0db8b5d40 100644 --- a/usr.bin/tail/misc.c +++ b/usr.bin/tail/misc.c @@ -32,9 +32,6 @@ * SUCH DAMAGE. */ -#include - -__FBSDID("$FreeBSD$"); #ifndef lint static const char sccsid[] = "@(#)misc.c 8.1 (Berkeley) 6/6/93"; diff --git a/usr.bin/tail/read.c b/usr.bin/tail/read.c index 1e757c86195c..ff025b31d64c 100644 --- a/usr.bin/tail/read.c +++ b/usr.bin/tail/read.c @@ -32,9 +32,6 @@ * SUCH DAMAGE. */ -#include - -__FBSDID("$FreeBSD$"); #ifndef lint static const char sccsid[] = "@(#)read.c 8.1 (Berkeley) 6/6/93"; diff --git a/usr.bin/tail/tail.c b/usr.bin/tail/tail.c index a9841f2d4a8a..492a6494628d 100644 --- a/usr.bin/tail/tail.c +++ b/usr.bin/tail/tail.c @@ -32,9 +32,6 @@ * SUCH DAMAGE. */ -#include - -__FBSDID("$FreeBSD$"); #ifndef lint static const char copyright[] = diff --git a/usr.bin/talk/ctl.c b/usr.bin/talk/ctl.c index abfd5e6b30ed..c9bd6f77fb81 100644 --- a/usr.bin/talk/ctl.c +++ b/usr.bin/talk/ctl.c @@ -29,9 +29,6 @@ * SUCH DAMAGE. */ -#include - -__FBSDID("$FreeBSD$"); #ifndef lint static const char sccsid[] = "@(#)ctl.c 8.1 (Berkeley) 6/6/93"; diff --git a/usr.bin/talk/ctl_transact.c b/usr.bin/talk/ctl_transact.c index 650134da6ca6..c51bbed28437 100644 --- a/usr.bin/talk/ctl_transact.c +++ b/usr.bin/talk/ctl_transact.c @@ -29,9 +29,6 @@ * SUCH DAMAGE. */ -#include - -__FBSDID("$FreeBSD$"); #ifndef lint static const char sccsid[] = "@(#)ctl_transact.c 8.1 (Berkeley) 6/6/93"; diff --git a/usr.bin/talk/display.c b/usr.bin/talk/display.c index 9987194fcbb9..5f29cfd600d9 100644 --- a/usr.bin/talk/display.c +++ b/usr.bin/talk/display.c @@ -29,9 +29,6 @@ * SUCH DAMAGE. */ -#include - -__FBSDID("$FreeBSD$"); #ifndef lint static const char sccsid[] = "@(#)display.c 8.1 (Berkeley) 6/6/93"; diff --git a/usr.bin/talk/get_addrs.c b/usr.bin/talk/get_addrs.c index 53b841cee2ca..678fabce9aa2 100644 --- a/usr.bin/talk/get_addrs.c +++ b/usr.bin/talk/get_addrs.c @@ -29,9 +29,6 @@ * SUCH DAMAGE. */ -#include - -__FBSDID("$FreeBSD$"); #ifndef lint static const char sccsid[] = "@(#)get_addrs.c 8.1 (Berkeley) 6/6/93"; diff --git a/usr.bin/talk/get_iface.c b/usr.bin/talk/get_iface.c index 96d3d6edabb5..5c69046c680e 100644 --- a/usr.bin/talk/get_iface.c +++ b/usr.bin/talk/get_iface.c @@ -27,9 +27,6 @@ * SUCH DAMAGE. */ -#include - -__FBSDID("$FreeBSD$"); /* * From: diff --git a/usr.bin/talk/get_names.c b/usr.bin/talk/get_names.c index 3ca362ad9bff..78b025144328 100644 --- a/usr.bin/talk/get_names.c +++ b/usr.bin/talk/get_names.c @@ -29,9 +29,6 @@ * SUCH DAMAGE. */ -#include - -__FBSDID("$FreeBSD$"); #ifndef lint static const char sccsid[] = "@(#)get_names.c 8.1 (Berkeley) 6/6/93"; diff --git a/usr.bin/talk/init_disp.c b/usr.bin/talk/init_disp.c index a3f125792254..936b9799a22c 100644 --- a/usr.bin/talk/init_disp.c +++ b/usr.bin/talk/init_disp.c @@ -29,9 +29,6 @@ * SUCH DAMAGE. */ -#include - -__FBSDID("$FreeBSD$"); #ifndef lint static const char sccsid[] = "@(#)init_disp.c 8.2 (Berkeley) 2/16/94"; diff --git a/usr.bin/talk/invite.c b/usr.bin/talk/invite.c index e000e54b0c35..78f92ed9cdbf 100644 --- a/usr.bin/talk/invite.c +++ b/usr.bin/talk/invite.c @@ -29,9 +29,6 @@ * SUCH DAMAGE. */ -#include - -__FBSDID("$FreeBSD$"); #ifndef lint static const char sccsid[] = "@(#)invite.c 8.1 (Berkeley) 6/6/93"; diff --git a/usr.bin/talk/io.c b/usr.bin/talk/io.c index 9cf7ad8346eb..c47bf928712b 100644 --- a/usr.bin/talk/io.c +++ b/usr.bin/talk/io.c @@ -29,9 +29,6 @@ * SUCH DAMAGE. */ -#include - -__FBSDID("$FreeBSD$"); #ifndef lint static const char sccsid[] = "@(#)io.c 8.1 (Berkeley) 6/6/93"; diff --git a/usr.bin/talk/look_up.c b/usr.bin/talk/look_up.c index 3c676b9c1ea2..3fb6cbb43037 100644 --- a/usr.bin/talk/look_up.c +++ b/usr.bin/talk/look_up.c @@ -29,9 +29,6 @@ * SUCH DAMAGE. */ -#include - -__FBSDID("$FreeBSD$"); #ifndef lint static const char sccsid[] = "@(#)look_up.c 8.1 (Berkeley) 6/6/93"; diff --git a/usr.bin/talk/msgs.c b/usr.bin/talk/msgs.c index e0886e9477f7..a40df7ff17e9 100644 --- a/usr.bin/talk/msgs.c +++ b/usr.bin/talk/msgs.c @@ -29,9 +29,6 @@ * SUCH DAMAGE. */ -#include - -__FBSDID("$FreeBSD$"); #ifndef lint static const char sccsid[] = "@(#)msgs.c 8.1 (Berkeley) 6/6/93"; diff --git a/usr.bin/talk/talk.c b/usr.bin/talk/talk.c index 4b7e748e2f09..04c8572a04b4 100644 --- a/usr.bin/talk/talk.c +++ b/usr.bin/talk/talk.c @@ -29,9 +29,6 @@ * SUCH DAMAGE. */ -#include - -__FBSDID("$FreeBSD$"); #ifndef lint static const char sccsid[] = "@(#)talk.c 8.1 (Berkeley) 6/6/93"; diff --git a/usr.bin/tcopy/tcopy.c b/usr.bin/tcopy/tcopy.c index ef0da430002e..556d8d3e032a 100644 --- a/usr.bin/tcopy/tcopy.c +++ b/usr.bin/tcopy/tcopy.c @@ -29,9 +29,6 @@ * SUCH DAMAGE. */ -#include - -__FBSDID("$FreeBSD$"); #ifndef lint static const char copyright[] = diff --git a/usr.bin/touch/touch.c b/usr.bin/touch/touch.c index 1594eacb67d0..91abcfd447ea 100644 --- a/usr.bin/touch/touch.c +++ b/usr.bin/touch/touch.c @@ -29,9 +29,6 @@ * SUCH DAMAGE. */ -#include - -__FBSDID("$FreeBSD$"); #ifndef lint static const char copyright[] = diff --git a/usr.bin/tr/str.c b/usr.bin/tr/str.c index 2cd811ce5d6b..bd02eafbdff5 100644 --- a/usr.bin/tr/str.c +++ b/usr.bin/tr/str.c @@ -29,9 +29,6 @@ * SUCH DAMAGE. */ -#include - -__FBSDID("$FreeBSD$"); #ifndef lint static const char sccsid[] = "@(#)str.c 8.2 (Berkeley) 4/28/95"; diff --git a/usr.bin/tr/tr.c b/usr.bin/tr/tr.c index 32f1858049ac..75638d6b3bc6 100644 --- a/usr.bin/tr/tr.c +++ b/usr.bin/tr/tr.c @@ -29,9 +29,6 @@ * SUCH DAMAGE. */ -#include - -__FBSDID("$FreeBSD$"); #ifndef lint static const char copyright[] = diff --git a/usr.bin/uname/uname.c b/usr.bin/uname/uname.c index 980705e984f4..fc1f34a3e3c6 100644 --- a/usr.bin/uname/uname.c +++ b/usr.bin/uname/uname.c @@ -34,9 +34,6 @@ * SUCH DAMAGE. */ -#include - -__FBSDID("$FreeBSD$"); #ifndef lint static const char copyright[] = diff --git a/usr.bin/unexpand/unexpand.c b/usr.bin/unexpand/unexpand.c index 47a3b1f611ca..6dcfc497d6e8 100644 --- a/usr.bin/unexpand/unexpand.c +++ b/usr.bin/unexpand/unexpand.c @@ -29,9 +29,6 @@ * SUCH DAMAGE. */ -#include - -__FBSDID("$FreeBSD$"); #ifndef lint static const char copyright[] = diff --git a/usr.bin/vgrind/regexp.c b/usr.bin/vgrind/regexp.c index 572f44d2aeed..97e5ef68cb9f 100644 --- a/usr.bin/vgrind/regexp.c +++ b/usr.bin/vgrind/regexp.c @@ -30,9 +30,6 @@ * SUCH DAMAGE. */ -#include - -__FBSDID("$FreeBSD$"); #ifndef lint static const char copyright[] = diff --git a/usr.bin/vgrind/vfontedpr.c b/usr.bin/vgrind/vfontedpr.c index 235073094296..dab2a3699008 100644 --- a/usr.bin/vgrind/vfontedpr.c +++ b/usr.bin/vgrind/vfontedpr.c @@ -29,9 +29,6 @@ * SUCH DAMAGE. */ -#include - -__FBSDID("$FreeBSD$"); #ifndef lint static const char copyright[] = diff --git a/usr.bin/w/pr_time.c b/usr.bin/w/pr_time.c index 20b75704c309..7be11b777e79 100644 --- a/usr.bin/w/pr_time.c +++ b/usr.bin/w/pr_time.c @@ -29,9 +29,6 @@ * SUCH DAMAGE. */ -#include - -__FBSDID("$FreeBSD$"); #ifndef lint static const char sccsid[] = "@(#)pr_time.c 8.2 (Berkeley) 4/4/94"; diff --git a/usr.bin/w/w.c b/usr.bin/w/w.c index 0a43957a73f8..93f17b0f4ae3 100644 --- a/usr.bin/w/w.c +++ b/usr.bin/w/w.c @@ -29,9 +29,6 @@ * SUCH DAMAGE. */ -#include - -__FBSDID("$FreeBSD$"); #ifndef lint static const char copyright[] = diff --git a/usr.bin/wall/ttymsg.c b/usr.bin/wall/ttymsg.c index beae788a9ba2..dc149db84885 100644 --- a/usr.bin/wall/ttymsg.c +++ b/usr.bin/wall/ttymsg.c @@ -29,9 +29,6 @@ * SUCH DAMAGE. */ -#include - -__FBSDID("$FreeBSD$"); #ifndef lint static const char sccsid[] = "@(#)ttymsg.c 8.2 (Berkeley) 11/16/93"; diff --git a/usr.bin/wall/wall.c b/usr.bin/wall/wall.c index b1db354e6ec3..335f83623576 100644 --- a/usr.bin/wall/wall.c +++ b/usr.bin/wall/wall.c @@ -29,9 +29,6 @@ * SUCH DAMAGE. */ -#include - -__FBSDID("$FreeBSD$"); #ifndef lint static const char copyright[] = diff --git a/usr.bin/what/what.c b/usr.bin/what/what.c index 5430a1fa0f35..1829a6b055b2 100644 --- a/usr.bin/what/what.c +++ b/usr.bin/what/what.c @@ -29,9 +29,6 @@ * SUCH DAMAGE. */ -#include - -__FBSDID("$FreeBSD$"); #ifndef lint static const char copyright[] = diff --git a/usr.bin/which/which.c b/usr.bin/which/which.c index abc23c876b2e..f6ee25f60cce 100644 --- a/usr.bin/which/which.c +++ b/usr.bin/which/which.c @@ -26,9 +26,6 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include - -__FBSDID("$FreeBSD$"); #include #include diff --git a/usr.bin/xstr/xstr.c b/usr.bin/xstr/xstr.c index af9f0d2893bb..880fc1583542 100644 --- a/usr.bin/xstr/xstr.c +++ b/usr.bin/xstr/xstr.c @@ -29,9 +29,6 @@ * SUCH DAMAGE. */ -#include - -__FBSDID("$FreeBSD$"); #ifndef lint static const char copyright[] = diff --git a/usr.bin/ypcat/ypcat.c b/usr.bin/ypcat/ypcat.c index 3d927ba0e839..0b3b1c9879c8 100644 --- a/usr.bin/ypcat/ypcat.c +++ b/usr.bin/ypcat/ypcat.c @@ -28,9 +28,6 @@ * SUCH DAMAGE. */ -#include - -__FBSDID("$FreeBSD$"); #include #include diff --git a/usr.bin/ypmatch/ypmatch.c b/usr.bin/ypmatch/ypmatch.c index a110abaeafe5..24af4b8c8993 100644 --- a/usr.bin/ypmatch/ypmatch.c +++ b/usr.bin/ypmatch/ypmatch.c @@ -29,9 +29,6 @@ * SUCH DAMAGE. */ -#include - -__FBSDID("$FreeBSD$"); #include #include From nobody Wed Aug 16 17:56:55 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RQwnR3ByXz4qvR9; Wed, 16 Aug 2023 17:56: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RQwnR1fFlz3VQf; Wed, 16 Aug 2023 17:56:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692208619; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Ei76kumCaJxsN+55KRHPdgK0zFx5wOhQDg5YgAkYKyY=; b=utEiRHq92TLFr6wc13u3AIMXUPVmM6mhtjy+AZx3hNghVqj+/GyL1YHzgXv1qF3fAUoxU0 b6LayWOFlojFmeoS28Tm7rxUvLLu0kcwKT+HniTpe4ZSWBHkwlxnXhO5jr/YLtvv0TaxxT lr6ylf4gAscIVyrqW2gqki6eOmc1kuN9vzt57gsdyhv7aCZHoPZ3fq/NIrBcqsVgBFunkv vbXOA34IQRPQbvf11GPS9INeM7A5ZR3ouie1oHP9/mgVxFiPCqCLDle/ZkSs1EgxtBqX1M oFqDR5rB/dYPZxT4OqvmPUOKqdFwuZi8dYNqEQlhHDM7XYK9RnGLvF8oo6wuBA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692208619; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Ei76kumCaJxsN+55KRHPdgK0zFx5wOhQDg5YgAkYKyY=; b=UN4zl2imcSaLWFcMX2tRmcn3PyushgNy5HZVJJrdJwchPTamOoGg9Vg2ARaaASskD55wIM MD6rAhMYv52z9S03N2/1A/lahRbXFgdSI8WepLLkGceyMnrjQ15xjNLsYVmVuRgNoo6npk 7KPuHRp4yAGSvG6b900V/lKWGgXJ9Nh6id8y0ipjB8LDR5l/fjrUz4joQEzbJlHUN7weub 6Ss2W8Bil3wDrX71x8+ExOyA/k9HyVH/p+ARxLSjnbDktmdXDPqIC8Xa8ip2hNDa7Ej5H6 sFLCPQ18DLmv/3QI28JiP7Xtt5eaR5LDGbr62s+cF+Mr2+nq28Zu0sFxYQ80Bw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692208619; a=rsa-sha256; cv=none; b=T7Hw2PAlDbA+akHLApM1UxMiTk9hN6xkYYjfORN0o9vBjJUb40znQC+FHgyRwa+7w63Ry5 LfQckK5KuFKhm2nmPgypLrbKpgOn0BRCMwa+eS7Ak6bVPqS/T4Q8ZIGRgTNYIG+hivlTU3 1/6DJjA28N1QebR4RPLkSbyihR9hNHslyCLcCG/gwv1TVev6AIKI9vkzx+D9pLU8WnXNkr QJP4339c88vP8Jr5KvzFmdvtNTwil2nauu/xkJEE8UUcknhtjMJ0SeDp5f5eUVoDUCw7Bz 2n2BSzjh9wznQ+4wYSPGsiCMo8vu6TZ0/JUKTKY0EHcBHygiYb0bwiZVLOAJzQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RQwnQ6rfrz11dM; Wed, 16 Aug 2023 17:56:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37GHuwP5059276; Wed, 16 Aug 2023 17:56:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37GHut92059268; Wed, 16 Aug 2023 17:56:55 GMT (envelope-from git) Date: Wed, 16 Aug 2023 17:56:55 GMT Message-Id: <202308161756.37GHut92059268@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: 685dc743dc3b - main - sys: Remove $FreeBSD$: one-line .c pattern List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 685dc743dc3b5645e34836464128e1c0558b404b Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=685dc743dc3b5645e34836464128e1c0558b404b commit 685dc743dc3b5645e34836464128e1c0558b404b Author: Warner Losh AuthorDate: 2023-08-16 17:54:36 +0000 Commit: Warner Losh CommitDate: 2023-08-16 17:54:36 +0000 sys: Remove $FreeBSD$: one-line .c pattern Remove /^[\s*]*__FBSDID\("\$FreeBSD\$"\);?\s*\n/ --- sys/amd64/acpica/acpi_machdep.c | 2 -- sys/amd64/acpica/acpi_wakeup.c | 2 -- sys/amd64/amd64/bios.c | 2 -- sys/amd64/amd64/bpf_jit_machdep.c | 2 -- sys/amd64/amd64/copyout.c | 2 -- sys/amd64/amd64/db_disasm.c | 2 -- sys/amd64/amd64/db_interface.c | 2 -- sys/amd64/amd64/db_trace.c | 2 -- sys/amd64/amd64/efirt_machdep.c | 2 -- sys/amd64/amd64/elf_machdep.c | 2 -- sys/amd64/amd64/exec_machdep.c | 2 -- sys/amd64/amd64/fpu.c | 2 -- sys/amd64/amd64/gdb_machdep.c | 2 -- sys/amd64/amd64/genassym.c | 2 -- sys/amd64/amd64/initcpu.c | 2 -- sys/amd64/amd64/io.c | 2 -- sys/amd64/amd64/machdep.c | 2 -- sys/amd64/amd64/mem.c | 2 -- sys/amd64/amd64/minidump_machdep.c | 2 -- sys/amd64/amd64/mp_machdep.c | 2 -- sys/amd64/amd64/pmap.c | 2 -- sys/amd64/amd64/ptrace_machdep.c | 2 -- sys/amd64/amd64/sys_machdep.c | 2 -- sys/amd64/amd64/trap.c | 2 -- sys/amd64/amd64/uio_machdep.c | 2 -- sys/amd64/amd64/uma_machdep.c | 2 -- sys/amd64/amd64/vm_machdep.c | 2 -- sys/amd64/ia32/ia32_misc.c | 2 -- sys/amd64/ia32/ia32_reg.c | 2 -- sys/amd64/ia32/ia32_signal.c | 2 -- sys/amd64/ia32/ia32_syscall.c | 2 -- sys/amd64/linux/linux_dummy_machdep.c | 2 -- sys/amd64/linux/linux_genassym.c | 2 -- sys/amd64/linux/linux_machdep.c | 2 -- sys/amd64/linux/linux_sysvec.c | 2 -- sys/amd64/linux/linux_vdso_gtod.c | 2 -- sys/amd64/linux32/linux32_dummy_machdep.c | 2 -- sys/amd64/linux32/linux32_genassym.c | 2 -- sys/amd64/linux32/linux32_machdep.c | 2 -- sys/amd64/linux32/linux32_sysvec.c | 2 -- sys/amd64/linux32/linux32_vdso_gtod.c | 2 -- sys/amd64/pci/pci_cfgreg.c | 2 -- sys/amd64/sgx/sgx.c | 2 -- sys/amd64/sgx/sgx_linux.c | 2 -- sys/amd64/vmm/amd/amdiommu.c | 2 -- sys/amd64/vmm/amd/amdv.c | 2 -- sys/amd64/vmm/amd/amdvi_hw.c | 2 -- sys/amd64/vmm/amd/ivrs_drv.c | 2 -- sys/amd64/vmm/amd/npt.c | 2 -- sys/amd64/vmm/amd/svm.c | 2 -- sys/amd64/vmm/amd/svm_genassym.c | 2 -- sys/amd64/vmm/amd/svm_msr.c | 2 -- sys/amd64/vmm/amd/vmcb.c | 2 -- sys/amd64/vmm/intel/ept.c | 2 -- sys/amd64/vmm/intel/vmcs.c | 2 -- sys/amd64/vmm/intel/vmx.c | 2 -- sys/amd64/vmm/intel/vmx_genassym.c | 2 -- sys/amd64/vmm/intel/vmx_msr.c | 2 -- sys/amd64/vmm/intel/vtd.c | 2 -- sys/amd64/vmm/io/iommu.c | 2 -- sys/amd64/vmm/io/ppt.c | 2 -- sys/amd64/vmm/io/vatpic.c | 2 -- sys/amd64/vmm/io/vatpit.c | 2 -- sys/amd64/vmm/io/vhpet.c | 2 -- sys/amd64/vmm/io/vioapic.c | 2 -- sys/amd64/vmm/io/vlapic.c | 2 -- sys/amd64/vmm/io/vpmtmr.c | 2 -- sys/amd64/vmm/io/vrtc.c | 2 -- sys/amd64/vmm/vmm.c | 2 -- sys/amd64/vmm/vmm_dev.c | 2 -- sys/amd64/vmm/vmm_host.c | 2 -- sys/amd64/vmm/vmm_instruction_emul.c | 2 -- sys/amd64/vmm/vmm_ioport.c | 2 -- sys/amd64/vmm/vmm_lapic.c | 2 -- sys/amd64/vmm/vmm_mem.c | 2 -- sys/amd64/vmm/vmm_snapshot.c | 2 -- sys/amd64/vmm/vmm_stat.c | 2 -- sys/amd64/vmm/vmm_util.c | 2 -- sys/amd64/vmm/x86.c | 2 -- sys/arm/allwinner/a10/a10_intc.c | 2 -- sys/arm/allwinner/a10/a10_padconf.c | 2 -- sys/arm/allwinner/a10_ahci.c | 2 -- sys/arm/allwinner/a10_codec.c | 2 -- sys/arm/allwinner/a10_dmac.c | 2 -- sys/arm/allwinner/a10_sramc.c | 2 -- sys/arm/allwinner/a10_timer.c | 2 -- sys/arm/allwinner/a13/a13_padconf.c | 2 -- sys/arm/allwinner/a20/a20_cpu_cfg.c | 2 -- sys/arm/allwinner/a20/a20_padconf.c | 2 -- sys/arm/allwinner/a31/a31_padconf.c | 2 -- sys/arm/allwinner/a31/a31_r_padconf.c | 2 -- sys/arm/allwinner/a31/a31s_padconf.c | 2 -- sys/arm/allwinner/a31_dmac.c | 2 -- sys/arm/allwinner/a33/a33_padconf.c | 2 -- sys/arm/allwinner/a33_codec.c | 2 -- sys/arm/allwinner/a64/a64_padconf.c | 2 -- sys/arm/allwinner/a64/a64_r_padconf.c | 2 -- sys/arm/allwinner/a64/sun50i_a64_acodec.c | 2 -- sys/arm/allwinner/a83t/a83t_padconf.c | 2 -- sys/arm/allwinner/a83t/a83t_r_padconf.c | 2 -- sys/arm/allwinner/aw_ccu.c | 2 -- sys/arm/allwinner/aw_cir.c | 2 -- sys/arm/allwinner/aw_dwc3.c | 2 -- sys/arm/allwinner/aw_gmacclk.c | 2 -- sys/arm/allwinner/aw_gpio.c | 2 -- sys/arm/allwinner/aw_i2s.c | 2 -- sys/arm/allwinner/aw_if_dwc.c | 2 -- sys/arm/allwinner/aw_machdep.c | 2 -- sys/arm/allwinner/aw_mmc.c | 2 -- sys/arm/allwinner/aw_mp.c | 2 -- sys/arm/allwinner/aw_nmi.c | 2 -- sys/arm/allwinner/aw_pwm.c | 2 -- sys/arm/allwinner/aw_r_intc.c | 2 -- sys/arm/allwinner/aw_reset.c | 2 -- sys/arm/allwinner/aw_rsb.c | 2 -- sys/arm/allwinner/aw_rtc.c | 2 -- sys/arm/allwinner/aw_sid.c | 2 -- sys/arm/allwinner/aw_spi.c | 2 -- sys/arm/allwinner/aw_syscon.c | 2 -- sys/arm/allwinner/aw_thermal.c | 2 -- sys/arm/allwinner/aw_ts.c | 2 -- sys/arm/allwinner/aw_usb3phy.c | 1 - sys/arm/allwinner/aw_usbphy.c | 2 -- sys/arm/allwinner/aw_wdog.c | 2 -- sys/arm/allwinner/axp209.c | 2 -- sys/arm/allwinner/axp81x.c | 2 -- sys/arm/allwinner/clkng/aw_ccung.c | 2 -- sys/arm/allwinner/clkng/aw_clk_frac.c | 2 -- sys/arm/allwinner/clkng/aw_clk_m.c | 2 -- sys/arm/allwinner/clkng/aw_clk_mipi.c | 2 -- sys/arm/allwinner/clkng/aw_clk_nkmp.c | 2 -- sys/arm/allwinner/clkng/aw_clk_nm.c | 2 -- sys/arm/allwinner/clkng/aw_clk_nmm.c | 2 -- sys/arm/allwinner/clkng/aw_clk_np.c | 2 -- sys/arm/allwinner/clkng/aw_clk_prediv_mux.c | 2 -- sys/arm/allwinner/clkng/ccu_a10.c | 2 -- sys/arm/allwinner/clkng/ccu_a13.c | 2 -- sys/arm/allwinner/clkng/ccu_a31.c | 2 -- sys/arm/allwinner/clkng/ccu_a64.c | 2 -- sys/arm/allwinner/clkng/ccu_a83t.c | 2 -- sys/arm/allwinner/clkng/ccu_de2.c | 2 -- sys/arm/allwinner/clkng/ccu_h3.c | 2 -- sys/arm/allwinner/clkng/ccu_h6.c | 2 -- sys/arm/allwinner/clkng/ccu_h6_r.c | 2 -- sys/arm/allwinner/clkng/ccu_sun8i_r.c | 2 -- sys/arm/allwinner/h3/h3_padconf.c | 2 -- sys/arm/allwinner/h3/h3_r_padconf.c | 2 -- sys/arm/allwinner/h6/h6_padconf.c | 2 -- sys/arm/allwinner/h6/h6_r_padconf.c | 2 -- sys/arm/allwinner/if_awg.c | 2 -- sys/arm/allwinner/if_emac.c | 2 -- sys/arm/altera/socfpga/socfpga_a10_manager.c | 2 -- sys/arm/altera/socfpga/socfpga_common.c | 2 -- sys/arm/altera/socfpga/socfpga_machdep.c | 2 -- sys/arm/altera/socfpga/socfpga_manager.c | 2 -- sys/arm/altera/socfpga/socfpga_mp.c | 1 - sys/arm/altera/socfpga/socfpga_rstmgr.c | 2 -- sys/arm/annapurna/alpine/alpine_ccu.c | 2 -- sys/arm/annapurna/alpine/alpine_machdep.c | 2 -- sys/arm/annapurna/alpine/alpine_machdep_mp.c | 1 - sys/arm/annapurna/alpine/alpine_nb_service.c | 2 -- sys/arm/annapurna/alpine/alpine_pci.c | 2 -- sys/arm/annapurna/alpine/alpine_pci_msix.c | 2 -- sys/arm/annapurna/alpine/alpine_serdes.c | 2 -- sys/arm/arm/autoconf.c | 2 -- sys/arm/arm/bcopy_page.S | 3 --- sys/arm/arm/bcopyinout.S | 2 -- sys/arm/arm/bcopyinout_xscale.S | 2 -- sys/arm/arm/blockio.S | 3 --- sys/arm/arm/bus_space_asm_generic.S | 2 -- sys/arm/arm/bus_space_base.c | 2 -- sys/arm/arm/bus_space_generic.c | 2 -- sys/arm/arm/busdma_machdep.c | 2 -- sys/arm/arm/copystr.S | 2 -- sys/arm/arm/cpufunc.c | 2 -- sys/arm/arm/cpufunc_asm.S | 2 -- sys/arm/arm/cpufunc_asm_arm11x6.S | 2 -- sys/arm/arm/cpufunc_asm_armv7.S | 2 -- sys/arm/arm/cpufunc_asm_pj4b.S | 2 -- sys/arm/arm/cpuinfo.c | 2 -- sys/arm/arm/db_disasm.c | 1 - sys/arm/arm/db_interface.c | 1 - sys/arm/arm/db_trace.c | 1 - sys/arm/arm/debug_monitor.c | 2 -- sys/arm/arm/disassem.c | 1 - sys/arm/arm/dump_machdep.c | 2 -- sys/arm/arm/elf_machdep.c | 2 -- sys/arm/arm/elf_note.S | 2 -- sys/arm/arm/exception.S | 3 --- sys/arm/arm/exec_machdep.c | 2 -- sys/arm/arm/fiq.c | 2 -- sys/arm/arm/fiq_subr.S | 2 -- sys/arm/arm/fusu.S | 2 -- sys/arm/arm/gdb_machdep.c | 2 -- sys/arm/arm/genassym.c | 1 - sys/arm/arm/generic_timer.c | 2 -- sys/arm/arm/gic.c | 2 -- sys/arm/arm/gic_acpi.c | 2 -- sys/arm/arm/gic_fdt.c | 2 -- sys/arm/arm/hypervisor-stub.S | 3 --- sys/arm/arm/identcpu-v6.c | 1 - sys/arm/arm/in_cksum_arm.S | 2 -- sys/arm/arm/in_cksum_machdep.c | 2 -- sys/arm/arm/locore-v6.S | 3 --- sys/arm/arm/machdep.c | 2 -- sys/arm/arm/machdep_boot.c | 2 -- sys/arm/arm/machdep_intr.c | 2 -- sys/arm/arm/machdep_kdb.c | 2 -- sys/arm/arm/machdep_ptrace.c | 2 -- sys/arm/arm/mem.c | 2 -- sys/arm/arm/minidump_machdep.c | 2 -- sys/arm/arm/mp_machdep.c | 1 - sys/arm/arm/mpcore_timer.c | 2 -- sys/arm/arm/nexus.c | 2 -- sys/arm/arm/ofw_machdep.c | 2 -- sys/arm/arm/pl310.c | 1 - sys/arm/arm/platform.c | 2 -- sys/arm/arm/pmap-v6.c | 2 -- sys/arm/arm/pmu.c | 2 -- sys/arm/arm/pmu_fdt.c | 2 -- sys/arm/arm/ptrace_machdep.c | 2 -- sys/arm/arm/sc_machdep.c | 2 -- sys/arm/arm/setcpsr.S | 2 -- sys/arm/arm/setstack.S | 2 -- sys/arm/arm/sp804.c | 2 -- sys/arm/arm/stack_machdep.c | 2 -- sys/arm/arm/stdatomic.c | 2 -- sys/arm/arm/support.S | 2 -- sys/arm/arm/swtch-v6.S | 3 --- sys/arm/arm/swtch.S | 3 --- sys/arm/arm/sys_machdep.c | 2 -- sys/arm/arm/syscall.c | 2 -- sys/arm/arm/trap-v6.c | 2 -- sys/arm/arm/uio_machdep.c | 2 -- sys/arm/arm/undefined.c | 2 -- sys/arm/arm/unwind.c | 2 -- sys/arm/arm/vfp.c | 2 -- sys/arm/arm/vm_machdep.c | 2 -- sys/arm/broadcom/bcm2835/bcm2835_bsc.c | 2 -- sys/arm/broadcom/bcm2835/bcm2835_clkman.c | 2 -- sys/arm/broadcom/bcm2835/bcm2835_cpufreq.c | 2 -- sys/arm/broadcom/bcm2835/bcm2835_dma.c | 2 -- sys/arm/broadcom/bcm2835/bcm2835_fb.c | 2 -- sys/arm/broadcom/bcm2835/bcm2835_fbd.c | 2 -- sys/arm/broadcom/bcm2835/bcm2835_firmware.c | 2 -- sys/arm/broadcom/bcm2835/bcm2835_ft5406.c | 2 -- sys/arm/broadcom/bcm2835/bcm2835_gpio.c | 2 -- sys/arm/broadcom/bcm2835/bcm2835_intr.c | 2 -- sys/arm/broadcom/bcm2835/bcm2835_machdep.c | 2 -- sys/arm/broadcom/bcm2835/bcm2835_mbox.c | 2 -- sys/arm/broadcom/bcm2835/bcm2835_pwm.c | 2 -- sys/arm/broadcom/bcm2835/bcm2835_sdhci.c | 2 -- sys/arm/broadcom/bcm2835/bcm2835_sdhost.c | 2 -- sys/arm/broadcom/bcm2835/bcm2835_spi.c | 2 -- sys/arm/broadcom/bcm2835/bcm2835_systimer.c | 2 -- sys/arm/broadcom/bcm2835/bcm2835_vcbus.c | 2 -- sys/arm/broadcom/bcm2835/bcm2835_vcio.c | 2 -- sys/arm/broadcom/bcm2835/bcm2835_wdog.c | 2 -- sys/arm/broadcom/bcm2835/bcm2836.c | 2 -- sys/arm/broadcom/bcm2835/bcm2836_mp.c | 2 -- sys/arm/broadcom/bcm2835/bcm2838_pci.c | 2 -- sys/arm/broadcom/bcm2835/bcm2838_xhci.c | 2 -- sys/arm/broadcom/bcm2835/bcm283x_dwc_fdt.c | 2 -- sys/arm/broadcom/bcm2835/raspberrypi_gpio.c | 2 -- sys/arm/freescale/fsl_ocotp.c | 2 -- sys/arm/freescale/imx/imx51_ccm.c | 2 -- sys/arm/freescale/imx/imx51_ipuv3.c | 2 -- sys/arm/freescale/imx/imx51_ipuv3_fbd.c | 2 -- sys/arm/freescale/imx/imx51_machdep.c | 2 -- sys/arm/freescale/imx/imx53_machdep.c | 2 -- sys/arm/freescale/imx/imx6_anatop.c | 2 -- sys/arm/freescale/imx/imx6_audmux.c | 2 -- sys/arm/freescale/imx/imx6_ccm.c | 2 -- sys/arm/freescale/imx/imx6_hdmi.c | 2 -- sys/arm/freescale/imx/imx6_ipu.c | 2 -- sys/arm/freescale/imx/imx6_machdep.c | 2 -- sys/arm/freescale/imx/imx6_mp.c | 1 - sys/arm/freescale/imx/imx6_pl310.c | 2 -- sys/arm/freescale/imx/imx6_sdma.c | 2 -- sys/arm/freescale/imx/imx6_snvs.c | 2 -- sys/arm/freescale/imx/imx6_src.c | 2 -- sys/arm/freescale/imx/imx6_ssi.c | 2 -- sys/arm/freescale/imx/imx6_usbphy.c | 2 -- sys/arm/freescale/imx/imx_console.c | 2 -- sys/arm/freescale/imx/imx_epit.c | 2 -- sys/arm/freescale/imx/imx_gpio.c | 2 -- sys/arm/freescale/imx/imx_gpt.c | 2 -- sys/arm/freescale/imx/imx_i2c.c | 2 -- sys/arm/freescale/imx/imx_machdep.c | 2 -- sys/arm/freescale/imx/imx_nop_usbphy.c | 2 -- sys/arm/freescale/imx/imx_spi.c | 2 -- sys/arm/freescale/imx/imx_wdog.c | 2 -- sys/arm/freescale/imx/tzic.c | 2 -- sys/arm/freescale/vybrid/vf_adc.c | 2 -- sys/arm/freescale/vybrid/vf_anadig.c | 2 -- sys/arm/freescale/vybrid/vf_ccm.c | 2 -- sys/arm/freescale/vybrid/vf_dcu4.c | 2 -- sys/arm/freescale/vybrid/vf_dmamux.c | 2 -- sys/arm/freescale/vybrid/vf_edma.c | 2 -- sys/arm/freescale/vybrid/vf_ehci.c | 2 -- sys/arm/freescale/vybrid/vf_gpio.c | 2 -- sys/arm/freescale/vybrid/vf_i2c.c | 2 -- sys/arm/freescale/vybrid/vf_iomuxc.c | 2 -- sys/arm/freescale/vybrid/vf_machdep.c | 2 -- sys/arm/freescale/vybrid/vf_mscm.c | 2 -- sys/arm/freescale/vybrid/vf_port.c | 2 -- sys/arm/freescale/vybrid/vf_sai.c | 2 -- sys/arm/freescale/vybrid/vf_spi.c | 2 -- sys/arm/freescale/vybrid/vf_src.c | 2 -- sys/arm/freescale/vybrid/vf_tcon.c | 2 -- sys/arm/freescale/vybrid/vf_uart.c | 2 -- sys/arm/mv/a37x0_gpio.c | 2 -- sys/arm/mv/a37x0_iic.c | 2 -- sys/arm/mv/a37x0_spi.c | 2 -- sys/arm/mv/armada/thermal.c | 2 -- sys/arm/mv/armada/wdt.c | 2 -- sys/arm/mv/armada38x/armada38x.c | 2 -- sys/arm/mv/armada38x/armada38x_mp.c | 2 -- sys/arm/mv/armada38x/armada38x_pl310.c | 2 -- sys/arm/mv/armada38x/armada38x_rtc.c | 2 -- sys/arm/mv/armada38x/pmsu.c | 2 -- sys/arm/mv/armadaxp/armadaxp.c | 2 -- sys/arm/mv/armadaxp/mptramp.S | 3 --- sys/arm/mv/clk/a37x0_periph_clk_driver.c | 2 -- sys/arm/mv/clk/a37x0_tbg.c | 2 -- sys/arm/mv/clk/a37x0_tbg_pll.c | 2 -- sys/arm/mv/clk/a37x0_xtal.c | 2 -- sys/arm/mv/clk/armada38x_gateclk.c | 2 -- sys/arm/mv/clk/armada38x_gen.c | 2 -- sys/arm/mv/clk/periph.c | 2 -- sys/arm/mv/clk/periph_clk_d.c | 2 -- sys/arm/mv/clk/periph_clk_fixed.c | 2 -- sys/arm/mv/clk/periph_clk_gate.c | 2 -- sys/arm/mv/clk/periph_clk_mux_gate.c | 2 -- sys/arm/mv/gpio.c | 2 -- sys/arm/mv/ic.c | 2 -- sys/arm/mv/mpic.c | 2 -- sys/arm/mv/mv_ap806_clock.c | 2 -- sys/arm/mv/mv_ap806_gicp.c | 2 -- sys/arm/mv/mv_ap806_sei.c | 2 -- sys/arm/mv/mv_armv7_machdep.c | 2 -- sys/arm/mv/mv_common.c | 2 -- sys/arm/mv/mv_cp110_clock.c | 2 -- sys/arm/mv/mv_cp110_icu.c | 2 -- sys/arm/mv/mv_cp110_icu_bus.c | 2 -- sys/arm/mv/mv_pci.c | 2 -- sys/arm/mv/mv_pci_ctrl.c | 2 -- sys/arm/mv/mv_spi.c | 2 -- sys/arm/mv/mv_thermal.c | 2 -- sys/arm/mv/mvebu_gpio.c | 2 -- sys/arm/mv/mvebu_pinctrl.c | 2 -- sys/arm/mv/rtc.c | 1 - sys/arm/mv/timer.c | 2 -- sys/arm/nvidia/as3722.c | 2 -- sys/arm/nvidia/as3722_gpio.c | 2 -- sys/arm/nvidia/as3722_regulators.c | 2 -- sys/arm/nvidia/as3722_rtc.c | 2 -- sys/arm/nvidia/drm2/hdmi.c | 2 -- sys/arm/nvidia/drm2/tegra_bo.c | 2 -- sys/arm/nvidia/drm2/tegra_dc.c | 2 -- sys/arm/nvidia/drm2/tegra_drm_subr.c | 2 -- sys/arm/nvidia/drm2/tegra_fb.c | 2 -- sys/arm/nvidia/drm2/tegra_hdmi.c | 2 -- sys/arm/nvidia/drm2/tegra_host1x.c | 2 -- sys/arm/nvidia/tegra124/tegra124_car.c | 2 -- sys/arm/nvidia/tegra124/tegra124_clk_per.c | 2 -- sys/arm/nvidia/tegra124/tegra124_clk_pll.c | 2 -- sys/arm/nvidia/tegra124/tegra124_clk_super.c | 2 -- sys/arm/nvidia/tegra124/tegra124_coretemp.c | 2 -- sys/arm/nvidia/tegra124/tegra124_cpufreq.c | 2 -- sys/arm/nvidia/tegra124/tegra124_machdep.c | 2 -- sys/arm/nvidia/tegra124/tegra124_mp.c | 2 -- sys/arm/nvidia/tegra124/tegra124_xusbpadctl.c | 2 -- sys/arm/nvidia/tegra_abpmisc.c | 2 -- sys/arm/nvidia/tegra_ahci.c | 2 -- sys/arm/nvidia/tegra_efuse.c | 2 -- sys/arm/nvidia/tegra_ehci.c | 2 -- sys/arm/nvidia/tegra_gpio.c | 2 -- sys/arm/nvidia/tegra_i2c.c | 2 -- sys/arm/nvidia/tegra_lic.c | 2 -- sys/arm/nvidia/tegra_mc.c | 2 -- sys/arm/nvidia/tegra_pcie.c | 2 -- sys/arm/nvidia/tegra_pinmux.c | 2 -- sys/arm/nvidia/tegra_rtc.c | 2 -- sys/arm/nvidia/tegra_sdhci.c | 2 -- sys/arm/nvidia/tegra_soctherm.c | 2 -- sys/arm/nvidia/tegra_uart.c | 2 -- sys/arm/nvidia/tegra_usbphy.c | 2 -- sys/arm/nvidia/tegra_xhci.c | 2 -- sys/arm/qemu/virt_machdep.c | 2 -- sys/arm/qemu/virt_mp.c | 2 -- sys/arm/qualcomm/ipq4018_machdep.c | 2 -- sys/arm/qualcomm/ipq4018_mp.c | 2 -- sys/arm/qualcomm/ipq4018_usb_hs_phy.c | 2 -- sys/arm/qualcomm/ipq4018_usb_ss_phy.c | 2 -- sys/arm/qualcomm/qcom_cpu_kpssv2.c | 2 -- sys/arm/qualcomm/qcom_scm_legacy.c | 2 -- sys/arm/rockchip/rk32xx_machdep.c | 2 -- sys/arm/rockchip/rk32xx_mp.c | 2 -- sys/arm/ti/aintc.c | 2 -- sys/arm/ti/am335x/am3359_cppi41.c | 2 -- sys/arm/ti/am335x/am335x_dmtimer.c | 2 -- sys/arm/ti/am335x/am335x_dmtpps.c | 2 -- sys/arm/ti/am335x/am335x_ecap.c | 2 -- sys/arm/ti/am335x/am335x_ehrpwm.c | 2 -- sys/arm/ti/am335x/am335x_gpio.c | 2 -- sys/arm/ti/am335x/am335x_lcd.c | 2 -- sys/arm/ti/am335x/am335x_lcd_syscons.c | 2 -- sys/arm/ti/am335x/am335x_musb.c | 2 -- sys/arm/ti/am335x/am335x_pmic.c | 1 - sys/arm/ti/am335x/am335x_pwmss.c | 2 -- sys/arm/ti/am335x/am335x_rtc.c | 2 -- sys/arm/ti/am335x/am335x_scm.c | 2 -- sys/arm/ti/am335x/am335x_scm_padconf.c | 2 -- sys/arm/ti/am335x/am335x_usb_phy.c | 2 -- sys/arm/ti/am335x/tda19988.c | 1 - sys/arm/ti/clk/clock_common.c | 2 -- sys/arm/ti/clk/clock_common.h | 2 -- sys/arm/ti/clk/ti_clk_clkctrl.c | 2 -- sys/arm/ti/clk/ti_clk_dpll.c | 2 -- sys/arm/ti/clk/ti_clkctrl.c | 2 -- sys/arm/ti/clk/ti_divider_clock.c | 2 -- sys/arm/ti/clk/ti_dpll_clock.c | 2 -- sys/arm/ti/clk/ti_gate_clock.c | 2 -- sys/arm/ti/clk/ti_mux_clock.c | 2 -- sys/arm/ti/cpsw/if_cpsw.c | 2 -- sys/arm/ti/omap4/omap4_gpio.c | 2 -- sys/arm/ti/omap4/omap4_l2cache.c | 1 - sys/arm/ti/omap4/omap4_mp.c | 1 - sys/arm/ti/omap4/omap4_prcm_clks.c | 2 -- sys/arm/ti/omap4/omap4_scm_padconf.c | 2 -- sys/arm/ti/omap4/omap4_wugen.c | 2 -- sys/arm/ti/omap4/pandaboard/pandaboard.c | 2 -- sys/arm/ti/ti_adc.c | 2 -- sys/arm/ti/ti_cpuid.c | 2 -- sys/arm/ti/ti_edma3.c | 2 -- sys/arm/ti/ti_gpio.c | 2 -- sys/arm/ti/ti_i2c.c | 2 -- sys/arm/ti/ti_machdep.c | 2 -- sys/arm/ti/ti_mbox.c | 2 -- sys/arm/ti/ti_omap4_cm.c | 2 -- sys/arm/ti/ti_pinmux.c | 2 -- sys/arm/ti/ti_prcm.c | 2 -- sys/arm/ti/ti_prm.c | 2 -- sys/arm/ti/ti_pruss.c | 2 -- sys/arm/ti/ti_scm.c | 2 -- sys/arm/ti/ti_scm_syscon.c | 2 -- sys/arm/ti/ti_sdhci.c | 2 -- sys/arm/ti/ti_sdma.c | 2 -- sys/arm/ti/ti_smc.S | 2 -- sys/arm/ti/ti_spi.c | 2 -- sys/arm/ti/ti_sysc.c | 2 -- sys/arm/ti/ti_wdt.c | 2 -- sys/arm/ti/twl/twl.c | 2 -- sys/arm/ti/twl/twl_clks.c | 2 -- sys/arm/ti/twl/twl_vreg.c | 2 -- sys/arm/ti/usb/omap_ehci.c | 2 -- sys/arm/ti/usb/omap_host.c | 2 -- sys/arm/ti/usb/omap_tll.c | 2 -- sys/arm/xilinx/uart_dev_cdnc.c | 2 -- sys/arm/xilinx/zy7_devcfg.c | 2 -- sys/arm/xilinx/zy7_ehci.c | 2 -- sys/arm/xilinx/zy7_gpio.c | 2 -- sys/arm/xilinx/zy7_l2cache.c | 2 -- sys/arm/xilinx/zy7_machdep.c | 2 -- sys/arm/xilinx/zy7_mp.c | 1 - sys/arm/xilinx/zy7_qspi.c | 2 -- sys/arm/xilinx/zy7_slcr.c | 2 -- sys/arm/xilinx/zy7_spi.c | 2 -- sys/arm64/acpica/OsdEnvironment.c | 2 -- sys/arm64/acpica/acpi_iort.c | 2 -- sys/arm64/acpica/acpi_machdep.c | 2 -- sys/arm64/acpica/acpi_wakeup.c | 2 -- sys/arm64/acpica/pci_cfgreg.c | 2 -- sys/arm64/arm64/autoconf.c | 2 -- sys/arm64/arm64/bus_machdep.c | 2 -- sys/arm64/arm64/bus_space_asm.S | 2 -- sys/arm64/arm64/busdma_bounce.c | 2 -- sys/arm64/arm64/busdma_machdep.c | 2 -- sys/arm64/arm64/clock.c | 2 -- sys/arm64/arm64/cmn600.c | 2 -- sys/arm64/arm64/copyinout.S | 2 -- sys/arm64/arm64/cpu_errata.c | 2 -- sys/arm64/arm64/cpufunc_asm.S | 3 --- sys/arm64/arm64/db_disasm.c | 1 - sys/arm64/arm64/db_interface.c | 1 - sys/arm64/arm64/db_trace.c | 1 - sys/arm64/arm64/debug_monitor.c | 2 -- sys/arm64/arm64/disassem.c | 2 -- sys/arm64/arm64/dump_machdep.c | 2 -- sys/arm64/arm64/efirt_machdep.c | 2 -- sys/arm64/arm64/elf32_machdep.c | 2 -- sys/arm64/arm64/elf_machdep.c | 2 -- sys/arm64/arm64/exception.S | 2 -- sys/arm64/arm64/exec_machdep.c | 2 -- sys/arm64/arm64/freebsd32_machdep.c | 2 -- sys/arm64/arm64/genassym.c | 1 - sys/arm64/arm64/gic_v3.c | 2 -- sys/arm64/arm64/gic_v3_acpi.c | 2 -- sys/arm64/arm64/gic_v3_fdt.c | 2 -- sys/arm64/arm64/gicv3_its.c | 2 -- sys/arm64/arm64/identcpu.c | 2 -- sys/arm64/arm64/machdep.c | 2 -- sys/arm64/arm64/machdep_boot.c | 2 -- sys/arm64/arm64/mem.c | 2 -- sys/arm64/arm64/minidump_machdep.c | 2 -- sys/arm64/arm64/mp_machdep.c | 2 -- sys/arm64/arm64/nexus.c | 2 -- sys/arm64/arm64/ofw_machdep.c | 2 -- sys/arm64/arm64/pmap.c | 2 -- sys/arm64/arm64/ptrace_machdep.c | 2 -- sys/arm64/arm64/ptrauth.c | 2 -- sys/arm64/arm64/stack_machdep.c | 2 -- sys/arm64/arm64/support.S | 2 -- sys/arm64/arm64/swtch.S | 3 --- sys/arm64/arm64/sys_machdep.c | 2 -- sys/arm64/arm64/trap.c | 2 -- sys/arm64/arm64/uio_machdep.c | 2 -- sys/arm64/arm64/uma_machdep.c | 2 -- sys/arm64/arm64/undefined.c | 2 -- sys/arm64/arm64/unwind.c | 1 - sys/arm64/arm64/vfp.c | 2 -- sys/arm64/arm64/vm_machdep.c | 2 -- sys/arm64/broadcom/brcmmdio/mdio_mux_iproc.c | 2 -- sys/arm64/broadcom/brcmmdio/mdio_nexus_iproc.c | 2 -- sys/arm64/broadcom/brcmmdio/mdio_ns2_pcie_phy.c | 2 -- sys/arm64/broadcom/genet/if_genet.c | 2 -- sys/arm64/cavium/thunder_pcie_common.c | 2 -- sys/arm64/cavium/thunder_pcie_fdt.c | 2 -- sys/arm64/cavium/thunder_pcie_pem.c | 2 -- sys/arm64/cavium/thunder_pcie_pem_fdt.c | 2 -- sys/arm64/coresight/coresight.c | 2 -- sys/arm64/coresight/coresight_acpi.c | 2 -- sys/arm64/coresight/coresight_cmd.c | 2 -- sys/arm64/coresight/coresight_cpu_debug.c | 2 -- sys/arm64/coresight/coresight_etm4x.c | 2 -- sys/arm64/coresight/coresight_etm4x_acpi.c | 2 -- sys/arm64/coresight/coresight_etm4x_fdt.c | 2 -- sys/arm64/coresight/coresight_fdt.c | 2 -- sys/arm64/coresight/coresight_funnel.c | 2 -- sys/arm64/coresight/coresight_funnel_acpi.c | 2 -- sys/arm64/coresight/coresight_funnel_fdt.c | 2 -- sys/arm64/coresight/coresight_replicator.c | 2 -- sys/arm64/coresight/coresight_replicator_acpi.c | 2 -- sys/arm64/coresight/coresight_replicator_fdt.c | 2 -- sys/arm64/coresight/coresight_tmc.c | 2 -- sys/arm64/coresight/coresight_tmc_acpi.c | 2 -- sys/arm64/coresight/coresight_tmc_fdt.c | 2 -- sys/arm64/freescale/imx/clk/imx_clk_composite.c | 2 -- sys/arm64/freescale/imx/clk/imx_clk_frac_pll.c | 2 -- sys/arm64/freescale/imx/clk/imx_clk_gate.c | 2 -- sys/arm64/freescale/imx/clk/imx_clk_mux.c | 2 -- sys/arm64/freescale/imx/clk/imx_clk_sscg_pll.c | 2 -- sys/arm64/freescale/imx/imx7gpc.c | 2 -- sys/arm64/freescale/imx/imx8mq_ccm.c | 2 -- sys/arm64/intel/stratix10-soc-fpga-mgr.c | 2 -- sys/arm64/intel/stratix10-svc.c | 2 -- sys/arm64/iommu/iommu.c | 2 -- sys/arm64/iommu/iommu_pmap.c | 2 -- sys/arm64/iommu/smmu.c | 2 -- sys/arm64/iommu/smmu_acpi.c | 2 -- sys/arm64/iommu/smmu_fdt.c | 2 -- sys/arm64/iommu/smmu_quirks.c | 2 -- sys/arm64/linux/linux_dummy_machdep.c | 2 -- sys/arm64/linux/linux_genassym.c | 1 - sys/arm64/linux/linux_machdep.c | 2 -- sys/arm64/linux/linux_support.S | 2 -- sys/arm64/linux/linux_sysvec.c | 2 -- sys/arm64/linux/linux_vdso_gtod.c | 2 -- sys/arm64/nvidia/tegra210/max77620.c | 2 -- sys/arm64/nvidia/tegra210/max77620_gpio.c | 2 -- sys/arm64/nvidia/tegra210/max77620_regulators.c | 2 -- sys/arm64/nvidia/tegra210/max77620_rtc.c | 2 -- sys/arm64/nvidia/tegra210/tegra210_car.c | 2 -- sys/arm64/nvidia/tegra210/tegra210_clk_per.c | 2 -- sys/arm64/nvidia/tegra210/tegra210_clk_pll.c | 2 -- sys/arm64/nvidia/tegra210/tegra210_clk_super.c | 2 -- sys/arm64/nvidia/tegra210/tegra210_coretemp.c | 2 -- sys/arm64/nvidia/tegra210/tegra210_cpufreq.c | 2 -- sys/arm64/nvidia/tegra210/tegra210_pinmux.c | 2 -- sys/arm64/nvidia/tegra210/tegra210_pmc.c | 2 -- sys/arm64/nvidia/tegra210/tegra210_xusbpadctl.c | 2 -- sys/arm64/qoriq/clk/ls1028a_clkgen.c | 2 -- sys/arm64/qoriq/clk/ls1028a_flexspi_clk.c | 2 -- sys/arm64/qoriq/clk/ls1046a_clkgen.c | 2 -- sys/arm64/qoriq/clk/ls1088a_clkgen.c | 2 -- sys/arm64/qoriq/clk/lx2160a_clkgen.c | 2 -- sys/arm64/qoriq/clk/qoriq_clk_pll.c | 2 -- sys/arm64/qoriq/clk/qoriq_clkgen.c | 2 -- sys/arm64/qoriq/qoriq_dw_pci.c | 3 --- sys/arm64/qoriq/qoriq_gpio_pic.c | 2 -- sys/arm64/qoriq/qoriq_therm.c | 2 -- sys/arm64/qualcomm/qcom_gcc.c | 2 -- sys/arm64/rockchip/clk/rk3288_cru.c | 2 -- sys/arm64/rockchip/clk/rk3328_cru.c | 2 -- sys/arm64/rockchip/clk/rk3399_cru.c | 2 -- sys/arm64/rockchip/clk/rk3399_pmucru.c | 2 -- sys/arm64/rockchip/clk/rk_clk_armclk.c | 2 -- sys/arm64/rockchip/clk/rk_clk_composite.c | 2 -- sys/arm64/rockchip/clk/rk_clk_fract.c | 2 -- sys/arm64/rockchip/clk/rk_clk_gate.c | 2 -- sys/arm64/rockchip/clk/rk_clk_mux.c | 2 -- sys/arm64/rockchip/clk/rk_clk_pll.c | 2 -- sys/arm64/rockchip/clk/rk_cru.c | 2 -- sys/arm64/rockchip/if_dwc_rk.c | 2 -- sys/arm64/rockchip/rk3328_codec.c | 2 -- sys/arm64/rockchip/rk3399_emmcphy.c | 2 -- sys/arm64/rockchip/rk_dwc3.c | 2 -- sys/arm64/rockchip/rk_gpio.c | 2 -- sys/arm64/rockchip/rk_grf.c | 2 -- sys/arm64/rockchip/rk_i2c.c | 2 -- sys/arm64/rockchip/rk_i2s.c | 2 -- sys/arm64/rockchip/rk_iodomain.c | 2 -- sys/arm64/rockchip/rk_otp.c | 2 -- sys/arm64/rockchip/rk_pcie.c | 2 -- sys/arm64/rockchip/rk_pcie_phy.c | 2 -- sys/arm64/rockchip/rk_pinctrl.c | 2 -- sys/arm64/rockchip/rk_pmu.c | 2 -- sys/arm64/rockchip/rk_pwm.c | 2 -- sys/arm64/rockchip/rk_spi.c | 2 -- sys/arm64/rockchip/rk_tsadc.c | 2 -- sys/arm64/rockchip/rk_typec_phy.c | 2 -- sys/arm64/rockchip/rk_usb2phy.c | 2 -- sys/arm64/rockchip/rk_usbphy.c | 2 -- sys/cam/ata/ata_all.c | 2 -- sys/cam/ata/ata_da.c | 2 -- sys/cam/ata/ata_pmp.c | 2 -- sys/cam/ata/ata_xpt.c | 2 -- sys/cam/cam.c | 2 -- sys/cam/cam_compat.c | 2 -- sys/cam/cam_iosched.c | 2 -- sys/cam/cam_periph.c | 2 -- sys/cam/cam_queue.c | 2 -- sys/cam/cam_sim.c | 2 -- sys/cam/cam_xpt.c | 2 -- sys/cam/ctl/ctl.c | 2 -- sys/cam/ctl/ctl_backend.c | 2 -- sys/cam/ctl/ctl_backend_block.c | 2 -- sys/cam/ctl/ctl_backend_ramdisk.c | 2 -- sys/cam/ctl/ctl_error.c | 2 -- sys/cam/ctl/ctl_frontend.c | 2 -- sys/cam/ctl/ctl_frontend_cam_sim.c | 2 -- sys/cam/ctl/ctl_frontend_ioctl.c | 2 -- sys/cam/ctl/ctl_frontend_iscsi.c | 2 -- sys/cam/ctl/ctl_ha.c | 2 -- sys/cam/ctl/ctl_scsi_all.c | 3 --- sys/cam/ctl/ctl_scsi_all.h | 3 --- sys/cam/ctl/ctl_tpc.c | 2 -- sys/cam/ctl/ctl_tpc_local.c | 2 -- sys/cam/ctl/ctl_util.c | 2 -- sys/cam/ctl/scsi_ctl.c | 2 -- sys/cam/mmc/mmc_da.c | 2 -- sys/cam/mmc/mmc_sim.c | 2 -- sys/cam/mmc/mmc_xpt.c | 2 -- sys/cam/nvme/nvme_all.c | 2 -- sys/cam/nvme/nvme_da.c | 2 -- sys/cam/nvme/nvme_xpt.c | 2 -- sys/cam/scsi/scsi_all.c | 2 -- sys/cam/scsi/scsi_cd.c | 2 -- sys/cam/scsi/scsi_ch.c | 2 -- sys/cam/scsi/scsi_da.c | 2 -- sys/cam/scsi/scsi_enc.c | 2 -- sys/cam/scsi/scsi_enc_safte.c | 2 -- sys/cam/scsi/scsi_enc_ses.c | 2 -- sys/cam/scsi/scsi_pass.c | 2 -- sys/cam/scsi/scsi_pt.c | 2 -- sys/cam/scsi/scsi_sa.c | 2 -- sys/cam/scsi/scsi_sg.c | 2 -- sys/cam/scsi/scsi_targ_bh.c | 2 -- sys/cam/scsi/scsi_target.c | 2 -- sys/cam/scsi/scsi_xpt.c | 2 -- sys/cam/scsi/smp_all.c | 2 -- sys/cddl/boot/zfs/zfssubr.c | 2 -- sys/cddl/compat/opensolaris/kern/opensolaris_acl.c | 2 -- sys/cddl/compat/opensolaris/kern/opensolaris_atomic.c | 2 -- sys/cddl/compat/opensolaris/kern/opensolaris_proc.c | 2 -- sys/cddl/compat/opensolaris/kern/opensolaris_taskq.c | 2 -- sys/cddl/compat/opensolaris/kern/opensolaris_vm.c | 2 -- sys/cddl/dev/systrace/systrace.c | 2 -- sys/compat/freebsd32/freebsd32_abort2.c | 2 -- sys/compat/freebsd32/freebsd32_capability.c | 2 -- sys/compat/freebsd32/freebsd32_ioctl.c | 2 -- sys/compat/freebsd32/freebsd32_misc.c | 2 -- sys/compat/ia32/ia32_genassym.c | 2 -- sys/compat/ia32/ia32_sysvec.c | 2 -- sys/compat/lindebugfs/lindebugfs.c | 2 -- sys/compat/linprocfs/linprocfs.c | 2 -- sys/compat/linsysfs/linsysfs.c | 2 -- sys/compat/linsysfs/linsysfs_net.c | 2 -- sys/compat/linux/linux.c | 2 -- sys/compat/linux/linux_common.c | 2 -- sys/compat/linux/linux_dummy.c | 2 -- sys/compat/linux/linux_elf.c | 2 -- sys/compat/linux/linux_elf32.c | 2 -- sys/compat/linux/linux_elf64.c | 2 -- sys/compat/linux/linux_emul.c | 2 -- sys/compat/linux/linux_errno.c | 2 -- sys/compat/linux/linux_event.c | 2 -- sys/compat/linux/linux_file.c | 2 -- sys/compat/linux/linux_fork.c | 2 -- sys/compat/linux/linux_futex.c | 2 -- sys/compat/linux/linux_getcwd.c | 2 -- sys/compat/linux/linux_ioctl.c | 2 -- sys/compat/linux/linux_ipc.c | 2 -- sys/compat/linux/linux_mib.c | 2 -- sys/compat/linux/linux_misc.c | 2 -- sys/compat/linux/linux_mmap.c | 2 -- sys/compat/linux/linux_netlink.c | 2 -- sys/compat/linux/linux_ptrace.c | 2 -- sys/compat/linux/linux_rseq.c | 2 -- sys/compat/linux/linux_signal.c | 2 -- sys/compat/linux/linux_socket.c | 2 -- sys/compat/linux/linux_stats.c | 2 -- sys/compat/linux/linux_sysctl.c | 2 -- sys/compat/linux/linux_time.c | 1 - sys/compat/linux/linux_timer.c | 2 -- sys/compat/linux/linux_uid16.c | 2 -- sys/compat/linux/linux_util.c | 2 -- sys/compat/linux/linux_vdso.c | 2 -- sys/compat/linux/linux_xattr.c | 2 -- sys/compat/linuxkpi/common/src/linux_80211.c | 2 -- sys/compat/linuxkpi/common/src/linux_80211_macops.c | 2 -- sys/compat/linuxkpi/common/src/linux_compat.c | 2 -- sys/compat/linuxkpi/common/src/linux_current.c | 2 -- sys/compat/linuxkpi/common/src/linux_devres.c | 2 -- sys/compat/linuxkpi/common/src/linux_domain.c | 2 -- sys/compat/linuxkpi/common/src/linux_hrtimer.c | 2 -- sys/compat/linuxkpi/common/src/linux_i2c.c | 2 -- sys/compat/linuxkpi/common/src/linux_i2cbb.c | 2 -- sys/compat/linuxkpi/common/src/linux_idr.c | 2 -- sys/compat/linuxkpi/common/src/linux_kmod.c | 2 -- sys/compat/linuxkpi/common/src/linux_kthread.c | 2 -- sys/compat/linuxkpi/common/src/linux_mhi.c | 2 -- sys/compat/linuxkpi/common/src/linux_netdev.c | 2 -- sys/compat/linuxkpi/common/src/linux_page.c | 2 -- sys/compat/linuxkpi/common/src/linux_pci.c | 2 -- sys/compat/linuxkpi/common/src/linux_radix.c | 2 -- sys/compat/linuxkpi/common/src/linux_rcu.c | 2 -- sys/compat/linuxkpi/common/src/linux_schedule.c | 2 -- sys/compat/linuxkpi/common/src/linux_seq_file.c | 2 -- sys/compat/linuxkpi/common/src/linux_shmemfs.c | 2 -- sys/compat/linuxkpi/common/src/linux_shrinker.c | 2 -- sys/compat/linuxkpi/common/src/linux_simple_attr.c | 2 -- sys/compat/linuxkpi/common/src/linux_skbuff.c | 2 -- sys/compat/linuxkpi/common/src/linux_slab.c | 2 -- sys/compat/linuxkpi/common/src/linux_tasklet.c | 2 -- sys/compat/linuxkpi/common/src/linux_work.c | 2 -- sys/compat/linuxkpi/common/src/linux_xarray.c | 2 -- sys/compat/x86bios/x86bios.c | 2 -- sys/crypto/aesni/aesni.c | 2 -- sys/crypto/aesni/aesni_wrap.c | 2 -- sys/crypto/aesni/intel_sha1.c | 2 -- sys/crypto/aesni/intel_sha256.c | 2 -- sys/crypto/armv8/armv8_crypto.c | 2 -- sys/crypto/armv8/armv8_crypto_wrap.c | 2 -- sys/crypto/blake2/blake2-sw.c | 2 -- sys/crypto/blake2/blake2_cryptodev.c | 2 -- sys/crypto/ccp/ccp.c | 2 -- sys/crypto/ccp/ccp_hardware.c | 2 -- sys/crypto/ccp/ccp_lsb.c | 2 -- sys/crypto/chacha20/chacha-sw.c | 2 -- sys/crypto/chacha20/chacha.c | 2 -- sys/crypto/des/des_ecb.c | 2 -- sys/crypto/des/des_enc.c | 2 -- sys/crypto/des/des_setkey.c | 2 -- sys/crypto/libsodium/randombytes.c | 1 - sys/crypto/libsodium/utils.c | 1 - sys/crypto/openssl/ossl.c | 2 -- sys/crypto/openssl/ossl_aes.c | 2 -- sys/crypto/openssl/ossl_sha1.c | 2 -- sys/crypto/openssl/ossl_sha256.c | 2 -- sys/crypto/openssl/ossl_sha512.c | 2 -- sys/crypto/rc4/rc4.c | 2 -- sys/crypto/rijndael/rijndael-alg-fst.c | 2 -- sys/crypto/rijndael/rijndael-api-fst.c | 2 -- sys/crypto/rijndael/rijndael-api.c | 2 -- sys/crypto/sha1.c | 2 -- sys/crypto/sha2/sha256c.c | 2 -- sys/crypto/sha2/sha256c_arm64.c | 2 -- sys/crypto/sha2/sha512c.c | 2 -- sys/crypto/sha2/sha512c_arm64.c | 2 -- sys/crypto/siphash/siphash.c | 2 -- sys/crypto/siphash/siphash_test.c | 2 -- sys/crypto/skein/skein.c | 2 -- sys/crypto/skein/skein_block.c | 2 -- sys/crypto/via/padlock.c | 2 -- sys/crypto/via/padlock_cipher.c | 2 -- sys/crypto/via/padlock_hash.c | 2 -- sys/ddb/db_access.c | 2 -- sys/ddb/db_break.c | 2 -- sys/ddb/db_capture.c | 2 -- sys/ddb/db_command.c | 2 -- sys/ddb/db_examine.c | 2 -- sys/ddb/db_expr.c | 2 -- sys/ddb/db_input.c | 2 -- sys/ddb/db_lex.c | 2 -- sys/ddb/db_main.c | 2 -- sys/ddb/db_output.c | 2 -- sys/ddb/db_print.c | 2 -- sys/ddb/db_ps.c | 2 -- sys/ddb/db_run.c | 2 -- sys/ddb/db_script.c | 2 -- sys/ddb/db_sym.c | 2 -- sys/ddb/db_textdump.c | 2 -- sys/ddb/db_thread.c | 2 -- sys/ddb/db_variables.c | 2 -- sys/ddb/db_watch.c | 2 -- sys/ddb/db_write_cmd.c | 2 -- sys/dev/aac/aac.c | 2 -- sys/dev/aac/aac_cam.c | 2 -- sys/dev/aac/aac_debug.c | 2 -- sys/dev/aac/aac_disk.c | 2 -- sys/dev/aac/aac_linux.c | 2 -- sys/dev/aac/aac_pci.c | 2 -- sys/dev/aacraid/aacraid.c | 2 -- sys/dev/aacraid/aacraid_cam.c | 2 -- sys/dev/aacraid/aacraid_debug.c | 2 -- sys/dev/aacraid/aacraid_endian.c | 2 -- sys/dev/aacraid/aacraid_linux.c | 2 -- sys/dev/aacraid/aacraid_pci.c | 2 -- sys/dev/acpi_support/acpi_asus.c | 2 -- sys/dev/acpi_support/acpi_asus_wmi.c | 2 -- sys/dev/acpi_support/acpi_fujitsu.c | 2 -- sys/dev/acpi_support/acpi_hp.c | 2 -- sys/dev/acpi_support/acpi_ibm.c | 2 -- sys/dev/acpi_support/acpi_panasonic.c | 2 -- sys/dev/acpi_support/acpi_rapidstart.c | 2 -- sys/dev/acpi_support/acpi_sony.c | 2 -- sys/dev/acpi_support/acpi_toshiba.c | 2 -- sys/dev/acpi_support/acpi_wmi.c | 2 -- sys/dev/acpi_support/atk0110.c | 2 -- sys/dev/acpica/Osd/OsdDebug.c | 2 -- sys/dev/acpica/Osd/OsdHardware.c | 2 -- sys/dev/acpica/Osd/OsdInterrupt.c | 2 -- sys/dev/acpica/Osd/OsdMemory.c | 2 -- sys/dev/acpica/Osd/OsdSchedule.c | 2 -- sys/dev/acpica/Osd/OsdStream.c | 2 -- sys/dev/acpica/Osd/OsdSynch.c | 2 -- sys/dev/acpica/Osd/OsdTable.c | 2 -- sys/dev/acpica/acpi.c | 2 -- sys/dev/acpica/acpi_acad.c | 2 -- sys/dev/acpica/acpi_apei.c | 2 -- sys/dev/acpica/acpi_battery.c | 2 -- sys/dev/acpica/acpi_button.c | 2 -- sys/dev/acpica/acpi_cmbat.c | 2 -- sys/dev/acpica/acpi_container.c | 2 -- sys/dev/acpica/acpi_cpu.c | 2 -- sys/dev/acpica/acpi_ec.c | 2 -- sys/dev/acpica/acpi_ged.c | 2 -- sys/dev/acpica/acpi_hpet.c | 2 -- sys/dev/acpica/acpi_isab.c | 2 -- sys/dev/acpica/acpi_lid.c | 2 -- sys/dev/acpica/acpi_package.c | 2 -- sys/dev/acpica/acpi_pci.c | 2 -- sys/dev/acpica/acpi_pci_link.c | 2 -- sys/dev/acpica/acpi_pcib.c | 2 -- sys/dev/acpica/acpi_pcib_acpi.c | 2 -- sys/dev/acpica/acpi_pcib_pci.c | 2 -- sys/dev/acpica/acpi_perf.c | 2 -- sys/dev/acpica/acpi_powerres.c | 2 -- sys/dev/acpica/acpi_pxm.c | 2 -- sys/dev/acpica/acpi_quirk.c | 2 -- sys/dev/acpica/acpi_resource.c | 2 -- sys/dev/acpica/acpi_smbat.c | 2 -- sys/dev/acpica/acpi_thermal.c | 2 -- sys/dev/acpica/acpi_throttle.c | 2 -- sys/dev/acpica/acpi_timer.c | 2 -- sys/dev/acpica/acpi_video.c | 2 -- sys/dev/adlink/adlink.c | 2 -- sys/dev/ae/if_ae.c | 2 -- sys/dev/age/if_age.c | 2 -- sys/dev/agp/agp.c | 2 -- sys/dev/agp/agp_ali.c | 2 -- sys/dev/agp/agp_amd.c | 2 -- sys/dev/agp/agp_amd64.c | 2 -- sys/dev/agp/agp_apple.c | 2 -- sys/dev/agp/agp_ati.c | 2 -- sys/dev/agp/agp_i810.c | 2 -- sys/dev/agp/agp_intel.c | 2 -- sys/dev/agp/agp_nvidia.c | 2 -- sys/dev/agp/agp_sis.c | 2 -- sys/dev/agp/agp_via.c | 2 -- sys/dev/ahci/ahci.c | 2 -- sys/dev/ahci/ahci_fsl_fdt.c | 2 -- sys/dev/ahci/ahci_generic.c | 2 -- sys/dev/ahci/ahci_mv_fdt.c | 2 -- sys/dev/ahci/ahci_pci.c | 2 -- sys/dev/ahci/ahciem.c | 2 -- sys/dev/aic7xxx/ahc_isa.c | 2 -- sys/dev/aic7xxx/ahc_pci.c | 2 -- sys/dev/aic7xxx/ahd_pci.c | 2 -- sys/dev/aic7xxx/aic7770.c | 1 - sys/dev/aic7xxx/aic79xx.c | 1 - sys/dev/aic7xxx/aic79xx_osm.c | 2 -- sys/dev/aic7xxx/aic79xx_pci.c | 1 - sys/dev/aic7xxx/aic79xx_reg_print.c | 1 - sys/dev/aic7xxx/aic7xxx.c | 1 - sys/dev/aic7xxx/aic7xxx_93cx6.c | 1 - sys/dev/aic7xxx/aic7xxx_osm.c | 2 -- sys/dev/aic7xxx/aic7xxx_pci.c | 1 - sys/dev/aic7xxx/aic7xxx_reg_print.c | 1 - sys/dev/aic7xxx/aic_osm_lib.c | 2 -- sys/dev/al_eth/al_eth.c | 2 -- sys/dev/al_eth/al_init_eth_kr.c | 2 -- sys/dev/al_eth/al_init_eth_lm.c | 2 -- sys/dev/alc/if_alc.c | 2 -- sys/dev/ale/if_ale.c | 2 -- sys/dev/alpm/alpm.c | 2 -- sys/dev/altera/atse/if_atse.c | 2 -- sys/dev/altera/atse/if_atse_fdt.c | 2 -- sys/dev/altera/atse/if_atse_nexus.c | 2 -- sys/dev/altera/avgen/altera_avgen.c | 2 -- sys/dev/altera/avgen/altera_avgen_fdt.c | 2 -- sys/dev/altera/avgen/altera_avgen_nexus.c | 2 -- sys/dev/altera/dwc/if_dwc_socfpga.c | 2 -- sys/dev/altera/jtag_uart/altera_jtag_uart_cons.c | 2 -- sys/dev/altera/jtag_uart/altera_jtag_uart_fdt.c | 2 -- sys/dev/altera/jtag_uart/altera_jtag_uart_nexus.c | 2 -- sys/dev/altera/jtag_uart/altera_jtag_uart_tty.c | 2 -- sys/dev/altera/msgdma/msgdma.c | 2 -- sys/dev/altera/pio/pio.c | 2 -- sys/dev/altera/sdcard/altera_sdcard.c | 2 -- sys/dev/altera/sdcard/altera_sdcard_disk.c | 2 -- sys/dev/altera/sdcard/altera_sdcard_fdt.c | 2 -- sys/dev/altera/sdcard/altera_sdcard_io.c | 2 -- sys/dev/altera/sdcard/altera_sdcard_nexus.c | 2 -- sys/dev/altera/softdma/softdma.c | 2 -- sys/dev/amdgpio/amdgpio.c | 2 -- sys/dev/amdpm/amdpm.c | 2 -- sys/dev/amdsbwd/amdsbwd.c | 2 -- sys/dev/amdsmb/amdsmb.c | 2 -- sys/dev/amdsmn/amdsmn.c | 2 -- sys/dev/amdtemp/amdtemp.c | 2 -- sys/dev/arcmsr/arcmsr.c | 2 -- sys/dev/asmc/asmc.c | 2 -- sys/dev/ata/ata-all.c | 2 -- sys/dev/ata/ata-dma.c | 2 -- sys/dev/ata/ata-isa.c | 2 -- sys/dev/ata/ata-lowlevel.c | 2 -- sys/dev/ata/ata-pci.c | 2 -- sys/dev/ata/ata-sata.c | 2 -- sys/dev/ata/chipsets/ata-acard.c | 2 -- sys/dev/ata/chipsets/ata-acerlabs.c | 2 -- sys/dev/ata/chipsets/ata-amd.c | 2 -- sys/dev/ata/chipsets/ata-ati.c | 2 -- sys/dev/ata/chipsets/ata-cenatek.c | 2 -- sys/dev/ata/chipsets/ata-cypress.c | 2 -- sys/dev/ata/chipsets/ata-cyrix.c | 2 -- sys/dev/ata/chipsets/ata-fsl.c | 2 -- sys/dev/ata/chipsets/ata-highpoint.c | 2 -- sys/dev/ata/chipsets/ata-intel.c | 2 -- sys/dev/ata/chipsets/ata-ite.c | 2 -- sys/dev/ata/chipsets/ata-jmicron.c | 2 -- sys/dev/ata/chipsets/ata-marvell.c | 2 -- sys/dev/ata/chipsets/ata-micron.c | 2 -- sys/dev/ata/chipsets/ata-national.c | 2 -- sys/dev/ata/chipsets/ata-netcell.c | 2 -- sys/dev/ata/chipsets/ata-nvidia.c | 2 -- sys/dev/ata/chipsets/ata-promise.c | 2 -- sys/dev/ata/chipsets/ata-serverworks.c | 2 -- sys/dev/ata/chipsets/ata-siliconimage.c | 2 -- sys/dev/ata/chipsets/ata-sis.c | 2 -- sys/dev/ata/chipsets/ata-via.c | 2 -- sys/dev/ath/ath_dfs/null/dfs_null.c | 2 -- sys/dev/ath/ath_rate/amrr/amrr.c | 2 -- sys/dev/ath/ath_rate/onoe/onoe.c | 2 -- sys/dev/ath/ath_rate/sample/sample.c | 2 -- sys/dev/ath/ath_rate/sample/tx_schedules.h | 2 -- sys/dev/ath/if_ath.c | 2 -- sys/dev/ath/if_ath_beacon.c | 2 -- sys/dev/ath/if_ath_btcoex.c | 2 -- sys/dev/ath/if_ath_btcoex_mci.c | 2 -- *** 52053 LINES SKIPPED *** From nobody Wed Aug 16 17:57:00 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RQwnT6642z4qvTZ; Wed, 16 Aug 2023 17:57: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RQwnT1VWtz3VCg; Wed, 16 Aug 2023 17:57:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692208621; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ClUsj6Yrar4iPbg5ccbjJNb0LOqMoBf6aEKpZmm/pjI=; b=Ak+LbXyj4jcTID/MguHOlPdOk7cjBbTz5+4voqJVRJyQxR370r6tEIUbQin9SU7i21w8hA sdt4JOGu8ecQN1gexZ4vkUkZjmtbseVpdkN18243MABa7Aqnw7nkyX8dahHgA46laIjbla 5EG0nxO0Ysaln8cey48BMlChgGmNNwi15f+rbRQpE9r7YGzh8tW2pif49+WRBinzzxaHk6 3bUkzoVWJeUgGwOVBZlwqqdElG9kV1ChB4tQtgCuT/8qptoPv0KiX4ECKMMiKd5OXaCOit It88JW2yBc2bSIL/uNn3GC2QsvEwLPqPX5dG1gc9a+LN/GPuWPqZ727ShwPSLA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692208621; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ClUsj6Yrar4iPbg5ccbjJNb0LOqMoBf6aEKpZmm/pjI=; b=xZyuz7E3jBoy35h9Zk7DEpxd6sxzECFMguKxD2rh/avx/yZO9zXpAtJ/smtT8PWOg0aUr/ Ud/auRKw8Qvf0R3xP+CuFRXHD78p68XQ7T4geYXwRU+gY4JWgcTGqf8klOcVkLTicIBlLE RS/rUCyhOmesmYgxtcgWCCEpLZuxMJLRa68jeNg7vVbRSiGos965Is5A75vPpmHaJxB5Dd QBgPMzKA+xNvXhtLSZGA5j7lQ/SZ4+TPNLQMZVN6SPUnL12xpMr1gr58K5BsLxpkzDmCtO jY5250R32qiIG5F8p7p+Q/ODVSdHxHzAXmJR6nXeHkMQ9llA5AzCoEkOzvlZ6A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692208621; a=rsa-sha256; cv=none; b=X4Dao2p5sHGMXkSTU92S/+BzA6IU33Gx9uCbNgo23fZwoZEWX05q2Pc21MfuMv1TcZYq6R g6KPTgo6I+JqPPTcWWgZQs9+704PFj7WMlUExyQ6Gp8D+hrv3CiYnN3vJfOrcsEYoxzeh2 Hbb6LAvKyqsuY/+puj4li2TXU/hhZxkSlR/akGEiRa26ZY8tIuJKpEtUn9isuuB1CgQNhm FqUcO8FlGOa8qmwV/UULcw/5tM3v37EhP+nM25x5Hpj+AOwxrTzAqruUBq3gJ0BOrYOr9b CrHcVbckglDkrnli2anYx6sIc//uYQAdMEMo3wXku2s392vO+KO+wy6unyqECg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RQwnT08d3z11Qf; Wed, 16 Aug 2023 17:57:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37GHv0mU059326; Wed, 16 Aug 2023 17:57:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37GHv0uN059323; Wed, 16 Aug 2023 17:57:00 GMT (envelope-from git) Date: Wed, 16 Aug 2023 17:57:00 GMT Message-Id: <202308161757.37GHv0uN059323@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: 1d386b48a555 - main - Remove $FreeBSD$: one-line .c pattern List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1d386b48a555f61cb7325543adbbb5c3f3407a66 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=1d386b48a555f61cb7325543adbbb5c3f3407a66 commit 1d386b48a555f61cb7325543adbbb5c3f3407a66 Author: Warner Losh AuthorDate: 2023-08-16 17:54:42 +0000 Commit: Warner Losh CommitDate: 2023-08-16 17:54:42 +0000 Remove $FreeBSD$: one-line .c pattern Remove /^[\s*]*__FBSDID\("\$FreeBSD\$"\);?\s*\n/ --- bin/cat/cat.c | 2 -- bin/chflags/chflags.c | 2 -- bin/chio/chio.c | 2 -- bin/chmod/chmod.c | 2 -- bin/cp/cp.c | 2 -- bin/cp/utils.c | 2 -- bin/cpuset/cpuset.c | 2 -- bin/date/date.c | 2 -- bin/date/vary.c | 2 -- bin/dd/args.c | 2 -- bin/dd/conv.c | 2 -- bin/dd/conv_tab.c | 2 -- bin/dd/dd.c | 2 -- bin/dd/misc.c | 2 -- bin/dd/position.c | 2 -- bin/df/df.c | 2 -- bin/domainname/domainname.c | 2 -- bin/echo/echo.c | 2 -- bin/ed/buf.c | 2 -- bin/ed/glbl.c | 2 -- bin/ed/io.c | 2 -- bin/ed/main.c | 2 -- bin/ed/re.c | 2 -- bin/ed/sub.c | 2 -- bin/ed/undo.c | 2 -- bin/getfacl/getfacl.c | 2 -- bin/hostname/hostname.c | 2 -- bin/kenv/kenv.c | 2 -- bin/kill/kill.c | 2 -- bin/ln/ln.c | 2 -- bin/ls/cmp.c | 3 --- bin/ls/ls.c | 2 -- bin/ls/print.c | 2 -- bin/ls/util.c | 2 -- bin/mkdir/mkdir.c | 2 -- bin/mv/mv.c | 2 -- bin/pax/ar_io.c | 2 -- bin/pax/ar_subs.c | 2 -- bin/pax/buf_subs.c | 2 -- bin/pax/cache.c | 2 -- bin/pax/cpio.c | 2 -- bin/pax/file_subs.c | 2 -- bin/pax/ftree.c | 2 -- bin/pax/gen_subs.c | 2 -- bin/pax/getoldopt.c | 2 -- bin/pax/options.c | 2 -- bin/pax/pat_rep.c | 2 -- bin/pax/pax.c | 2 -- bin/pax/sel_subs.c | 2 -- bin/pax/tables.c | 2 -- bin/pax/tar.c | 2 -- bin/pax/tty_subs.c | 2 -- bin/pkill/pkill.c | 2 -- bin/ps/fmt.c | 2 -- bin/ps/keyword.c | 2 -- bin/ps/nlist.c | 2 -- bin/ps/print.c | 2 -- bin/ps/ps.c | 2 -- bin/pwait/pwait.c | 2 -- bin/pwd/pwd.c | 2 -- bin/realpath/realpath.c | 2 -- bin/rm/rm.c | 2 -- bin/rmdir/rmdir.c | 2 -- bin/setfacl/file.c | 2 -- bin/setfacl/mask.c | 2 -- bin/setfacl/merge.c | 2 -- bin/setfacl/remove.c | 2 -- bin/setfacl/setfacl.c | 2 -- bin/setfacl/util.c | 2 -- bin/sh/alias.c | 2 -- bin/sh/arith_yacc.c | 2 -- bin/sh/arith_yylex.c | 2 -- bin/sh/bltin/echo.c | 2 -- bin/sh/cd.c | 2 -- bin/sh/error.c | 2 -- bin/sh/eval.c | 2 -- bin/sh/exec.c | 2 -- bin/sh/expand.c | 2 -- bin/sh/histedit.c | 2 -- bin/sh/input.c | 2 -- bin/sh/jobs.c | 2 -- bin/sh/mail.c | 2 -- bin/sh/main.c | 2 -- bin/sh/memalloc.c | 2 -- bin/sh/miscbltin.c | 2 -- bin/sh/mknodes.c | 2 -- bin/sh/mksyntax.c | 2 -- bin/sh/mystring.c | 2 -- bin/sh/options.c | 2 -- bin/sh/output.c | 2 -- bin/sh/parser.c | 2 -- bin/sh/redir.c | 2 -- bin/sh/show.c | 2 -- bin/sh/trap.c | 2 -- bin/sh/var.c | 2 -- bin/sleep/sleep.c | 2 -- bin/stty/cchar.c | 2 -- bin/stty/gfmt.c | 2 -- bin/stty/key.c | 2 -- bin/stty/modes.c | 2 -- bin/stty/print.c | 2 -- bin/stty/stty.c | 2 -- bin/stty/util.c | 2 -- bin/sync/sync.c | 2 -- bin/test/test.c | 2 -- bin/timeout/timeout.c | 2 -- bin/uuidgen/uuidgen.c | 2 -- cddl/usr.sbin/zfsd/case_file.cc | 3 --- cddl/usr.sbin/zfsd/tests/zfsd_unittest.cc | 3 --- cddl/usr.sbin/zfsd/vdev.cc | 2 -- cddl/usr.sbin/zfsd/zfsd.cc | 3 --- cddl/usr.sbin/zfsd/zfsd_event.cc | 2 -- cddl/usr.sbin/zfsd/zfsd_exception.cc | 2 -- cddl/usr.sbin/zfsd/zfsd_main.cc | 3 --- lib/csu/aarch64/crt1_c.c | 2 -- lib/csu/aarch64/crt1_s.S | 2 -- lib/csu/aarch64/crti.S | 2 -- lib/csu/aarch64/crtn.S | 2 -- lib/csu/amd64/crt1_c.c | 2 -- lib/csu/amd64/crti.S | 2 -- lib/csu/amd64/crtn.S | 2 -- lib/csu/arm/crt1_c.c | 2 -- lib/csu/arm/crt1_s.S | 2 -- lib/csu/arm/crti.S | 2 -- lib/csu/arm/crtn.S | 2 -- lib/csu/common/crtbegin.c | 2 -- lib/csu/common/crtbrand.S | 2 -- lib/csu/common/crtend.c | 2 -- lib/csu/common/feature_note.S | 2 -- lib/csu/common/ignore_init_note.S | 2 -- lib/csu/i386/crt1_c.c | 2 -- lib/csu/i386/crt1_s.S | 2 -- lib/csu/i386/crti.S | 2 -- lib/csu/i386/crtn.S | 2 -- lib/csu/powerpc/crt1_c.c | 2 -- lib/csu/powerpc/crti.S | 2 -- lib/csu/powerpc/crtn.S | 2 -- lib/csu/powerpc/crtsavres.S | 2 -- lib/csu/powerpc64/crt1_c.c | 2 -- lib/csu/powerpc64/crti.S | 2 -- lib/csu/powerpc64/crtn.S | 2 -- lib/csu/riscv/crt1_c.c | 2 -- lib/csu/riscv/crt1_s.S | 2 -- lib/csu/riscv/crti.S | 2 -- lib/csu/riscv/crtn.S | 2 -- lib/csu/tests/cxx_constructors.cc | 2 -- lib/csu/tests/fini_test.c | 2 -- lib/csu/tests/init_test.c | 2 -- lib/flua/libjail/lua_jail.c | 2 -- lib/geom/cache/geom_cache.c | 2 -- lib/geom/concat/geom_concat.c | 2 -- lib/geom/eli/geom_eli.c | 2 -- lib/geom/journal/geom_journal.c | 2 -- lib/geom/journal/geom_journal_ufs.c | 2 -- lib/geom/label/geom_label.c | 2 -- lib/geom/mirror/geom_mirror.c | 2 -- lib/geom/mountver/geom_mountver.c | 2 -- lib/geom/multipath/geom_multipath.c | 1 - lib/geom/nop/geom_nop.c | 2 -- lib/geom/part/geom_part.c | 2 -- lib/geom/raid/geom_raid.c | 2 -- lib/geom/raid3/geom_raid3.c | 2 -- lib/geom/shsec/geom_shsec.c | 2 -- lib/geom/stripe/geom_stripe.c | 2 -- lib/geom/virstor/geom_virstor.c | 2 -- lib/libbe/be.c | 2 -- lib/libbe/be_access.c | 2 -- lib/libbe/be_error.c | 2 -- lib/libbe/be_info.c | 2 -- lib/libbe/tests/target_prog.c | 2 -- lib/libc/aarch64/gen/_ctx_start.S | 2 -- lib/libc/aarch64/gen/_setjmp.S | 2 -- lib/libc/aarch64/gen/fabs.S | 2 -- lib/libc/aarch64/gen/flt_rounds.c | 2 -- lib/libc/aarch64/gen/fpgetmask.c | 2 -- lib/libc/aarch64/gen/fpsetmask.c | 2 -- lib/libc/aarch64/gen/infinity.c | 2 -- lib/libc/aarch64/gen/makecontext.c | 2 -- lib/libc/aarch64/gen/setjmp.S | 2 -- lib/libc/aarch64/gen/sigsetjmp.S | 2 -- lib/libc/aarch64/sys/__vdso_gettc.c | 2 -- lib/libc/aarch64/sys/cerror.S | 2 -- lib/libc/aarch64/sys/syscall.S | 2 -- lib/libc/aarch64/sys/vfork.S | 1 - lib/libc/amd64/gen/_setjmp.S | 2 -- lib/libc/amd64/gen/fabs.S | 2 -- lib/libc/amd64/gen/flt_rounds.c | 2 -- lib/libc/amd64/gen/infinity.c | 2 -- lib/libc/amd64/gen/makecontext.c | 2 -- lib/libc/amd64/gen/rfork_thread.S | 2 -- lib/libc/amd64/gen/setjmp.S | 2 -- lib/libc/amd64/gen/signalcontext.c | 2 -- lib/libc/amd64/gen/sigsetjmp.S | 2 -- lib/libc/amd64/stdlib/div.S | 2 -- lib/libc/amd64/stdlib/ldiv.S | 2 -- lib/libc/amd64/stdlib/lldiv.S | 2 -- lib/libc/amd64/string/bcopy.c | 2 -- lib/libc/amd64/string/bzero.c | 2 -- lib/libc/amd64/string/memcmp.S | 2 -- lib/libc/amd64/string/memmove.S | 2 -- lib/libc/amd64/string/memset.S | 2 -- lib/libc/amd64/string/stpcpy.S | 2 -- lib/libc/amd64/string/strcat.S | 2 -- lib/libc/amd64/string/strcmp.S | 2 -- lib/libc/amd64/string/strcpy.c | 2 -- lib/libc/amd64/string/strlen.S | 2 -- lib/libc/amd64/sys/amd64_get_fsbase.c | 2 -- lib/libc/amd64/sys/amd64_get_gsbase.c | 2 -- lib/libc/amd64/sys/amd64_set_fsbase.c | 2 -- lib/libc/amd64/sys/amd64_set_gsbase.c | 2 -- lib/libc/amd64/sys/cerror.S | 2 -- lib/libc/amd64/sys/getcontext.S | 2 -- lib/libc/amd64/sys/vfork.S | 2 -- lib/libc/arm/aeabi/aeabi_asm_double.S | 2 -- lib/libc/arm/aeabi/aeabi_asm_float.S | 2 -- lib/libc/arm/aeabi/aeabi_atexit.c | 2 -- lib/libc/arm/aeabi/aeabi_double.c | 2 -- lib/libc/arm/aeabi/aeabi_float.c | 2 -- lib/libc/arm/aeabi/aeabi_int_div.S | 2 -- lib/libc/arm/aeabi/aeabi_unwind_cpp.c | 2 -- lib/libc/arm/aeabi/aeabi_unwind_exidx.c | 2 -- lib/libc/arm/aeabi/aeabi_vfp_double.S | 2 -- lib/libc/arm/aeabi/aeabi_vfp_float.S | 2 -- lib/libc/arm/gen/__aeabi_read_tp.S | 2 -- lib/libc/arm/gen/_setjmp.S | 3 --- lib/libc/arm/gen/alloca.S | 2 -- lib/libc/arm/gen/arm_drain_writebuf.c | 2 -- lib/libc/arm/gen/arm_initfini.c | 2 -- lib/libc/arm/gen/arm_sync_icache.c | 2 -- lib/libc/arm/gen/divsi3.S | 2 -- lib/libc/arm/gen/fabs.c | 2 -- lib/libc/arm/gen/flt_rounds.c | 2 -- lib/libc/arm/gen/fpgetmask_vfp.c | 2 -- lib/libc/arm/gen/fpgetround_vfp.c | 2 -- lib/libc/arm/gen/fpgetsticky_vfp.c | 2 -- lib/libc/arm/gen/fpsetmask_vfp.c | 2 -- lib/libc/arm/gen/fpsetround_vfp.c | 2 -- lib/libc/arm/gen/fpsetsticky_vfp.c | 2 -- lib/libc/arm/gen/getcontextx.c | 2 -- lib/libc/arm/gen/infinity.c | 2 -- lib/libc/arm/gen/makecontext.c | 2 -- lib/libc/arm/gen/setjmp.S | 3 --- lib/libc/arm/gen/signalcontext.c | 2 -- lib/libc/arm/gen/sigsetjmp.S | 2 -- lib/libc/arm/string/bcopy.S | 1 - lib/libc/arm/string/bzero.S | 3 --- lib/libc/arm/string/memcmp.S | 3 --- lib/libc/arm/string/memcpy.S | 2 -- lib/libc/arm/string/memmove.S | 2 -- lib/libc/arm/string/memset.S | 2 -- lib/libc/arm/string/strcmp.S | 3 --- lib/libc/arm/string/strlen.S | 2 -- lib/libc/arm/string/strncmp.S | 3 --- lib/libc/arm/sys/Ovfork.S | 1 - lib/libc/arm/sys/__vdso_gettc.c | 2 -- lib/libc/arm/sys/cerror.S | 1 - lib/libc/arm/sys/syscall.S | 1 - lib/libc/compat-43/creat.c | 2 -- lib/libc/compat-43/gethostid.c | 2 -- lib/libc/compat-43/getwd.c | 2 -- lib/libc/compat-43/killpg.c | 2 -- lib/libc/compat-43/sethostid.c | 2 -- lib/libc/compat-43/setpgrp.c | 2 -- lib/libc/compat-43/setrgid.c | 2 -- lib/libc/compat-43/setruid.c | 2 -- lib/libc/compat-43/sigcompat.c | 2 -- lib/libc/csu/aarch64/reloc.c | 2 -- lib/libc/csu/amd64/reloc.c | 2 -- lib/libc/csu/i386/reloc.c | 2 -- lib/libc/csu/powerpc64/reloc.c | 2 -- lib/libc/db/btree/bt_close.c | 2 -- lib/libc/db/btree/bt_conv.c | 2 -- lib/libc/db/btree/bt_debug.c | 2 -- lib/libc/db/btree/bt_delete.c | 2 -- lib/libc/db/btree/bt_get.c | 2 -- lib/libc/db/btree/bt_open.c | 2 -- lib/libc/db/btree/bt_overflow.c | 2 -- lib/libc/db/btree/bt_page.c | 2 -- lib/libc/db/btree/bt_put.c | 2 -- lib/libc/db/btree/bt_search.c | 2 -- lib/libc/db/btree/bt_seq.c | 2 -- lib/libc/db/btree/bt_split.c | 2 -- lib/libc/db/btree/bt_utils.c | 2 -- lib/libc/db/db/db.c | 2 -- lib/libc/db/hash/hash.c | 2 -- lib/libc/db/hash/hash_bigkey.c | 2 -- lib/libc/db/hash/hash_buf.c | 2 -- lib/libc/db/hash/hash_func.c | 2 -- lib/libc/db/hash/hash_log2.c | 2 -- lib/libc/db/hash/hash_page.c | 2 -- lib/libc/db/hash/ndbm.c | 2 -- lib/libc/db/mpool/mpool-compat.c | 2 -- lib/libc/db/mpool/mpool.c | 2 -- lib/libc/db/recno/rec_close.c | 2 -- lib/libc/db/recno/rec_delete.c | 2 -- lib/libc/db/recno/rec_get.c | 2 -- lib/libc/db/recno/rec_open.c | 2 -- lib/libc/db/recno/rec_put.c | 2 -- lib/libc/db/recno/rec_search.c | 2 -- lib/libc/db/recno/rec_seq.c | 2 -- lib/libc/db/recno/rec_utils.c | 2 -- lib/libc/db/test/btree.tests/main.c | 2 -- lib/libc/db/test/dbtest.c | 2 -- lib/libc/db/test/hash.tests/driver2.c | 2 -- lib/libc/db/test/hash.tests/tcreat3.c | 2 -- lib/libc/db/test/hash.tests/tdel.c | 2 -- lib/libc/db/test/hash.tests/thash4.c | 2 -- lib/libc/db/test/hash.tests/tread2.c | 2 -- lib/libc/db/test/hash.tests/tseq.c | 2 -- lib/libc/db/test/hash.tests/tverify.c | 2 -- lib/libc/gdtoa/_hdtoa.c | 2 -- lib/libc/gdtoa/_hldtoa.c | 2 -- lib/libc/gdtoa/_ldtoa.c | 2 -- lib/libc/gdtoa/machdep_ldisQ.c | 2 -- lib/libc/gdtoa/machdep_ldisd.c | 2 -- lib/libc/gdtoa/machdep_ldisx.c | 2 -- lib/libc/gen/__getosreldate.c | 2 -- lib/libc/gen/__pthread_mutex_init_calloc_cb_stub.c | 2 -- lib/libc/gen/__xuname.c | 2 -- lib/libc/gen/_once_stub.c | 2 -- lib/libc/gen/_pthread_stubs.c | 2 -- lib/libc/gen/_rand48.c | 2 -- lib/libc/gen/_spinlock_stub.c | 2 -- lib/libc/gen/_thread_init.c | 2 -- lib/libc/gen/alarm.c | 2 -- lib/libc/gen/arc4random-compat.c | 2 -- lib/libc/gen/arc4random.c | 2 -- lib/libc/gen/assert.c | 2 -- lib/libc/gen/auxv.c | 2 -- lib/libc/gen/basename.c | 2 -- lib/libc/gen/basename_compat.c | 2 -- lib/libc/gen/cap_sandboxed.c | 2 -- lib/libc/gen/check_utility_compat.c | 2 -- lib/libc/gen/clock.c | 2 -- lib/libc/gen/clock_getcpuclockid.c | 2 -- lib/libc/gen/closedir.c | 2 -- lib/libc/gen/confstr.c | 2 -- lib/libc/gen/crypt.c | 2 -- lib/libc/gen/ctermid.c | 2 -- lib/libc/gen/daemon.c | 2 -- lib/libc/gen/devname-compat11.c | 2 -- lib/libc/gen/devname.c | 2 -- lib/libc/gen/dirfd.c | 2 -- lib/libc/gen/dirname.c | 2 -- lib/libc/gen/dirname_compat.c | 2 -- lib/libc/gen/disklabel.c | 2 -- lib/libc/gen/dlfcn.c | 2 -- lib/libc/gen/drand48.c | 2 -- lib/libc/gen/dup3.c | 2 -- lib/libc/gen/erand48.c | 2 -- lib/libc/gen/err.c | 2 -- lib/libc/gen/errlst.c | 2 -- lib/libc/gen/errno.c | 2 -- lib/libc/gen/eventfd.c | 2 -- lib/libc/gen/exec.c | 2 -- lib/libc/gen/exect.c | 2 -- lib/libc/gen/fdevname.c | 2 -- lib/libc/gen/feature_present.c | 2 -- lib/libc/gen/fmtcheck.c | 2 -- lib/libc/gen/fmtmsg.c | 2 -- lib/libc/gen/fnmatch.c | 2 -- lib/libc/gen/fstab.c | 2 -- lib/libc/gen/ftok.c | 2 -- lib/libc/gen/fts-compat.c | 2 -- lib/libc/gen/fts-compat11.c | 2 -- lib/libc/gen/fts.c | 2 -- lib/libc/gen/ftw-compat11.c | 2 -- lib/libc/gen/ftw.c | 2 -- lib/libc/gen/getbootfile.c | 2 -- lib/libc/gen/getbsize.c | 2 -- lib/libc/gen/getcap.c | 2 -- lib/libc/gen/getcwd.c | 2 -- lib/libc/gen/getdomainname.c | 2 -- lib/libc/gen/getentropy.c | 2 -- lib/libc/gen/getgrent.c | 2 -- lib/libc/gen/getgrouplist.c | 2 -- lib/libc/gen/gethostname.c | 2 -- lib/libc/gen/getloadavg.c | 2 -- lib/libc/gen/getlogin.c | 2 -- lib/libc/gen/getmntinfo-compat11.c | 2 -- lib/libc/gen/getmntinfo.c | 2 -- lib/libc/gen/getnetgrent.c | 2 -- lib/libc/gen/getosreldate.c | 2 -- lib/libc/gen/getpagesize.c | 2 -- lib/libc/gen/getpagesizes.c | 2 -- lib/libc/gen/getpeereid.c | 2 -- lib/libc/gen/getprogname.c | 2 -- lib/libc/gen/getpwent.c | 2 -- lib/libc/gen/getttyent.c | 2 -- lib/libc/gen/getusershell.c | 2 -- lib/libc/gen/getutxent.c | 2 -- lib/libc/gen/getvfsbyname.c | 2 -- lib/libc/gen/glob-compat11.c | 2 -- lib/libc/gen/glob.c | 2 -- lib/libc/gen/initgroups.c | 2 -- lib/libc/gen/isatty.c | 2 -- lib/libc/gen/jrand48.c | 2 -- lib/libc/gen/lcong48.c | 2 -- lib/libc/gen/ldexp.c | 2 -- lib/libc/gen/libc_dlopen.c | 2 -- lib/libc/gen/lockf.c | 2 -- lib/libc/gen/lrand48.c | 2 -- lib/libc/gen/memalign.c | 2 -- lib/libc/gen/modf.c | 2 -- lib/libc/gen/mrand48.c | 2 -- lib/libc/gen/nftw-compat11.c | 2 -- lib/libc/gen/nftw.c | 2 -- lib/libc/gen/nice.c | 2 -- lib/libc/gen/nlist.c | 2 -- lib/libc/gen/nrand48.c | 2 -- lib/libc/gen/opendir.c | 2 -- lib/libc/gen/pause.c | 2 -- lib/libc/gen/pmadvise.c | 2 -- lib/libc/gen/popen.c | 2 -- lib/libc/gen/posix_spawn.c | 2 -- lib/libc/gen/psignal.c | 2 -- lib/libc/gen/pututxline.c | 2 -- lib/libc/gen/pw_scan.c | 2 -- lib/libc/gen/raise.c | 2 -- lib/libc/gen/readdir-compat11.c | 2 -- lib/libc/gen/readdir.c | 2 -- lib/libc/gen/readpassphrase.c | 2 -- lib/libc/gen/recvmmsg.c | 2 -- lib/libc/gen/rewinddir.c | 2 -- lib/libc/gen/scandir-compat11.c | 2 -- lib/libc/gen/scandir.c | 2 -- lib/libc/gen/seed48.c | 2 -- lib/libc/gen/seekdir.c | 2 -- lib/libc/gen/semctl.c | 2 -- lib/libc/gen/sendmmsg.c | 2 -- lib/libc/gen/setdomainname.c | 2 -- lib/libc/gen/sethostname.c | 2 -- lib/libc/gen/setjmperr.c | 2 -- lib/libc/gen/setmode.c | 2 -- lib/libc/gen/setproctitle.c | 2 -- lib/libc/gen/setprogname.c | 2 -- lib/libc/gen/siginterrupt.c | 2 -- lib/libc/gen/siglist.c | 2 -- lib/libc/gen/signal.c | 2 -- lib/libc/gen/sigsetops.c | 2 -- lib/libc/gen/sleep.c | 2 -- lib/libc/gen/statvfs.c | 2 -- lib/libc/gen/stringlist.c | 2 -- lib/libc/gen/strtofflags.c | 2 -- lib/libc/gen/sysconf.c | 2 -- lib/libc/gen/sysctl.c | 2 -- lib/libc/gen/sysctlbyname.c | 2 -- lib/libc/gen/sysctlnametomib.c | 2 -- lib/libc/gen/syslog.c | 2 -- lib/libc/gen/telldir.c | 2 -- lib/libc/gen/termios.c | 2 -- lib/libc/gen/time.c | 2 -- lib/libc/gen/times.c | 2 -- lib/libc/gen/timespec_get.c | 2 -- lib/libc/gen/timezone.c | 2 -- lib/libc/gen/trivial-getcontextx.c | 2 -- lib/libc/gen/ttyname.c | 2 -- lib/libc/gen/ttyslot.c | 2 -- lib/libc/gen/ualarm.c | 2 -- lib/libc/gen/uname.c | 2 -- lib/libc/gen/usleep.c | 2 -- lib/libc/gen/utime.c | 2 -- lib/libc/gen/utxdb.c | 2 -- lib/libc/gen/valloc.c | 2 -- lib/libc/gen/wait.c | 2 -- lib/libc/gen/wait3.c | 2 -- lib/libc/gen/waitid.c | 2 -- lib/libc/gen/waitpid.c | 2 -- lib/libc/gen/wordexp.c | 3 --- lib/libc/gmon/gmon.c | 2 -- lib/libc/gmon/mcount.c | 2 -- lib/libc/i386/gen/_ctx_start.S | 2 -- lib/libc/i386/gen/_setjmp.S | 2 -- lib/libc/i386/gen/fabs.S | 2 -- lib/libc/i386/gen/flt_rounds.c | 2 -- lib/libc/i386/gen/infinity.c | 2 -- lib/libc/i386/gen/makecontext.c | 2 -- lib/libc/i386/gen/rfork_thread.S | 2 -- lib/libc/i386/gen/setjmp.S | 2 -- lib/libc/i386/gen/signalcontext.c | 2 -- lib/libc/i386/gen/sigsetjmp.S | 2 -- lib/libc/i386/stdlib/div.S | 2 -- lib/libc/i386/stdlib/ldiv.S | 2 -- lib/libc/i386/string/bcmp.S | 2 -- lib/libc/i386/string/bcopy.S | 2 -- lib/libc/i386/string/bzero.S | 2 -- lib/libc/i386/string/memcmp.S | 2 -- lib/libc/i386/string/memcpy.S | 2 -- lib/libc/i386/string/memmove.S | 2 -- lib/libc/i386/string/memset.S | 2 -- lib/libc/i386/string/strcat.S | 2 -- lib/libc/i386/string/strchr.S | 2 -- lib/libc/i386/string/strcmp.S | 2 -- lib/libc/i386/string/strcpy.S | 2 -- lib/libc/i386/string/strncmp.S | 2 -- lib/libc/i386/string/strrchr.S | 2 -- lib/libc/i386/string/swab.S | 2 -- lib/libc/i386/string/wcschr.S | 2 -- lib/libc/i386/string/wcscmp.S | 2 -- lib/libc/i386/string/wcslen.S | 2 -- lib/libc/i386/string/wmemchr.S | 2 -- lib/libc/i386/sys/Ovfork.S | 2 -- lib/libc/i386/sys/cerror.S | 2 -- lib/libc/i386/sys/getcontext.S | 2 -- lib/libc/i386/sys/i386_clr_watch.c | 2 -- lib/libc/i386/sys/i386_get_fsbase.c | 2 -- lib/libc/i386/sys/i386_get_gsbase.c | 2 -- lib/libc/i386/sys/i386_get_ioperm.c | 2 -- lib/libc/i386/sys/i386_get_ldt.c | 2 -- lib/libc/i386/sys/i386_set_fsbase.c | 2 -- lib/libc/i386/sys/i386_set_gsbase.c | 2 -- lib/libc/i386/sys/i386_set_ioperm.c | 2 -- lib/libc/i386/sys/i386_set_ldt.c | 2 -- lib/libc/i386/sys/i386_set_watch.c | 2 -- lib/libc/i386/sys/i386_vm86.c | 2 -- lib/libc/i386/sys/syscall.S | 2 -- lib/libc/inet/inet_addr.c | 2 -- lib/libc/inet/inet_cidr_ntop.c | 2 -- lib/libc/inet/inet_cidr_pton.c | 2 -- lib/libc/inet/inet_lnaof.c | 2 -- lib/libc/inet/inet_makeaddr.c | 2 -- lib/libc/inet/inet_net_ntop.c | 2 -- lib/libc/inet/inet_net_pton.c | 2 -- lib/libc/inet/inet_neta.c | 2 -- lib/libc/inet/inet_netof.c | 2 -- lib/libc/inet/inet_network.c | 2 -- lib/libc/inet/inet_ntoa.c | 2 -- lib/libc/inet/inet_ntop.c | 2 -- lib/libc/inet/inet_pton.c | 2 -- lib/libc/inet/nsap_addr.c | 2 -- lib/libc/isc/ev_streams.c | 2 -- lib/libc/isc/ev_timers.c | 2 -- lib/libc/locale/ascii.c | 2 -- lib/libc/locale/big5.c | 2 -- lib/libc/locale/btowc.c | 2 -- lib/libc/locale/c16rtomb.c | 2 -- lib/libc/locale/c32rtomb.c | 2 -- lib/libc/locale/cXXrtomb_iconv.h | 2 -- lib/libc/locale/collate.c | 2 -- lib/libc/locale/collcmp.c | 2 -- lib/libc/locale/euc.c | 2 -- lib/libc/locale/fix_grouping.c | 2 -- lib/libc/locale/gb18030.c | 2 -- lib/libc/locale/gb2312.c | 2 -- lib/libc/locale/gbk.c | 2 -- lib/libc/locale/isctype.c | 2 -- lib/libc/locale/iswctype.c | 2 -- lib/libc/locale/ldpart.c | 2 -- lib/libc/locale/lmessages.c | 2 -- lib/libc/locale/lmonetary.c | 2 -- lib/libc/locale/lnumeric.c | 2 -- lib/libc/locale/localeconv.c | 2 -- lib/libc/locale/mblen.c | 2 -- lib/libc/locale/mbrlen.c | 2 -- lib/libc/locale/mbrtoc16.c | 2 -- lib/libc/locale/mbrtoc32.c | 2 -- lib/libc/locale/mbrtocXX_iconv.h | 2 -- lib/libc/locale/mbrtowc.c | 2 -- lib/libc/locale/mbsinit.c | 2 -- lib/libc/locale/mbsnrtowcs.c | 2 -- lib/libc/locale/mbsrtowcs.c | 2 -- lib/libc/locale/mbstowcs.c | 2 -- lib/libc/locale/mbtowc.c | 2 -- lib/libc/locale/mskanji.c | 2 -- lib/libc/locale/nextwctype.c | 2 -- lib/libc/locale/nl_langinfo.c | 2 -- lib/libc/locale/nomacros.c | 2 -- lib/libc/locale/none.c | 2 -- lib/libc/locale/rpmatch.c | 2 -- lib/libc/locale/rune.c | 2 -- lib/libc/locale/runetype.c | 2 -- lib/libc/locale/setlocale.c | 2 -- lib/libc/locale/setrunelocale.c | 2 -- lib/libc/locale/table.c | 2 -- lib/libc/locale/tolower.c | 2 -- lib/libc/locale/toupper.c | 2 -- lib/libc/locale/utf8.c | 2 -- lib/libc/locale/wcrtomb.c | 2 -- lib/libc/locale/wcsftime.c | 2 -- lib/libc/locale/wcsnrtombs.c | 2 -- lib/libc/locale/wcsrtombs.c | 2 -- lib/libc/locale/wcstod.c | 2 -- lib/libc/locale/wcstof.c | 2 -- lib/libc/locale/wcstoimax.c | 2 -- lib/libc/locale/wcstol.c | 2 -- lib/libc/locale/wcstold.c | 2 -- lib/libc/locale/wcstoll.c | 2 -- lib/libc/locale/wcstombs.c | 2 -- lib/libc/locale/wcstoul.c | 2 -- lib/libc/locale/wcstoull.c | 2 -- lib/libc/locale/wcstoumax.c | 2 -- lib/libc/locale/wctob.c | 2 -- lib/libc/locale/wctomb.c | 2 -- lib/libc/locale/wctrans.c | 2 -- lib/libc/locale/wctype.c | 2 -- lib/libc/locale/wcwidth.c | 2 -- lib/libc/nameser/ns_name.c | 2 -- lib/libc/nameser/ns_netint.c | 2 -- lib/libc/nameser/ns_parse.c | 2 -- lib/libc/nameser/ns_print.c | 2 -- lib/libc/nameser/ns_samedomain.c | 2 -- lib/libc/nameser/ns_ttl.c | 2 -- lib/libc/net/base64.c | 2 -- lib/libc/net/ether_addr.c | 2 -- lib/libc/net/eui64.c | 2 -- lib/libc/net/gai_strerror.c | 2 -- lib/libc/net/getaddrinfo.c | 2 -- lib/libc/net/gethostbydns.c | 2 -- lib/libc/net/gethostbyht.c | 2 -- lib/libc/net/gethostbynis.c | 2 -- lib/libc/net/gethostnamadr.c | 2 -- lib/libc/net/getifaddrs.c | 2 -- lib/libc/net/getifmaddrs.c | 2 -- lib/libc/net/getnameinfo.c | 2 -- lib/libc/net/getnetbydns.c | 2 -- lib/libc/net/getnetbyht.c | 2 -- lib/libc/net/getnetbynis.c | 2 -- lib/libc/net/getnetnamadr.c | 2 -- lib/libc/net/getproto.c | 2 -- lib/libc/net/getprotoent.c | 2 -- lib/libc/net/getprotoname.c | 2 -- lib/libc/net/getservent.c | 2 -- lib/libc/net/hesiod.c | 2 -- lib/libc/net/if_indextoname.c | 2 -- lib/libc/net/if_nameindex.c | 2 -- lib/libc/net/if_nametoindex.c | 2 -- lib/libc/net/ip6opt.c | 2 -- lib/libc/net/linkaddr.c | 2 -- lib/libc/net/map_v4v6.c | 2 -- lib/libc/net/name6.c | 2 -- lib/libc/net/nscache.c | 2 -- lib/libc/net/nscachedcli.c | 2 -- lib/libc/net/nsdispatch.c | 2 -- lib/libc/net/nsparser.y | 2 -- lib/libc/net/nss_compat.c | 2 -- lib/libc/net/ntoh.c | 2 -- lib/libc/net/rcmd.c | 2 -- lib/libc/net/rcmdsh.c | 2 -- lib/libc/net/recv.c | 2 -- lib/libc/net/rthdr.c | 2 -- lib/libc/net/sctp_sys_calls.c | 2 -- lib/libc/net/send.c | 2 -- lib/libc/net/sourcefilter.c | 2 -- lib/libc/net/vars.c | 2 -- lib/libc/nls/msgcat.c | 2 -- lib/libc/posix1e/acl_branding.c | 2 -- lib/libc/posix1e/acl_calc_mask.c | 2 -- lib/libc/posix1e/acl_cmp_np.c | 2 -- lib/libc/posix1e/acl_compat.c | 2 -- lib/libc/posix1e/acl_copy.c | 2 -- lib/libc/posix1e/acl_delete.c | 2 -- lib/libc/posix1e/acl_delete_entry.c | 2 -- lib/libc/posix1e/acl_entry.c | 2 -- lib/libc/posix1e/acl_equiv_mode_np.c | 2 -- lib/libc/posix1e/acl_extended_file_np.c | 2 -- lib/libc/posix1e/acl_flag.c | 2 -- lib/libc/posix1e/acl_free.c | 2 -- lib/libc/posix1e/acl_from_mode_np.c | 2 -- lib/libc/posix1e/acl_from_text.c | 2 -- lib/libc/posix1e/acl_from_text_nfs4.c | 2 -- lib/libc/posix1e/acl_get.c | 2 -- lib/libc/posix1e/acl_id_to_name.c | 2 -- lib/libc/posix1e/acl_init.c | 2 -- lib/libc/posix1e/acl_perm.c | 2 -- lib/libc/posix1e/acl_set.c | 2 -- lib/libc/posix1e/acl_strip.c | 2 -- lib/libc/posix1e/acl_support.c | 2 -- lib/libc/posix1e/acl_support_nfs4.c | 2 -- lib/libc/posix1e/acl_to_text.c | 2 -- lib/libc/posix1e/acl_to_text_nfs4.c | 2 -- lib/libc/posix1e/acl_valid.c | 2 -- lib/libc/posix1e/extattr.c | 2 -- lib/libc/posix1e/mac.c | 2 -- lib/libc/posix1e/mac_exec.c | 2 -- lib/libc/posix1e/mac_get.c | 2 -- lib/libc/posix1e/mac_set.c | 2 -- lib/libc/powerpc/gen/_ctx_start.S | 3 --- lib/libc/powerpc/gen/_setjmp.S | 2 -- lib/libc/powerpc/gen/eabi.S | 2 -- lib/libc/powerpc/gen/fabs.S | 2 -- lib/libc/powerpc/gen/flt_rounds.c | 2 -- lib/libc/powerpc/gen/fpgetmask.c | 2 -- lib/libc/powerpc/gen/fpgetround.c | 2 -- lib/libc/powerpc/gen/fpsetmask.c | 2 -- lib/libc/powerpc/gen/fpsetround.c | 2 -- lib/libc/powerpc/gen/infinity.c | 2 -- lib/libc/powerpc/gen/makecontext.c | 2 -- lib/libc/powerpc/gen/setjmp.S | 2 -- lib/libc/powerpc/gen/signalcontext.c | 2 -- lib/libc/powerpc/gen/sigsetjmp.S | 2 -- lib/libc/powerpc/sys/__vdso_gettc.c | 2 -- lib/libc/powerpc/sys/cerror.S | 2 -- lib/libc/powerpc64/gen/_ctx_start.S | 3 --- lib/libc/powerpc64/gen/_setjmp.S | 2 -- lib/libc/powerpc64/gen/fabs.S | 2 -- lib/libc/powerpc64/gen/flt_rounds.c | 2 -- lib/libc/powerpc64/gen/fpgetmask.c | 2 -- lib/libc/powerpc64/gen/fpgetround.c | 2 -- lib/libc/powerpc64/gen/fpsetmask.c | 2 -- lib/libc/powerpc64/gen/fpsetround.c | 2 -- lib/libc/powerpc64/gen/infinity.c | 2 -- lib/libc/powerpc64/gen/makecontext.c | 2 -- lib/libc/powerpc64/gen/setjmp.S | 2 -- lib/libc/powerpc64/gen/signalcontext.c | 2 -- lib/libc/powerpc64/gen/sigsetjmp.S | 2 -- lib/libc/powerpc64/string/bcopy.S | 2 -- lib/libc/powerpc64/string/bcopy_resolver.c | 2 -- lib/libc/powerpc64/string/memcpy.S | 2 -- lib/libc/powerpc64/string/strcpy.c | 2 -- lib/libc/powerpc64/string/strcpy_arch_2_05.S | 2 -- lib/libc/powerpc64/string/strcpy_resolver.c | 2 -- lib/libc/powerpc64/string/strncpy.c | 2 -- lib/libc/powerpc64/string/strncpy_arch_2_05.S | 2 -- lib/libc/powerpc64/string/strncpy_resolver.c | 2 -- lib/libc/powerpc64/sys/__vdso_gettc.c | 2 -- lib/libc/powerpc64/sys/cerror.S | 2 -- lib/libc/powerpcspe/gen/_setjmp.S | 2 -- lib/libc/powerpcspe/gen/fabs.S | 2 -- lib/libc/powerpcspe/gen/flt_rounds.c | 2 -- lib/libc/powerpcspe/gen/fpgetmask.c | 2 -- lib/libc/powerpcspe/gen/fpgetround.c | 2 -- lib/libc/powerpcspe/gen/fpsetmask.c | 2 -- lib/libc/powerpcspe/gen/fpsetround.c | 2 -- lib/libc/powerpcspe/gen/setjmp.S | 2 -- lib/libc/powerpcspe/gen/sigsetjmp.S | 2 -- lib/libc/quad/TESTS/divrem.c | 2 -- lib/libc/quad/TESTS/mul.c | 2 -- lib/libc/quad/adddi3.c | 2 -- lib/libc/quad/anddi3.c | 2 -- lib/libc/quad/ashldi3.c | 2 -- lib/libc/quad/ashrdi3.c | 2 -- lib/libc/quad/cmpdi2.c | 2 -- lib/libc/quad/divdi3.c | 2 -- lib/libc/quad/fixdfdi.c | 2 -- lib/libc/quad/fixsfdi.c | 2 -- lib/libc/quad/fixunsdfdi.c | 2 -- lib/libc/quad/fixunssfdi.c | 2 -- lib/libc/quad/floatdidf.c | 2 -- lib/libc/quad/floatdisf.c | 2 -- lib/libc/quad/floatunsdidf.c | 2 -- lib/libc/quad/iordi3.c | 2 -- lib/libc/quad/lshldi3.c | 2 -- lib/libc/quad/lshrdi3.c | 2 -- lib/libc/quad/moddi3.c | 2 -- lib/libc/quad/muldi3.c | 2 -- lib/libc/quad/negdi2.c | 2 -- lib/libc/quad/notdi2.c | 2 -- lib/libc/quad/qdivrem.c | 2 -- lib/libc/quad/subdi3.c | 2 -- lib/libc/quad/ucmpdi2.c | 2 -- lib/libc/quad/udivdi3.c | 2 -- lib/libc/quad/umoddi3.c | 2 -- lib/libc/quad/xordi3.c | 2 -- lib/libc/regex/engine.c | 2 -- lib/libc/regex/grot/debug.c | 2 -- lib/libc/regex/grot/main.c | 2 -- lib/libc/regex/grot/split.c | 2 -- lib/libc/regex/regcomp.c | 2 -- lib/libc/regex/regerror.c | 2 -- lib/libc/regex/regexec.c | 2 -- lib/libc/regex/regfree.c | 2 -- lib/libc/resolv/herror.c | 2 -- lib/libc/resolv/mtctxres.c | 2 -- lib/libc/resolv/res_comp.c | 2 -- lib/libc/resolv/res_data.c | 2 -- lib/libc/resolv/res_debug.c | 2 -- lib/libc/resolv/res_findzonecut.c | 2 -- lib/libc/resolv/res_init.c | 2 -- lib/libc/resolv/res_mkquery.c | 2 -- lib/libc/resolv/res_mkupdate.c | 2 -- lib/libc/resolv/res_query.c | 2 -- lib/libc/resolv/res_send.c | 2 -- lib/libc/resolv/res_update.c | 2 -- lib/libc/riscv/gen/_ctx_start.S | 2 -- lib/libc/riscv/gen/_setjmp.S | 2 -- lib/libc/riscv/gen/fabs.S | 2 -- lib/libc/riscv/gen/flt_rounds.c | 2 -- lib/libc/riscv/gen/fpgetmask.c | 2 -- lib/libc/riscv/gen/fpsetmask.c | 2 -- lib/libc/riscv/gen/infinity.c | 2 -- lib/libc/riscv/gen/makecontext.c | 2 -- lib/libc/riscv/gen/setjmp.S | 2 -- lib/libc/riscv/gen/sigsetjmp.S | 2 -- lib/libc/riscv/sys/__vdso_gettc.c | 2 -- lib/libc/riscv/sys/cerror.S | 2 -- lib/libc/riscv/sys/syscall.S | 2 -- lib/libc/riscv/sys/vfork.S | 1 - lib/libc/rpc/auth_des.c | 2 -- lib/libc/rpc/auth_none.c | 2 -- lib/libc/rpc/auth_time.c | 2 -- lib/libc/rpc/auth_unix.c | 2 -- lib/libc/rpc/authdes_prot.c | 2 -- lib/libc/rpc/authunix_prot.c | 2 -- lib/libc/rpc/bindresvport.c | 2 -- lib/libc/rpc/clnt_bcast.c | 3 --- lib/libc/rpc/clnt_dg.c | 2 -- lib/libc/rpc/clnt_generic.c | 2 -- lib/libc/rpc/clnt_perror.c | 2 -- lib/libc/rpc/clnt_raw.c | 2 -- lib/libc/rpc/clnt_simple.c | 2 -- lib/libc/rpc/clnt_vc.c | 2 -- lib/libc/rpc/crypt_client.c | 2 -- lib/libc/rpc/des_crypt.c | 2 -- lib/libc/rpc/des_soft.c | 2 -- lib/libc/rpc/getnetconfig.c | 2 -- lib/libc/rpc/getnetpath.c | 2 -- lib/libc/rpc/getpublickey.c | 2 -- lib/libc/rpc/getrpcent.c | 2 -- lib/libc/rpc/getrpcport.c | 2 -- lib/libc/rpc/key_call.c | 2 -- lib/libc/rpc/key_prot_xdr.c | 2 -- lib/libc/rpc/mt_misc.c | 2 -- lib/libc/rpc/netname.c | 2 -- lib/libc/rpc/netnamer.c | 2 -- lib/libc/rpc/pmap_clnt.c | 2 -- lib/libc/rpc/pmap_getmaps.c | 2 -- lib/libc/rpc/pmap_getport.c | 2 -- lib/libc/rpc/pmap_prot.c | 2 -- lib/libc/rpc/pmap_prot2.c | 2 -- lib/libc/rpc/pmap_rmt.c | 2 -- lib/libc/rpc/rpc_callmsg.c | 2 -- lib/libc/rpc/rpc_commondata.c | 2 -- lib/libc/rpc/rpc_dtablesize.c | 2 -- lib/libc/rpc/rpc_generic.c | 2 -- lib/libc/rpc/rpc_prot.c | 2 -- lib/libc/rpc/rpc_soc.c | 2 -- lib/libc/rpc/rpcb_clnt.c | 2 -- lib/libc/rpc/rpcb_prot.c | 2 -- lib/libc/rpc/rpcb_st_xdr.c | 2 -- lib/libc/rpc/rpcdname.c | 2 -- lib/libc/rpc/rtime.c | 2 -- lib/libc/rpc/svc.c | 2 -- lib/libc/rpc/svc_auth.c | 2 -- lib/libc/rpc/svc_auth_des.c | 2 -- lib/libc/rpc/svc_auth_unix.c | 2 -- lib/libc/rpc/svc_dg.c | 2 -- lib/libc/rpc/svc_generic.c | 2 -- lib/libc/rpc/svc_raw.c | 2 -- lib/libc/rpc/svc_run.c | 2 -- lib/libc/rpc/svc_simple.c | 2 -- lib/libc/rpc/svc_vc.c | 2 -- lib/libc/secure/stack_protector.c | 2 -- lib/libc/secure/stack_protector_compat.c | 2 -- lib/libc/softfloat/bits32/softfloat.c | 2 -- lib/libc/softfloat/bits64/softfloat.c | 2 -- lib/libc/softfloat/eqdf2.c | 2 -- lib/libc/softfloat/eqsf2.c | 2 -- lib/libc/softfloat/eqtf2.c | 2 -- lib/libc/softfloat/fpgetmask.c | 2 -- lib/libc/softfloat/fpgetround.c | 2 -- lib/libc/softfloat/fpgetsticky.c | 2 -- lib/libc/softfloat/fpsetmask.c | 2 -- lib/libc/softfloat/fpsetround.c | 2 -- lib/libc/softfloat/fpsetsticky.c | 2 -- lib/libc/softfloat/gedf2.c | 2 -- lib/libc/softfloat/gesf2.c | 2 -- lib/libc/softfloat/getf2.c | 2 -- lib/libc/softfloat/gexf2.c | 2 -- lib/libc/softfloat/gtdf2.c | 2 -- lib/libc/softfloat/gtsf2.c | 2 -- lib/libc/softfloat/gttf2.c | 2 -- lib/libc/softfloat/gtxf2.c | 2 -- lib/libc/softfloat/ledf2.c | 2 -- lib/libc/softfloat/lesf2.c | 2 -- lib/libc/softfloat/letf2.c | 2 -- lib/libc/softfloat/ltdf2.c | 2 -- lib/libc/softfloat/ltsf2.c | 2 -- lib/libc/softfloat/lttf2.c | 2 -- lib/libc/softfloat/nedf2.c | 2 -- lib/libc/softfloat/negdf2.c | 2 -- lib/libc/softfloat/negsf2.c | 2 -- lib/libc/softfloat/negtf2.c | 2 -- lib/libc/softfloat/negxf2.c | 2 -- lib/libc/softfloat/nesf2.c | 2 -- lib/libc/softfloat/netf2.c | 2 -- lib/libc/softfloat/nexf2.c | 2 -- lib/libc/softfloat/timesoftfloat.c | 2 -- lib/libc/softfloat/unorddf2.c | 2 -- lib/libc/softfloat/unordsf2.c | 2 -- lib/libc/stdio/_flock_stub.c | 2 -- lib/libc/stdio/asprintf.c | 2 -- lib/libc/stdio/clrerr.c | 2 -- lib/libc/stdio/dprintf.c | 2 -- lib/libc/stdio/fclose.c | 2 -- lib/libc/stdio/fcloseall.c | 2 -- lib/libc/stdio/fdopen.c | 2 -- lib/libc/stdio/feof.c | 2 -- lib/libc/stdio/ferror.c | 2 -- lib/libc/stdio/fflush.c | 2 -- lib/libc/stdio/fgetc.c | 2 -- lib/libc/stdio/fgetln.c | 2 -- lib/libc/stdio/fgetpos.c | 2 -- lib/libc/stdio/fgets.c | 2 -- lib/libc/stdio/fgetwc.c | 2 -- lib/libc/stdio/fgetwln.c | 2 -- lib/libc/stdio/fgetws.c | 2 -- lib/libc/stdio/fileno.c | 2 -- lib/libc/stdio/findfp.c | 2 -- lib/libc/stdio/flags.c | 2 -- lib/libc/stdio/fmemopen.c | 2 -- lib/libc/stdio/fopen.c | 2 -- lib/libc/stdio/fopencookie.c | 2 -- lib/libc/stdio/fprintf.c | 2 -- lib/libc/stdio/fpurge.c | 2 -- lib/libc/stdio/fputc.c | 2 -- lib/libc/stdio/fputs.c | 2 -- lib/libc/stdio/fputwc.c | 2 -- lib/libc/stdio/fputws.c | 2 -- lib/libc/stdio/fread.c | 2 -- lib/libc/stdio/freopen.c | 2 -- lib/libc/stdio/fscanf.c | 2 -- lib/libc/stdio/fseek.c | 2 -- lib/libc/stdio/fsetpos.c | 2 -- lib/libc/stdio/ftell.c | 2 -- lib/libc/stdio/funopen.c | 2 -- lib/libc/stdio/fvwrite.c | 2 -- lib/libc/stdio/fwalk.c | 2 -- lib/libc/stdio/fwide.c | 2 -- lib/libc/stdio/fwprintf.c | 2 -- lib/libc/stdio/fwrite.c | 2 -- lib/libc/stdio/fwscanf.c | 2 -- lib/libc/stdio/getc.c | 2 -- lib/libc/stdio/getchar.c | 2 -- lib/libc/stdio/getdelim.c | 2 -- lib/libc/stdio/getline.c | 2 -- lib/libc/stdio/gets.c | 2 -- lib/libc/stdio/gets_s.c | 2 -- lib/libc/stdio/getw.c | 2 -- lib/libc/stdio/getwc.c | 2 -- lib/libc/stdio/getwchar.c | 2 -- lib/libc/stdio/makebuf.c | 2 -- lib/libc/stdio/mktemp.c | 2 -- lib/libc/stdio/open_memstream.c | 2 -- lib/libc/stdio/open_wmemstream.c | 2 -- lib/libc/stdio/perror.c | 2 -- lib/libc/stdio/printf-pos.c | 2 -- lib/libc/stdio/printf.c | 2 -- lib/libc/stdio/putc.c | 2 -- lib/libc/stdio/putchar.c | 2 -- lib/libc/stdio/puts.c | 2 -- lib/libc/stdio/putw.c | 2 -- lib/libc/stdio/putwc.c | 2 -- lib/libc/stdio/putwchar.c | 2 -- lib/libc/stdio/refill.c | 2 -- lib/libc/stdio/remove.c | 2 -- lib/libc/stdio/rewind.c | 2 -- lib/libc/stdio/rget.c | 2 -- lib/libc/stdio/scanf.c | 2 -- lib/libc/stdio/setbuf.c | 2 -- lib/libc/stdio/setbuffer.c | 2 -- lib/libc/stdio/setvbuf.c | 2 -- lib/libc/stdio/snprintf.c | 2 -- lib/libc/stdio/sprintf.c | 2 -- lib/libc/stdio/sscanf.c | 2 -- lib/libc/stdio/stdio.c | 2 -- lib/libc/stdio/swprintf.c | 2 -- lib/libc/stdio/swscanf.c | 2 -- lib/libc/stdio/tempnam.c | 2 -- lib/libc/stdio/tmpfile.c | 2 -- lib/libc/stdio/tmpnam.c | 2 -- lib/libc/stdio/ungetc.c | 2 -- lib/libc/stdio/ungetwc.c | 2 -- lib/libc/stdio/vasprintf.c | 2 -- lib/libc/stdio/vdprintf.c | 2 -- lib/libc/stdio/vfprintf.c | 2 -- lib/libc/stdio/vfscanf.c | 2 -- lib/libc/stdio/vfwprintf.c | 2 -- lib/libc/stdio/vfwscanf.c | 2 -- lib/libc/stdio/vprintf.c | 2 -- lib/libc/stdio/vscanf.c | 2 -- lib/libc/stdio/vsnprintf.c | 2 -- lib/libc/stdio/vsprintf.c | 2 -- *** 45035 LINES SKIPPED *** From nobody Wed Aug 16 17:57:02 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RQwnW245zz4qvPk; Wed, 16 Aug 2023 17:57: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RQwnV25Rmz3VHy; Wed, 16 Aug 2023 17:57:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692208622; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=as/CLxnlRRaaNnQ0ENFnP80Y4mnkeB8jlDsocgy2TNg=; b=KnR6lm6syi9Ho3bPovndNW6lolZnC6KAukMe6IQ2igWbGLisuCkbE0XZ20gj4XWJ1IK9vl RWKk3EGSeDcOt5sLa8QZBZGMV0fm267hRjdWQML3MZiVjaN4iI1AeOOMTRN7zAg2dRyoDf 5/1ahVRt93SfoDU7FGbb92SErXfxEUrV5mdJToNnyIh81br7NM1MZYMtCJk2RN/Krx0l36 kNhOEBQYl4+s0saeLY96Qjb3Y4jFZYKWkUyTuuT6v4Im/ojgRzFnhiMYok92CZ7s1g7CW/ 2W69YvUWo88n35n6pgFTasqm2enL+0xQ3DiZQ7eZvuvDUe1VIPjaE1zIoWIaQw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692208622; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=as/CLxnlRRaaNnQ0ENFnP80Y4mnkeB8jlDsocgy2TNg=; b=VYgvs76YylKt4VwRd3TUYAt4uGIHJf/uCjNSodZoHHsFfQS4JCRZZ63IhUPRwFpO79UP0D D0lUU+i3Knmigjn020d7kJTX9SZqVm7z1JDjt4DxuW9XXIUoZtES2ZfQWQ8F22mwt/2Ecd BgQO+9RUMnIP5bsSbB4Ei0evs8XzNDf4c9+pu9NnCGV1lTt9nZrUkiKQxwq5qKhNH1x/PL 4Jwyj0+iZ/JTYrxcHq+5m6owErA+0Q3bPV1YR49Dd1i9Re+Rx+ZhGaaywCv3PURf+/+DG8 Jb3EElvN25EH+yUMTinUwmBK/CkMkVrZxL2Oyx4Bldf1OUnl70uMWhBgUp33tQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692208622; a=rsa-sha256; cv=none; b=sUw65opO09D3Sl7qaLUjpCAN4pnLhWg7mKxtFAI1sjkXmgv/KDN4eBEzkMIlm14fDsqI2/ jHEvonhJ542Fts16WA0vnP5zr6O1yOnrS+fRSHT498KXmvq7qNFnfUFrDRnlz6VmpvsGZE neaUVz3ziwLxus5aaYCi9uAlv3MggL45KrZeGdrS4octtV9yD6u0TdLcA9pXEQTOap87el VEIjbxop+8cTjnpAF9yAAn+t0uwvoVWhJA1HsytXDi1DIgajQ6RV9BwbbW5mzOZZvRRTAV 0UGVI/yGrSa04E2s3abnd0D6qIEV4lGm13I77l3jCO7gCiX0jLKOmDnj3k2aww== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RQwnV1BjBz11dN; Wed, 16 Aug 2023 17:57:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37GHv229059371; Wed, 16 Aug 2023 17:57:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37GHv2ca059368; Wed, 16 Aug 2023 17:57:02 GMT (envelope-from git) Date: Wed, 16 Aug 2023 17:57:02 GMT Message-Id: <202308161757.37GHv2ca059368@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: da5432eda807 - main - Remove $FreeBSD$: alt two-line .c pattern List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: da5432eda807c4b7232d030d5157d5b417ea4f52 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=da5432eda807c4b7232d030d5157d5b417ea4f52 commit da5432eda807c4b7232d030d5157d5b417ea4f52 Author: Warner Losh AuthorDate: 2023-08-16 17:54:48 +0000 Commit: Warner Losh CommitDate: 2023-08-16 17:54:48 +0000 Remove $FreeBSD$: alt two-line .c pattern Remove /^\s*__RCSID\("\$FreeBSD\$"\);\n\n/ --- sbin/routed/if.c | 3 --- sbin/routed/input.c | 3 --- sbin/routed/main.c | 2 -- sbin/routed/output.c | 3 --- sbin/routed/parms.c | 3 --- sbin/routed/radix.c | 3 --- sbin/routed/rdisc.c | 3 --- sbin/routed/table.c | 3 --- sbin/routed/trace.c | 3 --- usr.bin/getconf/tests/arch_type.c | 2 -- usr.bin/procstat/tests/while1.c | 2 -- usr.sbin/mpsutil/mps_cmd.c | 2 -- usr.sbin/mpsutil/mps_debug.c | 2 -- usr.sbin/mpsutil/mps_flash.c | 2 -- usr.sbin/mpsutil/mps_set.c | 2 -- usr.sbin/mpsutil/mps_show.c | 2 -- usr.sbin/mpsutil/mps_slot.c | 2 -- usr.sbin/mpsutil/mpsutil.c | 2 -- usr.sbin/mptutil/mpt_cam.c | 2 -- usr.sbin/mptutil/mpt_cmd.c | 2 -- usr.sbin/mptutil/mpt_config.c | 2 -- usr.sbin/mptutil/mpt_drive.c | 2 -- usr.sbin/mptutil/mpt_evt.c | 2 -- usr.sbin/mptutil/mpt_show.c | 2 -- usr.sbin/mptutil/mpt_volume.c | 2 -- usr.sbin/mptutil/mptutil.c | 2 -- 26 files changed, 60 deletions(-) diff --git a/sbin/routed/if.c b/sbin/routed/if.c index 83d8fe503893..72894942fe05 100644 --- a/sbin/routed/if.c +++ b/sbin/routed/if.c @@ -33,9 +33,6 @@ #include "defs.h" #include "pathnames.h" - -__RCSID("$FreeBSD$"); - struct ifhead ifnet = LIST_HEAD_INITIALIZER(ifnet); /* all interfaces */ struct ifhead remote_if = LIST_HEAD_INITIALIZER(remote_if); /* remote interfaces */ diff --git a/sbin/routed/input.c b/sbin/routed/input.c index 854bfd8d9e66..238933d29e6b 100644 --- a/sbin/routed/input.c +++ b/sbin/routed/input.c @@ -30,9 +30,6 @@ */ #include "defs.h" - -__RCSID("$FreeBSD$"); - static void input(struct sockaddr_in *, struct interface *, struct interface *, struct rip *, int); static void input_route(naddr, naddr, struct rt_spare *, struct netinfo *); diff --git a/sbin/routed/main.c b/sbin/routed/main.c index cfc0c148971c..491a40026345 100644 --- a/sbin/routed/main.c +++ b/sbin/routed/main.c @@ -38,8 +38,6 @@ __COPYRIGHT("@(#) Copyright (c) 1983, 1988, 1993 " "The Regents of the University of California." " All rights reserved."); -__RCSID("$FreeBSD$"); - pid_t mypid; naddr myaddr; /* system address */ diff --git a/sbin/routed/output.c b/sbin/routed/output.c index 2974f2a6f19e..726fab2c11b5 100644 --- a/sbin/routed/output.c +++ b/sbin/routed/output.c @@ -31,9 +31,6 @@ #include "defs.h" -__RCSID("$FreeBSD$"); - - u_int update_seqno; diff --git a/sbin/routed/parms.c b/sbin/routed/parms.c index bd4fab045f84..59f141c76c66 100644 --- a/sbin/routed/parms.c +++ b/sbin/routed/parms.c @@ -33,9 +33,6 @@ #include "pathnames.h" #include -__RCSID("$FreeBSD$"); - - static struct parm *parms; struct intnet *intnets; struct r1net *r1nets; diff --git a/sbin/routed/radix.c b/sbin/routed/radix.c index 36a404f9d043..c4a0e5de2c2c 100644 --- a/sbin/routed/radix.c +++ b/sbin/routed/radix.c @@ -36,9 +36,6 @@ */ #include "defs.h" - -__RCSID("$FreeBSD$"); - #define log(x, msg) syslog(x, msg) #define panic(s) {log(LOG_ERR,s); exit(1);} #define min(a,b) (((a)<(b))?(a):(b)) diff --git a/sbin/routed/rdisc.c b/sbin/routed/rdisc.c index f72b1dd7fda7..2dfcc15768d8 100644 --- a/sbin/routed/rdisc.c +++ b/sbin/routed/rdisc.c @@ -33,9 +33,6 @@ #include #include #include - -__RCSID("$FreeBSD$"); - /* router advertisement ICMP packet */ struct icmp_ad { u_int8_t icmp_type; /* type of message */ diff --git a/sbin/routed/table.c b/sbin/routed/table.c index 7db9d784278b..b43c8bb873a5 100644 --- a/sbin/routed/table.c +++ b/sbin/routed/table.c @@ -30,9 +30,6 @@ */ #include "defs.h" - -__RCSID("$FreeBSD$"); - static struct rt_spare *rts_better(struct rt_entry *); static struct rt_spare rts_empty = {0,0,0,HOPCNT_INFINITY,0,0,0}; static void set_need_flash(void); diff --git a/sbin/routed/trace.c b/sbin/routed/trace.c index 1166039499bd..59929b130b1a 100644 --- a/sbin/routed/trace.c +++ b/sbin/routed/trace.c @@ -36,9 +36,6 @@ #include #include -__RCSID("$FreeBSD$"); - - int tracelevel, new_tracelevel; FILE *ftrace; /* output trace file */ diff --git a/usr.bin/getconf/tests/arch_type.c b/usr.bin/getconf/tests/arch_type.c index 6cf7a2fb7f79..731ddae656bb 100644 --- a/usr.bin/getconf/tests/arch_type.c +++ b/usr.bin/getconf/tests/arch_type.c @@ -24,8 +24,6 @@ */ #include -__RCSID("$FreeBSD$"); - #include #include #include diff --git a/usr.bin/procstat/tests/while1.c b/usr.bin/procstat/tests/while1.c index cc201b712745..c81e8193e072 100644 --- a/usr.bin/procstat/tests/while1.c +++ b/usr.bin/procstat/tests/while1.c @@ -24,8 +24,6 @@ */ #include -__RCSID("$FreeBSD$"); - #include #include diff --git a/usr.sbin/mpsutil/mps_cmd.c b/usr.sbin/mpsutil/mps_cmd.c index a9cb269abc5f..448e4cea602f 100644 --- a/usr.sbin/mpsutil/mps_cmd.c +++ b/usr.sbin/mpsutil/mps_cmd.c @@ -34,8 +34,6 @@ */ #include -__RCSID("$FreeBSD$"); - #include #include #include diff --git a/usr.sbin/mpsutil/mps_debug.c b/usr.sbin/mpsutil/mps_debug.c index 83315090d730..a3297b4176cd 100644 --- a/usr.sbin/mpsutil/mps_debug.c +++ b/usr.sbin/mpsutil/mps_debug.c @@ -28,8 +28,6 @@ */ #include -__RCSID("$FreeBSD$"); - #include #include #include diff --git a/usr.sbin/mpsutil/mps_flash.c b/usr.sbin/mpsutil/mps_flash.c index a0cc4a877b7d..98f476e3e234 100644 --- a/usr.sbin/mpsutil/mps_flash.c +++ b/usr.sbin/mpsutil/mps_flash.c @@ -24,8 +24,6 @@ */ #include -__RCSID("$FreeBSD$"); - #include #include #include diff --git a/usr.sbin/mpsutil/mps_set.c b/usr.sbin/mpsutil/mps_set.c index 91e4d23ab78d..b75f327cb993 100644 --- a/usr.sbin/mpsutil/mps_set.c +++ b/usr.sbin/mpsutil/mps_set.c @@ -26,8 +26,6 @@ */ #include -__RCSID("$FreeBSD$"); - #include #include #include diff --git a/usr.sbin/mpsutil/mps_show.c b/usr.sbin/mpsutil/mps_show.c index ef20cd942d86..7454bf15e06c 100644 --- a/usr.sbin/mpsutil/mps_show.c +++ b/usr.sbin/mpsutil/mps_show.c @@ -32,8 +32,6 @@ */ #include -__RCSID("$FreeBSD$"); - #include #include #include diff --git a/usr.sbin/mpsutil/mps_slot.c b/usr.sbin/mpsutil/mps_slot.c index 396d5706cd5f..2c90668ec808 100644 --- a/usr.sbin/mpsutil/mps_slot.c +++ b/usr.sbin/mpsutil/mps_slot.c @@ -26,8 +26,6 @@ */ #include -__RCSID("$FreeBSD$"); - #include #include #include diff --git a/usr.sbin/mpsutil/mpsutil.c b/usr.sbin/mpsutil/mpsutil.c index cb9563cefa60..0b6baa3aab93 100644 --- a/usr.sbin/mpsutil/mpsutil.c +++ b/usr.sbin/mpsutil/mpsutil.c @@ -32,8 +32,6 @@ */ #include -__RCSID("$FreeBSD$"); - #include #include #include diff --git a/usr.sbin/mptutil/mpt_cam.c b/usr.sbin/mptutil/mpt_cam.c index 04c13f0c25fe..2e636fb6ce25 100644 --- a/usr.sbin/mptutil/mpt_cam.c +++ b/usr.sbin/mptutil/mpt_cam.c @@ -31,8 +31,6 @@ */ #include -__RCSID("$FreeBSD$"); - #include #include #include diff --git a/usr.sbin/mptutil/mpt_cmd.c b/usr.sbin/mptutil/mpt_cmd.c index 79422c12dd89..8bcec08cd232 100644 --- a/usr.sbin/mptutil/mpt_cmd.c +++ b/usr.sbin/mptutil/mpt_cmd.c @@ -31,8 +31,6 @@ */ #include -__RCSID("$FreeBSD$"); - #include #include #include diff --git a/usr.sbin/mptutil/mpt_config.c b/usr.sbin/mptutil/mpt_config.c index 58894fb5ecc9..36c3881969c9 100644 --- a/usr.sbin/mptutil/mpt_config.c +++ b/usr.sbin/mptutil/mpt_config.c @@ -31,8 +31,6 @@ */ #include -__RCSID("$FreeBSD$"); - #include #include #include diff --git a/usr.sbin/mptutil/mpt_drive.c b/usr.sbin/mptutil/mpt_drive.c index 96004c7a3e74..bf5a52b0bfd7 100644 --- a/usr.sbin/mptutil/mpt_drive.c +++ b/usr.sbin/mptutil/mpt_drive.c @@ -31,8 +31,6 @@ */ #include -__RCSID("$FreeBSD$"); - #include #include #include diff --git a/usr.sbin/mptutil/mpt_evt.c b/usr.sbin/mptutil/mpt_evt.c index b1c423f71031..6a077d4a906e 100644 --- a/usr.sbin/mptutil/mpt_evt.c +++ b/usr.sbin/mptutil/mpt_evt.c @@ -31,8 +31,6 @@ */ #include -__RCSID("$FreeBSD$"); - #include #include #include diff --git a/usr.sbin/mptutil/mpt_show.c b/usr.sbin/mptutil/mpt_show.c index 4bc2c7569f53..a70a4dd90bc8 100644 --- a/usr.sbin/mptutil/mpt_show.c +++ b/usr.sbin/mptutil/mpt_show.c @@ -31,8 +31,6 @@ */ #include -__RCSID("$FreeBSD$"); - #include #include #include diff --git a/usr.sbin/mptutil/mpt_volume.c b/usr.sbin/mptutil/mpt_volume.c index ddf6492a8592..71251e591eec 100644 --- a/usr.sbin/mptutil/mpt_volume.c +++ b/usr.sbin/mptutil/mpt_volume.c @@ -31,8 +31,6 @@ */ #include -__RCSID("$FreeBSD$"); - #include #include #include diff --git a/usr.sbin/mptutil/mptutil.c b/usr.sbin/mptutil/mptutil.c index 0ec6620c8688..5e8b2eb71291 100644 --- a/usr.sbin/mptutil/mptutil.c +++ b/usr.sbin/mptutil/mptutil.c @@ -31,8 +31,6 @@ */ #include -__RCSID("$FreeBSD$"); - #include #include #include From nobody Wed Aug 16 17:57:03 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RQwnW6bXsz4qvTf; Wed, 16 Aug 2023 17:57: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RQwnW5Vdhz3VW6; Wed, 16 Aug 2023 17:57:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692208623; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=TmnpMdP5kW0jg3G3w+l+YKaAsLeDwHITZCRiCvg5ubE=; b=O8n6o/Vne5eoHG4gfy1GAYIrSfJk1RY4p/TFb04XOrAfER8+BJZWSaQOsQEhF6IeiPnEwZ LUjNBeZsas7CZN1pzqfG99moQII+Kg/mE95SakhWvhqrPY1lHVCNZtQcuLJwfpHfyK4VdF +jPKeokyVBuU0cZc3OPpsffy070CVDxhLmYkFiHJC6Q91TFg8rt3vNAKpdjCNoqbG5DT/A MIPN4t9LqCCi2fY0ERZTtrAu8mSBD8msLBeoietXLegLkyRWQQibHCKJKqugn57q6grfCZ gtelI9jhv2bg0DrPGXuKOL688zkN66B6P/HF4Dwv09PrUz6iSzOqKNQFjZNWfg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692208623; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=TmnpMdP5kW0jg3G3w+l+YKaAsLeDwHITZCRiCvg5ubE=; b=SmL26fjDdjVPmrd+TkNjcQqx1zQmiZwyifhxHne8Y4tqC9iBGuLPLOUmgnjzhERPXyGveo o65kjRz6pVnt0664qkh/qcEZtoKaQ2T+uRdRiTGGrJG3RgaRtHylRThd4Wbk6tf8rOJv5w pFhUaU6UvuFSG45/nEIrw+ChjBpKmOmEWKzXZIav9oherwQrvsrqyWMWOeY1xTZLQIdnwD KcHH0dI2slvNpNyrIak6mgLRTQWbkOLtZz400AprQb5TFapVXPSceKDHYRlJjyoXq62Qu4 MqYZ/zxJ5iHGUAiQUCm0GdIWg1yCFmZq9HYLrtolKFuzqJBCJx0ofpZYRHx0eA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692208623; a=rsa-sha256; cv=none; b=veRuR7gIUcS0P0Y9CB6ISSJzkySTU6W+pV8STTiiSbATuh4gFa639baNAXlpD1ZRzXfQWk I/DTUFvjBJzR76PY/F7QkFvx0eQ0EmsLm5U7ZTzwcgWhNaMGZzL4GS+wnYlyg8d9r4TxGu W9gg5BJ5k9Ku9stNrtplQLnk5FlqvMiavdAvMgT3/66FJ6emVIYDe/UJbfi1z0wyGOG+na flMKHBY3kUCZU/DrYvqgq8TkgJhkHmPG6AeKgDfuOHqUO56pLx6DFGtkn1UGVsz6885IN+ 8z/03rk9MEsi59rpmj89QaPoNpiQWypnnZoZPkxQYxI5opyywi+bzgTjw67VGg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RQwnW29ZBz11hs; Wed, 16 Aug 2023 17:57:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37GHv3j0059422; Wed, 16 Aug 2023 17:57:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37GHv3NB059419; Wed, 16 Aug 2023 17:57:03 GMT (envelope-from git) Date: Wed, 16 Aug 2023 17:57:03 GMT Message-Id: <202308161757.37GHv3NB059419@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: c8573564095b - main - Remove $FreeBSD$: alt one-line .c pattern List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c8573564095b38930196396702b606f52b20c957 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=c8573564095b38930196396702b606f52b20c957 commit c8573564095b38930196396702b606f52b20c957 Author: Warner Losh AuthorDate: 2023-08-16 17:54:53 +0000 Commit: Warner Losh CommitDate: 2023-08-16 17:54:53 +0000 Remove $FreeBSD$: alt one-line .c pattern Remove /^\s*__RCSID\("\$FreeBSD\$"\);\n/ --- sbin/routed/rtquery/rtquery.c | 1 - usr.bin/nl/nl.c | 1 - usr.sbin/lastlogin/lastlogin.c | 1 - 3 files changed, 3 deletions(-) diff --git a/sbin/routed/rtquery/rtquery.c b/sbin/routed/rtquery/rtquery.c index f4b8fe41d190..24c01a8ac308 100644 --- a/sbin/routed/rtquery/rtquery.c +++ b/sbin/routed/rtquery/rtquery.c @@ -62,7 +62,6 @@ __COPYRIGHT("@(#) Copyright (c) 1983, 1988, 1993\n" #ifdef __NetBSD__ __RCSID("$NetBSD$"); #elif defined(__FreeBSD__) -__RCSID("$FreeBSD$"); #else __RCSID("$Revision: 2.26 $"); #ident "$Revision: 2.26 $" diff --git a/usr.bin/nl/nl.c b/usr.bin/nl/nl.c index f0743074f30d..de4314155ff1 100644 --- a/usr.bin/nl/nl.c +++ b/usr.bin/nl/nl.c @@ -34,7 +34,6 @@ __COPYRIGHT( "@(#) Copyright (c) 1999\ The NetBSD Foundation, Inc. All rights reserved."); -__RCSID("$FreeBSD$"); #endif #include diff --git a/usr.sbin/lastlogin/lastlogin.c b/usr.sbin/lastlogin/lastlogin.c index 35aee1dcb2c5..a1dcde3f60bf 100644 --- a/usr.sbin/lastlogin/lastlogin.c +++ b/usr.sbin/lastlogin/lastlogin.c @@ -35,7 +35,6 @@ #include #ifndef lint -__RCSID("$FreeBSD$"); __RCSID("$NetBSD: lastlogin.c,v 1.4 1998/02/03 04:45:35 perry Exp $"); #endif From nobody Wed Aug 16 17:57:04 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RQwnX5QCBz4qvQ1; Wed, 16 Aug 2023 17:57: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RQwnX44gVz3VJG; Wed, 16 Aug 2023 17:57:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692208624; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9ACmvJJ5nEI35t2Dx6ejVFAaWmYAcySnaIf6YjcJeCU=; b=YF7VHxXIT2dR3Yg/ChAJYucvpHmLC+7fQwWJ9KtIpQe89rxyk1wP6/PBAdqHEJRX9KEtqO 0rV10cLBQMJrWxvFq4JGyk96rnu0uW3EsgOUXFbUm35/zCABdwtNssk1Xfw8iz3PiSXb2j zR8gZCwvtfp/f5wma7iWxFpavDaUpzRCYBUqqW20pSwsqIwzAE0APsSIy5QVxsLQcJcXkc hLVZJ0NqMsgEWosCvA3BLK1UV5VlcLmwwmGj4jjaS21ahIxqZBzTjx7KmiqOfhJ8PqR0eC N1hYczeJmUn0xJ1ULFyhY073CnPiH7ATvC9zshgIyJqtzvOKAesOm7Ly4yoTvA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692208624; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9ACmvJJ5nEI35t2Dx6ejVFAaWmYAcySnaIf6YjcJeCU=; b=juLLM+eS9gDwk6rFMMwUL85JfWpVQ3uKnkCp1ybXQyH0OxUnjUeygvl7wFBRxeL0qrzi9X iwLGVYdikV+ML5xcOL8fTZj0FzUBIytF+sstxW9S2fHuHVsNNOraMjMSjNcADnSxQB2BBx QhunzLAlkfco9NbOm/9V0LRu2Gx7bHmhS3MQiq5Bz4qNgeeaXHHqIbFAy8deW++ZfihyqG pFdH2CYYeccZuDgkjsofPyIfO77U9EcmyIxRCdkClAe9iiKS1v8d6h+f4OVooEyv8cMUku 48NYroD1y7/bTI93oJkiIct5QUTUc+t1ILer0lVkE4hNt+64e0K3Z6g+VDcjrw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692208624; a=rsa-sha256; cv=none; b=tizgd9TSISvub3JckZpk3J/mJ2vpQOkB5rDcKtNKQhrKEvwwXnVhxeiiZ7EZTOao4pYOho W/lHr0PDd4dvOUpsQekDwnfdac5sAcFN5W6Y4+F4xBehT/091wgMMsxlMuz0Nkx9rpsknK hODUAEoaq2Pyjd89bsSBUmJBbyeKtHj7CTlGA/3zxQK3a1k8o1hSjMi3jzH+y6aw1IclqB D8T7BGTosF+UIHLB3xzYZE8+Yug6AHuayOXfXpTSa+jhggo5L0VHfAGN9kDh4oG/1tOCT0 J/p6uSxwGcp+A8JL6mvb7LwWY6UfmCxnuL3areNak2FlaljYiTvpU2JS9O2Vsg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RQwnX38QHz11ht; Wed, 16 Aug 2023 17:57:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37GHv4SG059467; Wed, 16 Aug 2023 17:57:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37GHv4hJ059464; Wed, 16 Aug 2023 17:57:04 GMT (envelope-from git) Date: Wed, 16 Aug 2023 17:57:04 GMT Message-Id: <202308161757.37GHv4hJ059464@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: d4bf8003ee42 - main - sys: Remove $FreeBSD$: one-line .S pattern List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d4bf8003ee42e88f6108195ae100c83583ee6c44 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=d4bf8003ee42e88f6108195ae100c83583ee6c44 commit d4bf8003ee42e88f6108195ae100c83583ee6c44 Author: Warner Losh AuthorDate: 2023-08-16 17:54:54 +0000 Commit: Warner Losh CommitDate: 2023-08-16 17:54:54 +0000 sys: Remove $FreeBSD$: one-line .S pattern Remove /^\s\.(asciz|ident)\s+\"\$FreeBSD\$\".*\n/ --- sys/crypto/aesni/aeskeys_amd64.S | 1 - sys/crypto/aesni/aeskeys_i386.S | 1 - 2 files changed, 2 deletions(-) diff --git a/sys/crypto/aesni/aeskeys_amd64.S b/sys/crypto/aesni/aeskeys_amd64.S index 9b3e98c8437e..83f704c9ae53 100644 --- a/sys/crypto/aesni/aeskeys_amd64.S +++ b/sys/crypto/aesni/aeskeys_amd64.S @@ -220,4 +220,3 @@ ENTRY(aesni_set_deckey) .cfi_endproc END(aesni_set_deckey) - .ident "$FreeBSD$" diff --git a/sys/crypto/aesni/aeskeys_i386.S b/sys/crypto/aesni/aeskeys_i386.S index f9be26d2197c..346014412640 100644 --- a/sys/crypto/aesni/aeskeys_i386.S +++ b/sys/crypto/aesni/aeskeys_i386.S @@ -270,4 +270,3 @@ ENTRY(aesni_set_deckey) .cfi_endproc END(aesni_set_deckey) - .ident "$FreeBSD$" From nobody Wed Aug 16 17:57:05 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RQwnZ4lGLz4qvRN; Wed, 16 Aug 2023 17:57: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RQwnY6DD3z3VPT; Wed, 16 Aug 2023 17:57:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692208626; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=dspZ+pTGD/p6ELjjWQLyhacBbSYDmX6pmfIrwlnnbCY=; b=Z+a1Gn6v5QLQUQZFekcM7s6vOeNAh4geEzlg7CFA90UfmQL3paWFCfz6Efh7y3TMRb5B+y wUa9H4Wg+Jn3uaPlrY1GB5nphbe+3QXZIIgcU4sWZrbAcxHB0HIMiP21kfJlMCWJc2aZdx yED21jZp8t/yu1IceCTEMi8pAomhjFlnrRHf4U2zbGqDZKZxY2XCT2bHIO/0LAeb6UEQDv 3LKNFi0v3Wc69DRnTyeRiug5Vd7P81Y2SM35BiAkHhNb+xti16FAFSJT8kAZ2fs5pR/2yy mOj5+1HcLS4vnhvRPy8IkYj3LcHeb2cn/wtfAZwnaZKk4wrzfOR21dFbNTmqdA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692208626; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=dspZ+pTGD/p6ELjjWQLyhacBbSYDmX6pmfIrwlnnbCY=; b=yxOZ26Ah8OYt2jJTiEOO3JcfXmmv6Lg6X9BvoCxMyn5YHZfwZppxhFjDoUAFGcMiM0+G2b FMMXPi64l6jtDHBIHARf2H5g1MzSJN/fJ5Cx8PNvXZLvXhBrSt8Yhwjsf2rvpHCnGHdnnA 9jXqyJcLsXw6/chpRJZ09w4T9EWm8PkfpZ1eywY8XwiaDXO9M3EUd0YiH0uLDf5InDXdmt 4UTAKNy62Qyeq5QSNrQc4R1j3qMJGdEGaBKeWeq9R9CxBfKYlsCeOpeibp/4oaXy88K1ka 98Lp32qDipJ1j+YUNRQZ5J/fLBraG19YWDMdnOQdjcydK0JFY0MKJkxF8zsZ8A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692208626; a=rsa-sha256; cv=none; b=ZIGxL8pgZouKKI3LEwhpuZK0i5jBnXWcQOY8vmTy7nOPuxofBYPGGiSdoGl8PHbiUI4fr0 mtbXdEjLchvzO1t78kMT4vsACoWG2jWxKlOonEQ2ObvDWNY2ySCqakgNbS3Qaf2SngJoqw slfAUt11c1CYoZyowxYQtnin0A7elA0SinaK46BG9nU6EJ23fHKtYIYSAnM9W+j8lysVGG KPzxL89nlkAqL3Hi0OVZBDWQ8qYEW2yGm6xjtiovIdtTCuvczGJCZqoEwr4mTqv6QWWSVl ce3bWM6xNOnWZ3MUSs8DV6F965Y5vzR8rK3YqT8gX8Bj/Q/nS/F5BbLeDzPV/A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RQwnY4965z11Qg; Wed, 16 Aug 2023 17:57:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37GHv5ms059509; Wed, 16 Aug 2023 17:57:05 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37GHv5q8059506; Wed, 16 Aug 2023 17:57:05 GMT (envelope-from git) Date: Wed, 16 Aug 2023 17:57:05 GMT Message-Id: <202308161757.37GHv5q8059506@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: b1cfcffa89e6 - main - Remove $FreeBSD$: one-line .S pattern List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b1cfcffa89e66caedb84d6e92a92e3828bc08f04 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=b1cfcffa89e66caedb84d6e92a92e3828bc08f04 commit b1cfcffa89e66caedb84d6e92a92e3828bc08f04 Author: Warner Losh AuthorDate: 2023-08-16 17:54:57 +0000 Commit: Warner Losh CommitDate: 2023-08-16 17:54:57 +0000 Remove $FreeBSD$: one-line .S pattern Remove /^\s\.(asciz|ident)\s+\"\$FreeBSD\$\".*\n/ --- lib/libc/arm/gen/_ctx_start.S | 2 -- stand/libsa/i386/_setjmp.S | 1 - 2 files changed, 3 deletions(-) diff --git a/lib/libc/arm/gen/_ctx_start.S b/lib/libc/arm/gen/_ctx_start.S index faedfb5c6443..39c282bf30c7 100644 --- a/lib/libc/arm/gen/_ctx_start.S +++ b/lib/libc/arm/gen/_ctx_start.S @@ -1,6 +1,4 @@ #include - -.ident "$FreeBSD$" ENTRY(_ctx_start) mov lr, pc mov pc, r4 diff --git a/stand/libsa/i386/_setjmp.S b/stand/libsa/i386/_setjmp.S index 5766b25816ae..a1bd8d55834b 100644 --- a/stand/libsa/i386/_setjmp.S +++ b/stand/libsa/i386/_setjmp.S @@ -32,7 +32,6 @@ #if defined(LIBC_RCS) && !defined(lint) .text - .asciz "$FreeBSD$" #endif /* LIBC_RCS and not lint */ /* From nobody Wed Aug 16 17:57:06 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RQwnc48k9z4qv6y; Wed, 16 Aug 2023 17:57:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RQwnZ6zDbz3VWn; Wed, 16 Aug 2023 17:57:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692208627; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=IKhWIBg0xAw+IJXl6IQ8DwWt6BW5LpJSDuH/rFc+Fdk=; b=T8IE6ZBSxqkX3qGbKDD49jX5zQ2CVEAbauyY1GIPs6R9oSQ8CQj0RFUh5pk2zNNXdrLnyx TRMxPeZwraKo+vcEAWLFm+Us5T0kAd6gv5ax0LX1oud3D7nReiKegR/xzBz4Ym2OO78TKX R27KC6vGioYVb84kGjYXy1NFVnFduhlo23+2d7/BJ8ANw1Bc8g3IOU2Es8+FmVyZbhKUR2 2nPbUtulr0fVKsdMENjdSiTg+VB6Pl0NrrrwH5kSFKg0ItuQD8bYXEZpMUILz14J3/BaA/ MZ9jD8ndKvewWOcuUHz7MY5qRgxAaEYrhwqXO9lsxXuUpOvUm3VffTuS7iOLaQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692208627; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=IKhWIBg0xAw+IJXl6IQ8DwWt6BW5LpJSDuH/rFc+Fdk=; b=nIUVDgrWtwQvSjuJqVcxFBAzyIzxojjAgdear4AjHugD2TWL5IXrWhq47/Em6PSCtYDXBp BiX//GTQ6yplazc4JRPDeV5RohohkPQ7Vp9vtMY7AaXHoOKRqptL7k1XpCIQyYmdKmlvYE GG8mppj+MHp/oKYIFth5BJoBGpoEm90ciCf7Xk+uhuCbb/Rfcdl3Dy/6apjsGSM5t1wf0d USM380qilSK0PhA6AM1T4CgCBzbl0pIU85qkKDUQW0XVd2ZYuwAXrrsWs/JyjnqWgkWRKS HZ1lrQAZLhB6LYLPn2yM0YgW4H50eWRQX6tk/sskwd8lUvbjddJfhGbAUpuvEQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692208627; a=rsa-sha256; cv=none; b=pGwih+XVDJLuzHE7sdkhRrlUV/kL8LlgY1rr1KVJT/nlrjd55bOYsRlYJ3hL92hX2PEtKw 3+JIFCbRqgZcXmIU9WEVK1PGe0uaPnrfFjhLXZVF0xOxDVx8SY7MqwAs0/eCR6UIDoYSRh bIuySoI65lHrlriN1sOZH/HAtqwttWP2/tkIWdmUE+s72us9trfwLp1gwfYo5GDkNghEoe 9YgoJmCRoVPnyIuvshLCkmBHobh/1FQRTBsE4KEAKfMcZ43KW2PJMl/qrHzgcdzdyLdMmR ZGpy6bvhHkf+33hzkEoDE07bZ/CgWyqxycoyhTPkZvztp2W+fj55aEAGIPdTFQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RQwnZ63Twz11KL; Wed, 16 Aug 2023 17:57:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37GHv6us059554; Wed, 16 Aug 2023 17:57:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37GHv6nr059551; Wed, 16 Aug 2023 17:57:06 GMT (envelope-from git) Date: Wed, 16 Aug 2023 17:57:06 GMT Message-Id: <202308161757.37GHv6nr059551@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: 031beb4e239b - main - sys: Remove $FreeBSD$: one-line sh pattern List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 031beb4e239bfce798af17f5fe8dba8bcaf13d99 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=031beb4e239bfce798af17f5fe8dba8bcaf13d99 commit 031beb4e239bfce798af17f5fe8dba8bcaf13d99 Author: Warner Losh AuthorDate: 2023-08-16 17:54:58 +0000 Commit: Warner Losh CommitDate: 2023-08-16 17:54:58 +0000 sys: Remove $FreeBSD$: one-line sh pattern Remove /^\s*#[#!]?\s*\$FreeBSD\$.*$\n/ --- sys/Makefile | 1 - sys/amd64/Makefile | 1 - sys/amd64/conf/DEFAULTS | 1 - sys/amd64/conf/GENERIC | 1 - sys/amd64/conf/GENERIC-KASAN | 1 - sys/amd64/conf/GENERIC-KCSAN | 1 - sys/amd64/conf/GENERIC-KMSAN | 1 - sys/amd64/conf/GENERIC-MMCCAM | 1 - sys/amd64/conf/GENERIC-NODEBUG | 1 - sys/amd64/conf/GENERIC.hints | 1 - sys/amd64/conf/LINT | 1 - sys/amd64/conf/LINT-NOINET | 1 - sys/amd64/conf/LINT-NOINET6 | 1 - sys/amd64/conf/LINT-NOIP | 1 - sys/amd64/conf/MINIMAL | 1 - sys/amd64/conf/NOTES | 1 - sys/amd64/linux/Makefile | 1 - sys/amd64/linux/syscalls.conf | 1 - sys/amd64/linux32/Makefile | 1 - sys/amd64/linux32/syscalls.conf | 1 - sys/amd64/vmm/amd/ivhd_if.m | 1 - sys/arm/allwinner/a10/files.a10 | 1 - sys/arm/allwinner/a13/files.a13 | 1 - sys/arm/allwinner/a20/files.a20 | 1 - sys/arm/allwinner/a31/files.a31 | 1 - sys/arm/allwinner/a33/files.a33 | 1 - sys/arm/allwinner/a83t/files.a83t | 1 - sys/arm/allwinner/files.allwinner | 1 - sys/arm/allwinner/files.allwinner_up | 1 - sys/arm/allwinner/h3/files.h3 | 1 - sys/arm/allwinner/std.allwinner | 1 - sys/arm/allwinner/std.allwinner_up | 1 - sys/arm/allwinner/sunxi_dma_if.m | 1 - sys/arm/altera/socfpga/files.socfpga | 1 - sys/arm/altera/socfpga/std.socfpga | 1 - sys/arm/annapurna/alpine/files.alpine | 1 - sys/arm/annapurna/alpine/std.alpine | 1 - sys/arm/arm/gic_if.m | 1 - sys/arm/arm/platform_if.m | 1 - sys/arm/arm/platform_pl310_if.m | 1 - sys/arm/broadcom/bcm2835/files.bcm2835 | 1 - sys/arm/broadcom/bcm2835/files.bcm2836 | 1 - sys/arm/broadcom/bcm2835/files.bcm283x | 1 - sys/arm/broadcom/bcm2835/std.bcm2835 | 1 - sys/arm/broadcom/bcm2835/std.bcm2836 | 1 - sys/arm/broadcom/bcm2835/std.rpi | 1 - sys/arm/conf/ALPINE | 1 - sys/arm/conf/ARMADA38X | 1 - sys/arm/conf/ARMADAXP | 1 - sys/arm/conf/DEFAULTS | 1 - sys/arm/conf/GENERIC | 1 - sys/arm/conf/GENERIC-MMCCAM | 1 - sys/arm/conf/GENERIC-NODEBUG | 1 - sys/arm/conf/JETSON-TK1 | 1 - sys/arm/conf/LINT | 1 - sys/arm/conf/NOTES | 1 - sys/arm/conf/RPI-B | 1 - sys/arm/conf/TEGRA124 | 1 - sys/arm/conf/ZEDBOARD | 1 - sys/arm/conf/std.armv6 | 1 - sys/arm/conf/std.armv7 | 1 - sys/arm/freescale/imx/files.imx5 | 1 - sys/arm/freescale/imx/files.imx6 | 1 - sys/arm/freescale/imx/std.imx51 | 1 - sys/arm/freescale/imx/std.imx53 | 1 - sys/arm/freescale/imx/std.imx6 | 1 - sys/arm/freescale/vybrid/files.vybrid | 1 - sys/arm/freescale/vybrid/std.vybrid | 1 - sys/arm/mv/armada38x/files.armada38x | 1 - sys/arm/mv/armada38x/std.armada38x | 1 - sys/arm/mv/armadaxp/files.armadaxp | 1 - sys/arm/mv/armadaxp/std.armadaxp | 1 - sys/arm/mv/armadaxp/std.mv78x60 | 1 - sys/arm/mv/files.arm7 | 1 - sys/arm/mv/std-pj4b.mv | 1 - sys/arm/nvidia/drm2/tegra_dc_if.m | 1 - sys/arm/nvidia/drm2/tegra_drm_if.m | 1 - sys/arm/nvidia/tegra124/files.tegra124 | 1 - sys/arm/nvidia/tegra124/std.tegra124 | 1 - sys/arm/nvidia/tegra_soctherm_if.m | 1 - sys/arm/qemu/files.qemu | 1 - sys/arm/qemu/std.virt | 1 - sys/arm/rockchip/files.rk32xx | 1 - sys/arm/rockchip/std.rk32xx | 1 - sys/arm/ti/am335x/files.am335x | 1 - sys/arm/ti/am335x/std.am335x | 1 - sys/arm/ti/files.ti | 1 - sys/arm/ti/omap4/files.omap4 | 1 - sys/arm/ti/omap4/std.omap4 | 1 - sys/arm/ti/std.ti | 1 - sys/arm/ti/ti_gpio_if.m | 1 - sys/arm/xilinx/files.zynq7 | 1 - sys/arm/xilinx/std.zynq7 | 1 - sys/arm64/conf/DEFAULTS | 1 - sys/arm64/conf/GENERIC-MMCCAM | 1 - sys/arm64/conf/GENERIC-MMCCAM-NODEBUG | 1 - sys/arm64/conf/GENERIC-NODEBUG | 1 - sys/arm64/conf/GENERIC-UP | 1 - sys/arm64/conf/LINT | 1 - sys/arm64/conf/LINT-ACPI | 1 - sys/arm64/conf/LINT-FDT | 1 - sys/arm64/conf/NOTES | 1 - sys/arm64/conf/std.arm64 | 1 - sys/arm64/coresight/coresight_if.m | 1 - sys/arm64/iommu/iommu_if.m | 1 - sys/arm64/linux/Makefile | 1 - sys/arm64/linux/syscalls.conf | 1 - sys/arm64/qoriq/qoriq_therm_if.m | 1 - sys/arm64/rockchip/rk_tsadc_if.m | 1 - sys/cam/mmc/mmc_sim_if.m | 1 - sys/compat/freebsd32/Makefile | 1 - sys/compat/freebsd32/syscalls.conf | 1 - sys/conf/Makefile.amd64 | 1 - sys/conf/Makefile.arm | 1 - sys/conf/Makefile.arm64 | 1 - sys/conf/Makefile.i386 | 1 - sys/conf/Makefile.powerpc | 1 - sys/conf/Makefile.riscv | 1 - sys/conf/NOTES | 1 - sys/conf/WITHOUT_SOURCELESS | 1 - sys/conf/WITHOUT_SOURCELESS_HOST | 1 - sys/conf/WITHOUT_SOURCELESS_UCODE | 1 - sys/conf/config.mk | 1 - sys/conf/dtb.build.mk | 1 - sys/conf/dtb.mk | 1 - sys/conf/files | 1 - sys/conf/files.amd64 | 1 - sys/conf/files.arm | 1 - sys/conf/files.arm64 | 1 - sys/conf/files.i386 | 1 - sys/conf/files.powerpc | 1 - sys/conf/files.riscv | 1 - sys/conf/files.x86 | 1 - sys/conf/kern.mk | 1 - sys/conf/kern.opts.mk | 1 - sys/conf/kern.post.mk | 1 - sys/conf/kern.pre.mk | 1 - sys/conf/kmod.mk | 1 - sys/conf/kmod.opts.mk | 1 - sys/conf/kmod_syms.awk | 1 - sys/conf/kmod_syms_prefix.awk | 1 - sys/conf/newvers.sh | 1 - sys/conf/options | 1 - sys/conf/options.amd64 | 1 - sys/conf/options.arm | 1 - sys/conf/options.arm64 | 1 - sys/conf/options.i386 | 1 - sys/conf/options.powerpc | 1 - sys/conf/options.riscv | 1 - sys/conf/sysent.mk | 1 - sys/conf/systags.sh | 1 - sys/crypto/rijndael/Makefile | 1 - sys/crypto/skein/amd64/skein_block_asm.S | 1 - sys/dev/acpi_support/acpi_wmi_if.m | 1 - sys/dev/acpica/acpi_bus_if.m | 1 - sys/dev/acpica/acpi_if.m | 1 - sys/dev/acpica/acpi_quirks | 1 - sys/dev/adb/adb_hb_if.m | 1 - sys/dev/adb/adb_if.m | 1 - sys/dev/agp/agp_if.m | 1 - sys/dev/aic7xxx/aicasm/Makefile | 1 - sys/dev/altera/pio/pio_if.m | 1 - sys/dev/ata/ata_if.m | 1 - sys/dev/backlight/backlight_if.m | 1 - sys/dev/bhnd/bhnd_bus_if.m | 1 - sys/dev/bhnd/bhnd_erom_if.m | 1 - sys/dev/bhnd/bhndb/bhndb_bus_if.m | 1 - sys/dev/bhnd/bhndb/bhndb_if.m | 1 - sys/dev/bhnd/cores/chipc/bhnd_chipc_if.m | 1 - sys/dev/bhnd/cores/chipc/pwrctl/bhnd_pwrctl_hostb_if.m | 1 - sys/dev/bhnd/cores/chipc/pwrctl/bhnd_pwrctl_if.m | 1 - sys/dev/bhnd/cores/pmu/bhnd_pmu_if.m | 1 - sys/dev/bhnd/nvram/bhnd_nvram_if.m | 1 - sys/dev/bhnd/nvram/nvram_map | 1 - sys/dev/bhnd/tools/bus_macro.sh | 1 - sys/dev/bhnd/tools/nvram_map_gen.awk | 1 - sys/dev/bhnd/tools/nvram_map_gen.sh | 2 -- sys/dev/bnxt/convert_hsi.pl | 1 - sys/dev/cardbus/card_if.m | 1 - sys/dev/cardbus/power_if.m | 1 - sys/dev/cxgb/bin2h.pl | 2 -- sys/dev/cxgbe/firmware/t4fw_cfg.txt | 1 - sys/dev/cxgbe/firmware/t4fw_cfg_uwire.txt | 1 - sys/dev/cxgbe/firmware/t5fw_cfg.txt | 1 - sys/dev/cxgbe/firmware/t5fw_cfg_fpga.txt | 1 - sys/dev/cxgbe/firmware/t5fw_cfg_hashfilter.txt | 1 - sys/dev/cxgbe/firmware/t5fw_cfg_uwire.txt | 1 - sys/dev/cxgbe/firmware/t6fw_cfg.txt | 1 - sys/dev/cxgbe/firmware/t6fw_cfg_fpga.txt | 1 - sys/dev/cxgbe/firmware/t6fw_cfg_hashfilter.txt | 1 - sys/dev/cxgbe/firmware/t6fw_cfg_uwire.txt | 1 - sys/dev/cxgbe/t4_if.m | 1 - sys/dev/dpaa2/memac_mdio_if.m | 1 - sys/dev/dwc/if_dwc_if.m | 1 - sys/dev/etherswitch/etherswitch_if.m | 1 - sys/dev/extres/clk/clkdev_if.m | 1 - sys/dev/extres/clk/clknode_if.m | 1 - sys/dev/extres/hwreset/hwreset_if.m | 1 - sys/dev/extres/nvmem/nvmem_if.m | 1 - sys/dev/extres/phy/phydev_if.m | 1 - sys/dev/extres/phy/phynode_usb_if.m | 1 - sys/dev/extres/regulator/regdev_if.m | 1 - sys/dev/extres/regulator/regnode_if.m | 1 - sys/dev/extres/syscon/syscon_if.m | 1 - sys/dev/fdt/fdt_clock_if.m | 1 - sys/dev/fdt/fdt_pinctrl_if.m | 1 - sys/dev/flash/qspi_if.m | 1 - sys/dev/gpio/dwgpio/dwgpio_if.m | 1 - sys/dev/gpio/gpio_if.m | 1 - sys/dev/gpio/gpiobus_if.m | 1 - sys/dev/hid/hid_if.m | 1 - sys/dev/hyperv/vmbus/vmbus_if.m | 1 - sys/dev/ice/irdma_di_if.m | 1 - sys/dev/ice/irdma_if.m | 1 - sys/dev/iicbus/iicbb_if.m | 1 - sys/dev/iicbus/iicbus_if.m | 1 - sys/dev/iicbus/mux/iicmux_if.m | 1 - sys/dev/iscsi/icl_conn_if.m | 1 - sys/dev/mbox/mbox_if.m | 1 - sys/dev/mdio/mdio_if.m | 1 - sys/dev/mii/miibus_if.m | 1 - sys/dev/mmc/mmc_pwrseq_if.m | 1 - sys/dev/mmc/mmcbr_if.m | 1 - sys/dev/mmc/mmcbus_if.m | 1 - sys/dev/mvs/mvs_if.m | 1 - sys/dev/ntb/ntb_if.m | 1 - sys/dev/ofw/ofw_bus_if.m | 1 - sys/dev/ofw/ofw_if.m | 1 - sys/dev/ow/owll_if.m | 1 - sys/dev/ow/own_if.m | 1 - sys/dev/pci/pci_dw_if.m | 1 - sys/dev/pci/pci_if.m | 1 - sys/dev/pci/pci_iov_if.m | 1 - sys/dev/pci/pcib_if.m | 1 - sys/dev/ppbus/ppbus_if.m | 1 - sys/dev/pwm/pwmbus_if.m | 1 - sys/dev/qlxgb/README.txt | 1 - sys/dev/qlxgbe/README.txt | 1 - sys/dev/qlxge/README.txt | 1 - sys/dev/random/build.sh | 1 - sys/dev/scc/scc_if.m | 1 - sys/dev/sdhci/sdhci_if.m | 1 - sys/dev/sdio/sdio_if.m | 1 - sys/dev/smbus/smbus_if.m | 1 - sys/dev/sound/fdt/audio_dai_if.m | 1 - sys/dev/sound/midi/mpu_if.m | 1 - sys/dev/sound/midi/mpufoi_if.m | 1 - sys/dev/sound/midi/synth_if.m | 1 - sys/dev/sound/pci/hda/hdac_if.m | 1 - sys/dev/sound/pcm/ac97_if.m | 1 - sys/dev/sound/pcm/channel_if.m | 1 - sys/dev/sound/pcm/feeder_if.m | 1 - sys/dev/sound/pcm/mixer_if.m | 1 - sys/dev/spibus/spibus_if.m | 1 - sys/dev/sram/mmio_sram_if.m | 1 - sys/dev/syscons/fonts/cursor.awk | 1 - sys/dev/uart/uart_if.m | 1 - sys/dev/usb/controller/generic_usb_if.m | 1 - sys/dev/usb/usb_if.m | 1 - sys/dev/video/crtc_if.m | 1 - sys/dev/videomode/Makefile.ediddevs | 1 - sys/dev/videomode/Makefile.videomode | 1 - sys/dev/videomode/devlist2h.awk | 1 - sys/dev/videomode/modelines2c.awk | 1 - sys/dev/virtio/mmio/virtio_mmio_if.m | 1 - sys/dev/virtio/pci/virtio_pci_if.m | 1 - sys/dev/virtio/virtio_bus_if.m | 1 - sys/dev/virtio/virtio_if.m | 1 - sys/dev/vnic/lmac_if.m | 1 - sys/dev/xdma/xdma_if.m | 1 - sys/dts/Makefile | 1 - sys/dts/Makefile.inc | 1 - sys/dts/arm/Makefile | 1 - sys/dts/arm/Makefile.inc | 1 - sys/dts/arm/overlays/Makefile | 1 - sys/dts/arm64/Makefile | 1 - sys/dts/arm64/Makefile.inc | 1 - sys/dts/arm64/overlays/Makefile | 1 - sys/dts/powerpc/Makefile | 1 - sys/fs/cd9660/TODO | 1 - sys/geom/part/g_part_if.m | 1 - sys/geom/raid/g_raid_md_if.m | 1 - sys/geom/raid/g_raid_tr_if.m | 1 - sys/i386/Makefile | 1 - sys/i386/conf/DEFAULTS | 1 - sys/i386/conf/GENERIC | 1 - sys/i386/conf/GENERIC-NODEBUG | 1 - sys/i386/conf/GENERIC.hints | 1 - sys/i386/conf/LINT | 1 - sys/i386/conf/MINIMAL | 1 - sys/i386/conf/NOTES | 1 - sys/i386/conf/PAE | 1 - sys/i386/linux/Makefile | 1 - sys/i386/linux/syscalls.conf | 1 - sys/isa/isa_if.m | 1 - sys/kern/Make.tags.inc | 1 - sys/kern/Makefile | 1 - sys/kern/bus_if.m | 1 - sys/kern/clock_if.m | 1 - sys/kern/cpufreq_if.m | 1 - sys/kern/device_if.m | 1 - sys/kern/genassym.sh | 1 - sys/kern/genoffset.sh | 1 - sys/kern/linker_if.m | 1 - sys/kern/msi_if.m | 1 - sys/kern/pic_if.m | 1 - sys/kern/serdev_if.m | 1 - sys/kern/vnode_if.src | 1 - sys/kgssapi/kgss_if.m | 1 - sys/libkern/iconv_converter_if.m | 1 - sys/modules/3dfx/Makefile | 1 - sys/modules/3dfx_linux/Makefile | 1 - sys/modules/Makefile | 1 - sys/modules/Makefile.inc | 1 - sys/modules/aac/Makefile | 1 - sys/modules/aac/Makefile.inc | 1 - sys/modules/aac/aac_linux/Makefile | 1 - sys/modules/aacraid/Makefile | 1 - sys/modules/aacraid/Makefile.inc | 1 - sys/modules/aacraid/aacraid_linux/Makefile | 1 - sys/modules/accf_data/Makefile | 1 - sys/modules/accf_dns/Makefile | 1 - sys/modules/accf_http/Makefile | 1 - sys/modules/acl_nfs4/Makefile | 1 - sys/modules/acl_posix1e/Makefile | 1 - sys/modules/acpi/Makefile | 1 - sys/modules/acpi/Makefile.inc | 1 - sys/modules/acpi/acpi_asus/Makefile | 1 - sys/modules/acpi/acpi_asus_wmi/Makefile | 1 - sys/modules/acpi/acpi_dock/Makefile | 1 - sys/modules/acpi/acpi_fujitsu/Makefile | 1 - sys/modules/acpi/acpi_ged/Makefile | 1 - sys/modules/acpi/acpi_hp/Makefile | 1 - sys/modules/acpi/acpi_ibm/Makefile | 1 - sys/modules/acpi/acpi_panasonic/Makefile | 1 - sys/modules/acpi/acpi_rapidstart/Makefile | 1 - sys/modules/acpi/acpi_sony/Makefile | 1 - sys/modules/acpi/acpi_toshiba/Makefile | 1 - sys/modules/acpi/acpi_video/Makefile | 1 - sys/modules/acpi/acpi_wmi/Makefile | 1 - sys/modules/acpi/aibs/Makefile | 1 - sys/modules/adlink/Makefile | 1 - sys/modules/ae/Makefile | 1 - sys/modules/aesni/Makefile | 1 - sys/modules/age/Makefile | 1 - sys/modules/agp/Makefile | 1 - sys/modules/ahci/Makefile | 1 - sys/modules/aic7xxx/Makefile | 2 -- sys/modules/aic7xxx/Makefile.inc | 1 - sys/modules/aic7xxx/ahc/Makefile | 2 -- sys/modules/aic7xxx/ahc/Makefile.inc | 1 - sys/modules/aic7xxx/ahc/ahc_isa/Makefile | 2 -- sys/modules/aic7xxx/ahc/ahc_pci/Makefile | 2 -- sys/modules/aic7xxx/ahd/Makefile | 2 -- sys/modules/aic7xxx/aicasm/Makefile | 1 - sys/modules/alc/Makefile | 1 - sys/modules/ale/Makefile | 1 - sys/modules/allwinner/Makefile | 1 - sys/modules/allwinner/aw_mmc/Makefile | 1 - sys/modules/allwinner/aw_pwm/Makefile | 1 - sys/modules/allwinner/aw_rsb/Makefile | 1 - sys/modules/allwinner/aw_rtc/Makefile | 1 - sys/modules/allwinner/aw_sid/Makefile | 1 - sys/modules/allwinner/aw_spi/Makefile | 1 - sys/modules/allwinner/aw_thermal/Makefile | 1 - sys/modules/allwinner/axp81x/Makefile | 1 - sys/modules/allwinner/if_awg/Makefile | 1 - sys/modules/alq/Makefile | 1 - sys/modules/am335x_dmtpps/Makefile | 1 - sys/modules/amd_ecc_inject/Makefile | 1 - sys/modules/amdgpio/Makefile | 1 - sys/modules/amdsbwd/Makefile | 1 - sys/modules/amdsmb/Makefile | 1 - sys/modules/amdsmn/Makefile | 1 - sys/modules/amdtemp/Makefile | 1 - sys/modules/aout/Makefile | 1 - sys/modules/arcmsr/Makefile | 1 - sys/modules/arm_ti/Makefile | 1 - sys/modules/arm_ti/am335x_ehrpwm/Makefile | 1 - sys/modules/arm_ti/ti_i2c/Makefile | 1 - sys/modules/armv8crypto/Makefile | 1 - sys/modules/asmc/Makefile | 1 - sys/modules/ata/Makefile | 1 - sys/modules/ata/Makefile.inc | 1 - sys/modules/ata/atacore/Makefile | 1 - sys/modules/ata/ataisa/Makefile | 1 - sys/modules/ata/atapci/Makefile | 1 - sys/modules/ata/atapci/Makefile.inc | 1 - sys/modules/ata/atapci/chipsets/Makefile | 1 - sys/modules/ata/atapci/chipsets/Makefile.inc | 1 - sys/modules/ata/atapci/chipsets/ataacard/Makefile | 1 - sys/modules/ata/atapci/chipsets/ataacerlabs/Makefile | 1 - sys/modules/ata/atapci/chipsets/ataamd/Makefile | 1 - sys/modules/ata/atapci/chipsets/ataati/Makefile | 1 - sys/modules/ata/atapci/chipsets/atacenatek/Makefile | 1 - sys/modules/ata/atapci/chipsets/atacypress/Makefile | 1 - sys/modules/ata/atapci/chipsets/atacyrix/Makefile | 1 - sys/modules/ata/atapci/chipsets/atahighpoint/Makefile | 1 - sys/modules/ata/atapci/chipsets/ataintel/Makefile | 1 - sys/modules/ata/atapci/chipsets/ataite/Makefile | 1 - sys/modules/ata/atapci/chipsets/atajmicron/Makefile | 1 - sys/modules/ata/atapci/chipsets/atamarvell/Makefile | 1 - sys/modules/ata/atapci/chipsets/atamicron/Makefile | 1 - sys/modules/ata/atapci/chipsets/atanational/Makefile | 1 - sys/modules/ata/atapci/chipsets/atanetcell/Makefile | 1 - sys/modules/ata/atapci/chipsets/atanvidia/Makefile | 1 - sys/modules/ata/atapci/chipsets/atapromise/Makefile | 1 - sys/modules/ata/atapci/chipsets/ataserverworks/Makefile | 1 - sys/modules/ata/atapci/chipsets/atasiliconimage/Makefile | 1 - sys/modules/ata/atapci/chipsets/atasis/Makefile | 1 - sys/modules/ata/atapci/chipsets/atavia/Makefile | 1 - sys/modules/ath/Makefile | 1 - sys/modules/ath10k/Makefile | 1 - sys/modules/ath11k/Makefile | 1 - sys/modules/ath_dfs/Makefile | 1 - sys/modules/ath_hal/Makefile | 1 - sys/modules/ath_hal_ar5210/Makefile | 1 - sys/modules/ath_hal_ar5211/Makefile | 1 - sys/modules/ath_hal_ar5212/Makefile | 1 - sys/modules/ath_hal_ar5416/Makefile | 1 - sys/modules/ath_hal_ar9300/Makefile | 1 - sys/modules/ath_main/Makefile | 1 - sys/modules/ath_rate/Makefile | 1 - sys/modules/athk_common/Makefile | 1 - sys/modules/autofs/Makefile | 1 - sys/modules/axgbe/Makefile | 1 - sys/modules/axgbe/if_axa/Makefile | 1 - sys/modules/axgbe/if_axp/Makefile | 1 - sys/modules/backlight/Makefile | 1 - sys/modules/bce/Makefile | 1 - sys/modules/bcm283x_clkman/Makefile | 1 - sys/modules/bcm283x_pwm/Makefile | 1 - sys/modules/bfe/Makefile | 1 - sys/modules/bge/Makefile | 1 - sys/modules/bhnd/Makefile | 1 - sys/modules/bhnd/bcma/Makefile | 1 - sys/modules/bhnd/bcma_bhndb/Makefile | 1 - sys/modules/bhnd/bhndb/Makefile | 1 - sys/modules/bhnd/bhndb_pci/Makefile | 1 - sys/modules/bhnd/cores/Makefile | 1 - sys/modules/bhnd/cores/bhnd_pci/Makefile | 1 - sys/modules/bhnd/cores/bhnd_pci_hostb/Makefile | 1 - sys/modules/bhnd/cores/bhnd_pcib/Makefile | 1 - sys/modules/bhnd/siba/Makefile | 1 - sys/modules/bhnd/siba_bhndb/Makefile | 1 - sys/modules/bios/Makefile | 1 - sys/modules/bios/smapi/Makefile | 1 - sys/modules/bios/smbios/Makefile | 1 - sys/modules/bios/vpd/Makefile | 1 - sys/modules/blake2/Makefile | 1 - sys/modules/bnxt/Makefile | 1 - sys/modules/bridgestp/Makefile | 1 - sys/modules/bwi/Makefile | 1 - sys/modules/bwn/Makefile | 1 - sys/modules/bxe/Makefile | 1 - sys/modules/bytgpio/Makefile | 1 - sys/modules/cam/Makefile | 1 - sys/modules/cardbus/Makefile | 1 - sys/modules/carp/Makefile | 1 - sys/modules/cas/Makefile | 1 - sys/modules/cbb/Makefile | 1 - sys/modules/cc/Makefile | 1 - sys/modules/cc/cc_cdg/Makefile | 1 - sys/modules/cc/cc_chd/Makefile | 1 - sys/modules/cc/cc_cubic/Makefile | 1 - sys/modules/cc/cc_dctcp/Makefile | 1 - sys/modules/cc/cc_hd/Makefile | 1 - sys/modules/cc/cc_htcp/Makefile | 1 - sys/modules/cc/cc_newreno/Makefile | 1 - sys/modules/cc/cc_vegas/Makefile | 1 - sys/modules/ccp/Makefile | 1 - sys/modules/cd9660/Makefile | 1 - sys/modules/cd9660_iconv/Makefile | 1 - sys/modules/cfi/Makefile | 1 - sys/modules/cfiscsi/Makefile | 1 - sys/modules/chromebook_platform/Makefile | 1 - sys/modules/chvgpio/Makefile | 1 - sys/modules/ciss/Makefile | 1 - sys/modules/coretemp/Makefile | 1 - sys/modules/cpsw/Makefile | 1 - sys/modules/cpuctl/Makefile | 1 - sys/modules/cpufreq/Makefile | 1 - sys/modules/crypto/Makefile | 1 - sys/modules/cryptodev/Makefile | 1 - sys/modules/ctl/Makefile | 1 - sys/modules/cuse/Makefile | 1 - sys/modules/cxgb/Makefile | 1 - sys/modules/cxgb/cxgb/Makefile | 1 - sys/modules/cxgb/cxgb_t3fw/Makefile | 1 - sys/modules/cxgbe/Makefile | 1 - sys/modules/cxgbe/ccr/Makefile | 1 - sys/modules/cxgbe/cxgbei/Makefile | 1 - sys/modules/cxgbe/if_cc/Makefile | 1 - sys/modules/cxgbe/if_ccv/Makefile | 1 - sys/modules/cxgbe/if_cxgbe/Makefile | 1 - sys/modules/cxgbe/if_cxgbev/Makefile | 1 - sys/modules/cxgbe/if_cxl/Makefile | 1 - sys/modules/cxgbe/if_cxlv/Makefile | 1 - sys/modules/cxgbe/iw_cxgbe/Makefile | 1 - sys/modules/cxgbe/t4_firmware/Makefile | 1 - sys/modules/cxgbe/t5_firmware/Makefile | 1 - sys/modules/cxgbe/t6_firmware/Makefile | 1 - sys/modules/cxgbe/tom/Makefile | 1 - sys/modules/dc/Makefile | 1 - sys/modules/dcons/Makefile | 1 - sys/modules/dcons_crom/Makefile | 1 - sys/modules/dpdk_lpm4/Makefile | 1 - sys/modules/dpdk_lpm6/Makefile | 1 - sys/modules/dpms/Makefile | 1 - sys/modules/dtb/allwinner/Makefile | 1 - sys/modules/dtb/am335x/Makefile | 1 - sys/modules/dtb/freescale/Makefile | 1 - sys/modules/dtb/imx5/Makefile | 1 - sys/modules/dtb/imx6/Makefile | 1 - sys/modules/dtb/imx8/Makefile | 1 - sys/modules/dtb/mv/Makefile | 1 - sys/modules/dtb/nvidia/Makefile | 1 - sys/modules/dtb/omap4/Makefile | 1 - sys/modules/dtb/rockchip/Makefile | 1 - sys/modules/dtb/rpi/Makefile | 1 - sys/modules/dtb/sifive/Makefile | 1 - sys/modules/dtb/zynq/Makefile | 1 - sys/modules/dtrace/Makefile | 1 - sys/modules/dtrace/Makefile.inc | 1 - sys/modules/dtrace/dtaudit/Makefile | 1 - sys/modules/dtrace/dtmalloc/Makefile | 1 - sys/modules/dtrace/dtnfscl/Makefile | 1 - sys/modules/dtrace/dtrace/Makefile | 1 - sys/modules/dtrace/dtrace_test/Makefile | 1 - sys/modules/dtrace/dtraceall/Makefile | 1 - sys/modules/dtrace/fasttrap/Makefile | 1 - sys/modules/dtrace/fbt/Makefile | 1 - sys/modules/dtrace/profile/Makefile | 1 - sys/modules/dtrace/prototype/Makefile | 1 - sys/modules/dtrace/sdt/Makefile | 1 - sys/modules/dtrace/systrace/Makefile | 1 - sys/modules/dtrace/systrace_freebsd32/Makefile | 1 - sys/modules/dtrace/systrace_linux/Makefile | 1 - sys/modules/dtrace/systrace_linux32/Makefile | 1 - sys/modules/dummynet/Makefile | 1 - sys/modules/e6000sw/Makefile | 1 - sys/modules/efirt/Makefile | 1 - sys/modules/em/Makefile | 2 -- sys/modules/ena/Makefile | 1 - sys/modules/enetc/Makefile | 1 - sys/modules/epoch_test/Makefile | 1 - sys/modules/et/Makefile | 1 - sys/modules/evdev/Makefile | 1 - sys/modules/exca/Makefile | 1 - sys/modules/ext2fs/Makefile | 1 - sys/modules/fdc/Makefile | 1 - sys/modules/fdescfs/Makefile | 1 - sys/modules/fdt/Makefile | 1 - sys/modules/fdt/fdt_slicer/Makefile | 1 - sys/modules/ffec/Makefile | 1 - sys/modules/fib_dxr/Makefile | 1 - sys/modules/filemon/Makefile | 1 - sys/modules/filemon/Makefile.depend | 1 - sys/modules/firewire/Makefile | 1 - sys/modules/firewire/Makefile.inc | 1 - sys/modules/firewire/firewire/Makefile | 1 - sys/modules/firewire/fwe/Makefile | 1 - sys/modules/firewire/fwip/Makefile | 1 - sys/modules/firewire/sbp/Makefile | 1 - sys/modules/firewire/sbp_targ/Makefile | 1 - sys/modules/firmware/Makefile | 1 - sys/modules/flash/Makefile | 1 - sys/modules/flash/flexspi/Makefile | 1 - sys/modules/ftgpio/Makefile | 1 - sys/modules/ftwd/Makefile | 1 - sys/modules/fusefs/Makefile | 1 - sys/modules/fxp/Makefile | 1 - sys/modules/gem/Makefile | 1 - sys/modules/geom/Makefile | 1 - sys/modules/geom/Makefile.inc | 1 - sys/modules/geom/geom_bde/Makefile | 1 - sys/modules/geom/geom_cache/Makefile | 1 - sys/modules/geom/geom_ccd/Makefile | 1 - sys/modules/geom/geom_concat/Makefile | 1 - sys/modules/geom/geom_eli/Makefile | 1 - sys/modules/geom/geom_flashmap/Makefile | 1 - sys/modules/geom/geom_gate/Makefile | 1 - sys/modules/geom/geom_journal/Makefile | 1 - sys/modules/geom/geom_label/Makefile | 1 - sys/modules/geom/geom_linux_lvm/Makefile | 1 - sys/modules/geom/geom_map/Makefile | 1 - sys/modules/geom/geom_mirror/Makefile | 1 - sys/modules/geom/geom_mountver/Makefile | 1 - sys/modules/geom/geom_multipath/Makefile | 1 - sys/modules/geom/geom_nop/Makefile | 1 - sys/modules/geom/geom_part/Makefile | 1 - sys/modules/geom/geom_part/geom_part_apm/Makefile | 1 - sys/modules/geom/geom_part/geom_part_bsd/Makefile | 1 - sys/modules/geom/geom_part/geom_part_bsd64/Makefile | 1 - sys/modules/geom/geom_part/geom_part_ebr/Makefile | 1 - sys/modules/geom/geom_part/geom_part_gpt/Makefile | 1 - sys/modules/geom/geom_part/geom_part_ldm/Makefile | 1 - sys/modules/geom/geom_part/geom_part_mbr/Makefile | 1 - sys/modules/geom/geom_raid/Makefile | 1 - sys/modules/geom/geom_raid3/Makefile | 1 - sys/modules/geom/geom_shsec/Makefile | 1 - sys/modules/geom/geom_stripe/Makefile | 1 - sys/modules/geom/geom_union/Makefile | 1 - sys/modules/geom/geom_uzip/Makefile | 1 - sys/modules/geom/geom_vinum/Makefile | 1 - sys/modules/geom/geom_virstor/Makefile | 1 - sys/modules/geom/geom_zero/Makefile | 1 - sys/modules/glxiic/Makefile | 1 - sys/modules/glxsb/Makefile | 1 - sys/modules/gpio/Makefile | 1 - sys/modules/gpio/gpiobus/Makefile | 1 - sys/modules/gpio/gpioiic/Makefile | 1 - sys/modules/gpio/gpiokeys/Makefile | 1 - sys/modules/gpio/gpioled/Makefile | 1 - sys/modules/gpio/gpiopps/Makefile | 1 - sys/modules/gpio/gpiospi/Makefile | 1 - sys/modules/gpio/gpioths/Makefile | 1 - sys/modules/hid/Makefile | 1 - sys/modules/hid/bcm5974/Makefile | 1 - sys/modules/hid/hconf/Makefile | 1 - sys/modules/hid/hcons/Makefile | 1 - sys/modules/hid/hgame/Makefile | 1 - sys/modules/hid/hid/Makefile | 1 - sys/modules/hid/hidbus/Makefile | 1 - sys/modules/hid/hidmap/Makefile | 1 - sys/modules/hid/hidquirk/Makefile | 1 - sys/modules/hid/hidraw/Makefile | 1 - sys/modules/hid/hkbd/Makefile | 1 - sys/modules/hid/hms/Makefile | 1 - sys/modules/hid/hmt/Makefile | 1 - sys/modules/hid/hpen/Makefile | 1 - sys/modules/hid/hsctrl/Makefile | 1 - sys/modules/hid/ietp/Makefile | 1 - sys/modules/hid/ps4dshock/Makefile | 1 - sys/modules/hid/xb360gp/Makefile | 1 - sys/modules/hifn/Makefile | 1 - sys/modules/hpt27xx/Makefile | 1 - sys/modules/hptiop/Makefile | 1 - sys/modules/hptmv/Makefile | 1 - sys/modules/hptnr/Makefile | 1 - sys/modules/hptrr/Makefile | 1 - sys/modules/hwpmc/Makefile | 1 - sys/modules/hyperv/Makefile | 1 - sys/modules/hyperv/hid/Makefile | 1 - sys/modules/hyperv/hvsock/Makefile | 1 - sys/modules/hyperv/netvsc/Makefile | 1 - sys/modules/hyperv/pcib/Makefile | 1 - sys/modules/hyperv/storvsc/Makefile | 1 - sys/modules/hyperv/utilities/Makefile | 1 - sys/modules/hyperv/vmbus/Makefile | 1 - sys/modules/i2c/Makefile | 1 - sys/modules/i2c/Makefile.inc | 1 - sys/modules/i2c/ads111x/Makefile | 1 - sys/modules/i2c/controllers/Makefile | 1 - sys/modules/i2c/controllers/Makefile.inc | 1 - sys/modules/i2c/controllers/alpm/Makefile | 1 - sys/modules/i2c/controllers/amdpm/Makefile | 1 - sys/modules/i2c/controllers/amdsmb/Makefile | 1 - sys/modules/i2c/controllers/ichiic/Makefile | 1 - sys/modules/i2c/controllers/ichsmb/Makefile | 1 - sys/modules/i2c/controllers/imcsmb/Makefile | 1 - sys/modules/i2c/controllers/intpm/Makefile | 1 - sys/modules/i2c/controllers/ismt/Makefile | 1 - sys/modules/i2c/controllers/lpbb/Makefile | 1 - sys/modules/i2c/controllers/nfsmb/Makefile | 1 - sys/modules/i2c/controllers/pcf/Makefile | 1 - sys/modules/i2c/controllers/viapm/Makefile | 1 - sys/modules/i2c/cyapa/Makefile | 1 - sys/modules/i2c/ds1307/Makefile | 1 - sys/modules/i2c/ds13rtc/Makefile | 1 - sys/modules/i2c/ds1672/Makefile | 1 - sys/modules/i2c/ds3231/Makefile | 1 - sys/modules/i2c/htu21/Makefile | 1 - sys/modules/i2c/icee/Makefile | 1 - sys/modules/i2c/if_ic/Makefile | 1 - sys/modules/i2c/iic/Makefile | 1 - sys/modules/i2c/iicbb/Makefile | 1 - sys/modules/i2c/iicbus/Makefile | 1 - sys/modules/i2c/iichid/Makefile | 1 - sys/modules/i2c/iicsmb/Makefile | 1 - sys/modules/i2c/isl/Makefile | 1 - sys/modules/i2c/isl12xx/Makefile | 1 - sys/modules/i2c/jedec_dimm/Makefile | 1 - sys/modules/i2c/max44009/Makefile | 1 - sys/modules/i2c/mux/Makefile | 1 - sys/modules/i2c/mux/iic_gpiomux/Makefile | 1 - sys/modules/i2c/mux/iicmux/Makefile | 1 - sys/modules/i2c/mux/ltc430x/Makefile | 1 - sys/modules/i2c/mux/pca954x/Makefile | 1 - sys/modules/i2c/nxprtc/Makefile | 1 - sys/modules/i2c/pcf8574/Makefile | 1 - sys/modules/i2c/pcf8591/Makefile | 1 - sys/modules/i2c/rtc8583/Makefile | 1 - sys/modules/i2c/rx8803/Makefile | 1 - sys/modules/i2c/s35390a/Makefile | 1 - sys/modules/i2c/smb/Makefile | 1 - sys/modules/i2c/smbus/Makefile | 1 - sys/modules/i2c/tmp461/Makefile | 1 - sys/modules/iavf/Makefile | 1 - sys/modules/ibcore/Makefile | 1 - sys/modules/ice/Makefile | 1 - sys/modules/ice_ddp/Makefile | 1 - sys/modules/ichwd/Makefile | 1 - sys/modules/ida/Makefile | 1 - sys/modules/if_bridge/Makefile | 1 - sys/modules/if_disc/Makefile | 1 - sys/modules/if_edsc/Makefile | 1 - sys/modules/if_enc/Makefile | 1 - sys/modules/if_epair/Makefile | 1 - sys/modules/if_gif/Makefile | 1 - sys/modules/if_gre/Makefile | 1 - sys/modules/if_infiniband/Makefile | 1 - sys/modules/if_lagg/Makefile | 1 - sys/modules/if_me/Makefile | 1 - sys/modules/if_stf/Makefile | 1 - sys/modules/if_tuntap/Makefile | 1 - sys/modules/if_vlan/Makefile | 1 - sys/modules/if_vxlan/Makefile | 1 - sys/modules/iflib/Makefile | 1 - sys/modules/igc/Makefile | 1 - sys/modules/imgact_binmisc/Makefile | 1 - sys/modules/imx/Makefile | 1 - sys/modules/imx/imx6_ahci/Makefile | 1 - sys/modules/imx/imx6_snvs/Makefile | 1 - sys/modules/imx/imx_i2c/Makefile | 1 - sys/modules/imx/imx_spi/Makefile | 1 - sys/modules/imx/imx_wdog/Makefile | 1 - sys/modules/intelspi/Makefile | 1 - sys/modules/io/Makefile | 1 - sys/modules/ioat/Makefile | 1 - sys/modules/ip6_mroute_mod/Makefile | 1 - sys/modules/ip_mroute_mod/Makefile | 1 - sys/modules/ipdivert/Makefile | 1 - sys/modules/ipfilter/Makefile | 1 - sys/modules/ipfw/Makefile | 1 - sys/modules/ipfw_nat/Makefile | 1 - sys/modules/ipfw_nat64/Makefile | 1 - sys/modules/ipfw_nptv6/Makefile | 1 - sys/modules/ipfw_pmod/Makefile | 1 - sys/modules/ipmi/Makefile | 1 - sys/modules/ipmi/ipmi_linux/Makefile | 1 - sys/modules/ipoib/Makefile | 1 - sys/modules/ips/Makefile | 1 - sys/modules/ipsec/Makefile | 1 - sys/modules/ipw/Makefile | 1 - sys/modules/ipwfw/Makefile | 1 - sys/modules/ipwfw/ipw_bss/Makefile | 1 - sys/modules/ipwfw/ipw_ibss/Makefile | 1 - sys/modules/ipwfw/ipw_monitor/Makefile | 1 - sys/modules/isci/Makefile | 1 - sys/modules/iscsi/Makefile | 1 - sys/modules/iser/Makefile | 1 - sys/modules/isp/Makefile | 1 - sys/modules/ispfw/Makefile | 2 -- sys/modules/ispfw/isp_2400/Makefile | 2 -- sys/modules/ispfw/isp_2500/Makefile | 1 - sys/modules/ispfw/ispfw/Makefile | 2 -- sys/modules/itwd/Makefile | 1 - sys/modules/iwi/Makefile | 1 - sys/modules/iwifw/Makefile | 1 - sys/modules/iwifw/iwi_bss/Makefile | 1 - sys/modules/iwifw/iwi_ibss/Makefile | 1 - sys/modules/iwifw/iwi_monitor/Makefile | 1 - sys/modules/iwlwifi/Makefile | 1 - sys/modules/iwlwififw/Makefile | 1 - sys/modules/iwlwififw/Makefile.inc | 1 - sys/modules/iwlwififw/iwlwifi-3160-fw/Makefile | 1 - sys/modules/iwlwififw/iwlwifi-3168-fw/Makefile | 1 - sys/modules/iwlwififw/iwlwifi-7260-fw/Makefile | 1 - sys/modules/iwlwififw/iwlwifi-7265-fw/Makefile | 1 - sys/modules/iwlwififw/iwlwifi-7265D-fw/Makefile | 1 - sys/modules/iwlwififw/iwlwifi-8000C-fw/Makefile | 1 - sys/modules/iwlwififw/iwlwifi-8265-fw/Makefile | 1 - sys/modules/iwlwififw/iwlwifi-9000-pu-b0-jf-b0-fw/Makefile | 1 - sys/modules/iwlwififw/iwlwifi-9260-th-b0-jf-b0-fw/Makefile | 1 - sys/modules/iwlwififw/iwlwifi-Qu-b0-hr-b0-fw/Makefile | 1 - sys/modules/iwlwififw/iwlwifi-Qu-b0-jf-b0-fw/Makefile | 1 - sys/modules/iwlwififw/iwlwifi-Qu-c0-hr-b0-fw/Makefile | 1 - sys/modules/iwlwififw/iwlwifi-Qu-c0-jf-b0-fw/Makefile | 1 - sys/modules/iwlwififw/iwlwifi-QuZ-a0-hr-b0-fw/Makefile | 1 - sys/modules/iwlwififw/iwlwifi-QuZ-a0-jf-b0-fw/Makefile | 1 - sys/modules/iwlwififw/iwlwifi-cc-a0-fw/Makefile | 1 - sys/modules/iwlwififw/iwlwifi-so-a0-gf-a0-fw/Makefile | 1 - sys/modules/iwlwififw/iwlwifi-so-a0-gf-a0-pnvm/Makefile | 1 - sys/modules/iwlwififw/iwlwifi-so-a0-gf4-a0-fw/Makefile | 1 - sys/modules/iwlwififw/iwlwifi-so-a0-gf4-a0-pnvm/Makefile | 1 - sys/modules/iwlwififw/iwlwifi-so-a0-hr-b0-fw/Makefile | 1 - sys/modules/iwlwififw/iwlwifi-so-a0-jf-b0-fw/Makefile | 1 - sys/modules/iwlwififw/iwlwifi-ty-a0-gf-a0-fw/Makefile | 1 - sys/modules/iwlwififw/iwlwifi-ty-a0-gf-a0-pnvm/Makefile | 1 - sys/modules/iwm/Makefile | 1 - sys/modules/iwmfw/Makefile | 1 - sys/modules/iwmfw/Makefile.inc | 1 - sys/modules/iwmfw/iwm3160fw/Makefile | 1 - sys/modules/iwmfw/iwm3168fw/Makefile | 1 - sys/modules/iwmfw/iwm7260fw/Makefile | 1 - sys/modules/iwmfw/iwm7265Dfw/Makefile | 1 - sys/modules/iwmfw/iwm7265fw/Makefile | 1 - sys/modules/iwmfw/iwm8000Cfw/Makefile | 1 - sys/modules/iwmfw/iwm8265fw/Makefile | 1 - sys/modules/iwmfw/iwm9000fw/Makefile | 1 - sys/modules/iwmfw/iwm9260fw/Makefile | 1 - sys/modules/iwn/Makefile | 1 - sys/modules/iwnfw/Makefile | 1 - sys/modules/iwnfw/Makefile.inc | 1 - sys/modules/iwnfw/iwn100/Makefile | 1 - sys/modules/iwnfw/iwn1000/Makefile | 1 - sys/modules/iwnfw/iwn105/Makefile | 1 - sys/modules/iwnfw/iwn135/Makefile | 1 - sys/modules/iwnfw/iwn2000/Makefile | 1 - sys/modules/iwnfw/iwn2030/Makefile | 1 - sys/modules/iwnfw/iwn4965/Makefile | 1 - sys/modules/iwnfw/iwn5000/Makefile | 1 - sys/modules/iwnfw/iwn5150/Makefile | 1 - sys/modules/iwnfw/iwn6000/Makefile | 1 - sys/modules/iwnfw/iwn6000g2a/Makefile | 1 - sys/modules/iwnfw/iwn6000g2b/Makefile | 1 - sys/modules/iwnfw/iwn6050/Makefile | 1 - sys/modules/ix/Makefile | 1 - sys/modules/ixl/Makefile | 1 - sys/modules/ixv/Makefile | 1 - sys/modules/jme/Makefile | 1 - sys/modules/kbdmux/Makefile | 1 - sys/modules/kgssapi/Makefile | 1 - sys/modules/kgssapi_krb5/Makefile | 1 - sys/modules/khelp/Makefile | 1 - sys/modules/khelp/h_ertt/Makefile | 1 - sys/modules/krpc/Makefile | 1 - sys/modules/ksyms/Makefile | 1 - sys/modules/ktest/ktest/Makefile | 1 - sys/modules/ktest/ktest_example/Makefile | 1 - sys/modules/ktest/ktest_netlink_message_writer/Makefile | 1 - sys/modules/le/Makefile | 1 - sys/modules/lge/Makefile | 1 - sys/modules/libalias/Makefile | 1 - sys/modules/libalias/libalias/Makefile | 1 - sys/modules/libalias/modules/Makefile | 1 - sys/modules/libalias/modules/Makefile.inc | 1 - sys/modules/libalias/modules/dummy/Makefile | 1 - sys/modules/libalias/modules/ftp/Makefile | 1 - sys/modules/libalias/modules/irc/Makefile | 1 - sys/modules/libalias/modules/modules.inc | 1 - sys/modules/libalias/modules/nbt/Makefile | 1 - sys/modules/libalias/modules/pptp/Makefile | 1 - sys/modules/libalias/modules/skinny/Makefile | 1 - sys/modules/libalias/modules/smedia/Makefile | 1 - sys/modules/libiconv/Makefile | 1 - sys/modules/libmchain/Makefile | 1 - sys/modules/lindebugfs/Makefile | 1 - sys/modules/linprocfs/Makefile | 1 - sys/modules/linsysfs/Makefile | 1 - sys/modules/linux/Makefile | 1 - sys/modules/linux64/Makefile | 1 - sys/modules/linux_common/Makefile | 1 - sys/modules/linuxkpi/Makefile | 1 - sys/modules/linuxkpi_wlan/Makefile | 1 - sys/modules/lio/Makefile | 1 - sys/modules/lpt/Makefile | 2 -- sys/modules/mac_biba/Makefile | 1 - sys/modules/mac_bsdextended/Makefile | 1 - sys/modules/mac_ifoff/Makefile | 1 - sys/modules/mac_ipacl/Makefile | 1 - sys/modules/mac_lomac/Makefile | 1 - sys/modules/mac_mls/Makefile | 1 - sys/modules/mac_none/Makefile | 1 - sys/modules/mac_ntpd/Makefile | 1 - sys/modules/mac_partition/Makefile | 1 - sys/modules/mac_pimd/Makefile | 1 - sys/modules/mac_portacl/Makefile | 1 - sys/modules/mac_seeotheruids/Makefile | 1 - sys/modules/mac_stub/Makefile | 1 - sys/modules/mac_test/Makefile | 1 - sys/modules/mac_veriexec/Makefile | 1 - sys/modules/mac_veriexec_sha1/Makefile | 1 - sys/modules/mac_veriexec_sha256/Makefile | 1 - sys/modules/mac_veriexec_sha384/Makefile | 1 - sys/modules/mac_veriexec_sha512/Makefile | 1 - sys/modules/malo/Makefile | 1 - sys/modules/mana/Makefile | 1 - sys/modules/md/Makefile | 1 - sys/modules/mdio/Makefile | 1 - sys/modules/mem/Makefile | 1 - sys/modules/mfi/Makefile | 1 - sys/modules/mfi/mfi_linux/Makefile | 1 - sys/modules/mfi/mfip/Makefile | 1 - sys/modules/mgb/Makefile | 1 - sys/modules/mii/Makefile | 1 - sys/modules/mlx/Makefile | 1 - sys/modules/mlx4/Makefile | 1 - sys/modules/mlx4en/Makefile | 1 - sys/modules/mlx4ib/Makefile | 1 - sys/modules/mlx5/Makefile | 1 - sys/modules/mlx5en/Makefile | 1 - sys/modules/mlx5fpga_tools/Makefile | 1 - sys/modules/mlx5ib/Makefile | 1 - sys/modules/mlxfw/Makefile | 1 - sys/modules/mmc/Makefile | 1 - sys/modules/mmcnull/Makefile | 1 - sys/modules/mmcsd/Makefile | 1 - sys/modules/mpi3mr/Makefile | 1 - sys/modules/mpr/Makefile | 1 - sys/modules/mps/Makefile | 1 - sys/modules/mpt/Makefile | 1 - sys/modules/mqueue/Makefile | 1 - sys/modules/mrsas/Makefile | 1 - sys/modules/mrsas/mrsas_linux/Makefile | 1 - sys/modules/msdosfs/Makefile | 1 - sys/modules/msdosfs_iconv/Makefile | 1 - sys/modules/msk/Makefile | 1 - sys/modules/mt76/Makefile | 1 - sys/modules/mt76/Makefile.inc | 1 - sys/modules/mt76/core/Makefile | 1 - sys/modules/mt76/mt7915/Makefile | 1 - sys/modules/mt76/mt7921/Makefile | 1 - sys/modules/mthca/Makefile | 1 - sys/modules/mvs/Makefile | 1 - sys/modules/mwl/Makefile | 1 - sys/modules/mwlfw/Makefile | 1 - sys/modules/mxge/Makefile | 1 - sys/modules/mxge/mxge/Makefile | 1 - sys/modules/mxge/mxge_eth_z8e/Makefile | 1 - sys/modules/mxge/mxge_ethp_z8e/Makefile | 1 - sys/modules/mxge/mxge_rss_eth_z8e/Makefile | 1 - sys/modules/mxge/mxge_rss_ethp_z8e/Makefile | 1 - sys/modules/my/Makefile | 1 - sys/modules/nctgpio/Makefile | 1 - sys/modules/ncthwm/Makefile | 1 - sys/modules/neta/Makefile | 1 - sys/modules/netgraph/Makefile | 1 - sys/modules/netgraph/Makefile.inc | 1 - sys/modules/netgraph/UI/Makefile | 1 - sys/modules/netgraph/async/Makefile | 1 - sys/modules/netgraph/bluetooth/Makefile | 1 - sys/modules/netgraph/bluetooth/Makefile.inc | 1 - sys/modules/netgraph/bluetooth/bluetooth/Makefile | 1 - sys/modules/netgraph/bluetooth/hci/Makefile | 1 - sys/modules/netgraph/bluetooth/l2cap/Makefile | 1 - sys/modules/netgraph/bluetooth/socket/Makefile | 1 - sys/modules/netgraph/bluetooth/ubt/Makefile | 1 - sys/modules/netgraph/bluetooth/ubtbcmfw/Makefile | 1 - sys/modules/netgraph/bpf/Makefile | 1 - sys/modules/netgraph/bridge/Makefile | 1 - sys/modules/netgraph/car/Makefile | 1 - sys/modules/netgraph/checksum/Makefile | 1 - sys/modules/netgraph/cisco/Makefile | 1 - sys/modules/netgraph/deflate/Makefile | 1 - sys/modules/netgraph/device/Makefile | 1 - sys/modules/netgraph/echo/Makefile | 1 - sys/modules/netgraph/eiface/Makefile | 1 - sys/modules/netgraph/etf/Makefile | 1 - sys/modules/netgraph/ether/Makefile | 1 - sys/modules/netgraph/ether_echo/Makefile | 1 - sys/modules/netgraph/frame_relay/Makefile | 1 - sys/modules/netgraph/gif/Makefile | 1 - sys/modules/netgraph/gif_demux/Makefile | 1 - sys/modules/netgraph/hole/Makefile | 1 - sys/modules/netgraph/hub/Makefile | 1 - sys/modules/netgraph/iface/Makefile | 1 - sys/modules/netgraph/ip_input/Makefile | 1 - sys/modules/netgraph/ipfw/Makefile | 1 - sys/modules/netgraph/ksocket/Makefile | 1 - sys/modules/netgraph/l2tp/Makefile | 1 - sys/modules/netgraph/lmi/Makefile | 1 - sys/modules/netgraph/macfilter/Makefile | 1 - sys/modules/netgraph/mppc/Makefile | 1 - sys/modules/netgraph/nat/Makefile | 1 - sys/modules/netgraph/netflow/Makefile | 1 - sys/modules/netgraph/netgraph/Makefile | 1 - sys/modules/netgraph/one2many/Makefile | 1 - sys/modules/netgraph/patch/Makefile | 1 - sys/modules/netgraph/pipe/Makefile | 1 - sys/modules/netgraph/ppp/Makefile | 1 - *** 14308 LINES SKIPPED *** From nobody Wed Aug 16 17:57:07 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RQwnf0mHPz4qvQC; Wed, 16 Aug 2023 17:57: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RQwnd6Z2Dz3Vck; Wed, 16 Aug 2023 17:57:09 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692208630; h=from:from:reply-to:subject:subject: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+IFgkqi90SDGZ1gq3ERJ2u1AmssuR8GL3rS7QjiOMU=; b=kXii+B8/QcCaGejrQWwxveRbJPACZN9bINroXibWf1qarVWAeKf1gQ/vCGTzml/cyPmWVi mHzdfe79GdxNOU5OQj7767Qs4ZmjtbIWU/qwtm89C+lI8UV+BBcyCaP/xw2fMYMevq9UFY yAAUTxIc6NADY3Hh8IYVUsy3yfTW9/aBwDgiWsww9YtniYkN3VFhq9MmHdUcv5JkwtHO8q gRrbEU+/ZVG1QZUbpzqqqXvVQ3WJl7hC/XF1bWODjAQ1bPC+kS87Rs60tgJJSSuHSAZxzB wvV97DWkWrGGYPXvma+BnETBo9S9mTvkfcKjhvP/FJdR2LuYpFy3lhWV+Mttig== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692208630; h=from:from:reply-to:subject:subject: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+IFgkqi90SDGZ1gq3ERJ2u1AmssuR8GL3rS7QjiOMU=; b=vBYB1J1ozpV4XBm9wsfsblLu9CdTHmcjQ4dMHAhejGW4iZzDrPAVxBjjd7tbpB90WWkOFd i1Uza59qgf8OdhgOOYU7+d04Cmgelg5XCc9OYZYVdT5WAqxTh3kHBHp9b44cw8FSh9viyb EnMGWS1PwHmvuDirleLamHTD8Sth12q4vbtuoc+SG0nknEmOomCbzYQTXK5c4DmnJpMMyX zzArzBym0lHkhyQU8nOMecPpcb9jm1acZAc5IFv8KNfNnIIxneWqjip28AeFmOm8y8e+Og jFvvSZPWUWZYaMiYuhvLLq0VQgBEvFyKhWsqITirfzqnmxHPh7kXq5RaCIEXKg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692208630; a=rsa-sha256; cv=none; b=oAEg1oeZykACu2wGTaJkkVClVrelnmYHcM7hiVJS0tEEEt4rhdUbb0SewuNZSBCuCTsCd1 tWRdLxHMTLGCf6PnpbTyfnDvx+gYaAkWY7ZaMxC5ZRpysxeEZJSeevTRHqqA+IAvodrBez JkhPf6+jK1fmDAG9IFmlmEAKg+sEXquFBWwuBoYDlTXeIv99d65frH0UJT+hv9aMUJODt7 IG/N/v9LAg9XKJTlDwnE2JNnnmUQ+9BZfuH1AxAutSxIPT36/miJmBTxigxW3bZ+3lCzrG ybjUSZYN7MuoZim1yrMZ0qcgASIdxDUxbQkuSPBqTOdvhDIKEojh6S2GflxMoQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RQwnd4sR5z11qc; Wed, 16 Aug 2023 17:57:09 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37GHv91q059606; Wed, 16 Aug 2023 17:57:09 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37GHv7Kk059593; Wed, 16 Aug 2023 17:57:07 GMT (envelope-from git) Date: Wed, 16 Aug 2023 17:57:07 GMT Message-Id: <202308161757.37GHv7Kk059593@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: d0b2dbfa0ecf - main - Remove $FreeBSD$: one-line sh pattern List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d0b2dbfa0ecf2bbc9709efc5e20baf8e4b44bbbf Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=d0b2dbfa0ecf2bbc9709efc5e20baf8e4b44bbbf commit d0b2dbfa0ecf2bbc9709efc5e20baf8e4b44bbbf Author: Warner Losh AuthorDate: 2023-08-16 17:55:03 +0000 Commit: Warner Losh CommitDate: 2023-08-16 17:55:03 +0000 Remove $FreeBSD$: one-line sh pattern Remove /^\s*#[#!]?\s*\$FreeBSD\$.*$\n/ --- .cirrus.yml | 1 - .clang-format | 1 - Makefile | 1 - Makefile.inc1 | 1 - Makefile.libcompat | 1 - Makefile.sys.inc | 1 - ObsoleteFiles.inc | 1 - bin/Makefile | 1 - bin/Makefile.inc | 1 - bin/cat/Makefile | 1 - bin/cat/Makefile.depend | 1 - bin/cat/tests/Makefile | 1 - bin/cat/tests/Makefile.depend | 1 - bin/chflags/Makefile | 1 - bin/chflags/Makefile.depend | 1 - bin/chflags/tests/Makefile | 1 - bin/chflags/tests/Makefile.depend | 1 - bin/chflags/tests/chflags_test.sh | 1 - bin/chio/Makefile | 1 - bin/chio/Makefile.depend | 1 - bin/chmod/Makefile | 1 - bin/chmod/Makefile.depend | 1 - bin/chmod/tests/Makefile | 1 - bin/chmod/tests/Makefile.depend | 1 - bin/chmod/tests/chmod_test.sh | 1 - bin/cp/Makefile | 1 - bin/cp/Makefile.depend | 1 - bin/cp/tests/Makefile | 1 - bin/cp/tests/cp_test.sh | 1 - bin/cpuset/Makefile | 1 - bin/cpuset/Makefile.depend | 1 - bin/csh/Makefile | 1 - bin/csh/Makefile.depend | 1 - bin/csh/csh.cshrc | 1 - bin/csh/csh.login | 1 - bin/csh/csh.logout | 1 - bin/csh/dot.cshrc | 1 - bin/csh/dot.login | 1 - bin/date/Makefile | 1 - bin/date/Makefile.depend | 1 - bin/date/tests/Makefile | 1 - bin/date/tests/Makefile.depend | 1 - bin/date/tests/format_string_test.sh | 1 - bin/dd/Makefile | 1 - bin/dd/Makefile.depend | 1 - bin/dd/tests/Makefile | 1 - bin/dd/tests/Makefile.depend | 1 - bin/df/Makefile | 1 - bin/df/Makefile.depend | 1 - bin/domainname/Makefile | 1 - bin/domainname/Makefile.depend | 1 - bin/echo/Makefile | 1 - bin/echo/Makefile.depend | 1 - bin/echo/tests/Makefile | 1 - bin/echo/tests/Makefile.depend | 1 - bin/echo/tests/echo_test.sh | 1 - bin/ed/Makefile | 1 - bin/ed/Makefile.depend | 1 - bin/ed/test/Makefile | 1 - bin/ed/test/README | 1 - bin/ed/test/ckscripts.sh | 1 - bin/ed/test/mkscripts.sh | 1 - bin/expr/Makefile | 1 - bin/expr/Makefile.depend | 1 - bin/expr/tests/Makefile | 1 - bin/expr/tests/Makefile.depend | 1 - bin/freebsd-version/Makefile | 1 - bin/freebsd-version/Makefile.depend | 1 - bin/freebsd-version/freebsd-version.sh.in | 1 - bin/getfacl/Makefile | 1 - bin/getfacl/Makefile.depend | 1 - bin/hostname/Makefile | 1 - bin/hostname/Makefile.depend | 1 - bin/kenv/Makefile | 1 - bin/kenv/Makefile.depend | 1 - bin/kill/Makefile | 1 - bin/kill/Makefile.depend | 1 - bin/ln/Makefile | 1 - bin/ln/Makefile.depend | 1 - bin/ln/tests/Makefile | 1 - bin/ln/tests/Makefile.depend | 1 - bin/ln/tests/ln_test.sh | 1 - bin/ls/Makefile | 1 - bin/ls/Makefile.depend | 1 - bin/ls/Makefile.depend.options | 1 - bin/ls/tests/Makefile | 1 - bin/ls/tests/Makefile.depend | 1 - bin/ls/tests/ls_tests.sh | 1 - bin/mkdir/Makefile | 1 - bin/mkdir/Makefile.depend | 1 - bin/mkdir/tests/Makefile | 1 - bin/mkdir/tests/Makefile.depend | 1 - bin/mkdir/tests/mkdir_test.sh | 1 - bin/mv/Makefile | 1 - bin/mv/Makefile.depend | 1 - bin/mv/tests/Makefile | 1 - bin/mv/tests/Makefile.depend | 1 - bin/mv/tests/legacy_test.sh | 1 - bin/pax/Makefile | 1 - bin/pax/Makefile.depend | 1 - bin/pax/tests/Makefile | 1 - bin/pax/tests/Makefile.depend | 1 - bin/pax/tests/legacy_test.pl | 1 - bin/pkill/Makefile | 1 - bin/pkill/Makefile.depend | 1 - bin/pkill/tests/Makefile | 1 - bin/pkill/tests/Makefile.depend | 1 - bin/pkill/tests/pgrep-_f_test.sh | 1 - bin/pkill/tests/pgrep-_g_test.sh | 1 - bin/pkill/tests/pgrep-_lf_test.sh | 1 - bin/pkill/tests/pgrep-_p_test.sh | 1 - bin/pkill/tests/pgrep-_s_test.sh | 1 - bin/pkill/tests/pgrep-_u_test.sh | 1 - bin/pkill/tests/pgrep-f_test.sh | 1 - bin/pkill/tests/pgrep-g_test.sh | 1 - bin/pkill/tests/pgrep-i_test.sh | 1 - bin/pkill/tests/pgrep-j_test.sh | 1 - bin/pkill/tests/pgrep-l_test.sh | 1 - bin/pkill/tests/pgrep-n_test.sh | 1 - bin/pkill/tests/pgrep-o_test.sh | 1 - bin/pkill/tests/pgrep-q_test.sh | 1 - bin/pkill/tests/pgrep-s_test.sh | 1 - bin/pkill/tests/pgrep-t_test.sh | 1 - bin/pkill/tests/pgrep-v_test.sh | 1 - bin/pkill/tests/pgrep-x_test.sh | 1 - bin/pkill/tests/pkill-_f_test.sh | 1 - bin/pkill/tests/pkill-_g_test.sh | 1 - bin/pkill/tests/pkill-_lf_test.sh | 1 - bin/pkill/tests/pkill-_p_test.sh | 1 - bin/pkill/tests/pkill-_u_test.sh | 1 - bin/pkill/tests/pkill-g_test.sh | 1 - bin/pkill/tests/pkill-i_test.sh | 1 - bin/pkill/tests/pkill-j_test.sh | 1 - bin/pkill/tests/pkill-s_test.sh | 1 - bin/pkill/tests/pkill-t_test.sh | 1 - bin/pkill/tests/pkill-x_test.sh | 1 - bin/ps/Makefile | 1 - bin/ps/Makefile.depend | 1 - bin/pwait/Makefile | 1 - bin/pwait/Makefile.depend | 1 - bin/pwait/tests/Makefile | 1 - bin/pwait/tests/Makefile.depend | 1 - bin/pwait/tests/pwait_test.sh | 1 - bin/pwd/Makefile | 1 - bin/pwd/Makefile.depend | 1 - bin/realpath/Makefile | 1 - bin/realpath/Makefile.depend | 1 - bin/rm/Makefile | 1 - bin/rm/Makefile.depend | 1 - bin/rm/tests/Makefile | 1 - bin/rm/tests/Makefile.depend | 1 - bin/rm/tests/rm_test.sh | 1 - bin/rmail/Makefile | 1 - bin/rmail/Makefile.depend | 1 - bin/rmdir/Makefile | 1 - bin/rmdir/Makefile.depend | 1 - bin/rmdir/tests/Makefile | 1 - bin/rmdir/tests/Makefile.depend | 1 - bin/rmdir/tests/rmdir_test.sh | 1 - bin/setfacl/Makefile | 1 - bin/setfacl/Makefile.depend | 1 - bin/sh/Makefile | 1 - bin/sh/Makefile.depend | 1 - bin/sh/TOUR | 1 - bin/sh/builtins.def | 1 - bin/sh/dot.profile | 1 - bin/sh/dot.shrc | 1 - bin/sh/funcs/cmv | 1 - bin/sh/funcs/dirs | 1 - bin/sh/funcs/login | 1 - bin/sh/funcs/newgrp | 1 - bin/sh/funcs/popd | 1 - bin/sh/funcs/pushd | 1 - bin/sh/funcs/suspend | 1 - bin/sh/mkbuiltins | 1 - bin/sh/mktokens | 1 - bin/sh/nodetypes | 1 - bin/sh/profile | 1 - bin/sh/tests/Makefile | 1 - bin/sh/tests/Makefile.depend | 1 - bin/sh/tests/builtins/Makefile | 1 - bin/sh/tests/builtins/Makefile.depend | 1 - bin/sh/tests/builtins/alias.0 | 1 - bin/sh/tests/builtins/alias.1 | 1 - bin/sh/tests/builtins/alias3.0 | 1 - bin/sh/tests/builtins/alias4.0 | 1 - bin/sh/tests/builtins/break1.0 | 1 - bin/sh/tests/builtins/break2.0 | 1 - bin/sh/tests/builtins/break3.0 | 1 - bin/sh/tests/builtins/break4.4 | 1 - bin/sh/tests/builtins/break5.4 | 1 - bin/sh/tests/builtins/break6.0 | 1 - bin/sh/tests/builtins/builtin1.0 | 1 - bin/sh/tests/builtins/case1.0 | 1 - bin/sh/tests/builtins/case10.0 | 1 - bin/sh/tests/builtins/case11.0 | 1 - bin/sh/tests/builtins/case12.0 | 1 - bin/sh/tests/builtins/case13.0 | 1 - bin/sh/tests/builtins/case14.0 | 1 - bin/sh/tests/builtins/case15.0 | 1 - bin/sh/tests/builtins/case16.0 | 1 - bin/sh/tests/builtins/case17.0 | 1 - bin/sh/tests/builtins/case18.0 | 1 - bin/sh/tests/builtins/case19.0 | 1 - bin/sh/tests/builtins/case2.0 | 1 - bin/sh/tests/builtins/case20.0 | 1 - bin/sh/tests/builtins/case21.0 | 1 - bin/sh/tests/builtins/case22.0 | 1 - bin/sh/tests/builtins/case23.0 | 1 - bin/sh/tests/builtins/case3.0 | 1 - bin/sh/tests/builtins/case4.0 | 1 - bin/sh/tests/builtins/case5.0 | 1 - bin/sh/tests/builtins/case6.0 | 1 - bin/sh/tests/builtins/case7.0 | 1 - bin/sh/tests/builtins/case8.0 | 1 - bin/sh/tests/builtins/case9.0 | 1 - bin/sh/tests/builtins/cd1.0 | 1 - bin/sh/tests/builtins/cd10.0 | 1 - bin/sh/tests/builtins/cd11.0 | 1 - bin/sh/tests/builtins/cd2.0 | 1 - bin/sh/tests/builtins/cd3.0 | 1 - bin/sh/tests/builtins/cd4.0 | 1 - bin/sh/tests/builtins/cd5.0 | 1 - bin/sh/tests/builtins/cd6.0 | 1 - bin/sh/tests/builtins/cd7.0 | 1 - bin/sh/tests/builtins/cd8.0 | 1 - bin/sh/tests/builtins/cd9.0 | 1 - bin/sh/tests/builtins/command1.0 | 1 - bin/sh/tests/builtins/command10.0 | 1 - bin/sh/tests/builtins/command11.0 | 1 - bin/sh/tests/builtins/command12.0 | 1 - bin/sh/tests/builtins/command13.0 | 1 - bin/sh/tests/builtins/command14.0 | 1 - bin/sh/tests/builtins/command2.0 | 1 - bin/sh/tests/builtins/command3.0 | 1 - bin/sh/tests/builtins/command4.0 | 1 - bin/sh/tests/builtins/command5.0 | 1 - bin/sh/tests/builtins/command6.0 | 1 - bin/sh/tests/builtins/command7.0 | 1 - bin/sh/tests/builtins/command8.0 | 1 - bin/sh/tests/builtins/command9.0 | 1 - bin/sh/tests/builtins/dot1.0 | 1 - bin/sh/tests/builtins/dot2.0 | 1 - bin/sh/tests/builtins/dot3.0 | 1 - bin/sh/tests/builtins/dot4.0 | 1 - bin/sh/tests/builtins/echo1.0 | 1 - bin/sh/tests/builtins/echo2.0 | 1 - bin/sh/tests/builtins/echo3.0 | 1 - bin/sh/tests/builtins/eval1.0 | 1 - bin/sh/tests/builtins/eval2.0 | 1 - bin/sh/tests/builtins/eval3.0 | 1 - bin/sh/tests/builtins/eval4.0 | 1 - bin/sh/tests/builtins/eval5.0 | 1 - bin/sh/tests/builtins/eval6.0 | 1 - bin/sh/tests/builtins/eval7.0 | 1 - bin/sh/tests/builtins/eval8.7 | 1 - bin/sh/tests/builtins/exec1.0 | 1 - bin/sh/tests/builtins/exec2.0 | 1 - bin/sh/tests/builtins/exit1.0 | 1 - bin/sh/tests/builtins/exit2.8 | 1 - bin/sh/tests/builtins/exit3.0 | 1 - bin/sh/tests/builtins/export1.0 | 1 - bin/sh/tests/builtins/fc1.0 | 1 - bin/sh/tests/builtins/fc2.0 | 1 - bin/sh/tests/builtins/for1.0 | 1 - bin/sh/tests/builtins/for2.0 | 1 - bin/sh/tests/builtins/for3.0 | 1 - bin/sh/tests/builtins/getopts1.0 | 1 - bin/sh/tests/builtins/getopts10.0 | 1 - bin/sh/tests/builtins/getopts2.0 | 1 - bin/sh/tests/builtins/getopts3.0 | 1 - bin/sh/tests/builtins/getopts4.0 | 1 - bin/sh/tests/builtins/getopts5.0 | 1 - bin/sh/tests/builtins/getopts6.0 | 1 - bin/sh/tests/builtins/getopts7.0 | 1 - bin/sh/tests/builtins/getopts8.0 | 1 - bin/sh/tests/builtins/getopts9.0 | 1 - bin/sh/tests/builtins/hash1.0 | 1 - bin/sh/tests/builtins/hash2.0 | 1 - bin/sh/tests/builtins/hash3.0 | 1 - bin/sh/tests/builtins/hash4.0 | 1 - bin/sh/tests/builtins/jobid1.0 | 1 - bin/sh/tests/builtins/jobid2.0 | 1 - bin/sh/tests/builtins/kill1.0 | 1 - bin/sh/tests/builtins/kill2.0 | 1 - bin/sh/tests/builtins/lineno.0 | 1 - bin/sh/tests/builtins/lineno2.0 | 1 - bin/sh/tests/builtins/lineno3.0 | 1 - bin/sh/tests/builtins/local1.0 | 1 - bin/sh/tests/builtins/local2.0 | 1 - bin/sh/tests/builtins/local3.0 | 1 - bin/sh/tests/builtins/local4.0 | 1 - bin/sh/tests/builtins/local5.0 | 1 - bin/sh/tests/builtins/local6.0 | 1 - bin/sh/tests/builtins/local7.0 | 1 - bin/sh/tests/builtins/locale1.0 | 1 - bin/sh/tests/builtins/locale2.0 | 1 - bin/sh/tests/builtins/printf1.0 | 1 - bin/sh/tests/builtins/printf2.0 | 1 - bin/sh/tests/builtins/printf3.0 | 1 - bin/sh/tests/builtins/printf4.0 | 1 - bin/sh/tests/builtins/read1.0 | 1 - bin/sh/tests/builtins/read2.0 | 1 - bin/sh/tests/builtins/read3.0 | 1 - bin/sh/tests/builtins/read4.0 | 1 - bin/sh/tests/builtins/read5.0 | 1 - bin/sh/tests/builtins/read6.0 | 1 - bin/sh/tests/builtins/read7.0 | 1 - bin/sh/tests/builtins/read8.0 | 1 - bin/sh/tests/builtins/read9.0 | 1 - bin/sh/tests/builtins/return1.0 | 1 - bin/sh/tests/builtins/return2.1 | 1 - bin/sh/tests/builtins/return3.1 | 1 - bin/sh/tests/builtins/return4.0 | 1 - bin/sh/tests/builtins/return5.0 | 1 - bin/sh/tests/builtins/return6.4 | 1 - bin/sh/tests/builtins/return7.4 | 1 - bin/sh/tests/builtins/return8.0 | 1 - bin/sh/tests/builtins/set1.0 | 1 - bin/sh/tests/builtins/set2.0 | 1 - bin/sh/tests/builtins/set3.0 | 1 - bin/sh/tests/builtins/trap1.0 | 1 - bin/sh/tests/builtins/trap10.0 | 1 - bin/sh/tests/builtins/trap11.0 | 1 - bin/sh/tests/builtins/trap12.0 | 1 - bin/sh/tests/builtins/trap13.0 | 1 - bin/sh/tests/builtins/trap14.0 | 1 - bin/sh/tests/builtins/trap15.0 | 1 - bin/sh/tests/builtins/trap16.0 | 1 - bin/sh/tests/builtins/trap17.0 | 1 - bin/sh/tests/builtins/trap2.0 | 1 - bin/sh/tests/builtins/trap3.0 | 1 - bin/sh/tests/builtins/trap4.0 | 1 - bin/sh/tests/builtins/trap5.0 | 1 - bin/sh/tests/builtins/trap6.0 | 1 - bin/sh/tests/builtins/trap7.0 | 1 - bin/sh/tests/builtins/trap8.0 | 1 - bin/sh/tests/builtins/trap9.0 | 1 - bin/sh/tests/builtins/type1.0 | 1 - bin/sh/tests/builtins/type2.0 | 1 - bin/sh/tests/builtins/type3.0 | 1 - bin/sh/tests/builtins/type4.0 | 1 - bin/sh/tests/builtins/unalias.0 | 1 - bin/sh/tests/builtins/var-assign.0 | 1 - bin/sh/tests/builtins/var-assign2.0 | 1 - bin/sh/tests/builtins/wait1.0 | 1 - bin/sh/tests/builtins/wait10.0 | 1 - bin/sh/tests/builtins/wait2.0 | 1 - bin/sh/tests/builtins/wait3.0 | 1 - bin/sh/tests/builtins/wait4.0 | 1 - bin/sh/tests/builtins/wait5.0 | 1 - bin/sh/tests/builtins/wait6.0 | 1 - bin/sh/tests/builtins/wait7.0 | 1 - bin/sh/tests/builtins/wait8.0 | 1 - bin/sh/tests/builtins/wait9.127 | 1 - bin/sh/tests/errors/Makefile | 1 - bin/sh/tests/errors/Makefile.depend | 1 - bin/sh/tests/errors/assignment-error1.0 | 1 - bin/sh/tests/errors/assignment-error2.0 | 1 - bin/sh/tests/errors/backquote-error1.0 | 1 - bin/sh/tests/errors/backquote-error2.0 | 1 - bin/sh/tests/errors/bad-binary1.126 | 1 - bin/sh/tests/errors/bad-keyword1.0 | 1 - bin/sh/tests/errors/bad-parm-exp1.0 | 1 - bin/sh/tests/errors/bad-parm-exp2.2 | 1 - bin/sh/tests/errors/bad-parm-exp3.2 | 1 - bin/sh/tests/errors/bad-parm-exp4.2 | 1 - bin/sh/tests/errors/bad-parm-exp5.2 | 1 - bin/sh/tests/errors/bad-parm-exp6.2 | 1 - bin/sh/tests/errors/bad-parm-exp7.0 | 1 - bin/sh/tests/errors/bad-parm-exp8.0 | 1 - bin/sh/tests/errors/option-error.0 | 1 - bin/sh/tests/errors/redirection-error.0 | 1 - bin/sh/tests/errors/redirection-error2.2 | 1 - bin/sh/tests/errors/redirection-error3.0 | 1 - bin/sh/tests/errors/redirection-error4.0 | 1 - bin/sh/tests/errors/redirection-error5.0 | 1 - bin/sh/tests/errors/redirection-error6.0 | 1 - bin/sh/tests/errors/redirection-error7.0 | 1 - bin/sh/tests/errors/redirection-error8.0 | 1 - bin/sh/tests/errors/script-error1.0 | 1 - bin/sh/tests/errors/write-error1.0 | 1 - bin/sh/tests/execution/Makefile | 1 - bin/sh/tests/execution/Makefile.depend | 1 - bin/sh/tests/execution/bg1.0 | 1 - bin/sh/tests/execution/bg10.0 | 1 - bin/sh/tests/execution/bg11.0 | 1 - bin/sh/tests/execution/bg12.0 | 1 - bin/sh/tests/execution/bg13.0 | 1 - bin/sh/tests/execution/bg2.0 | 1 - bin/sh/tests/execution/bg3.0 | 1 - bin/sh/tests/execution/bg4.0 | 1 - bin/sh/tests/execution/bg5.0 | 1 - bin/sh/tests/execution/bg6.0 | 1 - bin/sh/tests/execution/bg7.0 | 1 - bin/sh/tests/execution/bg8.0 | 1 - bin/sh/tests/execution/bg9.0 | 1 - bin/sh/tests/execution/env1.0 | 1 - bin/sh/tests/execution/fork1.0 | 1 - bin/sh/tests/execution/fork2.0 | 1 - bin/sh/tests/execution/fork3.0 | 1 - bin/sh/tests/execution/func1.0 | 1 - bin/sh/tests/execution/func2.0 | 1 - bin/sh/tests/execution/func3.0 | 1 - bin/sh/tests/execution/hash1.0 | 1 - bin/sh/tests/execution/int-cmd1.0 | 1 - bin/sh/tests/execution/killed1.0 | 1 - bin/sh/tests/execution/killed2.0 | 1 - bin/sh/tests/execution/not1.0 | 1 - bin/sh/tests/execution/not2.0 | 1 - bin/sh/tests/execution/path1.0 | 1 - bin/sh/tests/execution/pipefail1.0 | 1 - bin/sh/tests/execution/pipefail2.42 | 1 - bin/sh/tests/execution/pipefail3.42 | 1 - bin/sh/tests/execution/pipefail4.42 | 1 - bin/sh/tests/execution/pipefail5.42 | 1 - bin/sh/tests/execution/pipefail6.42 | 1 - bin/sh/tests/execution/pipefail7.0 | 1 - bin/sh/tests/execution/redir1.0 | 1 - bin/sh/tests/execution/redir2.0 | 1 - bin/sh/tests/execution/redir3.0 | 1 - bin/sh/tests/execution/redir4.0 | 1 - bin/sh/tests/execution/redir5.0 | 1 - bin/sh/tests/execution/redir6.0 | 1 - bin/sh/tests/execution/redir7.0 | 1 - bin/sh/tests/execution/set-C1.0 | 1 - bin/sh/tests/execution/set-n1.0 | 1 - bin/sh/tests/execution/set-n2.0 | 1 - bin/sh/tests/execution/set-n3.0 | 1 - bin/sh/tests/execution/set-n4.0 | 1 - bin/sh/tests/execution/set-x1.0 | 1 - bin/sh/tests/execution/set-x2.0 | 1 - bin/sh/tests/execution/set-x3.0 | 1 - bin/sh/tests/execution/set-x4.0 | 1 - bin/sh/tests/execution/shellproc1.0 | 1 - bin/sh/tests/execution/shellproc2.0 | 1 - bin/sh/tests/execution/shellproc3.0 | 1 - bin/sh/tests/execution/shellproc4.0 | 1 - bin/sh/tests/execution/shellproc5.0 | 1 - bin/sh/tests/execution/shellproc6.0 | 1 - bin/sh/tests/execution/shellproc7.0 | 1 - bin/sh/tests/execution/subshell1.0 | 1 - bin/sh/tests/execution/subshell2.0 | 1 - bin/sh/tests/execution/subshell3.0 | 1 - bin/sh/tests/execution/subshell4.0 | 1 - bin/sh/tests/execution/unknown1.0 | 1 - bin/sh/tests/execution/unknown2.0 | 1 - bin/sh/tests/execution/var-assign1.0 | 1 - bin/sh/tests/expansion/Makefile | 1 - bin/sh/tests/expansion/Makefile.depend | 1 - bin/sh/tests/expansion/arith1.0 | 1 - bin/sh/tests/expansion/arith10.0 | 1 - bin/sh/tests/expansion/arith11.0 | 1 - bin/sh/tests/expansion/arith12.0 | 1 - bin/sh/tests/expansion/arith13.0 | 1 - bin/sh/tests/expansion/arith14.0 | 1 - bin/sh/tests/expansion/arith15.0 | 1 - bin/sh/tests/expansion/arith16.0 | 1 - bin/sh/tests/expansion/arith17.0 | 1 - bin/sh/tests/expansion/arith2.0 | 1 - bin/sh/tests/expansion/arith3.0 | 1 - bin/sh/tests/expansion/arith4.0 | 1 - bin/sh/tests/expansion/arith5.0 | 1 - bin/sh/tests/expansion/arith6.0 | 1 - bin/sh/tests/expansion/arith7.0 | 1 - bin/sh/tests/expansion/arith8.0 | 1 - bin/sh/tests/expansion/arith9.0 | 1 - bin/sh/tests/expansion/assign1.0 | 1 - bin/sh/tests/expansion/cmdsubst1.0 | 1 - bin/sh/tests/expansion/cmdsubst10.0 | 1 - bin/sh/tests/expansion/cmdsubst11.0 | 1 - bin/sh/tests/expansion/cmdsubst12.0 | 1 - bin/sh/tests/expansion/cmdsubst13.0 | 1 - bin/sh/tests/expansion/cmdsubst14.0 | 1 - bin/sh/tests/expansion/cmdsubst15.0 | 1 - bin/sh/tests/expansion/cmdsubst16.0 | 1 - bin/sh/tests/expansion/cmdsubst17.0 | 1 - bin/sh/tests/expansion/cmdsubst18.0 | 1 - bin/sh/tests/expansion/cmdsubst19.0 | 1 - bin/sh/tests/expansion/cmdsubst2.0 | 1 - bin/sh/tests/expansion/cmdsubst20.0 | 1 - bin/sh/tests/expansion/cmdsubst21.0 | 1 - bin/sh/tests/expansion/cmdsubst22.0 | 1 - bin/sh/tests/expansion/cmdsubst23.0 | 1 - bin/sh/tests/expansion/cmdsubst24.0 | 1 - bin/sh/tests/expansion/cmdsubst25.0 | 1 - bin/sh/tests/expansion/cmdsubst26.0 | 1 - bin/sh/tests/expansion/cmdsubst3.0 | 1 - bin/sh/tests/expansion/cmdsubst4.0 | 1 - bin/sh/tests/expansion/cmdsubst5.0 | 1 - bin/sh/tests/expansion/cmdsubst6.0 | 1 - bin/sh/tests/expansion/cmdsubst7.0 | 1 - bin/sh/tests/expansion/cmdsubst8.0 | 1 - bin/sh/tests/expansion/cmdsubst9.0 | 1 - bin/sh/tests/expansion/export1.0 | 1 - bin/sh/tests/expansion/export2.0 | 1 - bin/sh/tests/expansion/export3.0 | 1 - bin/sh/tests/expansion/heredoc1.0 | 1 - bin/sh/tests/expansion/heredoc2.0 | 1 - bin/sh/tests/expansion/ifs1.0 | 1 - bin/sh/tests/expansion/ifs2.0 | 1 - bin/sh/tests/expansion/ifs3.0 | 1 - bin/sh/tests/expansion/ifs4.0 | 1 - bin/sh/tests/expansion/ifs5.0 | 1 - bin/sh/tests/expansion/ifs6.0 | 1 - bin/sh/tests/expansion/ifs7.0 | 1 - bin/sh/tests/expansion/length1.0 | 1 - bin/sh/tests/expansion/length2.0 | 1 - bin/sh/tests/expansion/length3.0 | 1 - bin/sh/tests/expansion/length4.0 | 1 - bin/sh/tests/expansion/length5.0 | 1 - bin/sh/tests/expansion/length6.0 | 1 - bin/sh/tests/expansion/length7.0 | 1 - bin/sh/tests/expansion/length8.0 | 1 - bin/sh/tests/expansion/local1.0 | 1 - bin/sh/tests/expansion/local2.0 | 1 - bin/sh/tests/expansion/pathname1.0 | 1 - bin/sh/tests/expansion/pathname2.0 | 1 - bin/sh/tests/expansion/pathname3.0 | 1 - bin/sh/tests/expansion/pathname4.0 | 1 - bin/sh/tests/expansion/pathname5.0 | 1 - bin/sh/tests/expansion/pathname6.0 | 1 - bin/sh/tests/expansion/plus-minus1.0 | 1 - bin/sh/tests/expansion/plus-minus2.0 | 1 - bin/sh/tests/expansion/plus-minus3.0 | 1 - bin/sh/tests/expansion/plus-minus4.0 | 1 - bin/sh/tests/expansion/plus-minus5.0 | 1 - bin/sh/tests/expansion/plus-minus6.0 | 1 - bin/sh/tests/expansion/plus-minus7.0 | 1 - bin/sh/tests/expansion/plus-minus8.0 | 1 - bin/sh/tests/expansion/plus-minus9.0 | 1 - bin/sh/tests/expansion/question1.0 | 1 - bin/sh/tests/expansion/question2.0 | 1 - bin/sh/tests/expansion/readonly1.0 | 1 - bin/sh/tests/expansion/redir1.0 | 1 - bin/sh/tests/expansion/set-u1.0 | 1 - bin/sh/tests/expansion/set-u2.0 | 1 - bin/sh/tests/expansion/set-u3.0 | 1 - bin/sh/tests/expansion/tilde1.0 | 1 - bin/sh/tests/expansion/tilde2.0 | 1 - bin/sh/tests/expansion/trim1.0 | 1 - bin/sh/tests/expansion/trim10.0 | 1 - bin/sh/tests/expansion/trim11.0 | 1 - bin/sh/tests/expansion/trim2.0 | 1 - bin/sh/tests/expansion/trim3.0 | 1 - bin/sh/tests/expansion/trim4.0 | 1 - bin/sh/tests/expansion/trim5.0 | 1 - bin/sh/tests/expansion/trim6.0 | 1 - bin/sh/tests/expansion/trim7.0 | 1 - bin/sh/tests/expansion/trim8.0 | 1 - bin/sh/tests/expansion/trim9.0 | 1 - bin/sh/tests/functional_test.sh | 1 - bin/sh/tests/invocation/Makefile | 1 - bin/sh/tests/invocation/Makefile.depend | 1 - bin/sh/tests/invocation/sh-ac1.0 | 1 - bin/sh/tests/invocation/sh-c-missing1.0 | 1 - bin/sh/tests/invocation/sh-c1.0 | 1 - bin/sh/tests/invocation/sh-ca1.0 | 1 - bin/sh/tests/invocation/sh-fca1.0 | 1 - bin/sh/tests/parameters/Makefile | 1 - bin/sh/tests/parameters/Makefile.depend | 1 - bin/sh/tests/parameters/env1.0 | 1 - bin/sh/tests/parameters/exitstatus1.0 | 1 - bin/sh/tests/parameters/ifs1.0 | 1 - bin/sh/tests/parameters/mail1.0 | 1 - bin/sh/tests/parameters/mail2.0 | 1 - bin/sh/tests/parameters/optind1.0 | 1 - bin/sh/tests/parameters/optind2.0 | 1 - bin/sh/tests/parameters/positional1.0 | 1 - bin/sh/tests/parameters/positional2.0 | 1 - bin/sh/tests/parameters/positional3.0 | 1 - bin/sh/tests/parameters/positional4.0 | 1 - bin/sh/tests/parameters/positional5.0 | 1 - bin/sh/tests/parameters/positional6.0 | 1 - bin/sh/tests/parameters/positional7.0 | 1 - bin/sh/tests/parameters/positional8.0 | 1 - bin/sh/tests/parameters/positional9.0 | 1 - bin/sh/tests/parameters/pwd1.0 | 1 - bin/sh/tests/parameters/pwd2.0 | 1 - bin/sh/tests/parser/Makefile | 1 - bin/sh/tests/parser/Makefile.depend | 1 - bin/sh/tests/parser/alias1.0 | 1 - bin/sh/tests/parser/alias10.0 | 1 - bin/sh/tests/parser/alias11.0 | 1 - bin/sh/tests/parser/alias12.0 | 1 - bin/sh/tests/parser/alias13.0 | 1 - bin/sh/tests/parser/alias14.0 | 1 - bin/sh/tests/parser/alias15.0 | 1 - bin/sh/tests/parser/alias16.0 | 1 - bin/sh/tests/parser/alias17.0 | 1 - bin/sh/tests/parser/alias18.0 | 1 - bin/sh/tests/parser/alias19.0 | 1 - bin/sh/tests/parser/alias2.0 | 1 - bin/sh/tests/parser/alias20.0 | 1 - bin/sh/tests/parser/alias3.0 | 1 - bin/sh/tests/parser/alias4.0 | 1 - bin/sh/tests/parser/alias5.0 | 1 - bin/sh/tests/parser/alias6.0 | 1 - bin/sh/tests/parser/alias7.0 | 1 - bin/sh/tests/parser/alias8.0 | 1 - bin/sh/tests/parser/alias9.0 | 1 - bin/sh/tests/parser/and-pipe-not.0 | 1 - bin/sh/tests/parser/case1.0 | 1 - bin/sh/tests/parser/case2.0 | 1 - bin/sh/tests/parser/comment1.0 | 1 - bin/sh/tests/parser/comment2.42 | 1 - bin/sh/tests/parser/dollar-quote1.0 | 1 - bin/sh/tests/parser/dollar-quote10.0 | 1 - bin/sh/tests/parser/dollar-quote11.0 | 1 - bin/sh/tests/parser/dollar-quote12.0 | 1 - bin/sh/tests/parser/dollar-quote13.0 | 1 - bin/sh/tests/parser/dollar-quote2.0 | 1 - bin/sh/tests/parser/dollar-quote3.0 | 1 - bin/sh/tests/parser/dollar-quote4.0 | 1 - bin/sh/tests/parser/dollar-quote5.0 | 1 - bin/sh/tests/parser/dollar-quote6.0 | 1 - bin/sh/tests/parser/dollar-quote7.0 | 1 - bin/sh/tests/parser/dollar-quote8.0 | 1 - bin/sh/tests/parser/dollar-quote9.0 | 1 - bin/sh/tests/parser/empty-braces1.0 | 1 - bin/sh/tests/parser/empty-cmd1.0 | 1 - bin/sh/tests/parser/for1.0 | 1 - bin/sh/tests/parser/for2.0 | 1 - bin/sh/tests/parser/func1.0 | 1 - bin/sh/tests/parser/func2.0 | 1 - bin/sh/tests/parser/func3.0 | 1 - bin/sh/tests/parser/heredoc1.0 | 1 - bin/sh/tests/parser/heredoc10.0 | 1 - bin/sh/tests/parser/heredoc11.0 | 1 - bin/sh/tests/parser/heredoc12.0 | 1 - bin/sh/tests/parser/heredoc13.0 | 1 - bin/sh/tests/parser/heredoc2.0 | 1 - bin/sh/tests/parser/heredoc3.0 | 1 - bin/sh/tests/parser/heredoc4.0 | 1 - bin/sh/tests/parser/heredoc5.0 | 1 - bin/sh/tests/parser/heredoc6.0 | 1 - bin/sh/tests/parser/heredoc7.0 | 1 - bin/sh/tests/parser/heredoc8.0 | 1 - bin/sh/tests/parser/heredoc9.0 | 1 - bin/sh/tests/parser/line-cont1.0 | 1 - bin/sh/tests/parser/line-cont10.0 | 1 - bin/sh/tests/parser/line-cont11.0 | 1 - bin/sh/tests/parser/line-cont12.0 | 1 - bin/sh/tests/parser/line-cont2.0 | 1 - bin/sh/tests/parser/line-cont3.0 | 1 - bin/sh/tests/parser/line-cont4.0 | 1 - bin/sh/tests/parser/line-cont5.0 | 1 - bin/sh/tests/parser/line-cont6.0 | 1 - bin/sh/tests/parser/line-cont7.0 | 1 - bin/sh/tests/parser/line-cont8.0 | 1 - bin/sh/tests/parser/line-cont9.0 | 1 - bin/sh/tests/parser/no-space1.0 | 1 - bin/sh/tests/parser/no-space2.0 | 1 - bin/sh/tests/parser/nul1.0 | 1 - bin/sh/tests/parser/only-redir1.0 | 1 - bin/sh/tests/parser/only-redir2.0 | 1 - bin/sh/tests/parser/only-redir3.0 | 1 - bin/sh/tests/parser/only-redir4.0 | 1 - bin/sh/tests/parser/pipe-not1.0 | 1 - bin/sh/tests/parser/set-v1.0 | 1 - bin/sh/tests/parser/var-assign1.0 | 1 - bin/sh/tests/set-e/Makefile | 1 - bin/sh/tests/set-e/Makefile.depend | 1 - bin/sh/tests/set-e/and1.0 | 1 - bin/sh/tests/set-e/and2.1 | 1 - bin/sh/tests/set-e/and3.0 | 1 - bin/sh/tests/set-e/and4.0 | 1 - bin/sh/tests/set-e/background1.0 | 1 - bin/sh/tests/set-e/cmd1.0 | 1 - bin/sh/tests/set-e/cmd2.1 | 1 - bin/sh/tests/set-e/elif1.0 | 1 - bin/sh/tests/set-e/elif2.0 | 1 - bin/sh/tests/set-e/eval1.0 | 1 - bin/sh/tests/set-e/eval2.1 | 1 - bin/sh/tests/set-e/for1.0 | 1 - bin/sh/tests/set-e/func1.0 | 1 - bin/sh/tests/set-e/func2.1 | 1 - bin/sh/tests/set-e/if1.0 | 1 - bin/sh/tests/set-e/if2.0 | 1 - bin/sh/tests/set-e/if3.0 | 1 - bin/sh/tests/set-e/not1.0 | 1 - bin/sh/tests/set-e/not2.0 | 1 - bin/sh/tests/set-e/or1.0 | 1 - bin/sh/tests/set-e/or2.0 | 1 - bin/sh/tests/set-e/or3.1 | 1 - bin/sh/tests/set-e/pipe1.1 | 1 - bin/sh/tests/set-e/pipe2.0 | 1 - bin/sh/tests/set-e/return1.0 | 1 - bin/sh/tests/set-e/semi1.1 | 1 - bin/sh/tests/set-e/semi2.1 | 1 - bin/sh/tests/set-e/subshell1.0 | 1 - bin/sh/tests/set-e/subshell2.1 | 1 - bin/sh/tests/set-e/until1.0 | 1 - bin/sh/tests/set-e/until2.0 | 1 - bin/sh/tests/set-e/until3.0 | 1 - bin/sh/tests/set-e/while1.0 | 1 - bin/sh/tests/set-e/while2.0 | 1 - bin/sh/tests/set-e/while3.0 | 1 - bin/sleep/Makefile | 1 - bin/sleep/Makefile.depend | 1 - bin/sleep/tests/Makefile | 1 - bin/sleep/tests/Makefile.depend | 1 - bin/stty/Makefile | 1 - bin/stty/Makefile.depend | 1 - bin/sync/Makefile | 1 - bin/sync/Makefile.depend | 1 - bin/test/Makefile | 1 - bin/test/Makefile.depend | 1 - bin/test/tests/Makefile | 1 - bin/test/tests/Makefile.depend | 1 - bin/test/tests/legacy_test.sh | 1 - bin/tests/Makefile | 1 - bin/tests/Makefile.depend | 1 - bin/timeout/Makefile | 1 - bin/timeout/Makefile.depend | 1 - bin/timeout/tests/Makefile | 1 - bin/timeout/tests/Makefile.depend | 1 - bin/timeout/tests/timeout_test.sh | 1 - bin/uuidgen/Makefile | 1 - bin/uuidgen/Makefile.depend | 1 - cddl/Makefile | 1 - cddl/Makefile.inc | 1 - cddl/lib/Makefile | 1 - cddl/lib/Makefile.inc | 1 - cddl/lib/drti/Makefile | 1 - cddl/lib/drti/Makefile.depend | 1 - cddl/lib/libavl/Makefile | 1 - cddl/lib/libavl/Makefile.depend | 1 - cddl/lib/libctf/Makefile | 1 - cddl/lib/libctf/Makefile.depend | 1 - cddl/lib/libdtrace/Makefile | 1 - cddl/lib/libdtrace/Makefile.depend | 1 - cddl/lib/libicp/Makefile | 1 - cddl/lib/libicp_rescue/Makefile | 1 - cddl/lib/libnvpair/Makefile | 1 - cddl/lib/libnvpair/Makefile.depend | 1 - cddl/lib/libspl/Makefile | 1 - cddl/lib/libtpool/Makefile | 1 - cddl/lib/libumem/Makefile | 1 - cddl/lib/libumem/Makefile.depend | 1 - cddl/lib/libuutil/Makefile | 1 - cddl/lib/libuutil/Makefile.depend | 1 - cddl/lib/libzfs/Makefile | 1 - cddl/lib/libzfs/Makefile.depend | 1 - cddl/lib/libzfs_core/Makefile | 1 - cddl/lib/libzfs_core/Makefile.depend | 1 - cddl/lib/libzfsbootenv/Makefile | 1 - cddl/lib/libzpool/Makefile | 1 - cddl/lib/libzpool/Makefile.depend | 1 - cddl/lib/libzutil/Makefile | 1 - cddl/lib/tests/Makefile | 1 - cddl/lib/tests/Makefile.depend | 1 - cddl/sbin/Makefile | 1 - cddl/sbin/Makefile.inc | 1 - cddl/sbin/tests/Makefile | 1 - cddl/sbin/tests/Makefile.depend | 1 - cddl/sbin/zfs/Makefile | 1 - cddl/sbin/zfs/Makefile.depend | 1 - cddl/sbin/zpool/Makefile | 1 - cddl/sbin/zpool/Makefile.depend | 1 - cddl/share/Makefile | 1 - cddl/share/zfs/Makefile | 1 - cddl/share/zfs/compatibility.d/Makefile | 1 - cddl/tests/Makefile | 1 - cddl/tests/Makefile.depend | 1 - cddl/usr.bin/Makefile | 1 - cddl/usr.bin/Makefile.inc | 1 - cddl/usr.bin/ctfconvert/Makefile | 1 - cddl/usr.bin/ctfconvert/Makefile.depend | 1 - cddl/usr.bin/ctfconvert/tests/Makefile | 1 - cddl/usr.bin/ctfconvert/tests/ctfconvert_test.sh | 1 - cddl/usr.bin/ctfdump/Makefile | 1 - cddl/usr.bin/ctfdump/Makefile.depend | 1 - cddl/usr.bin/ctfmerge/Makefile | 1 - cddl/usr.bin/ctfmerge/Makefile.depend | 1 - cddl/usr.bin/tests/Makefile | 1 - cddl/usr.bin/tests/Makefile.depend | 1 - cddl/usr.bin/zinject/Makefile | 1 - cddl/usr.bin/zinject/Makefile.depend | 1 - cddl/usr.bin/zstream/Makefile | 1 - cddl/usr.bin/ztest/Makefile | 1 - cddl/usr.bin/ztest/Makefile.depend | 1 - cddl/usr.bin/ztest/tests/Makefile | 1 - cddl/usr.bin/ztest/tests/ztest.sh | 1 - cddl/usr.libexec/Makefile | 1 - cddl/usr.libexec/zpool_influxdb/Makefile | 1 - cddl/usr.libexec/zpool_influxdb/Makefile.depend | 1 - cddl/usr.sbin/Makefile | 1 - cddl/usr.sbin/Makefile.inc | 1 - cddl/usr.sbin/dtrace/Makefile | 1 - cddl/usr.sbin/dtrace/Makefile.depend | 1 - cddl/usr.sbin/dtrace/tests/Makefile | 1 - cddl/usr.sbin/dtrace/tests/Makefile.depend | 1 - cddl/usr.sbin/dtrace/tests/amd64/Makefile | 1 - cddl/usr.sbin/dtrace/tests/amd64/arrays/Makefile | 1 - cddl/usr.sbin/dtrace/tests/common/Makefile | 1 - cddl/usr.sbin/dtrace/tests/common/Makefile.depend | 1 - cddl/usr.sbin/dtrace/tests/common/aggs/Makefile | 1 - cddl/usr.sbin/dtrace/tests/common/aggs/Makefile.depend | 1 - cddl/usr.sbin/dtrace/tests/common/arithmetic/Makefile | 1 - cddl/usr.sbin/dtrace/tests/common/arithmetic/Makefile.depend | 1 - cddl/usr.sbin/dtrace/tests/common/arrays/Makefile | 1 - cddl/usr.sbin/dtrace/tests/common/arrays/Makefile.depend | 1 - cddl/usr.sbin/dtrace/tests/common/assocs/Makefile | 1 - cddl/usr.sbin/dtrace/tests/common/assocs/Makefile.depend | 1 - cddl/usr.sbin/dtrace/tests/common/begin/Makefile | 1 - cddl/usr.sbin/dtrace/tests/common/begin/Makefile.depend | 1 - cddl/usr.sbin/dtrace/tests/common/bitfields/Makefile | 1 - cddl/usr.sbin/dtrace/tests/common/bitfields/Makefile.depend | 1 - cddl/usr.sbin/dtrace/tests/common/buffering/Makefile | 1 - cddl/usr.sbin/dtrace/tests/common/buffering/Makefile.depend | 1 - cddl/usr.sbin/dtrace/tests/common/builtinvar/Makefile | 1 - cddl/usr.sbin/dtrace/tests/common/builtinvar/Makefile.depend | 1 - cddl/usr.sbin/dtrace/tests/common/cg/Makefile | 1 - cddl/usr.sbin/dtrace/tests/common/cg/Makefile.depend | 1 - cddl/usr.sbin/dtrace/tests/common/clauses/Makefile | 1 - cddl/usr.sbin/dtrace/tests/common/clauses/Makefile.depend | 1 - cddl/usr.sbin/dtrace/tests/common/cpc/Makefile | 1 - cddl/usr.sbin/dtrace/tests/common/cpc/Makefile.depend | 1 - cddl/usr.sbin/dtrace/tests/common/decls/Makefile | 1 - cddl/usr.sbin/dtrace/tests/common/decls/Makefile.depend | 1 - cddl/usr.sbin/dtrace/tests/common/docsExamples/Makefile | 1 - cddl/usr.sbin/dtrace/tests/common/docsExamples/Makefile.depend | 1 - cddl/usr.sbin/dtrace/tests/common/drops/Makefile | 1 - cddl/usr.sbin/dtrace/tests/common/drops/Makefile.depend | 1 - cddl/usr.sbin/dtrace/tests/common/dtraceUtil/Makefile | 1 - cddl/usr.sbin/dtrace/tests/common/dtraceUtil/Makefile.depend | 1 - cddl/usr.sbin/dtrace/tests/common/end/Makefile | 1 - cddl/usr.sbin/dtrace/tests/common/end/Makefile.depend | 1 - cddl/usr.sbin/dtrace/tests/common/enum/Makefile | 1 - cddl/usr.sbin/dtrace/tests/common/enum/Makefile.depend | 1 - cddl/usr.sbin/dtrace/tests/common/env/Makefile | 1 - cddl/usr.sbin/dtrace/tests/common/error/Makefile | 1 - cddl/usr.sbin/dtrace/tests/common/error/Makefile.depend | 1 - cddl/usr.sbin/dtrace/tests/common/exit/Makefile | 1 - cddl/usr.sbin/dtrace/tests/common/exit/Makefile.depend | 1 - cddl/usr.sbin/dtrace/tests/common/fbtprovider/Makefile | 1 - cddl/usr.sbin/dtrace/tests/common/fbtprovider/Makefile.depend | 1 - cddl/usr.sbin/dtrace/tests/common/funcs/Makefile | 1 - cddl/usr.sbin/dtrace/tests/common/funcs/Makefile.depend | 1 - cddl/usr.sbin/dtrace/tests/common/grammar/Makefile | 1 - cddl/usr.sbin/dtrace/tests/common/grammar/Makefile.depend | 1 - cddl/usr.sbin/dtrace/tests/common/include/Makefile | 1 - cddl/usr.sbin/dtrace/tests/common/include/Makefile.depend | 1 - cddl/usr.sbin/dtrace/tests/common/inline/Makefile | 1 - cddl/usr.sbin/dtrace/tests/common/inline/Makefile.depend | 1 - cddl/usr.sbin/dtrace/tests/common/io/Makefile | 1 - cddl/usr.sbin/dtrace/tests/common/io/Makefile.depend | 1 - cddl/usr.sbin/dtrace/tests/common/ip/Makefile | 1 - cddl/usr.sbin/dtrace/tests/common/ip/Makefile.depend | 1 - cddl/usr.sbin/dtrace/tests/common/java_api/Makefile | 1 - cddl/usr.sbin/dtrace/tests/common/java_api/Makefile.depend | 1 - cddl/usr.sbin/dtrace/tests/common/json/Makefile | 1 - cddl/usr.sbin/dtrace/tests/common/json/Makefile.depend | 1 - cddl/usr.sbin/dtrace/tests/common/kinst/Makefile | 1 - cddl/usr.sbin/dtrace/tests/common/lexer/Makefile | 1 - cddl/usr.sbin/dtrace/tests/common/lexer/Makefile.depend | 1 - cddl/usr.sbin/dtrace/tests/common/llquantize/Makefile | 1 - cddl/usr.sbin/dtrace/tests/common/llquantize/Makefile.depend | 1 - cddl/usr.sbin/dtrace/tests/common/mdb/Makefile | 1 - cddl/usr.sbin/dtrace/tests/common/mdb/Makefile.depend | 1 - cddl/usr.sbin/dtrace/tests/common/mib/Makefile | 1 - cddl/usr.sbin/dtrace/tests/common/mib/Makefile.depend | 1 - cddl/usr.sbin/dtrace/tests/common/misc/Makefile | 1 - cddl/usr.sbin/dtrace/tests/common/misc/Makefile.depend | 1 - cddl/usr.sbin/dtrace/tests/common/multiaggs/Makefile | 1 - cddl/usr.sbin/dtrace/tests/common/multiaggs/Makefile.depend | 1 - cddl/usr.sbin/dtrace/tests/common/nfs/Makefile | 1 - cddl/usr.sbin/dtrace/tests/common/offsetof/Makefile | 1 - cddl/usr.sbin/dtrace/tests/common/offsetof/Makefile.depend | 1 - cddl/usr.sbin/dtrace/tests/common/operators/Makefile | 1 - cddl/usr.sbin/dtrace/tests/common/operators/Makefile.depend | 1 - cddl/usr.sbin/dtrace/tests/common/pid/Makefile | 1 - cddl/usr.sbin/dtrace/tests/common/pid/Makefile.depend | 1 - cddl/usr.sbin/dtrace/tests/common/plockstat/Makefile | 1 - cddl/usr.sbin/dtrace/tests/common/plockstat/Makefile.depend | 1 - cddl/usr.sbin/dtrace/tests/common/pointers/Makefile | 1 - cddl/usr.sbin/dtrace/tests/common/pointers/Makefile.depend | 1 - cddl/usr.sbin/dtrace/tests/common/pragma/Makefile | 1 - cddl/usr.sbin/dtrace/tests/common/pragma/Makefile.depend | 1 - cddl/usr.sbin/dtrace/tests/common/predicates/Makefile | 1 - cddl/usr.sbin/dtrace/tests/common/predicates/Makefile.depend | 1 - cddl/usr.sbin/dtrace/tests/common/preprocessor/Makefile | 1 - cddl/usr.sbin/dtrace/tests/common/preprocessor/Makefile.depend | 1 - cddl/usr.sbin/dtrace/tests/common/print/Makefile | 1 - cddl/usr.sbin/dtrace/tests/common/print/Makefile.depend | 1 - cddl/usr.sbin/dtrace/tests/common/printa/Makefile | 1 - cddl/usr.sbin/dtrace/tests/common/printa/Makefile.depend | 1 - cddl/usr.sbin/dtrace/tests/common/printf/Makefile | 1 - cddl/usr.sbin/dtrace/tests/common/printf/Makefile.depend | 1 - cddl/usr.sbin/dtrace/tests/common/privs/Makefile | 1 - cddl/usr.sbin/dtrace/tests/common/privs/Makefile.depend | 1 - cddl/usr.sbin/dtrace/tests/common/probes/Makefile | 1 - cddl/usr.sbin/dtrace/tests/common/probes/Makefile.depend | 1 - cddl/usr.sbin/dtrace/tests/common/proc/Makefile | 1 - cddl/usr.sbin/dtrace/tests/common/proc/Makefile.depend | 1 - cddl/usr.sbin/dtrace/tests/common/profile-n/Makefile | 1 - cddl/usr.sbin/dtrace/tests/common/profile-n/Makefile.depend | 1 - cddl/usr.sbin/dtrace/tests/common/providers/Makefile | 1 - cddl/usr.sbin/dtrace/tests/common/providers/Makefile.depend | 1 - cddl/usr.sbin/dtrace/tests/common/raise/Makefile | 1 - cddl/usr.sbin/dtrace/tests/common/raise/Makefile.depend | 1 - cddl/usr.sbin/dtrace/tests/common/rates/Makefile | 1 - cddl/usr.sbin/dtrace/tests/common/rates/Makefile.depend | 1 - cddl/usr.sbin/dtrace/tests/common/safety/Makefile | 1 - cddl/usr.sbin/dtrace/tests/common/safety/Makefile.depend | 1 - cddl/usr.sbin/dtrace/tests/common/scalars/Makefile | 1 - cddl/usr.sbin/dtrace/tests/common/scalars/Makefile.depend | 1 - cddl/usr.sbin/dtrace/tests/common/sched/Makefile | 1 - cddl/usr.sbin/dtrace/tests/common/sched/Makefile.depend | 1 - cddl/usr.sbin/dtrace/tests/common/scripting/Makefile | 1 - cddl/usr.sbin/dtrace/tests/common/scripting/Makefile.depend | 1 - cddl/usr.sbin/dtrace/tests/common/sdt/Makefile | 1 - cddl/usr.sbin/dtrace/tests/common/sdt/Makefile.depend | 1 - cddl/usr.sbin/dtrace/tests/common/sizeof/Makefile | 1 - cddl/usr.sbin/dtrace/tests/common/sizeof/Makefile.depend | 1 - cddl/usr.sbin/dtrace/tests/common/speculation/Makefile | 1 - cddl/usr.sbin/dtrace/tests/common/speculation/Makefile.depend | 1 - cddl/usr.sbin/dtrace/tests/common/stability/Makefile | 1 - cddl/usr.sbin/dtrace/tests/common/stability/Makefile.depend | 1 - cddl/usr.sbin/dtrace/tests/common/stack/Makefile | 1 - cddl/usr.sbin/dtrace/tests/common/stack/Makefile.depend | 1 - cddl/usr.sbin/dtrace/tests/common/stackdepth/Makefile | 1 - cddl/usr.sbin/dtrace/tests/common/stackdepth/Makefile.depend | 1 - cddl/usr.sbin/dtrace/tests/common/stop/Makefile | 1 - cddl/usr.sbin/dtrace/tests/common/stop/Makefile.depend | 1 - cddl/usr.sbin/dtrace/tests/common/strlen/Makefile | 1 - cddl/usr.sbin/dtrace/tests/common/strlen/Makefile.depend | 1 - cddl/usr.sbin/dtrace/tests/common/strtoll/Makefile | 1 - cddl/usr.sbin/dtrace/tests/common/strtoll/Makefile.depend | 1 - cddl/usr.sbin/dtrace/tests/common/struct/Makefile | 1 - cddl/usr.sbin/dtrace/tests/common/struct/Makefile.depend | 1 - cddl/usr.sbin/dtrace/tests/common/sugar/Makefile | 1 - cddl/usr.sbin/dtrace/tests/common/sugar/Makefile.depend | 1 - cddl/usr.sbin/dtrace/tests/common/syscall/Makefile | 1 - cddl/usr.sbin/dtrace/tests/common/syscall/Makefile.depend | 1 - cddl/usr.sbin/dtrace/tests/common/sysevent/Makefile | 1 - cddl/usr.sbin/dtrace/tests/common/tick-n/Makefile | 1 - cddl/usr.sbin/dtrace/tests/common/tick-n/Makefile.depend | 1 - cddl/usr.sbin/dtrace/tests/common/trace/Makefile | 1 - cddl/usr.sbin/dtrace/tests/common/trace/Makefile.depend | 1 - cddl/usr.sbin/dtrace/tests/common/tracemem/Makefile | 1 - cddl/usr.sbin/dtrace/tests/common/tracemem/Makefile.depend | 1 - cddl/usr.sbin/dtrace/tests/common/translators/Makefile | 1 - cddl/usr.sbin/dtrace/tests/common/translators/Makefile.depend | 1 - cddl/usr.sbin/dtrace/tests/common/typedef/Makefile | 1 - cddl/usr.sbin/dtrace/tests/common/typedef/Makefile.depend | 1 - cddl/usr.sbin/dtrace/tests/common/types/Makefile | 1 - cddl/usr.sbin/dtrace/tests/common/types/Makefile.depend | 1 - cddl/usr.sbin/dtrace/tests/common/uctf/Makefile | 1 - cddl/usr.sbin/dtrace/tests/common/uctf/Makefile.depend | 1 - cddl/usr.sbin/dtrace/tests/common/union/Makefile | 1 - cddl/usr.sbin/dtrace/tests/common/union/Makefile.depend | 1 - cddl/usr.sbin/dtrace/tests/common/usdt/Makefile | 1 - cddl/usr.sbin/dtrace/tests/common/usdt/Makefile.depend | 1 - cddl/usr.sbin/dtrace/tests/common/ustack/Makefile | 1 - cddl/usr.sbin/dtrace/tests/common/ustack/Makefile.depend | 1 - cddl/usr.sbin/dtrace/tests/common/vars/Makefile | 1 - cddl/usr.sbin/dtrace/tests/common/vars/Makefile.depend | 1 - cddl/usr.sbin/dtrace/tests/common/version/Makefile | 1 - cddl/usr.sbin/dtrace/tests/common/version/Makefile.depend | 1 - cddl/usr.sbin/dtrace/tests/dtrace.test.mk | 1 - cddl/usr.sbin/dtrace/tests/i386/Makefile | 1 - cddl/usr.sbin/dtrace/tests/i386/arrays/Makefile | 1 - cddl/usr.sbin/dtrace/tests/i386/funcs/Makefile | 1 - cddl/usr.sbin/dtrace/tests/i386/pid/Makefile | 1 - cddl/usr.sbin/dtrace/tests/i386/ustack/Makefile | 1 - cddl/usr.sbin/dtrace/tests/tools/dtest.sh | 2 -- cddl/usr.sbin/dtrace/tests/tools/exclude.sh | 1 - cddl/usr.sbin/dtrace/tests/tools/genmakefiles.sh | 1 - cddl/usr.sbin/dtrace/tests/tools/gentest.sh | 1 - cddl/usr.sbin/dwatch/Makefile | 1 - *** 103328 LINES SKIPPED *** From nobody Wed Aug 16 17:57:10 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RQwng3fnJz4qvGJ; Wed, 16 Aug 2023 17:57: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RQwng0gyWz3VTq; Wed, 16 Aug 2023 17:57:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692208631; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=nV4rQoDBt0n6aw4pt9nMpESpdcKdkkKCES3RVwLD/80=; b=hKjRxSqJgimug2kUZToKS76FBmV0O0KNzPIoLC/VFmLuJtd/EA2ztnhdpt0IWvrKOk0nRm 9pU5SmrdAwnWfNjJ4+j71TnwSjVIWW0JxonL9jMd7/km1H41A5KVS8bntKLPK2si+DZaxB V5re4L9zCJs1gIEf1i8G4OgxlUMFrZp5I4qKxJmA/f0x2eJDOZHz+ZPbrj3HmJJCehRrcQ /TV4rC3/j0uceOcpiXL2FPfckIDN0xXy+WNnDt6NBF4Aa/FukYldhpxHNY09xOOZR8oRur CI7SLt2e4E1uD8fevumgRMHkQFGLfPxAArxr9QCzOIqJXWbB1VV4250XQQGtbA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692208631; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=nV4rQoDBt0n6aw4pt9nMpESpdcKdkkKCES3RVwLD/80=; b=CtPmFORuYqEPuendhJtiWUTnUApAtExMmnTdajCh3bnSNspArRy+HIDfIEKi0O2WGNQC6H 4yMC6bM/xEppJyLkFWiIRkrU7xSAPQjUujCGDEmX9H2/KBu89NVpqQ+ijJPRxF0Z/7KKeF 2YgBWkaxaPAe6Xn6omWit6QS6VbOIOFEyb+Wz74LgK95pb1eHP4A6f9MEcNVsJINRtHy8r ufv4KFSNs+HcaPC2iFQ1XQ01K8syuydstMTfy2jW+te6J4PGTr3pAGj0zFkwN1U/P8BbwO MpIVeY347TNpxiGMlb6oVOMAHOHjWQUlHkVTByLIq0L/Yi434alBlfeQD6m6ig== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692208631; a=rsa-sha256; cv=none; b=fNbfOhlT4DRmAXXeQ4Y5kqAbG2vIPMbxrvBuM8DM6iORUR5tPM3g8+g7RxepJHhE9c+uoo swKw0DTpgF+QRY9/bWvbFdqS02EcR50RI9NUff54UkWCUG9hgPT2QC2CRnmue1ljdzUohU v2FA+83OtyC958d8VhgXcpiGCI2g9aL7Gbi90IYsGIhmwx5lTYJRRIWkcCuSGLQ4XZJYKV 7DLkZivn+0Tn1saK+VyaL1nXtX0TWyra6Fzcq0d0AstVcO0RSZE5Od4HxiDn1d1l6MH3BQ tzQX/eYuW5BHwLGaDqisr8exKh00vibwj6FkDq1MZzPi4FLnzWwF2MqBtARCcA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RQwnf5mCvz11Vj; Wed, 16 Aug 2023 17:57:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37GHvAqh059653; Wed, 16 Aug 2023 17:57:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37GHvASV059650; Wed, 16 Aug 2023 17:57:10 GMT (envelope-from git) Date: Wed, 16 Aug 2023 17:57:10 GMT Message-Id: <202308161757.37GHvASV059650@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: 9e7892125655 - main - sys: Remove $FreeBSD$: two-line nroff pattern List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9e7892125655e7f86b7c52d2c4f67ee64eac6fe2 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=9e7892125655e7f86b7c52d2c4f67ee64eac6fe2 commit 9e7892125655e7f86b7c52d2c4f67ee64eac6fe2 Author: Warner Losh AuthorDate: 2023-08-16 17:55:06 +0000 Commit: Warner Losh CommitDate: 2023-08-16 17:55:06 +0000 sys: Remove $FreeBSD$: two-line nroff pattern Remove /^\.\\"\n\.\\"\s*\$FreeBSD\$$\n/ --- sys/netinet/libalias/libalias.3 | 2 -- sys/teken/libteken/teken.3 | 2 -- 2 files changed, 4 deletions(-) diff --git a/sys/netinet/libalias/libalias.3 b/sys/netinet/libalias/libalias.3 index 85ebe55f527c..b4d123682f0b 100644 --- a/sys/netinet/libalias/libalias.3 +++ b/sys/netinet/libalias/libalias.3 @@ -23,8 +23,6 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD$ -.\" .Dd May 31, 2021 .Dt LIBALIAS 3 .Os diff --git a/sys/teken/libteken/teken.3 b/sys/teken/libteken/teken.3 index 2f4a0d8eaf75..5a7f5cd18e73 100644 --- a/sys/teken/libteken/teken.3 +++ b/sys/teken/libteken/teken.3 @@ -22,8 +22,6 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD$ -.\" .Dd Mar 13, 2017 .Dt TEKEN 3 .Os From nobody Wed Aug 16 17:57:11 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RQwnj4pMfz4qvGM; Wed, 16 Aug 2023 17:57:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RQwnh4sFPz3Vpb; Wed, 16 Aug 2023 17:57:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692208632; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vINoRZXPVyIASu1bi1FWq5H3NnkOE6WX6qxYECKvsBY=; b=N9NDT71gjvWSQSoG41HXYHJVeANsRe4liDUH2lPcG59Zd8IRZbFtcRnsqbv9WyH/H8adw4 JjvaTV6SNa4D7LTibgRKiCFggdz9KyznhpUaKb8KLYb8ml5K02/P3eVAafwqQKds+22dhs KppVB4U0OVtjelPlZpyFl8duVxdlg0fEV0wdx16De930STXQFl4jG7ly4tPqsgqOH+MGqn Z6/c00UDtuQdMGEPWe6o3mOZTAKLKwoj/jGyC+ANoOeNUua0Q510UiNiNRksrKqfRoWZhF QPIG81hUHmqhloHlRzylavalmPmqANxZpaMYye9cILoMyUrFfDer4F+bBgTpxw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692208632; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vINoRZXPVyIASu1bi1FWq5H3NnkOE6WX6qxYECKvsBY=; b=Dp5QnKJJztj9xphJlV7mbon5UIsLxUhrU3TFz5CDSSRtJs3pjcb2z8EmLVlbwhcz6yD5Kr nOfY32Gi3vOOI8NY19oaVvoFX5KlkHzfAiuGR8SXaos6kRS1NXv5Td/wxz0TL7ucvR85xa 7AFbG6+R9t+R4WzUaZPODCz9aJRROpBuVsKlSZumO4H1vRPlxKSucqZE0RGXOL5OuVkxru tKpFcUXcGdIZbOdw8bjQzTtn9LRyjcKWX97iW2obYrTKmF9ntMH2uONRWD9To+A1h8oFq6 5QxLJTZ+mGmnufRh08KCulfAEkmANlPUbne4EJD71cu1xqK0279O0SaDwOW9UQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692208632; a=rsa-sha256; cv=none; b=dExlzgQSPgmBxvQjOWmcY0UUn+EMMR2BRtzRz15DMgCRMuR7Bz6qTGo78LTcbZpmCXmQcG ik/G4ixHPF5y5Zyh1RDg/+HjJAl4qFfdojkEhfDb9UdniaGa4SAi7uBUtSLdpvFORZZe0/ L6rVLTS9yqLxgGeIvuSmRUAg1+qCOr+xOKR0MhMtj9CePJrOUjUBdNTZ6ochl2i2WnavwY qnLnXjbVRhWSlN80651o0YdK1iIBK0lgON+n2fhv05CFYR5HqX9nO2vCY7vShqpsjCPBSL lB2Jg19BolTkEASGsZwWsk2NTQ+rB6Ul88gipjoiY94NbXn4Rtlsl7eOrg8p1Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RQwnh3L4Nz11Gp; Wed, 16 Aug 2023 17:57:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37GHvC3a059696; Wed, 16 Aug 2023 17:57:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37GHvB4C059692; Wed, 16 Aug 2023 17:57:11 GMT (envelope-from git) Date: Wed, 16 Aug 2023 17:57:11 GMT Message-Id: <202308161757.37GHvB4C059692@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: fa9896e082a1 - main - Remove $FreeBSD$: two-line nroff pattern List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: fa9896e082a1046ff4fbc75fcba4d18d1f2efc19 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=fa9896e082a1046ff4fbc75fcba4d18d1f2efc19 commit fa9896e082a1046ff4fbc75fcba4d18d1f2efc19 Author: Warner Losh AuthorDate: 2023-08-16 17:55:10 +0000 Commit: Warner Losh CommitDate: 2023-08-16 17:55:10 +0000 Remove $FreeBSD$: two-line nroff pattern Remove /^\.\\"\n\.\\"\s*\$FreeBSD\$$\n/ --- bin/chio/chio.1 | 2 -- bin/cpuset/cpuset.1 | 2 -- bin/expr/expr.1 | 2 -- bin/freebsd-version/freebsd-version.1 | 2 -- bin/getfacl/getfacl.1 | 2 -- bin/kenv/kenv.1 | 2 -- bin/pkill/pkill.1 | 2 -- bin/pwait/pwait.1 | 2 -- bin/setfacl/setfacl.1 | 2 -- bin/timeout/timeout.1 | 2 -- bin/uuidgen/uuidgen.1 | 2 -- cddl/usr.bin/ctfconvert/ctfconvert.1 | 2 -- cddl/usr.bin/ctfdump/ctfdump.1 | 2 -- cddl/usr.bin/ctfmerge/ctfmerge.1 | 2 -- cddl/usr.sbin/dwatch/dwatch.1 | 2 -- cddl/usr.sbin/plockstat/plockstat.1 | 2 -- cddl/usr.sbin/zfsd/zfsd.8 | 2 -- lib/flua/libjail/jail.3lua | 2 -- lib/geom/cache/gcache.8 | 2 -- lib/geom/concat/gconcat.8 | 2 -- lib/geom/eli/geli.8 | 2 -- lib/geom/journal/gjournal.8 | 2 -- lib/geom/label/glabel.8 | 2 -- lib/geom/mirror/gmirror.8 | 2 -- lib/geom/mountver/gmountver.8 | 2 -- lib/geom/multipath/gmultipath.8 | 2 -- lib/geom/nop/gnop.8 | 2 -- lib/geom/part/gpart.8 | 2 -- lib/geom/raid/graid.8 | 2 -- lib/geom/raid3/graid3.8 | 2 -- lib/geom/shsec/gshsec.8 | 2 -- lib/geom/stripe/gstripe.8 | 2 -- lib/geom/union/gunion.8 | 2 -- lib/geom/virstor/gvirstor.8 | 2 -- lib/lib80211/lib80211.3 | 2 -- lib/libbe/libbe.3 | 2 -- lib/libc/arm/gen/arm_drain_writebuf.2 | 2 -- lib/libc/arm/gen/arm_sync_icache.2 | 2 -- lib/libc/capability/cap_rights_init.3 | 2 -- lib/libc/db/man/dbm.3 | 2 -- lib/libc/gen/auxv.3 | 2 -- lib/libc/gen/basename.3 | 2 -- lib/libc/gen/cap_rights_get.3 | 2 -- lib/libc/gen/cap_sandboxed.3 | 2 -- lib/libc/gen/check_utility_compat.3 | 2 -- lib/libc/gen/clock_getcpuclockid.3 | 2 -- lib/libc/gen/dirname.3 | 2 -- lib/libc/gen/dladdr.3 | 2 -- lib/libc/gen/dlinfo.3 | 2 -- lib/libc/gen/dllockinit.3 | 2 -- lib/libc/gen/dup3.3 | 2 -- lib/libc/gen/feature_present.3 | 2 -- lib/libc/gen/fmtcheck.3 | 2 -- lib/libc/gen/fmtmsg.3 | 2 -- lib/libc/gen/fpclassify.3 | 2 -- lib/libc/gen/ftok.3 | 2 -- lib/libc/gen/ftw.3 | 2 -- lib/libc/gen/getcontext.3 | 2 -- lib/libc/gen/getentropy.3 | 2 -- lib/libc/gen/getosreldate.3 | 2 -- lib/libc/gen/getpagesizes.3 | 2 -- lib/libc/gen/getpeereid.3 | 2 -- lib/libc/gen/getprogname.3 | 2 -- lib/libc/gen/getutxent.3 | 2 -- lib/libc/gen/isgreater.3 | 2 -- lib/libc/gen/lockf.3 | 2 -- lib/libc/gen/makecontext.3 | 2 -- lib/libc/gen/posix_spawn.3 | 2 -- lib/libc/gen/posix_spawn_file_actions_addopen.3 | 2 -- lib/libc/gen/posix_spawn_file_actions_init.3 | 2 -- lib/libc/gen/posix_spawnattr_getflags.3 | 2 -- lib/libc/gen/posix_spawnattr_getpgroup.3 | 2 -- lib/libc/gen/posix_spawnattr_getschedparam.3 | 2 -- lib/libc/gen/posix_spawnattr_getschedpolicy.3 | 2 -- lib/libc/gen/posix_spawnattr_getsigdefault.3 | 2 -- lib/libc/gen/posix_spawnattr_getsigmask.3 | 2 -- lib/libc/gen/posix_spawnattr_init.3 | 2 -- lib/libc/gen/readpassphrase.3 | 2 -- lib/libc/gen/rfork_thread.3 | 2 -- lib/libc/gen/sem_destroy.3 | 2 -- lib/libc/gen/sem_getvalue.3 | 2 -- lib/libc/gen/sem_init.3 | 2 -- lib/libc/gen/sem_open.3 | 2 -- lib/libc/gen/sem_post.3 | 2 -- lib/libc/gen/sem_timedwait.3 | 2 -- lib/libc/gen/sem_wait.3 | 2 -- lib/libc/gen/statvfs.3 | 2 -- lib/libc/gen/stringlist.3 | 2 -- lib/libc/gen/tcgetsid.3 | 2 -- lib/libc/gen/tcgetwinsize.3 | 2 -- lib/libc/gen/tcsetsid.3 | 2 -- lib/libc/gen/timespec_get.3 | 2 -- lib/libc/gen/ucontext.3 | 2 -- lib/libc/gen/ulimit.3 | 2 -- lib/libc/gen/wordexp.3 | 2 -- lib/libc/i386/sys/i386_get_ioperm.2 | 2 -- lib/libc/i386/sys/i386_set_watch.3 | 2 -- lib/libc/i386/sys/i386_vm86.2 | 2 -- lib/libc/iconv/__iconv_get_list.3 | 2 -- lib/libc/iconv/iconv_canonicalize.3 | 2 -- lib/libc/iconv/iconvctl.3 | 2 -- lib/libc/iconv/iconvlist.3 | 2 -- lib/libc/locale/big5.5 | 2 -- lib/libc/locale/btowc.3 | 2 -- lib/libc/locale/ctype_l.3 | 2 -- lib/libc/locale/duplocale.3 | 2 -- lib/libc/locale/freelocale.3 | 2 -- lib/libc/locale/gb18030.5 | 2 -- lib/libc/locale/gb2312.5 | 2 -- lib/libc/locale/gbk.5 | 2 -- lib/libc/locale/isideogram.3 | 2 -- lib/libc/locale/isphonogram.3 | 2 -- lib/libc/locale/isrune.3 | 2 -- lib/libc/locale/isspecial.3 | 2 -- lib/libc/locale/iswalnum_l.3 | 2 -- lib/libc/locale/mbrlen.3 | 2 -- lib/libc/locale/mbrtowc.3 | 2 -- lib/libc/locale/mbsinit.3 | 2 -- lib/libc/locale/mbsrtowcs.3 | 2 -- lib/libc/locale/mskanji.5 | 2 -- lib/libc/locale/newlocale.3 | 2 -- lib/libc/locale/nextwctype.3 | 2 -- lib/libc/locale/nl_langinfo.3 | 2 -- lib/libc/locale/querylocale.3 | 2 -- lib/libc/locale/rpmatch.3 | 2 -- lib/libc/locale/uselocale.3 | 2 -- lib/libc/locale/wcrtomb.3 | 2 -- lib/libc/locale/wcsftime.3 | 2 -- lib/libc/locale/wcsrtombs.3 | 2 -- lib/libc/locale/wcstod.3 | 2 -- lib/libc/locale/wcstol.3 | 2 -- lib/libc/locale/wctrans.3 | 2 -- lib/libc/locale/wctype.3 | 2 -- lib/libc/locale/wcwidth.3 | 2 -- lib/libc/locale/xlocale.3 | 2 -- lib/libc/net/ethers.3 | 2 -- lib/libc/net/eui64.3 | 2 -- lib/libc/net/gai_strerror.3 | 2 -- lib/libc/net/getaddrinfo.3 | 2 -- lib/libc/net/getifaddrs.3 | 2 -- lib/libc/net/getifmaddrs.3 | 2 -- lib/libc/net/getnameinfo.3 | 2 -- lib/libc/net/hesiod.3 | 2 -- lib/libc/net/if_indextoname.3 | 2 -- lib/libc/net/inet6_opt_init.3 | 2 -- lib/libc/net/inet6_option_space.3 | 2 -- lib/libc/net/inet6_rth_space.3 | 2 -- lib/libc/net/inet6_rthdr_space.3 | 2 -- lib/libc/net/inet_net.3 | 2 -- lib/libc/net/nsdispatch.3 | 2 -- lib/libc/net/rcmdsh.3 | 2 -- lib/libc/net/sctp_connectx.3 | 2 -- lib/libc/net/sctp_getassocid.3 | 2 -- lib/libc/net/sctp_recvmsg.3 | 2 -- lib/libc/net/sctp_send.3 | 2 -- lib/libc/net/sockatmark.3 | 2 -- lib/libc/net/sourcefilter.3 | 2 -- lib/libc/nls/catclose.3 | 2 -- lib/libc/nls/catgets.3 | 2 -- lib/libc/nls/catopen.3 | 2 -- lib/libc/posix1e/acl.3 | 2 -- lib/libc/posix1e/acl_add_flag_np.3 | 2 -- lib/libc/posix1e/acl_add_perm.3 | 2 -- lib/libc/posix1e/acl_calc_mask.3 | 2 -- lib/libc/posix1e/acl_clear_flags_np.3 | 2 -- lib/libc/posix1e/acl_clear_perms.3 | 2 -- lib/libc/posix1e/acl_copy_entry.3 | 2 -- lib/libc/posix1e/acl_create_entry.3 | 2 -- lib/libc/posix1e/acl_delete.3 | 2 -- lib/libc/posix1e/acl_delete_entry.3 | 2 -- lib/libc/posix1e/acl_delete_flag_np.3 | 2 -- lib/libc/posix1e/acl_delete_perm.3 | 2 -- lib/libc/posix1e/acl_dup.3 | 2 -- lib/libc/posix1e/acl_free.3 | 2 -- lib/libc/posix1e/acl_from_text.3 | 2 -- lib/libc/posix1e/acl_get.3 | 2 -- lib/libc/posix1e/acl_get_brand_np.3 | 2 -- lib/libc/posix1e/acl_get_entry.3 | 2 -- lib/libc/posix1e/acl_get_entry_type_np.3 | 2 -- lib/libc/posix1e/acl_get_flag_np.3 | 2 -- lib/libc/posix1e/acl_get_flagset_np.3 | 2 -- lib/libc/posix1e/acl_get_perm_np.3 | 2 -- lib/libc/posix1e/acl_get_permset.3 | 2 -- lib/libc/posix1e/acl_get_qualifier.3 | 2 -- lib/libc/posix1e/acl_get_tag_type.3 | 2 -- lib/libc/posix1e/acl_init.3 | 2 -- lib/libc/posix1e/acl_is_trivial_np.3 | 2 -- lib/libc/posix1e/acl_set.3 | 2 -- lib/libc/posix1e/acl_set_entry_type_np.3 | 2 -- lib/libc/posix1e/acl_set_flagset_np.3 | 2 -- lib/libc/posix1e/acl_set_permset.3 | 2 -- lib/libc/posix1e/acl_set_qualifier.3 | 2 -- lib/libc/posix1e/acl_set_tag_type.3 | 2 -- lib/libc/posix1e/acl_strip_np.3 | 2 -- lib/libc/posix1e/acl_to_text.3 | 2 -- lib/libc/posix1e/acl_valid.3 | 2 -- lib/libc/posix1e/extattr.3 | 2 -- lib/libc/posix1e/mac.3 | 2 -- lib/libc/posix1e/mac.conf.5 | 2 -- lib/libc/posix1e/mac_free.3 | 2 -- lib/libc/posix1e/mac_get.3 | 2 -- lib/libc/posix1e/mac_is_present.3 | 2 -- lib/libc/posix1e/mac_prepare.3 | 2 -- lib/libc/posix1e/mac_set.3 | 2 -- lib/libc/posix1e/mac_text.3 | 2 -- lib/libc/posix1e/posix1e.3 | 2 -- lib/libc/stdio/flockfile.3 | 2 -- lib/libc/stdio/fopencookie.3 | 2 -- lib/libc/stdio/getline.3 | 2 -- lib/libc/stdio/open_memstream.3 | 2 -- lib/libc/stdio/printf_l.3 | 2 -- lib/libc/stdio/scanf_l.3 | 2 -- lib/libc/stdlib/a64l.3 | 2 -- lib/libc/stdlib/at_quick_exit.3 | 2 -- lib/libc/stdlib/hcreate.3 | 2 -- lib/libc/stdlib/imaxabs.3 | 2 -- lib/libc/stdlib/imaxdiv.3 | 2 -- lib/libc/stdlib/insque.3 | 2 -- lib/libc/stdlib/llabs.3 | 2 -- lib/libc/stdlib/lldiv.3 | 2 -- lib/libc/stdlib/lsearch.3 | 2 -- lib/libc/stdlib/ptsname.3 | 2 -- lib/libc/stdlib/quick_exit.3 | 2 -- lib/libc/stdlib/reallocarray.3 | 2 -- lib/libc/stdlib/set_constraint_handler_s.3 | 2 -- lib/libc/stdlib/strfmon.3 | 2 -- lib/libc/stdtime/strptime.3 | 2 -- lib/libc/string/memmem.3 | 2 -- lib/libc/string/strlcpy.3 | 2 -- lib/libc/string/timingsafe_bcmp.3 | 2 -- lib/libc/string/wcstok.3 | 2 -- lib/libc/string/wcswidth.3 | 2 -- lib/libc/string/wmemchr.3 | 2 -- lib/libc/sys/_umtx_op.2 | 2 -- lib/libc/sys/abort2.2 | 2 -- lib/libc/sys/aio_cancel.2 | 2 -- lib/libc/sys/aio_error.2 | 2 -- lib/libc/sys/aio_fsync.2 | 2 -- lib/libc/sys/aio_mlock.2 | 2 -- lib/libc/sys/aio_read.2 | 2 -- lib/libc/sys/aio_return.2 | 2 -- lib/libc/sys/aio_suspend.2 | 2 -- lib/libc/sys/aio_waitcomplete.2 | 2 -- lib/libc/sys/aio_write.2 | 2 -- lib/libc/sys/bindat.2 | 2 -- lib/libc/sys/cap_enter.2 | 2 -- lib/libc/sys/cap_fcntls_limit.2 | 2 -- lib/libc/sys/cap_ioctls_limit.2 | 2 -- lib/libc/sys/cap_rights_limit.2 | 2 -- lib/libc/sys/clock_gettime.2 | 2 -- lib/libc/sys/closefrom.2 | 2 -- lib/libc/sys/connectat.2 | 2 -- lib/libc/sys/copy_file_range.2 | 2 -- lib/libc/sys/cpuset.2 | 2 -- lib/libc/sys/cpuset_getaffinity.2 | 2 -- lib/libc/sys/cpuset_getdomain.2 | 2 -- lib/libc/sys/eventfd.2 | 2 -- lib/libc/sys/extattr_get_file.2 | 2 -- lib/libc/sys/ffclock.2 | 2 -- lib/libc/sys/fhlink.2 | 2 -- lib/libc/sys/fhopen.2 | 2 -- lib/libc/sys/fhreadlink.2 | 2 -- lib/libc/sys/getloginclass.2 | 2 -- lib/libc/sys/getrandom.2 | 2 -- lib/libc/sys/getsid.2 | 2 -- lib/libc/sys/ioctl.2 | 2 -- lib/libc/sys/issetugid.2 | 2 -- lib/libc/sys/jail.2 | 2 -- lib/libc/sys/kenv.2 | 2 -- lib/libc/sys/kldfind.2 | 2 -- lib/libc/sys/kldfirstmod.2 | 2 -- lib/libc/sys/kldload.2 | 2 -- lib/libc/sys/kldnext.2 | 2 -- lib/libc/sys/kldstat.2 | 2 -- lib/libc/sys/kldsym.2 | 2 -- lib/libc/sys/kldunload.2 | 2 -- lib/libc/sys/kqueue.2 | 2 -- lib/libc/sys/lio_listio.2 | 2 -- lib/libc/sys/mlockall.2 | 2 -- lib/libc/sys/modfind.2 | 2 -- lib/libc/sys/modnext.2 | 2 -- lib/libc/sys/modstat.2 | 2 -- lib/libc/sys/mq_close.2 | 2 -- lib/libc/sys/mq_getattr.2 | 2 -- lib/libc/sys/mq_notify.2 | 2 -- lib/libc/sys/mq_open.2 | 2 -- lib/libc/sys/mq_receive.2 | 2 -- lib/libc/sys/mq_send.2 | 2 -- lib/libc/sys/mq_setattr.2 | 2 -- lib/libc/sys/mq_unlink.2 | 2 -- lib/libc/sys/msgctl.2 | 2 -- lib/libc/sys/msgsnd.2 | 2 -- lib/libc/sys/ntp_adjtime.2 | 2 -- lib/libc/sys/pdfork.2 | 2 -- lib/libc/sys/posix_openpt.2 | 2 -- lib/libc/sys/procctl.2 | 2 -- lib/libc/sys/pselect.2 | 2 -- lib/libc/sys/rctl_add_rule.2 | 2 -- lib/libc/sys/rfork.2 | 2 -- lib/libc/sys/rtprio.2 | 2 -- lib/libc/sys/sched_get_priority_max.2 | 2 -- lib/libc/sys/sctp_generic_recvmsg.2 | 2 -- lib/libc/sys/sctp_generic_sendmsg.2 | 2 -- lib/libc/sys/sctp_peeloff.2 | 2 -- lib/libc/sys/semctl.2 | 2 -- lib/libc/sys/semget.2 | 2 -- lib/libc/sys/semop.2 | 2 -- lib/libc/sys/sendfile.2 | 2 -- lib/libc/sys/setfib.2 | 2 -- lib/libc/sys/setresuid.2 | 2 -- lib/libc/sys/shm_open.2 | 2 -- lib/libc/sys/shmat.2 | 2 -- lib/libc/sys/shmctl.2 | 2 -- lib/libc/sys/shmget.2 | 2 -- lib/libc/sys/sigfastblock.2 | 2 -- lib/libc/sys/sigqueue.2 | 2 -- lib/libc/sys/sigwait.2 | 2 -- lib/libc/sys/sigwaitinfo.2 | 2 -- lib/libc/sys/thr_exit.2 | 2 -- lib/libc/sys/thr_kill.2 | 2 -- lib/libc/sys/thr_new.2 | 2 -- lib/libc/sys/thr_self.2 | 2 -- lib/libc/sys/thr_set_name.2 | 2 -- lib/libc/sys/thr_suspend.2 | 2 -- lib/libc/sys/thr_wake.2 | 2 -- lib/libc/sys/timer_create.2 | 2 -- lib/libc/sys/timer_delete.2 | 2 -- lib/libc/sys/timer_settime.2 | 2 -- lib/libc/sys/utrace.2 | 2 -- lib/libc/sys/uuidgen.2 | 2 -- lib/libc/uuid/uuid.3 | 2 -- lib/libc/x86/sys/pkru.3 | 2 -- lib/libcalendar/calendar.3 | 2 -- lib/libcam/cam.3 | 2 -- lib/libcam/cam_cdbparse.3 | 2 -- lib/libcapsicum/capsicum_helpers.3 | 2 -- lib/libcasper/libcasper/libcasper.3 | 2 -- lib/libcasper/libcasper/libcasper_service.3 | 2 -- lib/libcasper/services/cap_dns/cap_dns.3 | 2 -- lib/libcasper/services/cap_fileargs/cap_fileargs.3 | 2 -- lib/libcasper/services/cap_grp/cap_grp.3 | 2 -- lib/libcasper/services/cap_net/cap_net.3 | 2 -- lib/libcasper/services/cap_netdb/cap_netdb.3 | 2 -- lib/libcasper/services/cap_pwd/cap_pwd.3 | 2 -- lib/libcasper/services/cap_sysctl/cap_sysctl.3 | 2 -- lib/libcasper/services/cap_syslog/cap_syslog.3 | 2 -- lib/libcompat/4.4/cuserid.3 | 2 -- lib/libcrypt/crypt.3 | 2 -- lib/libdevctl/devctl.3 | 2 -- lib/libdevinfo/devinfo.3 | 2 -- lib/libdevstat/devstat.3 | 2 -- lib/libdpv/dpv.3 | 2 -- lib/libefivar/efivar.3 | 2 -- lib/libexpat/libbsdxml.3 | 2 -- lib/libfetch/fetch.3 | 2 -- lib/libfigpar/figpar.3 | 2 -- lib/libgeom/libgeom.3 | 2 -- lib/libgpio/gpio.3 | 2 -- lib/libgssapi/gss_accept_sec_context.3 | 2 -- lib/libgssapi/gss_acquire_cred.3 | 2 -- lib/libgssapi/gss_add_cred.3 | 2 -- lib/libgssapi/gss_add_oid_set_member.3 | 2 -- lib/libgssapi/gss_canonicalize_name.3 | 2 -- lib/libgssapi/gss_compare_name.3 | 2 -- lib/libgssapi/gss_context_time.3 | 2 -- lib/libgssapi/gss_create_empty_oid_set.3 | 2 -- lib/libgssapi/gss_delete_sec_context.3 | 2 -- lib/libgssapi/gss_display_name.3 | 2 -- lib/libgssapi/gss_display_status.3 | 2 -- lib/libgssapi/gss_duplicate_name.3 | 2 -- lib/libgssapi/gss_export_name.3 | 2 -- lib/libgssapi/gss_export_sec_context.3 | 2 -- lib/libgssapi/gss_get_mic.3 | 2 -- lib/libgssapi/gss_import_name.3 | 2 -- lib/libgssapi/gss_import_sec_context.3 | 2 -- lib/libgssapi/gss_indicate_mechs.3 | 2 -- lib/libgssapi/gss_init_sec_context.3 | 2 -- lib/libgssapi/gss_inquire_context.3 | 2 -- lib/libgssapi/gss_inquire_cred.3 | 2 -- lib/libgssapi/gss_inquire_cred_by_mech.3 | 2 -- lib/libgssapi/gss_inquire_mechs_for_name.3 | 2 -- lib/libgssapi/gss_inquire_names_for_mech.3 | 2 -- lib/libgssapi/gss_process_context_token.3 | 2 -- lib/libgssapi/gss_release_buffer.3 | 2 -- lib/libgssapi/gss_release_cred.3 | 2 -- lib/libgssapi/gss_release_name.3 | 2 -- lib/libgssapi/gss_release_oid_set.3 | 2 -- lib/libgssapi/gss_test_oid_set_member.3 | 2 -- lib/libgssapi/gss_unwrap.3 | 2 -- lib/libgssapi/gss_verify_mic.3 | 2 -- lib/libgssapi/gss_wrap.3 | 2 -- lib/libgssapi/gss_wrap_size_limit.3 | 2 -- lib/libgssapi/gssapi.3 | 2 -- lib/libgssapi/mech.5 | 2 -- lib/libipsec/ipsec_set_policy.3 | 2 -- lib/libipsec/ipsec_strerror.3 | 2 -- lib/libjail/jail.3 | 2 -- lib/libkiconv/kiconv.3 | 2 -- lib/libkvm/kvm_getcptime.3 | 2 -- lib/libkvm/kvm_getpcpu.3 | 2 -- lib/libkvm/kvm_getswapinfo.3 | 2 -- lib/libkvm/kvm_kerndisp.3 | 2 -- lib/libkvm/kvm_native.3 | 2 -- lib/libmd/mdX.3 | 2 -- lib/libmd/skein.3 | 2 -- lib/libmemstat/libmemstat.3 | 2 -- lib/libmixer/mixer.3 | 2 -- lib/libmp/libmp.3 | 2 -- lib/libmt/mt.3 | 2 -- lib/libnetgraph/netgraph.3 | 2 -- lib/libopenbsd/imsg_init.3 | 2 -- lib/libopenbsd/ohash_init.3 | 2 -- lib/libopenbsd/ohash_interval.3 | 2 -- lib/libpam/modules/pam_chroot/pam_chroot.8 | 2 -- lib/libpam/modules/pam_deny/pam_deny.8 | 2 -- lib/libpam/modules/pam_echo/pam_echo.8 | 2 -- lib/libpam/modules/pam_exec/pam_exec.8 | 2 -- lib/libpam/modules/pam_ftpusers/pam_ftpusers.8 | 2 -- lib/libpam/modules/pam_group/pam_group.8 | 2 -- lib/libpam/modules/pam_guest/pam_guest.8 | 2 -- lib/libpam/modules/pam_ksu/pam_ksu.8 | 2 -- lib/libpam/modules/pam_lastlog/pam_lastlog.8 | 2 -- lib/libpam/modules/pam_login_access/login.access.5 | 2 -- lib/libpam/modules/pam_login_access/pam_login_access.8 | 2 -- lib/libpam/modules/pam_nologin/pam_nologin.8 | 2 -- lib/libpam/modules/pam_passwdqc/pam_passwdqc.8 | 2 -- lib/libpam/modules/pam_permit/pam_permit.8 | 2 -- lib/libpam/modules/pam_radius/pam_radius.8 | 2 -- lib/libpam/modules/pam_rhosts/pam_rhosts.8 | 2 -- lib/libpam/modules/pam_rootok/pam_rootok.8 | 2 -- lib/libpam/modules/pam_securetty/pam_securetty.8 | 2 -- lib/libpam/modules/pam_self/pam_self.8 | 2 -- lib/libpam/modules/pam_ssh/pam_ssh.8 | 2 -- lib/libpam/modules/pam_tacplus/pam_tacplus.8 | 2 -- lib/libpam/modules/pam_unix/pam_unix.8 | 2 -- lib/libpathconv/abs2rel.3 | 2 -- lib/libpathconv/rel2abs.3 | 2 -- lib/libpmc/pmc.3 | 2 -- lib/libpmc/pmc.atom.3 | 2 -- lib/libpmc/pmc.atomsilvermont.3 | 2 -- lib/libpmc/pmc.cmn-600.3 | 2 -- lib/libpmc/pmc.core.3 | 2 -- lib/libpmc/pmc.core2.3 | 2 -- lib/libpmc/pmc.corei7.3 | 2 -- lib/libpmc/pmc.corei7uc.3 | 2 -- lib/libpmc/pmc.haswell.3 | 2 -- lib/libpmc/pmc.haswelluc.3 | 2 -- lib/libpmc/pmc.haswellxeon.3 | 2 -- lib/libpmc/pmc.iaf.3 | 2 -- lib/libpmc/pmc.ivybridge.3 | 2 -- lib/libpmc/pmc.ivybridgexeon.3 | 2 -- lib/libpmc/pmc.k7.3 | 2 -- lib/libpmc/pmc.k8.3 | 2 -- lib/libpmc/pmc.sandybridge.3 | 2 -- lib/libpmc/pmc.sandybridgeuc.3 | 2 -- lib/libpmc/pmc.sandybridgexeon.3 | 2 -- lib/libpmc/pmc.soft.3 | 2 -- lib/libpmc/pmc.tsc.3 | 2 -- lib/libpmc/pmc.ucf.3 | 2 -- lib/libpmc/pmc.westmere.3 | 2 -- lib/libpmc/pmc.westmereuc.3 | 2 -- lib/libpmc/pmc_allocate.3 | 2 -- lib/libpmc/pmc_attach.3 | 2 -- lib/libpmc/pmc_capabilities.3 | 2 -- lib/libpmc/pmc_configure_logfile.3 | 2 -- lib/libpmc/pmc_disable.3 | 2 -- lib/libpmc/pmc_event_names_of_class.3 | 2 -- lib/libpmc/pmc_get_driver_stats.3 | 2 -- lib/libpmc/pmc_get_msr.3 | 2 -- lib/libpmc/pmc_init.3 | 2 -- lib/libpmc/pmc_name_of_capability.3 | 2 -- lib/libpmc/pmc_read.3 | 2 -- lib/libpmc/pmc_set.3 | 2 -- lib/libpmc/pmc_start.3 | 2 -- lib/libpmc/pmclog.3 | 2 -- lib/libprocstat/libprocstat.3 | 2 -- lib/libradius/libradius.3 | 2 -- lib/libradius/radius.conf.5 | 2 -- lib/librpcsec_gss/rpc_gss_get_error.3 | 2 -- lib/librpcsec_gss/rpc_gss_get_mech_info.3 | 2 -- lib/librpcsec_gss/rpc_gss_get_mechanisms.3 | 2 -- lib/librpcsec_gss/rpc_gss_get_principal_name.3 | 2 -- lib/librpcsec_gss/rpc_gss_get_versions.3 | 2 -- lib/librpcsec_gss/rpc_gss_getcred.3 | 2 -- lib/librpcsec_gss/rpc_gss_is_installed.3 | 2 -- lib/librpcsec_gss/rpc_gss_max_data_length.3 | 2 -- lib/librpcsec_gss/rpc_gss_mech_to_oid.3 | 2 -- lib/librpcsec_gss/rpc_gss_oid_to_mech.3 | 2 -- lib/librpcsec_gss/rpc_gss_qop_to_num.3 | 2 -- lib/librpcsec_gss/rpc_gss_seccreate.3 | 2 -- lib/librpcsec_gss/rpc_gss_set_callback.3 | 2 -- lib/librpcsec_gss/rpc_gss_set_defaults.3 | 2 -- lib/librpcsec_gss/rpc_gss_set_svc_name.3 | 2 -- lib/librpcsec_gss/rpc_gss_svc_max_data_length.3 | 2 -- lib/librpcsec_gss/rpcsec_gss.3 | 2 -- lib/librtld_db/librtld_db.3 | 2 -- lib/libstdbuf/libstdbuf.3 | 2 -- lib/libstdthreads/thrd_create.3 | 2 -- lib/libsysdecode/sysdecode.3 | 2 -- lib/libsysdecode/sysdecode_abi_to_freebsd_errno.3 | 2 -- lib/libsysdecode/sysdecode_cap_rights.3 | 2 -- lib/libsysdecode/sysdecode_cmsg_type.3 | 2 -- lib/libsysdecode/sysdecode_enum.3 | 2 -- lib/libsysdecode/sysdecode_fcntl_arg.3 | 2 -- lib/libsysdecode/sysdecode_ioctlname.3 | 2 -- lib/libsysdecode/sysdecode_kevent.3 | 2 -- lib/libsysdecode/sysdecode_mask.3 | 2 -- lib/libsysdecode/sysdecode_quotactl_cmd.3 | 2 -- lib/libsysdecode/sysdecode_sctp_sinfo_flags.3 | 2 -- lib/libsysdecode/sysdecode_sigcode.3 | 2 -- lib/libsysdecode/sysdecode_socket_protocol.3 | 2 -- lib/libsysdecode/sysdecode_sockopt_name.3 | 2 -- lib/libsysdecode/sysdecode_syscallnames.3 | 2 -- lib/libsysdecode/sysdecode_utrace.3 | 2 -- lib/libtacplus/libtacplus.3 | 2 -- lib/libtacplus/tacplus.conf.5 | 2 -- lib/libthr/libthr.3 | 2 -- lib/libufs/bread.3 | 2 -- lib/libufs/cgread.3 | 2 -- lib/libufs/getinode.3 | 2 -- lib/libufs/libufs.3 | 2 -- lib/libufs/sbread.3 | 2 -- lib/libufs/ufs_disk_close.3 | 2 -- lib/libugidfw/bsde_get_rule.3 | 2 -- lib/libugidfw/bsde_get_rule_count.3 | 2 -- lib/libugidfw/bsde_parse_rule.3 | 2 -- lib/libugidfw/bsde_rule_to_string.3 | 2 -- lib/libugidfw/libugidfw.3 | 2 -- lib/libulog/ulog_login.3 | 2 -- lib/libulog/utempter_add_record.3 | 2 -- lib/libusb/libusb.3 | 2 -- lib/libusb/libusb20.3 | 2 -- lib/libusbhid/usbhid.3 | 2 -- lib/libutil/_secure_path.3 | 2 -- lib/libutil/cpuset.3 | 2 -- lib/libutil/expand_number.3 | 2 -- lib/libutil/flopen.3 | 2 -- lib/libutil/getlocalbase.3 | 2 -- lib/libutil/hexdump.3 | 2 -- lib/libutil/kinfo_getallproc.3 | 2 -- lib/libutil/kinfo_getfile.3 | 2 -- lib/libutil/kinfo_getproc.3 | 2 -- lib/libutil/kinfo_getvmmap.3 | 2 -- lib/libutil/kinfo_getvmobject.3 | 2 -- lib/libutil/kld.3 | 2 -- lib/libutil/login.conf.5 | 2 -- lib/libutil/login_auth.3 | 2 -- lib/libutil/login_cap.3 | 2 -- lib/libutil/login_class.3 | 2 -- lib/libutil/login_ok.3 | 2 -- lib/libutil/login_times.3 | 2 -- lib/libutil/login_tty.3 | 2 -- lib/libutil/pidfile.3 | 2 -- lib/libutil/property.3 | 2 -- lib/libutil/pty.3 | 2 -- lib/libutil/pw_util.3 | 2 -- lib/libutil/quotafile.3 | 2 -- lib/libutil/realhostname.3 | 2 -- lib/libutil/realhostname_sa.3 | 2 -- lib/libutil/trimdomain.3 | 2 -- lib/libutil/uucplock.3 | 2 -- lib/libveriexec/veriexec.3 | 2 -- lib/libvgl/vgl.3 | 2 -- lib/libz/zopen.3 | 2 -- lib/msun/man/cacos.3 | 2 -- lib/msun/man/ccos.3 | 2 -- lib/msun/man/ccosh.3 | 2 -- lib/msun/man/cexp.3 | 2 -- lib/msun/man/cimag.3 | 2 -- lib/msun/man/clog.3 | 2 -- lib/msun/man/complex.3 | 2 -- lib/msun/man/cospi.3 | 2 -- lib/msun/man/csqrt.3 | 2 -- lib/msun/man/fdim.3 | 2 -- lib/msun/man/feclearexcept.3 | 2 -- lib/msun/man/feenableexcept.3 | 2 -- lib/msun/man/fegetenv.3 | 2 -- lib/msun/man/fegetround.3 | 2 -- lib/msun/man/fenv.3 | 2 -- lib/msun/man/fma.3 | 2 -- lib/msun/man/fmax.3 | 2 -- lib/msun/man/log.3 | 2 -- lib/msun/man/lrint.3 | 2 -- lib/msun/man/lround.3 | 2 -- lib/msun/man/nan.3 | 2 -- lib/msun/man/round.3 | 2 -- lib/msun/man/signbit.3 | 2 -- lib/msun/man/sincos.3 | 2 -- lib/msun/man/sinpi.3 | 2 -- lib/msun/man/tanpi.3 | 2 -- lib/msun/man/trunc.3 | 2 -- libexec/bootpd/bootpd.8 | 2 -- libexec/bootpd/bootptab.5 | 2 -- libexec/ftpd/ftpchroot.5 | 2 -- libexec/makewhatis.local/makewhatis.local.8 | 2 -- libexec/mknetid/mknetid.8 | 2 -- libexec/mknetid/netid.5 | 2 -- libexec/phttpget/phttpget.8 | 2 -- libexec/pppoed/pppoed.8 | 2 -- libexec/revnetgroup/revnetgroup.8 | 2 -- libexec/rpc.rquotad/rpc.rquotad.8 | 2 -- libexec/rpc.rstatd/rpc.rstatd.8 | 2 -- libexec/rpc.rusersd/rpc.rusersd.8 | 2 -- libexec/rpc.rwalld/rpc.rwalld.8 | 2 -- libexec/rpc.sprayd/rpc.sprayd.8 | 2 -- libexec/rtld-elf/rtld.1 | 2 -- libexec/ypxfr/ypxfr.8 | 2 -- sbin/adjkerntz/adjkerntz.8 | 2 -- sbin/bectl/bectl.8 | 2 -- sbin/camcontrol/camcontrol.8 | 2 -- sbin/conscontrol/conscontrol.8 | 2 -- sbin/ddb/ddb.8 | 2 -- sbin/decryptcore/decryptcore.8 | 2 -- sbin/devd/devd.8 | 2 -- sbin/devd/devd.conf.5 | 2 -- sbin/devfs/devfs.8 | 2 -- sbin/devmatch/devmatch.8 | 2 -- sbin/dhclient/dhclient-script.8 | 2 -- sbin/dhclient/dhclient.8 | 2 -- sbin/dhclient/dhclient.conf.5 | 2 -- sbin/dhclient/dhclient.leases.5 | 2 -- sbin/dhclient/dhcp-options.5 | 2 -- sbin/etherswitchcfg/etherswitchcfg.8 | 2 -- sbin/fsck/fsck.8 | 2 -- sbin/fsck_msdosfs/fsck_msdosfs.8 | 2 -- sbin/fsdb/fsdb.8 | 2 -- sbin/gbde/gbde.8 | 2 -- sbin/geom/core/geom.8 | 2 -- sbin/ggate/ggatec/ggatec.8 | 2 -- sbin/ggate/ggated/ggated.8 | 2 -- sbin/ggate/ggatel/ggatel.8 | 2 -- sbin/gvinum/gvinum.8 | 2 -- sbin/hastctl/hastctl.8 | 2 -- sbin/hastd/hast.conf.5 | 2 -- sbin/hastd/hastd.8 | 2 -- sbin/ipfw/ipfw.8 | 2 -- sbin/kldconfig/kldconfig.8 | 2 -- sbin/kldload/kldload.8 | 2 -- sbin/kldstat/kldstat.8 | 2 -- sbin/kldunload/kldunload.8 | 2 -- sbin/ldconfig/ldconfig.8 | 2 -- sbin/mdconfig/mdconfig.8 | 2 -- sbin/mdmfs/mdmfs.8 | 2 -- sbin/mount_fusefs/mount_fusefs.8 | 2 -- sbin/mount_msdosfs/mount_msdosfs.8 | 2 -- sbin/mount_udf/mount_udf.8 | 2 -- sbin/newfs_msdos/newfs_msdos.8 | 2 -- sbin/nos-tun/nos-tun.8 | 2 -- sbin/nvmecontrol/nvmecontrol.8 | 2 -- sbin/pfctl/pfctl.8 | 2 -- sbin/pfilctl/pfilctl.8 | 2 -- sbin/rcorder/rcorder.8 | 2 -- sbin/reboot/boot_i386.8 | 2 -- sbin/reboot/nextboot.8 | 2 -- sbin/recoverdisk/recoverdisk.1 | 2 -- sbin/setkey/setkey.8 | 2 -- sbin/veriexec/veriexec.8 | 2 -- sbin/zfsbootcfg/zfsbootcfg.8 | 2 -- share/doc/papers/bufbio/bio.ms | 2 -- share/doc/papers/contents/contents.ms | 2 -- share/doc/papers/diskperf/motivation.ms | 2 -- share/doc/papers/jail/future.ms | 2 -- share/doc/papers/jail/implementation.ms | 2 -- share/doc/papers/jail/mgt.ms | 2 -- share/doc/papers/jail/paper.ms | 2 -- share/doc/papers/malloc/abs.ms | 2 -- share/doc/papers/malloc/alternatives.ms | 2 -- share/doc/papers/malloc/conclusion.ms | 2 -- share/doc/papers/malloc/implementation.ms | 2 -- share/doc/papers/malloc/intro.ms | 2 -- share/doc/papers/malloc/kernel.ms | 2 -- share/doc/papers/malloc/malloc.ms | 2 -- share/doc/papers/malloc/performance.ms | 2 -- share/doc/papers/malloc/problems.ms | 2 -- share/doc/papers/sysperf/4.t | 2 -- share/doc/papers/sysperf/5.t | 2 -- share/doc/papers/timecounter/timecounter.ms | 2 -- share/doc/psd/01.cacm/p.mac | 2 -- share/doc/psd/01.cacm/p1 | 2 -- share/doc/psd/01.cacm/p2 | 2 -- share/doc/psd/01.cacm/p3 | 2 -- share/doc/psd/01.cacm/p4 | 2 -- share/doc/psd/01.cacm/p5 | 2 -- share/doc/psd/01.cacm/p6 | 2 -- share/doc/psd/02.implement/fig1.pic | 2 -- share/doc/psd/02.implement/fig2.pic | 2 -- share/doc/psd/02.implement/implement | 2 -- share/doc/psd/03.iosys/iosys | 2 -- share/doc/psd/06.Clang/Clang.ms | 2 -- share/doc/psd/15.yacc/ss0 | 2 -- share/doc/psd/15.yacc/ss1 | 2 -- share/doc/psd/15.yacc/ss10 | 2 -- share/doc/psd/15.yacc/ss11 | 2 -- share/doc/psd/15.yacc/ss2 | 2 -- share/doc/psd/15.yacc/ss3 | 2 -- share/doc/psd/15.yacc/ss4 | 2 -- share/doc/psd/15.yacc/ss5 | 2 -- share/doc/psd/15.yacc/ss6 | 2 -- share/doc/psd/15.yacc/ss7 | 2 -- share/doc/psd/15.yacc/ss8 | 2 -- share/doc/psd/15.yacc/ss9 | 2 -- share/doc/psd/15.yacc/ss_ | 2 -- share/doc/psd/15.yacc/ssa | 2 -- share/doc/psd/15.yacc/ssb | 2 -- share/doc/psd/15.yacc/ssc | 2 -- share/doc/psd/15.yacc/ssd | 2 -- share/doc/psd/16.lex/lex.ms | 2 -- share/doc/psd/17.m4/m4.ms | 2 -- share/doc/psd/21.ipc/3.t | 2 -- share/doc/smm/01.setup/3.t | 2 -- share/doc/smm/03.fsck/0.t | 2 -- share/doc/smm/03.fsck/1.t | 2 -- share/doc/smm/03.fsck/2.t | 2 -- share/doc/smm/03.fsck/3.t | 2 -- share/doc/smm/03.fsck/4.t | 2 -- share/doc/smm/05.fastfs/3.t | 2 -- share/doc/smm/06.nfs/1.t | 2 -- share/doc/smm/06.nfs/2.t | 2 -- share/doc/smm/18.net/7.t | 2 -- share/doc/usd/07.mail/mail0.nr | 2 -- share/doc/usd/13.viref/vi.ref | 2 -- share/doc/usd/18.msdiffs/ms.diffs | 2 -- share/doc/usd/21.troff/m.mac | 2 -- share/doc/usd/21.troff/m0 | 2 -- share/doc/usd/21.troff/m0a | 2 -- share/doc/usd/21.troff/m1 | 2 -- share/doc/usd/21.troff/m2 | 2 -- share/doc/usd/21.troff/m3 | 2 -- share/doc/usd/21.troff/m4 | 2 -- share/doc/usd/21.troff/m5 | 2 -- share/doc/usd/21.troff/table1 | 2 -- share/doc/usd/21.troff/table2 | 2 -- share/doc/usd/22.trofftut/tt04 | 2 -- share/examples/mdoc/POSIX-copyright | 2 -- share/examples/scsi_target/scsi_target.8 | 2 -- share/examples/ses/getencstat/getencstat.0 | 2 -- share/examples/ses/sesd/sesd.0 | 2 -- share/examples/ses/setencstat/setencstat.0 | 2 -- share/examples/ses/setobjstat/setobjstat.0 | 2 -- share/man/man1/builtin.1 | 2 -- share/man/man3/ATOMIC_VAR_INIT.3 | 2 -- share/man/man3/CMSG_DATA.3 | 2 -- share/man/man3/Q_FRAWMASK.3 | 2 -- share/man/man3/Q_IFRAWMASK.3 | 2 -- share/man/man3/Q_INI.3 | 2 -- share/man/man3/Q_IRAWMASK.3 | 2 -- share/man/man3/Q_QABS.3 | 2 -- share/man/man3/Q_QADDI.3 | 2 -- share/man/man3/Q_QADDQ.3 | 2 -- share/man/man3/Q_SIGNED.3 | 2 -- share/man/man3/Q_SIGNSHFT.3 | 2 -- share/man/man3/arb.3 | 2 -- share/man/man3/makedev.3 | 2 -- share/man/man3/offsetof.3 | 2 -- share/man/man3/pthread.3 | 2 -- share/man/man3/pthread_affinity_np.3 | 2 -- share/man/man3/pthread_atfork.3 | 2 -- share/man/man3/pthread_attr.3 | 2 -- share/man/man3/pthread_attr_affinity_np.3 | 2 -- share/man/man3/pthread_attr_get_np.3 | 2 -- share/man/man3/pthread_attr_setcreatesuspend_np.3 | 2 -- share/man/man3/pthread_barrier_destroy.3 | 2 -- share/man/man3/pthread_barrierattr.3 | 2 -- share/man/man3/pthread_cleanup_pop.3 | 2 -- share/man/man3/pthread_cleanup_push.3 | 2 -- share/man/man3/pthread_cond_broadcast.3 | 2 -- share/man/man3/pthread_cond_destroy.3 | 2 -- share/man/man3/pthread_cond_init.3 | 2 -- share/man/man3/pthread_cond_signal.3 | 2 -- share/man/man3/pthread_cond_timedwait.3 | 2 -- share/man/man3/pthread_cond_wait.3 | 2 -- share/man/man3/pthread_condattr.3 | 2 -- share/man/man3/pthread_create.3 | 2 -- share/man/man3/pthread_detach.3 | 2 -- share/man/man3/pthread_equal.3 | 2 -- share/man/man3/pthread_exit.3 | 2 -- share/man/man3/pthread_getconcurrency.3 | 2 -- share/man/man3/pthread_getcpuclockid.3 | 2 -- share/man/man3/pthread_getspecific.3 | 2 -- share/man/man3/pthread_getthreadid_np.3 | 2 -- share/man/man3/pthread_join.3 | 2 -- share/man/man3/pthread_key_create.3 | 2 -- share/man/man3/pthread_key_delete.3 | 2 -- share/man/man3/pthread_kill.3 | 2 -- share/man/man3/pthread_main_np.3 | 2 -- share/man/man3/pthread_multi_np.3 | 2 -- share/man/man3/pthread_mutex_consistent.3 | 2 -- share/man/man3/pthread_mutex_destroy.3 | 2 -- share/man/man3/pthread_mutex_init.3 | 2 -- share/man/man3/pthread_mutex_lock.3 | 2 -- share/man/man3/pthread_mutex_timedlock.3 | 2 -- share/man/man3/pthread_mutex_trylock.3 | 2 -- share/man/man3/pthread_mutex_unlock.3 | 2 -- share/man/man3/pthread_mutexattr.3 | 2 -- share/man/man3/pthread_mutexattr_getkind_np.3 | 2 -- share/man/man3/pthread_once.3 | 2 -- share/man/man3/pthread_resume_all_np.3 | 2 -- share/man/man3/pthread_resume_np.3 | 2 -- share/man/man3/pthread_rwlock_destroy.3 | 2 -- share/man/man3/pthread_rwlock_init.3 | 2 -- share/man/man3/pthread_rwlock_rdlock.3 | 2 -- share/man/man3/pthread_rwlock_timedrdlock.3 | 2 -- share/man/man3/pthread_rwlock_timedwrlock.3 | 2 -- share/man/man3/pthread_rwlock_unlock.3 | 2 -- share/man/man3/pthread_rwlock_wrlock.3 | 2 -- share/man/man3/pthread_rwlockattr_destroy.3 | 2 -- share/man/man3/pthread_rwlockattr_getpshared.3 | 2 -- share/man/man3/pthread_rwlockattr_init.3 | 2 -- share/man/man3/pthread_rwlockattr_setpshared.3 | 2 -- share/man/man3/pthread_schedparam.3 | 2 -- share/man/man3/pthread_self.3 | 2 -- share/man/man3/pthread_set_name_np.3 | 2 -- share/man/man3/pthread_setspecific.3 | 2 -- share/man/man3/pthread_sigmask.3 | 2 -- share/man/man3/pthread_spin_init.3 | 2 -- share/man/man3/pthread_spin_lock.3 | 2 -- share/man/man3/pthread_suspend_all_np.3 | 2 -- share/man/man3/pthread_suspend_np.3 | 2 -- share/man/man3/pthread_switch_add_np.3 | 2 -- share/man/man3/pthread_yield.3 | 2 -- share/man/man3/qmath.3 | 2 -- share/man/man3/sigevent.3 | 2 -- share/man/man3/siginfo.3 | 2 -- share/man/man3/snl.3 | 2 -- share/man/man3/stats.3 | 2 -- share/man/man3/sysexits.3 | 2 -- share/man/man3/tgmath.3 | 2 -- share/man/man3/timeradd.3 | 2 -- share/man/man3/tree.3 | 2 -- share/man/man3lua/intro.3lua | 2 -- share/man/man4/aac.4 | 2 -- share/man/man4/aacraid.4 | 2 -- share/man/man4/acpi.4 | 2 -- share/man/man4/acpi_asus.4 | 2 -- share/man/man4/acpi_asus_wmi.4 | 2 -- share/man/man4/acpi_battery.4 | 2 -- share/man/man4/acpi_dock.4 | 2 -- share/man/man4/acpi_fujitsu.4 | 2 -- share/man/man4/acpi_ged.4 | 2 -- share/man/man4/acpi_hp.4 | 2 -- share/man/man4/acpi_ibm.4 | 2 -- share/man/man4/acpi_panasonic.4 | 2 -- share/man/man4/acpi_rapidstart.4 | 2 -- share/man/man4/acpi_sony.4 | 2 -- share/man/man4/acpi_thermal.4 | 2 -- share/man/man4/acpi_toshiba.4 | 2 -- share/man/man4/acpi_video.4 | 2 -- share/man/man4/acpi_wmi.4 | 2 -- share/man/man4/ada.4 | 2 -- share/man/man4/adm6996fc.4 | 2 -- share/man/man4/ads111x.4 | 2 -- share/man/man4/ae.4 | 2 -- share/man/man4/aesni.4 | 2 -- share/man/man4/age.4 | 2 -- share/man/man4/agp.4 | 2 -- share/man/man4/ahc.4 | 2 -- share/man/man4/ahci.4 | 2 -- share/man/man4/ahd.4 | 2 -- share/man/man4/aio.4 | 2 -- share/man/man4/alc.4 | 2 -- share/man/man4/ale.4 | 2 -- share/man/man4/alpm.4 | 2 -- share/man/man4/altera_atse.4 | 2 -- share/man/man4/altera_avgen.4 | 2 -- share/man/man4/altera_jtag_uart.4 | 2 -- share/man/man4/altera_sdcard.4 | 2 -- share/man/man4/altq.4 | 2 -- share/man/man4/amdpm.4 | 2 -- share/man/man4/amdsbwd.4 | 2 -- share/man/man4/amdsmb.4 | 2 -- share/man/man4/amdsmn.4 | 2 -- share/man/man4/amdtemp.4 | 2 -- share/man/man4/aout.4 | 2 -- share/man/man4/apic.4 | 2 -- share/man/man4/arcmsr.4 | 2 -- share/man/man4/arswitch.4 | 2 -- share/man/man4/asmc.4 | 2 -- share/man/man4/at45d.4 | 2 -- share/man/man4/ata.4 | 2 -- share/man/man4/ath.4 | 2 -- share/man/man4/ath10k.4 | 2 -- share/man/man4/ath_hal.4 | 2 -- share/man/man4/atkbd.4 | 2 -- share/man/man4/atkbdc.4 | 2 -- share/man/man4/atp.4 | 2 -- share/man/man4/atrtc.4 | 2 -- share/man/man4/attimer.4 | 2 -- share/man/man4/audit.4 | 2 -- share/man/man4/auditpipe.4 | 2 -- share/man/man4/aue.4 | 2 -- share/man/man4/axe.4 | 2 -- share/man/man4/axge.4 | 2 -- share/man/man4/bce.4 | 2 -- share/man/man4/bcm5974.4 | 2 -- share/man/man4/bcma.4 | 2 -- share/man/man4/bfe.4 | 2 -- share/man/man4/bge.4 | 2 -- share/man/man4/bhnd.4 | 2 -- share/man/man4/bhnd_chipc.4 | 2 -- share/man/man4/bhnd_pmu.4 | 2 -- share/man/man4/bhndb.4 | 2 -- share/man/man4/bhndb_pci.4 | 2 -- share/man/man4/bhyve.4 | 2 -- share/man/man4/blackhole.4 | 2 -- share/man/man4/bnxt.4 | 2 -- share/man/man4/bpf.4 | 2 -- share/man/man4/bridge.4 | 2 -- share/man/man4/bwi.4 | 2 -- share/man/man4/bwn.4 | 2 -- share/man/man4/bxe.4 | 2 -- share/man/man4/bytgpio.4 | 2 -- share/man/man4/capsicum.4 | 2 -- share/man/man4/cardbus.4 | 2 -- share/man/man4/carp.4 | 2 -- share/man/man4/cas.4 | 2 -- share/man/man4/cc_cdg.4 | 2 -- share/man/man4/cc_chd.4 | 2 -- share/man/man4/cc_cubic.4 | 2 -- share/man/man4/cc_dctcp.4 | 2 -- share/man/man4/cc_hd.4 | 2 -- share/man/man4/cc_htcp.4 | 2 -- share/man/man4/cc_newreno.4 | 2 -- share/man/man4/cc_vegas.4 | 2 -- share/man/man4/ccd.4 | 2 -- share/man/man4/ccr.4 | 2 -- share/man/man4/cd.4 | 2 -- share/man/man4/cdceem.4 | 2 -- share/man/man4/cfi.4 | 2 -- share/man/man4/cfiscsi.4 | 2 -- share/man/man4/cfumass.4 | 2 -- share/man/man4/cgem.4 | 2 -- share/man/man4/chromebook_platform.4 | 2 -- share/man/man4/chvgpio.4 | 2 -- share/man/man4/coretemp.4 | 2 -- share/man/man4/cp2112.4 | 2 -- share/man/man4/cpuctl.4 | 2 -- share/man/man4/cpufreq.4 | 2 -- share/man/man4/crypto.4 | 2 -- share/man/man4/ctl.4 | 2 -- share/man/man4/cue.4 | 2 -- share/man/man4/cxgb.4 | 2 -- share/man/man4/cxgbe.4 | 2 -- share/man/man4/cxgbev.4 | 2 -- share/man/man4/cyapa.4 | 2 -- share/man/man4/da.4 | 2 -- share/man/man4/dc.4 | 2 -- share/man/man4/dcons.4 | 2 -- share/man/man4/dcons_crom.4 | 2 -- share/man/man4/ddb.4 | 2 -- share/man/man4/devctl.4 | 2 -- share/man/man4/disk.4 | 2 -- share/man/man4/dpms.4 | 2 -- share/man/man4/ds1307.4 | 2 -- share/man/man4/ds3231.4 | 2 -- share/man/man4/dtrace_audit.4 | 2 -- share/man/man4/dtrace_io.4 | 2 -- share/man/man4/dtrace_ip.4 | 2 -- share/man/man4/dtrace_kinst.4 | 2 -- share/man/man4/dtrace_lockstat.4 | 2 -- share/man/man4/dtrace_proc.4 | 2 -- share/man/man4/dtrace_sched.4 | 2 -- share/man/man4/dtrace_sctp.4 | 2 -- share/man/man4/dtrace_tcp.4 | 2 -- share/man/man4/dtrace_udp.4 | 2 -- share/man/man4/dtrace_udplite.4 | 2 -- share/man/man4/dummynet.4 | 2 -- share/man/man4/e6060sw.4 | 2 -- share/man/man4/efidev.4 | 2 -- share/man/man4/ehci.4 | 2 -- share/man/man4/em.4 | 2 -- share/man/man4/ena.4 | 2 -- share/man/man4/enc.4 | 2 -- *** 31689 LINES SKIPPED *** From nobody Wed Aug 16 17:57:13 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RQwnk2cJZz4qvZD; Wed, 16 Aug 2023 17:57:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RQwnj6pJ2z3Vg5; Wed, 16 Aug 2023 17:57:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692208634; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kh3sBEDkjDYsVZQvYBSUO/M/m8dwk8XOOqTzAcazp3w=; b=f97pHjHYbp/hqQLrfKBwPMvOt1q67/BHCNoidaQsq1Vy4UpXvDPNZV79Kh8uiJsL7zpN/h 1s9X2nSWgS4oCFyAdm1T3f9SoLrVBsXmFCz1J6AyHuQAbcJsD5mzkQn6ALV+2upoVdK9kN 1rR9UMPajex/S/8U49OTC3nhsrSBNWdb3uteqV4Nkxi6a1qphDJjc3BPr4J+T0vd0SQuyK 8Drf1lIZiFk22zlx10Rmju4V2tYFnEAEbPPllUIQfMTIspD30EdxhRQGnGv+agxytM891S cusZWYABQTp8Ne/FqFrkPuFbhwX6iYj6nr9W/4tDtl2NN3+1aGWHaKdJmP2Xkg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692208634; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kh3sBEDkjDYsVZQvYBSUO/M/m8dwk8XOOqTzAcazp3w=; b=CPzjGQCtI0VRtuA4kRCocKl/qi65mcXnLv6D5zcvNsaXN4aEkt1+xIJoa4p2+dVT7tTaYm e0hKWwt282NQMakFO+rHOkW3vnTzX0KuMEnJI+RU8dvIlBn4+gvKCCy15/khT2vwVJeJ26 sfbWTrm3zFJtNmlVxoSu3fe27iX7lqEwaMCHnhXpzKeC8z2P8+4K1Trf5oR+98LMwlvaLD ZRpXvu9G2x/RkICqveCBLOW5kNg9bfWfmTmyhQYJA8t4fCqsD4bcAzY6z5B9txmX7VS8GM mulMLYHvukOAXXi+Zgu0E/uQSGnTJw4AOejnBVjSkbm6yYJbvHKGxYcb6gUVtQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692208634; a=rsa-sha256; cv=none; b=mFd4PxU8bVySHFRKe6FarWEHUa6LzJcVd/sibpB5dvu4tQAk1aWQhuVBpWJU7fhAvdujrw +pOWhW4w5q9IjjK5FUqcHmya+b0o7zpv8JqrQxnwzh7SXwWuq/0A6iqhp9ceEyGrgl6U1i T2FmFKB2RkXVJQZMy24NPaAdMg2edxtctyf4v2eqtRwPT/WSgX7RSu9e7bZBZv55WaV9ag Da4KwBkUas1O1dbZ9weTQG8jHMA6jpl/6E5HbZdWrlszRAhOajC5469rvr7mPnT49r5RYw YnFEJppX5yvxO80QE3QFKiy/0J+GlQ+jxZTLQZ6zX8rwUEJIRcguPQOd6oenmQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RQwnj5vQlz11dP; Wed, 16 Aug 2023 17:57:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37GHvDnc059743; Wed, 16 Aug 2023 17:57:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37GHvDAj059740; Wed, 16 Aug 2023 17:57:13 GMT (envelope-from git) Date: Wed, 16 Aug 2023 17:57:13 GMT Message-Id: <202308161757.37GHvDAj059740@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: b2c76c41be32 - main - Remove $FreeBSD$: one-line nroff pattern List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b2c76c41be32f904179efed29c0ca04d53f3996c Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=b2c76c41be32f904179efed29c0ca04d53f3996c commit b2c76c41be32f904179efed29c0ca04d53f3996c Author: Warner Losh AuthorDate: 2023-08-16 17:55:15 +0000 Commit: Warner Losh CommitDate: 2023-08-16 17:55:15 +0000 Remove $FreeBSD$: one-line nroff pattern Remove /^\.\\"\s*\$FreeBSD\$$\n/ --- bin/cat/cat.1 | 1 - bin/chflags/chflags.1 | 1 - bin/chmod/chmod.1 | 1 - bin/cp/cp.1 | 1 - bin/date/date.1 | 1 - bin/dd/dd.1 | 1 - bin/df/df.1 | 1 - bin/domainname/domainname.1 | 1 - bin/echo/echo.1 | 1 - bin/ed/ed.1 | 1 - bin/hostname/hostname.1 | 1 - bin/kill/kill.1 | 1 - bin/ln/ln.1 | 1 - bin/ln/symlink.7 | 1 - bin/ls/ls.1 | 1 - bin/mkdir/mkdir.1 | 1 - bin/mv/mv.1 | 1 - bin/pax/pax.1 | 1 - bin/ps/ps.1 | 1 - bin/pwd/pwd.1 | 1 - bin/realpath/realpath.1 | 1 - bin/rm/rm.1 | 1 - bin/rmdir/rmdir.1 | 1 - bin/sh/sh.1 | 1 - bin/sleep/sleep.1 | 1 - bin/stty/stty.1 | 1 - bin/sync/sync.8 | 1 - bin/test/test.1 | 1 - lib/libbluetooth/bluetooth.3 | 1 - lib/libc/compat-43/creat.2 | 1 - lib/libc/compat-43/gethostid.3 | 1 - lib/libc/compat-43/killpg.2 | 1 - lib/libc/compat-43/setruid.3 | 1 - lib/libc/compat-43/sigpause.2 | 1 - lib/libc/compat-43/sigsetmask.2 | 1 - lib/libc/compat-43/sigvec.2 | 1 - lib/libc/db/man/btree.3 | 1 - lib/libc/db/man/dbopen.3 | 1 - lib/libc/db/man/hash.3 | 1 - lib/libc/db/man/mpool.3 | 1 - lib/libc/db/man/recno.3 | 1 - lib/libc/gen/alarm.3 | 1 - lib/libc/gen/arc4random.3 | 1 - lib/libc/gen/clock.3 | 1 - lib/libc/gen/confstr.3 | 1 - lib/libc/gen/ctermid.3 | 1 - lib/libc/gen/daemon.3 | 1 - lib/libc/gen/devname.3 | 1 - lib/libc/gen/directory.3 | 1 - lib/libc/gen/dl_iterate_phdr.3 | 1 - lib/libc/gen/dlopen.3 | 1 - lib/libc/gen/err.3 | 1 - lib/libc/gen/exec.3 | 1 - lib/libc/gen/fnmatch.3 | 1 - lib/libc/gen/frexp.3 | 1 - lib/libc/gen/fts.3 | 1 - lib/libc/gen/getbootfile.3 | 1 - lib/libc/gen/getbsize.3 | 1 - lib/libc/gen/getcap.3 | 1 - lib/libc/gen/getcwd.3 | 1 - lib/libc/gen/getdiskbyname.3 | 1 - lib/libc/gen/getdomainname.3 | 1 - lib/libc/gen/getfsent.3 | 1 - lib/libc/gen/getgrent.3 | 1 - lib/libc/gen/getgrouplist.3 | 1 - lib/libc/gen/gethostname.3 | 1 - lib/libc/gen/getloadavg.3 | 1 - lib/libc/gen/getmntinfo.3 | 1 - lib/libc/gen/getnetgrent.3 | 1 - lib/libc/gen/getpagesize.3 | 1 - lib/libc/gen/getpass.3 | 1 - lib/libc/gen/getpwent.3 | 1 - lib/libc/gen/getttyent.3 | 1 - lib/libc/gen/getusershell.3 | 1 - lib/libc/gen/getvfsbyname.3 | 1 - lib/libc/gen/glob.3 | 1 - lib/libc/gen/initgroups.3 | 1 - lib/libc/gen/ldexp.3 | 1 - lib/libc/gen/modf.3 | 1 - lib/libc/gen/nice.3 | 1 - lib/libc/gen/nlist.3 | 1 - lib/libc/gen/pause.3 | 1 - lib/libc/gen/popen.3 | 1 - lib/libc/gen/psignal.3 | 1 - lib/libc/gen/raise.3 | 1 - lib/libc/gen/rand48.3 | 1 - lib/libc/gen/scandir.3 | 1 - lib/libc/gen/setjmp.3 | 1 - lib/libc/gen/setmode.3 | 1 - lib/libc/gen/siginterrupt.3 | 1 - lib/libc/gen/signal.3 | 1 - lib/libc/gen/sigsetops.3 | 1 - lib/libc/gen/sleep.3 | 1 - lib/libc/gen/strtofflags.3 | 1 - lib/libc/gen/sysconf.3 | 1 - lib/libc/gen/sysctl.3 | 1 - lib/libc/gen/syslog.3 | 1 - lib/libc/gen/tcgetpgrp.3 | 1 - lib/libc/gen/tcsendbreak.3 | 1 - lib/libc/gen/tcsetattr.3 | 1 - lib/libc/gen/tcsetpgrp.3 | 1 - lib/libc/gen/time.3 | 1 - lib/libc/gen/times.3 | 1 - lib/libc/gen/timezone.3 | 1 - lib/libc/gen/ttyname.3 | 1 - lib/libc/gen/tzset.3 | 1 - lib/libc/gen/ualarm.3 | 1 - lib/libc/gen/uname.3 | 1 - lib/libc/gen/usleep.3 | 1 - lib/libc/gen/utime.3 | 1 - lib/libc/gen/valloc.3 | 1 - lib/libc/gmon/moncontrol.3 | 1 - lib/libc/i386/sys/i386_get_ldt.2 | 1 - lib/libc/iconv/iconv.3 | 1 - lib/libc/locale/ctype.3 | 1 - lib/libc/locale/digittoint.3 | 1 - lib/libc/locale/euc.5 | 1 - lib/libc/locale/isalnum.3 | 1 - lib/libc/locale/isalpha.3 | 1 - lib/libc/locale/isascii.3 | 1 - lib/libc/locale/isblank.3 | 1 - lib/libc/locale/iscntrl.3 | 1 - lib/libc/locale/isdigit.3 | 1 - lib/libc/locale/isgraph.3 | 1 - lib/libc/locale/islower.3 | 1 - lib/libc/locale/isprint.3 | 1 - lib/libc/locale/ispunct.3 | 1 - lib/libc/locale/isspace.3 | 1 - lib/libc/locale/isupper.3 | 1 - lib/libc/locale/iswalnum.3 | 1 - lib/libc/locale/isxdigit.3 | 1 - lib/libc/locale/localeconv.3 | 1 - lib/libc/locale/mblen.3 | 1 - lib/libc/locale/mbstowcs.3 | 1 - lib/libc/locale/mbtowc.3 | 1 - lib/libc/locale/multibyte.3 | 1 - lib/libc/locale/setlocale.3 | 1 - lib/libc/locale/toascii.3 | 1 - lib/libc/locale/tolower.3 | 1 - lib/libc/locale/toupper.3 | 1 - lib/libc/locale/towlower.3 | 1 - lib/libc/locale/towupper.3 | 1 - lib/libc/locale/utf8.5 | 1 - lib/libc/locale/wcstombs.3 | 1 - lib/libc/locale/wctomb.3 | 1 - lib/libc/net/byteorder.3 | 1 - lib/libc/net/gethostbyname.3 | 1 - lib/libc/net/getipnodebyname.3 | 1 - lib/libc/net/getnetent.3 | 1 - lib/libc/net/getprotoent.3 | 1 - lib/libc/net/getservent.3 | 1 - lib/libc/net/inet.3 | 1 - lib/libc/net/linkaddr.3 | 1 - lib/libc/net/rcmd.3 | 1 - lib/libc/net/resolver.3 | 1 - lib/libc/net/sctp_bindx.3 | 1 - lib/libc/net/sctp_freepaddrs.3 | 1 - lib/libc/net/sctp_getaddrlen.3 | 1 - lib/libc/net/sctp_getpaddrs.3 | 1 - lib/libc/net/sctp_opt_info.3 | 1 - lib/libc/net/sctp_sendmsg.3 | 1 - lib/libc/regex/re_format.7 | 1 - lib/libc/regex/regex.3 | 1 - lib/libc/rpc/bindresvport.3 | 1 - lib/libc/rpc/des_crypt.3 | 1 - lib/libc/rpc/getnetconfig.3 | 1 - lib/libc/rpc/getnetpath.3 | 1 - lib/libc/rpc/getrpcent.3 | 1 - lib/libc/rpc/getrpcport.3 | 1 - lib/libc/rpc/netconfig.5 | 1 - lib/libc/rpc/publickey.3 | 1 - lib/libc/rpc/publickey.5 | 1 - lib/libc/rpc/rpc.3 | 1 - lib/libc/rpc/rpc.5 | 1 - lib/libc/rpc/rpc_clnt_auth.3 | 1 - lib/libc/rpc/rpc_clnt_calls.3 | 1 - lib/libc/rpc/rpc_clnt_create.3 | 1 - lib/libc/rpc/rpc_secure.3 | 1 - lib/libc/rpc/rpc_soc.3 | 1 - lib/libc/rpc/rpc_svc_calls.3 | 1 - lib/libc/rpc/rpc_svc_create.3 | 1 - lib/libc/rpc/rpc_svc_err.3 | 1 - lib/libc/rpc/rpc_svc_reg.3 | 1 - lib/libc/rpc/rpc_xdr.3 | 1 - lib/libc/rpc/rpcbind.3 | 1 - lib/libc/rpc/rtime.3 | 1 - lib/libc/stdio/fclose.3 | 1 - lib/libc/stdio/ferror.3 | 1 - lib/libc/stdio/fflush.3 | 1 - lib/libc/stdio/fgetln.3 | 1 - lib/libc/stdio/fgets.3 | 1 - lib/libc/stdio/fgetwln.3 | 1 - lib/libc/stdio/fgetws.3 | 1 - lib/libc/stdio/fopen.3 | 1 - lib/libc/stdio/fputs.3 | 1 - lib/libc/stdio/fputws.3 | 1 - lib/libc/stdio/fread.3 | 1 - lib/libc/stdio/fseek.3 | 1 - lib/libc/stdio/funopen.3 | 1 - lib/libc/stdio/fwide.3 | 1 - lib/libc/stdio/getc.3 | 1 - lib/libc/stdio/getwc.3 | 1 - lib/libc/stdio/mktemp.3 | 1 - lib/libc/stdio/printf.3 | 1 - lib/libc/stdio/putc.3 | 1 - lib/libc/stdio/putwc.3 | 1 - lib/libc/stdio/remove.3 | 1 - lib/libc/stdio/scanf.3 | 1 - lib/libc/stdio/setbuf.3 | 1 - lib/libc/stdio/stdio.3 | 1 - lib/libc/stdio/tmpnam.3 | 1 - lib/libc/stdio/ungetc.3 | 1 - lib/libc/stdio/ungetwc.3 | 1 - lib/libc/stdio/wprintf.3 | 1 - lib/libc/stdio/wscanf.3 | 1 - lib/libc/stdlib/abort.3 | 1 - lib/libc/stdlib/abs.3 | 1 - lib/libc/stdlib/alloca.3 | 1 - lib/libc/stdlib/atexit.3 | 1 - lib/libc/stdlib/atof.3 | 1 - lib/libc/stdlib/atoi.3 | 1 - lib/libc/stdlib/atol.3 | 1 - lib/libc/stdlib/bsearch.3 | 1 - lib/libc/stdlib/div.3 | 1 - lib/libc/stdlib/exit.3 | 1 - lib/libc/stdlib/getenv.3 | 1 - lib/libc/stdlib/getopt.3 | 1 - lib/libc/stdlib/getopt_long.3 | 1 - lib/libc/stdlib/getsubopt.3 | 1 - lib/libc/stdlib/labs.3 | 1 - lib/libc/stdlib/ldiv.3 | 1 - lib/libc/stdlib/memory.3 | 1 - lib/libc/stdlib/qsort.3 | 1 - lib/libc/stdlib/radixsort.3 | 1 - lib/libc/stdlib/rand.3 | 1 - lib/libc/stdlib/random.3 | 1 - lib/libc/stdlib/reallocf.3 | 1 - lib/libc/stdlib/realpath.3 | 1 - lib/libc/stdlib/strtod.3 | 1 - lib/libc/stdlib/strtol.3 | 1 - lib/libc/stdlib/strtonum.3 | 1 - lib/libc/stdlib/strtoul.3 | 1 - lib/libc/stdlib/system.3 | 1 - lib/libc/stdlib/tsearch.3 | 1 - lib/libc/stdtime/ctime.3 | 1 - lib/libc/stdtime/strftime.3 | 1 - lib/libc/string/bcmp.3 | 1 - lib/libc/string/bcopy.3 | 1 - lib/libc/string/bstring.3 | 1 - lib/libc/string/bzero.3 | 1 - lib/libc/string/ffs.3 | 1 - lib/libc/string/index.3 | 1 - lib/libc/string/memccpy.3 | 1 - lib/libc/string/memchr.3 | 1 - lib/libc/string/memcmp.3 | 1 - lib/libc/string/memcpy.3 | 1 - lib/libc/string/memmove.3 | 1 - lib/libc/string/memset.3 | 1 - lib/libc/string/strcasecmp.3 | 1 - lib/libc/string/strcat.3 | 1 - lib/libc/string/strchr.3 | 1 - lib/libc/string/strcmp.3 | 1 - lib/libc/string/strcoll.3 | 1 - lib/libc/string/strcpy.3 | 1 - lib/libc/string/strdup.3 | 1 - lib/libc/string/strerror.3 | 1 - lib/libc/string/string.3 | 1 - lib/libc/string/strlen.3 | 1 - lib/libc/string/strmode.3 | 1 - lib/libc/string/strpbrk.3 | 1 - lib/libc/string/strsep.3 | 1 - lib/libc/string/strspn.3 | 1 - lib/libc/string/strstr.3 | 1 - lib/libc/string/strtok.3 | 1 - lib/libc/string/strxfrm.3 | 1 - lib/libc/string/swab.3 | 1 - lib/libc/string/wcscoll.3 | 1 - lib/libc/string/wcsxfrm.3 | 1 - lib/libc/sys/_exit.2 | 1 - lib/libc/sys/accept.2 | 1 - lib/libc/sys/access.2 | 1 - lib/libc/sys/acct.2 | 1 - lib/libc/sys/adjtime.2 | 1 - lib/libc/sys/bind.2 | 1 - lib/libc/sys/brk.2 | 1 - lib/libc/sys/chdir.2 | 1 - lib/libc/sys/chflags.2 | 1 - lib/libc/sys/chmod.2 | 1 - lib/libc/sys/chown.2 | 1 - lib/libc/sys/chroot.2 | 1 - lib/libc/sys/close.2 | 1 - lib/libc/sys/connect.2 | 1 - lib/libc/sys/dup.2 | 1 - lib/libc/sys/execve.2 | 1 - lib/libc/sys/fcntl.2 | 1 - lib/libc/sys/flock.2 | 1 - lib/libc/sys/fork.2 | 1 - lib/libc/sys/fsync.2 | 1 - lib/libc/sys/getdirentries.2 | 1 - lib/libc/sys/getdtablesize.2 | 1 - lib/libc/sys/getfh.2 | 1 - lib/libc/sys/getfsstat.2 | 1 - lib/libc/sys/getgid.2 | 1 - lib/libc/sys/getgroups.2 | 1 - lib/libc/sys/getitimer.2 | 1 - lib/libc/sys/getlogin.2 | 1 - lib/libc/sys/getpeername.2 | 1 - lib/libc/sys/getpgrp.2 | 1 - lib/libc/sys/getpid.2 | 1 - lib/libc/sys/getpriority.2 | 1 - lib/libc/sys/getrlimit.2 | 1 - lib/libc/sys/getrusage.2 | 1 - lib/libc/sys/getsockname.2 | 1 - lib/libc/sys/getsockopt.2 | 1 - lib/libc/sys/gettimeofday.2 | 1 - lib/libc/sys/getuid.2 | 1 - lib/libc/sys/intro.2 | 1 - lib/libc/sys/kill.2 | 1 - lib/libc/sys/ktrace.2 | 1 - lib/libc/sys/link.2 | 1 - lib/libc/sys/listen.2 | 1 - lib/libc/sys/lseek.2 | 1 - lib/libc/sys/madvise.2 | 1 - lib/libc/sys/mincore.2 | 1 - lib/libc/sys/minherit.2 | 1 - lib/libc/sys/mkdir.2 | 1 - lib/libc/sys/mkfifo.2 | 1 - lib/libc/sys/mknod.2 | 1 - lib/libc/sys/mlock.2 | 1 - lib/libc/sys/mmap.2 | 1 - lib/libc/sys/mount.2 | 1 - lib/libc/sys/mprotect.2 | 1 - lib/libc/sys/msgget.2 | 1 - lib/libc/sys/msgrcv.2 | 1 - lib/libc/sys/msync.2 | 1 - lib/libc/sys/munmap.2 | 1 - lib/libc/sys/nanosleep.2 | 1 - lib/libc/sys/nfssvc.2 | 1 - lib/libc/sys/open.2 | 1 - lib/libc/sys/pathconf.2 | 1 - lib/libc/sys/pipe.2 | 1 - lib/libc/sys/poll.2 | 1 - lib/libc/sys/posix_fadvise.2 | 1 - lib/libc/sys/posix_fallocate.2 | 1 - lib/libc/sys/profil.2 | 1 - lib/libc/sys/ptrace.2 | 1 - lib/libc/sys/quotactl.2 | 1 - lib/libc/sys/read.2 | 1 - lib/libc/sys/readlink.2 | 1 - lib/libc/sys/reboot.2 | 1 - lib/libc/sys/recv.2 | 1 - lib/libc/sys/rename.2 | 1 - lib/libc/sys/revoke.2 | 1 - lib/libc/sys/rmdir.2 | 1 - lib/libc/sys/sched_setparam.2 | 1 - lib/libc/sys/sched_setscheduler.2 | 1 - lib/libc/sys/sched_yield.2 | 1 - lib/libc/sys/select.2 | 1 - lib/libc/sys/send.2 | 1 - lib/libc/sys/setgroups.2 | 1 - lib/libc/sys/setpgid.2 | 1 - lib/libc/sys/setregid.2 | 1 - lib/libc/sys/setreuid.2 | 1 - lib/libc/sys/setsid.2 | 1 - lib/libc/sys/setuid.2 | 1 - lib/libc/sys/shutdown.2 | 1 - lib/libc/sys/sigaction.2 | 1 - lib/libc/sys/sigaltstack.2 | 1 - lib/libc/sys/sigpending.2 | 1 - lib/libc/sys/sigprocmask.2 | 1 - lib/libc/sys/sigreturn.2 | 1 - lib/libc/sys/sigstack.2 | 1 - lib/libc/sys/sigsuspend.2 | 1 - lib/libc/sys/socket.2 | 1 - lib/libc/sys/socketpair.2 | 1 - lib/libc/sys/stat.2 | 1 - lib/libc/sys/statfs.2 | 1 - lib/libc/sys/swapon.2 | 1 - lib/libc/sys/symlink.2 | 1 - lib/libc/sys/sync.2 | 1 - lib/libc/sys/sysarch.2 | 1 - lib/libc/sys/syscall.2 | 1 - lib/libc/sys/truncate.2 | 1 - lib/libc/sys/umask.2 | 1 - lib/libc/sys/undelete.2 | 1 - lib/libc/sys/unlink.2 | 1 - lib/libc/sys/utimensat.2 | 1 - lib/libc/sys/utimes.2 | 1 - lib/libc/sys/vfork.2 | 1 - lib/libc/sys/wait.2 | 1 - lib/libc/sys/write.2 | 1 - lib/libc/xdr/xdr.3 | 1 - lib/libcompat/4.1/ftime.3 | 1 - lib/libcompat/4.3/re_comp.3 | 1 - lib/libcompat/4.3/rexec.3 | 1 - lib/libcuse/cuse.3 | 1 - lib/libkvm/kvm.3 | 1 - lib/libkvm/kvm_geterr.3 | 1 - lib/libkvm/kvm_getloadavg.3 | 1 - lib/libkvm/kvm_getprocs.3 | 1 - lib/libkvm/kvm_nlist.3 | 1 - lib/libkvm/kvm_open.3 | 1 - lib/libkvm/kvm_read.3 | 1 - lib/libmd/md4.copyright | 1 - lib/libmd/md5.copyright | 1 - lib/libmd/ripemd.3 | 1 - lib/libmd/sha.3 | 1 - lib/libmd/sha256.3 | 1 - lib/libmd/sha512.3 | 1 - lib/libpam/modules/pam_krb5/pam_krb5.8 | 1 - lib/librss/librss.3 | 1 - lib/libsdp/sdp.3 | 1 - lib/libutil/fparseln.3 | 1 - lib/libutil/humanize_number.3 | 1 - lib/libxo/add.man | 1 - lib/msun/man/acos.3 | 1 - lib/msun/man/acosh.3 | 1 - lib/msun/man/asin.3 | 1 - lib/msun/man/asinh.3 | 1 - lib/msun/man/atan.3 | 1 - lib/msun/man/atan2.3 | 1 - lib/msun/man/atanh.3 | 1 - lib/msun/man/ceil.3 | 1 - lib/msun/man/copysign.3 | 1 - lib/msun/man/cos.3 | 1 - lib/msun/man/cosh.3 | 1 - lib/msun/man/cpow.3 | 1 - lib/msun/man/erf.3 | 1 - lib/msun/man/exp.3 | 1 - lib/msun/man/fabs.3 | 1 - lib/msun/man/floor.3 | 1 - lib/msun/man/fmod.3 | 1 - lib/msun/man/hypot.3 | 1 - lib/msun/man/ieee.3 | 1 - lib/msun/man/ieee_test.3 | 1 - lib/msun/man/ilogb.3 | 1 - lib/msun/man/j0.3 | 1 - lib/msun/man/lgamma.3 | 1 - lib/msun/man/math.3 | 1 - lib/msun/man/nextafter.3 | 1 - lib/msun/man/remainder.3 | 1 - lib/msun/man/rint.3 | 1 - lib/msun/man/scalbn.3 | 1 - lib/msun/man/sin.3 | 1 - lib/msun/man/sinh.3 | 1 - lib/msun/man/sqrt.3 | 1 - lib/msun/man/tan.3 | 1 - lib/msun/man/tanh.3 | 1 - libexec/atrun/atrun.man | 1 - libexec/bootpd/tools/bootpef/bootpef.8 | 1 - libexec/bootpd/tools/bootptest/bootptest.8 | 1 - libexec/comsat/comsat.8 | 1 - libexec/fingerd/fingerd.8 | 1 - libexec/ftpd/ftpd.8 | 1 - libexec/getty/getty.8 | 1 - libexec/getty/gettytab.5 | 1 - libexec/getty/ttys.5 | 1 - libexec/rbootd/rbootd.8 | 1 - libexec/talkd/talkd.8 | 1 - libexec/tftpd/tftpd.8 | 1 - sbin/bsdlabel/bsdlabel.8 | 1 - sbin/ccdconfig/ccdconfig.8 | 1 - sbin/clri/clri.8 | 1 - sbin/comcontrol/comcontrol.8 | 1 - sbin/dmesg/dmesg.8 | 1 - sbin/dump/dump.8 | 1 - sbin/dumpfs/dumpfs.8 | 1 - sbin/dumpon/dumpon.8 | 1 - sbin/fdisk/fdisk.8 | 1 - sbin/ffsinfo/ffsinfo.8 | 1 - sbin/fsck_ffs/fsck_ffs.8 | 1 - sbin/fsirand/fsirand.8 | 1 - sbin/growfs/growfs.8 | 1 - sbin/ifconfig/ifconfig.8 | 1 - sbin/init/init.8 | 1 - sbin/ipf/ipf/ipf.4 | 1 - sbin/ipf/ipf/ipf.5 | 1 - sbin/ipf/ipf/ipf.8 | 1 - sbin/ipf/ipf/ipfilter.4 | 1 - sbin/ipf/ipf/ipfilter.5 | 1 - sbin/ipf/ipf/ipl.4 | 1 - sbin/ipf/ipfs/ipfs.8 | 1 - sbin/ipf/ipfstat/ipfstat.8 | 1 - sbin/ipf/ipftest/ipftest.1 | 1 - sbin/ipf/ipmon/ipmon.5 | 1 - sbin/ipf/ipmon/ipmon.8 | 1 - sbin/ipf/ipnat/ipnat.4 | 1 - sbin/ipf/ipnat/ipnat.5 | 1 - sbin/ipf/ipnat/ipnat.8 | 1 - sbin/ipf/ippool/ippool.5 | 1 - sbin/ipf/ippool/ippool.8 | 1 - sbin/ipf/ipscan/ipscan.5 | 1 - sbin/ipf/ipscan/ipscan.8 | 1 - sbin/ipf/ipsend/ipresend.1 | 1 - sbin/ipf/ipsend/ipsend.1 | 1 - sbin/ipf/ipsend/ipsend.5 | 1 - sbin/ipf/ipsend/iptest.1 | 1 - sbin/md5/md5.1 | 1 - sbin/mknod/mknod.8 | 1 - sbin/mount/mount.8 | 1 - sbin/mount_cd9660/mount_cd9660.8 | 1 - sbin/mount_nfs/mount_nfs.8 | 1 - sbin/mount_nullfs/mount_nullfs.8 | 1 - sbin/mount_unionfs/mount_unionfs.8 | 1 - sbin/natd/natd.8 | 1 - sbin/newfs/newfs.8 | 1 - sbin/nfsiod/nfsiod.8 | 1 - sbin/ping/ping.8 | 1 - sbin/quotacheck/quotacheck.8 | 1 - sbin/reboot/reboot.8 | 1 - sbin/restore/restore.8 | 1 - sbin/route/route.8 | 1 - sbin/routed/routed.8 | 1 - sbin/routed/rtquery/rtquery.8 | 1 - sbin/savecore/savecore.8 | 1 - sbin/shutdown/shutdown.8 | 1 - sbin/swapon/swapon.8 | 1 - sbin/sysctl/sysctl.8 | 1 - sbin/tunefs/tunefs.8 | 1 - sbin/umount/umount.8 | 1 - share/doc/papers/beyond4.3/beyond43.ms | 1 - share/doc/papers/devfs/paper.me | 1 - share/doc/papers/diskperf/conclusions.ms | 1 - share/doc/papers/diskperf/tests.ms | 1 - share/doc/papers/fsinterface/fsinterface.ms | 1 - share/doc/papers/kernmalloc/appendix.ms | 1 - share/doc/papers/kernmalloc/kernmalloc.t | 1 - share/doc/papers/kerntune/1.t | 1 - share/doc/papers/newvm/1.t | 1 - share/doc/papers/newvm/a.t | 1 - share/doc/papers/relengr/0.t | 1 - share/doc/papers/sysperf/appendix.ms | 2 -- share/doc/papers/timecounter/tmac.usenix | 1 - share/doc/psd/04.uprog/p.mac | 1 - share/doc/psd/04.uprog/p0 | 1 - share/doc/psd/04.uprog/p1 | 1 - share/doc/psd/04.uprog/p2 | 1 - share/doc/psd/04.uprog/p3 | 1 - share/doc/psd/04.uprog/p4 | 1 - share/doc/psd/04.uprog/p5 | 1 - share/doc/psd/04.uprog/p6 | 1 - share/doc/psd/04.uprog/p8 | 1 - share/doc/psd/04.uprog/p9 | 1 - share/doc/psd/05.sysman/1.1.t | 1 - share/doc/psd/05.sysman/1.2.t | 1 - share/doc/psd/05.sysman/2.3.t | 1 - share/doc/psd/12.make/stubs | 1 - share/doc/psd/12.make/tutorial.ms | 1 - share/doc/psd/21.ipc/4.t | 1 - share/doc/psd/21.ipc/5.t | 1 - share/doc/psd/22.rpcgen/rpcgen.ms | 1 - share/doc/psd/22.rpcgen/stubs | 1 - share/doc/psd/23.rpc/rpc.prog.ms | 1 - share/doc/psd/23.rpc/stubs | 1 - share/doc/psd/24.xdr/stubs | 1 - share/doc/psd/24.xdr/xdr.nts.ms | 1 - share/doc/psd/25.xdrrfc/stubs | 1 - share/doc/psd/25.xdrrfc/xdr.rfc.ms | 1 - share/doc/psd/26.rpcrfc/rpc.rfc.ms | 1 - share/doc/psd/26.rpcrfc/stubs | 1 - share/doc/psd/27.nfsrpc/nfs.rfc.ms | 1 - share/doc/psd/27.nfsrpc/stubs | 1 - share/doc/psd/contents/contents.ms | 1 - share/doc/psd/title/Title | 1 - share/doc/smm/01.setup/0.t | 1 - share/doc/smm/01.setup/2.t | 1 - share/doc/smm/01.setup/4.t | 1 - share/doc/smm/01.setup/5.t | 1 - share/doc/smm/01.setup/stubs | 1 - share/doc/smm/02.config/6.t | 1 - share/doc/smm/12.timed/timed.ms | 1 - share/doc/smm/contents/contents.ms | 1 - share/doc/smm/title/Title | 1 - share/doc/usd/04.csh/csh.1 | 1 - share/doc/usd/04.csh/csh.2 | 1 - share/doc/usd/04.csh/csh.3 | 1 - share/doc/usd/04.csh/csh.4 | 1 - share/doc/usd/04.csh/csh.a | 1 - share/doc/usd/04.csh/csh.g | 1 - share/doc/usd/04.csh/tabs | 1 - share/doc/usd/05.dc/dc | 1 - share/doc/usd/06.bc/bc | 1 - share/doc/usd/07.mail/mail5.nr | 1 - share/doc/usd/10.exref/exref/ex.rm | 1 - share/doc/usd/22.trofftut/tt.mac | 1 - share/doc/usd/22.trofftut/tt00 | 1 - share/doc/usd/22.trofftut/tt01 | 1 - share/doc/usd/22.trofftut/tt02 | 1 - share/doc/usd/22.trofftut/tt03 | 1 - share/doc/usd/22.trofftut/tt05 | 1 - share/doc/usd/22.trofftut/tt06 | 1 - share/doc/usd/22.trofftut/tt07 | 1 - share/doc/usd/22.trofftut/tt08 | 1 - share/doc/usd/22.trofftut/tt09 | 1 - share/doc/usd/22.trofftut/tt10 | 1 - share/doc/usd/22.trofftut/tt11 | 1 - share/doc/usd/22.trofftut/tt12 | 1 - share/doc/usd/22.trofftut/tt13 | 1 - share/doc/usd/22.trofftut/tt14 | 1 - share/doc/usd/22.trofftut/ttack | 1 - share/doc/usd/22.trofftut/ttcharset | 1 - share/doc/usd/22.trofftut/ttindex | 1 - share/doc/usd/contents/contents.ms | 1 - share/doc/usd/title/Title | 1 - share/examples/ipfilter/mkfilters.1 | 1 - share/man/man1/intro.1 | 1 - share/man/man3/assert.3 | 1 - share/man/man3/bitstring.3 | 1 - share/man/man3/end.3 | 1 - share/man/man3/fpgetround.3 | 1 - share/man/man3/intro.3 | 1 - share/man/man3/pthread_cancel.3 | 1 - share/man/man3/pthread_testcancel.3 | 1 - share/man/man3/queue.3 | 1 - share/man/man3/stdarg.3 | 1 - share/man/man4/aibs.4 | 1 - share/man/man4/cdce.4 | 1 - share/man/man4/ch.4 | 1 - share/man/man4/ciss.4 | 1 - share/man/man4/disc.4 | 1 - share/man/man4/divert.4 | 1 - share/man/man4/edsc.4 | 1 - share/man/man4/fd.4 | 1 - share/man/man4/hv_kvp.4 | 1 - share/man/man4/hv_netvsc.4 | 1 - share/man/man4/hv_storvsc.4 | 1 - share/man/man4/hv_utils.4 | 1 - share/man/man4/hv_vmbus.4 | 1 - share/man/man4/icmp.4 | 1 - share/man/man4/ida.4 | 1 - share/man/man4/iflib.4 | 1 - share/man/man4/inet.4 | 1 - share/man/man4/ip.4 | 1 - share/man/man4/kbdmux.4 | 1 - share/man/man4/le.4 | 1 - share/man/man4/liquidio.4 | 1 - share/man/man4/lo.4 | 1 - share/man/man4/lp.4 | 1 - share/man/man4/man4.i386/npx.4 | 1 - share/man/man4/man4.powerpc/ofw_console.4 | 1 - share/man/man4/mem.4 | 1 - share/man/man4/mpr.4 | 1 - share/man/man4/mps.4 | 1 - share/man/man4/mtio.4 | 1 - share/man/man4/nctgpio.4 | 1 - share/man/man4/ncthwm.4 | 1 - share/man/man4/netgraph.4 | 1 - share/man/man4/netintro.4 | 1 - share/man/man4/ng_bluetooth.4 | 1 - share/man/man4/ng_btsocket.4 | 1 - share/man/man4/ng_hci.4 | 1 - share/man/man4/ng_l2cap.4 | 1 - share/man/man4/ng_mppc.4 | 1 - share/man/man4/ng_source.4 | 1 - share/man/man4/ng_ubt.4 | 1 - share/man/man4/null.4 | 1 - share/man/man4/otus.4 | 1 - share/man/man4/otusfw.4 | 1 - share/man/man4/pts.4 | 1 - share/man/man4/qat.4 | 1 - share/man/man4/route.4 | 1 - share/man/man4/rsu.4 | 1 - share/man/man4/rsufw.4 | 1 - share/man/man4/tap.4 | 1 - share/man/man4/tcp.4 | 1 - share/man/man4/termios.4 | 1 - share/man/man4/tty.4 | 1 - share/man/man4/tun.4 | 1 - share/man/man4/ubtbcmfw.4 | 1 - share/man/man4/udl.4 | 1 - share/man/man4/udp.4 | 1 - share/man/man4/unix.4 | 1 - share/man/man4/upgt.4 | 1 - share/man/man4/usb_template.4 | 1 - share/man/man4/vkbd.4 | 1 - share/man/man4/zyd.4 | 1 - share/man/man5/a.out.5 | 1 - share/man/man5/acct.5 | 1 - share/man/man5/bluetooth.hosts.5 | 1 - share/man/man5/bluetooth.protocols.5 | 1 - share/man/man5/core.5 | 1 - share/man/man5/dir.5 | 1 - share/man/man5/disktab.5 | 1 - share/man/man5/fs.5 | 1 - share/man/man5/fstab.5 | 1 - share/man/man5/group.5 | 1 - share/man/man5/hosts.5 | 1 - share/man/man5/linprocfs.5 | 1 - share/man/man5/motd.5 | 1 - share/man/man5/msdosfs.5 | 1 - share/man/man5/networks.5 | 1 - share/man/man5/passwd.5 | 1 - share/man/man5/pf.conf.5 | 1 - share/man/man5/phones.5 | 1 - share/man/man5/procfs.5 | 1 - share/man/man5/protocols.5 | 1 - share/man/man5/remote.5 | 1 - share/man/man5/resolver.5 | 1 - share/man/man5/services.5 | 1 - share/man/man5/shells.5 | 1 - share/man/man5/stab.5 | 1 - share/man/man7/ascii.7 | 1 - share/man/man7/environ.7 | 1 - share/man/man7/hier.7 | 1 - share/man/man7/hostname.7 | 1 - share/man/man7/intro.7 | 1 - share/man/man7/operator.7 | 1 - share/man/man7/sdoc.7 | 1 - share/man/man7/sticky.7 | 1 - share/man/man7/tests.7 | 1 - share/man/man8/intro.8 | 1 - share/man/man8/rc.8 | 1 - share/man/man8/yp.8 | 1 - share/man/man9/EVENTHANDLER.9 | 1 - share/man/man9/bios.9 | 1 - share/man/man9/bus_get_resource.9 | 1 - share/man/man9/hash.9 | 1 - share/man/man9/iflib.9 | 1 - share/man/man9/iflibdd.9 | 1 - share/man/man9/iflibdi.9 | 1 - share/man/man9/iflibtxrx.9 | 1 - share/man/man9/malloc.9 | 1 - share/man/man9/mutex.9 | 1 - share/man/man9/psignal.9 | 1 - share/man/man9/securelevel_gt.9 | 1 - share/man/man9/style.9 | 1 - share/misc/mdoc.template | 1 - tools/build/options/WITHOUT_ACCT | 1 - tools/build/options/WITHOUT_ACPI | 1 - tools/build/options/WITHOUT_APM | 1 - tools/build/options/WITHOUT_ASSERT_DEBUG | 1 - tools/build/options/WITHOUT_AT | 1 - tools/build/options/WITHOUT_AUDIT | 1 - tools/build/options/WITHOUT_AUTHPF | 1 - tools/build/options/WITHOUT_AUTOFS | 1 - tools/build/options/WITHOUT_AUTO_OBJ | 1 - tools/build/options/WITHOUT_BHYVE | 1 - tools/build/options/WITHOUT_BIND_NOW | 1 - tools/build/options/WITHOUT_BLACKLIST | 1 - tools/build/options/WITHOUT_BLACKLIST_SUPPORT | 1 - tools/build/options/WITHOUT_BLUETOOTH | 1 - tools/build/options/WITHOUT_BOOT | 1 - tools/build/options/WITHOUT_BOOTPARAMD | 1 - tools/build/options/WITHOUT_BOOTPD | 1 - tools/build/options/WITHOUT_BSDINSTALL | 1 - tools/build/options/WITHOUT_BSD_CPIO | 1 - tools/build/options/WITHOUT_BSNMP | 1 - tools/build/options/WITHOUT_BZIP2 | 1 - tools/build/options/WITHOUT_BZIP2_SUPPORT | 1 - tools/build/options/WITHOUT_CALENDAR | 1 - tools/build/options/WITHOUT_CAROOT | 1 - tools/build/options/WITHOUT_CCD | 1 - tools/build/options/WITHOUT_CDDL | 1 - tools/build/options/WITHOUT_CLANG | 1 - tools/build/options/WITHOUT_CLANG_BOOTSTRAP | 1 - tools/build/options/WITHOUT_CLANG_FULL | 1 - tools/build/options/WITHOUT_CLEAN | 1 - tools/build/options/WITHOUT_CPP | 1 - tools/build/options/WITHOUT_CROSS_COMPILER | 1 - tools/build/options/WITHOUT_CRYPT | 1 - tools/build/options/WITHOUT_CUSE | 1 - tools/build/options/WITHOUT_CXGBETOOL | 1 - tools/build/options/WITHOUT_DEBUG_FILES | 1 - tools/build/options/WITHOUT_DIALOG | 1 - tools/build/options/WITHOUT_DICT | 1 - tools/build/options/WITHOUT_DMAGENT | 1 - tools/build/options/WITHOUT_DOCCOMPRESS | 1 - tools/build/options/WITHOUT_DTRACE | 1 - tools/build/options/WITHOUT_DYNAMICROOT | 1 - tools/build/options/WITHOUT_EE | 1 - tools/build/options/WITHOUT_EFI | 1 - tools/build/options/WITHOUT_ELFTOOLCHAIN_BOOTSTRAP | 1 - tools/build/options/WITHOUT_EXAMPLES | 1 - tools/build/options/WITHOUT_FDT | 1 - tools/build/options/WITHOUT_FILE | 1 - tools/build/options/WITHOUT_FINGER | 1 - tools/build/options/WITHOUT_FLOPPY | 1 - tools/build/options/WITHOUT_FORMAT_EXTENSIONS | 1 - tools/build/options/WITHOUT_FORTH | 1 - tools/build/options/WITHOUT_FP_LIBC | 1 - tools/build/options/WITHOUT_FREEBSD_UPDATE | 1 - tools/build/options/WITHOUT_FTP | 1 - tools/build/options/WITHOUT_GAMES | 1 - tools/build/options/WITHOUT_GCC | 1 - tools/build/options/WITHOUT_GCC_BOOTSTRAP | 1 - tools/build/options/WITHOUT_GCOV | 1 - tools/build/options/WITHOUT_GDB | 1 - tools/build/options/WITHOUT_GH_BC | 1 - tools/build/options/WITHOUT_GNU_DIFF | 1 - tools/build/options/WITHOUT_GOOGLETEST | 1 - tools/build/options/WITHOUT_GPIO | 1 - tools/build/options/WITHOUT_GSSAPI | 1 - tools/build/options/WITHOUT_HAST | 1 - tools/build/options/WITHOUT_HTML | 1 - tools/build/options/WITHOUT_HYPERV | 1 - tools/build/options/WITHOUT_ICONV | 1 - tools/build/options/WITHOUT_INCLUDES | 1 - tools/build/options/WITHOUT_INET | 1 - tools/build/options/WITHOUT_INET6 | 1 - tools/build/options/WITHOUT_INET6_SUPPORT | 1 - tools/build/options/WITHOUT_INETD | 1 - tools/build/options/WITHOUT_INET_SUPPORT | 1 - tools/build/options/WITHOUT_INFO | 1 - tools/build/options/WITHOUT_INSTALLLIB | 1 - tools/build/options/WITHOUT_IPFILTER | 1 - tools/build/options/WITHOUT_IPFW | 1 - tools/build/options/WITHOUT_IPSEC_SUPPORT | 1 - tools/build/options/WITHOUT_ISCSI | 1 - tools/build/options/WITHOUT_JAIL | 1 - tools/build/options/WITHOUT_KDUMP | 1 - tools/build/options/WITHOUT_KERBEROS | 1 - tools/build/options/WITHOUT_KERBEROS_SUPPORT | 1 - tools/build/options/WITHOUT_KERNEL_RETPOLINE | 1 - tools/build/options/WITHOUT_KERNEL_SYMBOLS | 1 - tools/build/options/WITHOUT_KVM | 1 - tools/build/options/WITHOUT_KVM_SUPPORT | 1 - tools/build/options/WITHOUT_LDNS | 1 - tools/build/options/WITHOUT_LDNS_UTILS | 1 - tools/build/options/WITHOUT_LEGACY_CONSOLE | 1 - tools/build/options/WITHOUT_LIB32 | 1 - tools/build/options/WITHOUT_LLD | 1 - tools/build/options/WITHOUT_LLDB | 1 - tools/build/options/WITHOUT_LLD_BOOTSTRAP | 1 - tools/build/options/WITHOUT_LLD_IS_LD | 1 - tools/build/options/WITHOUT_LLVM_ASSERTIONS | 1 - tools/build/options/WITHOUT_LLVM_COV | 1 - tools/build/options/WITHOUT_LLVM_CXXFILT | 1 - tools/build/options/WITHOUT_LLVM_TARGET_AARCH64 | 1 - tools/build/options/WITHOUT_LLVM_TARGET_ALL | 1 - tools/build/options/WITHOUT_LLVM_TARGET_ARM | 1 - tools/build/options/WITHOUT_LLVM_TARGET_MIPS | 1 - tools/build/options/WITHOUT_LLVM_TARGET_POWERPC | 1 - tools/build/options/WITHOUT_LLVM_TARGET_RISCV | 1 - tools/build/options/WITHOUT_LLVM_TARGET_SPARC | 1 - tools/build/options/WITHOUT_LLVM_TARGET_X86 | 1 - tools/build/options/WITHOUT_LOADER_GELI | 1 - tools/build/options/WITHOUT_LOADER_LUA | 1 - tools/build/options/WITHOUT_LOADER_OFW | 1 - tools/build/options/WITHOUT_LOADER_UBOOT | 1 - tools/build/options/WITHOUT_LOADER_ZFS | 1 - tools/build/options/WITHOUT_LOCALES | 1 - tools/build/options/WITHOUT_LOCATE | 1 - tools/build/options/WITHOUT_LPR | 1 - tools/build/options/WITHOUT_LS_COLORS | 1 - tools/build/options/WITHOUT_MAIL | 1 - tools/build/options/WITHOUT_MAILWRAPPER | 1 - tools/build/options/WITHOUT_MAKE | 1 - tools/build/options/WITHOUT_MAKE_CHECK_USE_SANDBOX | 1 - tools/build/options/WITHOUT_MALLOC_PRODUCTION | 1 - tools/build/options/WITHOUT_MAN | 1 - tools/build/options/WITHOUT_MANCOMPRESS | 1 - tools/build/options/WITHOUT_MAN_UTILS | 1 - tools/build/options/WITHOUT_MLX5TOOL | 1 - tools/build/options/WITHOUT_MODULE_DRM | 1 - tools/build/options/WITHOUT_MODULE_DRM2 | 1 - tools/build/options/WITHOUT_NCP | 1 - tools/build/options/WITHOUT_NETCAT | 1 - tools/build/options/WITHOUT_NETGRAPH | 1 - tools/build/options/WITHOUT_NETGRAPH_SUPPORT | 1 - tools/build/options/WITHOUT_NETLINK | 1 - tools/build/options/WITHOUT_NETLINK_SUPPORT | 1 - tools/build/options/WITHOUT_NIS | 1 - tools/build/options/WITHOUT_NLS | 1 - tools/build/options/WITHOUT_NLS_CATALOGS | 1 - tools/build/options/WITHOUT_NS_CACHING | 1 - tools/build/options/WITHOUT_NTP | 1 - tools/build/options/WITHOUT_NVME | 1 - tools/build/options/WITHOUT_OPENMP | 1 - tools/build/options/WITHOUT_OPENSSH | 1 - tools/build/options/WITHOUT_OPENSSL | 1 - tools/build/options/WITHOUT_PAM | 1 - tools/build/options/WITHOUT_PAM_SUPPORT | 1 - tools/build/options/WITHOUT_PF | 1 - tools/build/options/WITHOUT_PIE | 1 - tools/build/options/WITHOUT_PKGBOOTSTRAP | 1 - tools/build/options/WITHOUT_PMC | 1 - tools/build/options/WITHOUT_PPP | 1 - tools/build/options/WITHOUT_PROFILE | 1 - tools/build/options/WITHOUT_QUOTAS | 1 - tools/build/options/WITHOUT_RADIUS_SUPPORT | 1 - tools/build/options/WITHOUT_RBOOTD | 1 - tools/build/options/WITHOUT_REPRODUCIBLE_BUILD | 1 - tools/build/options/WITHOUT_RESCUE | 1 - tools/build/options/WITHOUT_RETPOLINE | 1 - tools/build/options/WITHOUT_ROUTED | 1 - tools/build/options/WITHOUT_SENDMAIL | 1 - tools/build/options/WITHOUT_SERVICESDB | 1 - tools/build/options/WITHOUT_SETUID_LOGIN | 1 - tools/build/options/WITHOUT_SHAREDOCS | 1 - tools/build/options/WITHOUT_SOURCELESS | 1 - tools/build/options/WITHOUT_SOURCELESS_HOST | 1 - tools/build/options/WITHOUT_SOURCELESS_UCODE | 1 - tools/build/options/WITHOUT_SSP | 1 - tools/build/options/WITHOUT_STATS | 1 - tools/build/options/WITHOUT_SYSCONS | 1 - tools/build/options/WITHOUT_SYSTEM_COMPILER | 1 - tools/build/options/WITHOUT_SYSTEM_LINKER | 1 - tools/build/options/WITHOUT_TALK | 1 - tools/build/options/WITHOUT_TCP_WRAPPERS | 1 - tools/build/options/WITHOUT_TCSH | 1 - tools/build/options/WITHOUT_TELNET | 1 - tools/build/options/WITHOUT_TESTS | 1 - tools/build/options/WITHOUT_TESTS_SUPPORT | 1 - tools/build/options/WITHOUT_TEXTPROC | 1 - tools/build/options/WITHOUT_TFTP | 1 - tools/build/options/WITHOUT_TOOLCHAIN | 1 - tools/build/options/WITHOUT_UNBOUND | 1 - tools/build/options/WITHOUT_UNIFIED_OBJDIR | 1 - tools/build/options/WITHOUT_USB | 1 - tools/build/options/WITHOUT_USB_GADGET_EXAMPLES | 1 - tools/build/options/WITHOUT_UTMPX | 1 - tools/build/options/WITHOUT_VI | 1 - tools/build/options/WITHOUT_VT | 1 - tools/build/options/WITHOUT_WARNS | 1 - tools/build/options/WITHOUT_WERROR | 1 - tools/build/options/WITHOUT_WIRELESS | 1 - tools/build/options/WITHOUT_WIRELESS_SUPPORT | 1 - tools/build/options/WITHOUT_WPA_SUPPLICANT_EAPOL | 1 - tools/build/options/WITHOUT_ZFS | 1 - tools/build/options/WITHOUT_ZONEINFO | 1 - tools/build/options/WITH_AUTO_OBJ | 1 - tools/build/options/WITH_BEARSSL | 1 - tools/build/options/WITH_BHYVE_SNAPSHOT | 1 - tools/build/options/WITH_BIND_NOW | 1 - tools/build/options/WITH_CCACHE_BUILD | 1 - tools/build/options/WITH_CLANG | 1 - tools/build/options/WITH_CLANG_BOOTSTRAP | 1 - tools/build/options/WITH_CLANG_EXTRAS | 1 - tools/build/options/WITH_CLANG_FORMAT | 1 - tools/build/options/WITH_CLANG_FULL | 1 - tools/build/options/WITH_CTF | 1 - tools/build/options/WITH_CXGBETOOL | 1 - tools/build/options/WITH_CXX | 1 - tools/build/options/WITH_DEBUG_FILES | 1 - tools/build/options/WITH_DETECT_TZ_CHANGES | 1 - tools/build/options/WITH_DIRDEPS_BUILD | 1 - tools/build/options/WITH_DIRDEPS_CACHE | 1 - tools/build/options/WITH_DTRACE_TESTS | 1 - tools/build/options/WITH_EFI | 1 - tools/build/options/WITH_EXPERIMENTAL | 1 - tools/build/options/WITH_EXTRA_TCP_STACKS | 1 - tools/build/options/WITH_FDT | 1 - tools/build/options/WITH_GCC | 1 - tools/build/options/WITH_GCC_BOOTSTRAP | 1 - tools/build/options/WITH_GCOV | 1 - tools/build/options/WITH_GDB | 1 - tools/build/options/WITH_GH_BC | 1 - tools/build/options/WITH_GNU_DIFF | 1 - tools/build/options/WITH_GOOGLETEST | 1 - tools/build/options/WITH_HESIOD | 1 - tools/build/options/WITH_HYPERV | 1 - tools/build/options/WITH_INIT_ALL_PATTERN | 1 - tools/build/options/WITH_INIT_ALL_ZERO | 1 - tools/build/options/WITH_INSTALL_AS_USER | 1 - tools/build/options/WITH_KERNEL_RETPOLINE | 1 - tools/build/options/WITH_LIBSOFT | 1 - tools/build/options/WITH_LLD | 1 - tools/build/options/WITH_LLDB | 1 - tools/build/options/WITH_LLD_BOOTSTRAP | 1 - tools/build/options/WITH_LLD_IS_LD | 1 - tools/build/options/WITH_LLVM_ASSERTIONS | 1 - tools/build/options/WITH_LLVM_BINUTILS | 1 - tools/build/options/WITH_LLVM_COV | 1 - tools/build/options/WITH_LLVM_CXXFILT | 1 - tools/build/options/WITH_LLVM_TARGET_AARCH64 | 1 - tools/build/options/WITH_LLVM_TARGET_ALL | 1 - tools/build/options/WITH_LLVM_TARGET_ARM | 1 - tools/build/options/WITH_LLVM_TARGET_BPF | 1 - tools/build/options/WITH_LLVM_TARGET_MIPS | 1 - tools/build/options/WITH_LLVM_TARGET_POWERPC | 1 - tools/build/options/WITH_LLVM_TARGET_RISCV | 1 - tools/build/options/WITH_LLVM_TARGET_SPARC | 1 - *** 13698 LINES SKIPPED *** From nobody Wed Aug 16 17:57:14 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RQwnl1nszz4qvVB; Wed, 16 Aug 2023 17:57:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RQwnl0tFSz3VYC; Wed, 16 Aug 2023 17:57:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692208635; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=n6pknDEEidG4FkzlYSL64UBATf6V9OjO6qCFHgySYS8=; b=bIcikU9RKNluTorBTjiNwVH1AwdWwmXGymplbbWmpUNOd5/n93+VIlw2tQWL4W6yRGPlZ7 bpjupBOZMdeF7MmqvE+RzvnsUB88+vhohTQqoPeOBQhrWJ9m1qugrOMEPP3gXR798I9ILc Hbuso9Vv2AjUpGLjvAVdmL+0fmfjkaEqaHDH+T3UfPtFmFDybC8hM+psGXctCNliml4Hod MFZQeAX9AhUkupgjlikuFnBNpTGCOFgXVJuu67rbh1UKf2KRxIDWELGdDvjhS70n/b08UW ZnS2kFCRMn3BPee4S0yCYCbzP61KSY/D1RRw5vYHyCXOVXsjrWxnVVg+jOR3RA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692208635; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=n6pknDEEidG4FkzlYSL64UBATf6V9OjO6qCFHgySYS8=; b=aMmB1PwIlxX81h2r9O+pFigLBEF11BYCu35t54ciWhWwM0hjb2Q17aLKLCHV+1QFOiWXUW 04apvLMjZSRqjwtBqsRVOOPyYz4GcPONmydSzMB6dTGBmUqmcz9nQQH3n5aqijcTNka1Qv 7xrVlfG7T0ri3A+IxzrzAs+H/y+EIH4LeLt7z8UE+ScbgrTdT0BH1RAt3AwxL14LUfmRuu Tr3iXjdCLRUK/kmi3sN6AD7Wme0vtzzc1DNgj3yRf1e8RrvZU6BDYa/YwHnm2k7MeE+Mq4 Y8UBJq9ia/iX35NED25W5sjscn85BV+n/kHxo7HQndRN6snR9Pke0Ulzrq4K2g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692208635; a=rsa-sha256; cv=none; b=xyhYjgdZvFCf+5MXVUntBUSi50xO2YwsywIQDr/9ns5PUMzJXCcdI/2VyWceaBIsjNaY7v gt+UErD2HnYivYbjFLWs5TkGcUC2Zz5eMEethCJ5hTKIWZp7a8gPa9C1RvLlCqF+zrwNzd WGVmQMTeJ2eYYI0Q5BqI/JYsVtCr34yIfeLhwRDHfn3/FsJMOLETRLfKud7bSkFy2sIg4p Ran+Aohoa2zcNv1oQ8oc+K7t53JIyztJn0tf2jxlUxhfXE3p5KEGoQryMXrR5geJ7XmMOy obpAc7XLfFco1m7z+cpu6D5nNYTLS4KSJawSlD+I3hyu9Sas0K0fOQAvd9o5aQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RQwnk71QBz11qd; Wed, 16 Aug 2023 17:57:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37GHvEWV059796; Wed, 16 Aug 2023 17:57:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37GHvEIZ059793; Wed, 16 Aug 2023 17:57:14 GMT (envelope-from git) Date: Wed, 16 Aug 2023 17:57:14 GMT Message-Id: <202308161757.37GHvEIZ059793@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: 78d146160dc5 - main - sys: Remove $FreeBSD$: one-line bare tag List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 78d146160dc5339c9cdf7799551bcc442a6eb95b Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=78d146160dc5339c9cdf7799551bcc442a6eb95b commit 78d146160dc5339c9cdf7799551bcc442a6eb95b Author: Warner Losh AuthorDate: 2023-08-16 17:55:17 +0000 Commit: Warner Losh CommitDate: 2023-08-16 17:55:17 +0000 sys: Remove $FreeBSD$: one-line bare tag Remove /^\s*\$FreeBSD\$$\n/ --- sys/amd64/linux/syscalls.master | 1 - sys/amd64/linux32/syscalls.master | 1 - sys/arm64/linux/syscalls.master | 1 - sys/cddl/boot/zfs/README | 1 - sys/crypto/chacha20/chacha.h | 2 -- sys/dev/cxgb/common/cxgb_common.h | 2 -- sys/dev/cxgb/common/cxgb_firmware_exports.h | 2 -- sys/dev/cxgb/common/cxgb_regs.h | 2 -- sys/dev/cxgb/common/cxgb_sge_defs.h | 2 -- sys/dev/cxgb/common/cxgb_t3_cpl.h | 2 -- sys/dev/cxgb/common/cxgb_tcb.h | 2 -- sys/dev/cxgb/cxgb_adapter.h | 2 -- sys/dev/cxgb/cxgb_ioctl.h | 2 -- sys/dev/cxgb/cxgb_offload.h | 2 -- sys/dev/cxgb/cxgb_osdep.h | 3 --- sys/dev/cxgb/cxgb_t3fw.h | 3 --- sys/dev/cxgb/t3b_protocol_sram.h | 3 --- sys/dev/cxgb/t3b_tp_eeprom.h | 3 --- sys/dev/cxgb/t3c_protocol_sram.h | 3 --- sys/dev/cxgb/t3c_tp_eeprom.h | 3 --- sys/dev/cxgbe/cudbg/fastlz.h | 2 -- sys/dev/e1000/LICENSE | 1 - sys/dev/e1000/README | 1 - sys/dev/firewire/00README | 1 - sys/dev/hpt27xx/README | 2 -- sys/dev/hptmv/readme.txt | 1 - sys/dev/hptnr/README | 2 -- sys/dev/mii/miidevs | 1 - sys/dev/mxge/eth_z8e.h | 2 -- sys/dev/mxge/ethp_z8e.h | 2 -- sys/dev/mxge/if_mxge_var.h | 2 -- sys/dev/mxge/mcp_gen_header.h | 2 -- sys/dev/mxge/mxge_mcp.h | 2 -- sys/dev/mxge/rss_eth_z8e.h | 2 -- sys/dev/mxge/rss_ethp_z8e.h | 2 -- sys/dev/ow/README.txt | 2 -- sys/dev/sdio/sdiodevs | 1 - sys/dev/usb/usbdevs | 1 - sys/dev/videomode/ediddevs | 1 - sys/dev/vmware/pvscsi/LICENSE | 1 - sys/dev/vmware/vmci/LICENSE | 1 - sys/dts/bindings-gpio.txt | 1 - sys/dts/bindings-localbus.txt | 1 - sys/dts/bindings-mpp.txt | 1 - sys/fs/cd9660/TODO.hibler | 1 - sys/geom/notes | 1 - sys/i386/linux/syscalls.master | 1 - sys/kern/syscalls.master | 1 - sys/netgraph/NOTES | 1 - sys/netgraph/bluetooth/hci/TODO | 1 - sys/netgraph/bluetooth/l2cap/TODO | 1 - sys/netgraph/bluetooth/socket/TODO | 1 - sys/netinet/libalias/HISTORY | 1 - sys/netpfil/ipfilter/netinet/IPFILTER.LICENCE | 1 - sys/ufs/ufs/README.acls | 1 - sys/ufs/ufs/README.extattr | 1 - 56 files changed, 89 deletions(-) diff --git a/sys/amd64/linux/syscalls.master b/sys/amd64/linux/syscalls.master index 929c42fc4056..178ae18836e6 100644 --- a/sys/amd64/linux/syscalls.master +++ b/sys/amd64/linux/syscalls.master @@ -1,4 +1,3 @@ - $FreeBSD$ ; @(#)syscalls.master 8.1 (Berkeley) 7/19/93 ; System call name/number master file (or rather, slave, from LINUX). diff --git a/sys/amd64/linux32/syscalls.master b/sys/amd64/linux32/syscalls.master index d1eb57a8295a..a282ff00345f 100644 --- a/sys/amd64/linux32/syscalls.master +++ b/sys/amd64/linux32/syscalls.master @@ -1,4 +1,3 @@ - $FreeBSD$ ; @(#)syscalls.master 8.1 (Berkeley) 7/19/93 ; System call name/number master file (or rather, slave, from LINUX). diff --git a/sys/arm64/linux/syscalls.master b/sys/arm64/linux/syscalls.master index da2ad24997ce..2bf8d4fad8ac 100644 --- a/sys/arm64/linux/syscalls.master +++ b/sys/arm64/linux/syscalls.master @@ -1,4 +1,3 @@ - $FreeBSD$ ; Linux ABI system call generic name/number map, based on Linux file ; include/uapi/asm-generic/unistd.h diff --git a/sys/cddl/boot/zfs/README b/sys/cddl/boot/zfs/README index 0c2006096c99..c6d0105d3d02 100644 --- a/sys/cddl/boot/zfs/README +++ b/sys/cddl/boot/zfs/README @@ -1,4 +1,3 @@ -$FreeBSD$ This directory contains various files derived from CDDL sources that are used by the ZFS bootstrap: diff --git a/sys/crypto/chacha20/chacha.h b/sys/crypto/chacha20/chacha.h index 32262b04d568..f6d409db0992 100644 --- a/sys/crypto/chacha20/chacha.h +++ b/sys/crypto/chacha20/chacha.h @@ -4,8 +4,6 @@ chacha-merged.c version 20080118 D. J. Bernstein Public domain. - - $FreeBSD$ */ #ifndef CHACHA_H diff --git a/sys/dev/cxgb/common/cxgb_common.h b/sys/dev/cxgb/common/cxgb_common.h index 4b08553f587f..4603794099c2 100644 --- a/sys/dev/cxgb/common/cxgb_common.h +++ b/sys/dev/cxgb/common/cxgb_common.h @@ -26,8 +26,6 @@ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -$FreeBSD$ - ***************************************************************************/ #ifndef __CHELSIO_COMMON_H #define __CHELSIO_COMMON_H diff --git a/sys/dev/cxgb/common/cxgb_firmware_exports.h b/sys/dev/cxgb/common/cxgb_firmware_exports.h index 207787d59186..47c75ff586c6 100644 --- a/sys/dev/cxgb/common/cxgb_firmware_exports.h +++ b/sys/dev/cxgb/common/cxgb_firmware_exports.h @@ -26,8 +26,6 @@ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -$FreeBSD$ - ***************************************************************************/ #ifndef _FIRMWARE_EXPORTS_H_ #define _FIRMWARE_EXPORTS_H_ diff --git a/sys/dev/cxgb/common/cxgb_regs.h b/sys/dev/cxgb/common/cxgb_regs.h index 1941efbaa08b..6e242f11277c 100644 --- a/sys/dev/cxgb/common/cxgb_regs.h +++ b/sys/dev/cxgb/common/cxgb_regs.h @@ -26,8 +26,6 @@ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -$FreeBSD$ - ***************************************************************************/ /* This file is automatically generated --- do not edit */ diff --git a/sys/dev/cxgb/common/cxgb_sge_defs.h b/sys/dev/cxgb/common/cxgb_sge_defs.h index 6b8781586f17..1ff63bf9b437 100644 --- a/sys/dev/cxgb/common/cxgb_sge_defs.h +++ b/sys/dev/cxgb/common/cxgb_sge_defs.h @@ -26,8 +26,6 @@ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -$FreeBSD$ - ***************************************************************************/ /* * This file is automatically generated --- any changes will be lost. diff --git a/sys/dev/cxgb/common/cxgb_t3_cpl.h b/sys/dev/cxgb/common/cxgb_t3_cpl.h index 4e2f4452efd0..c30d7d2d57b5 100644 --- a/sys/dev/cxgb/common/cxgb_t3_cpl.h +++ b/sys/dev/cxgb/common/cxgb_t3_cpl.h @@ -26,8 +26,6 @@ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -$FreeBSD$ - ***************************************************************************/ #ifndef T3_CPL_H #define T3_CPL_H diff --git a/sys/dev/cxgb/common/cxgb_tcb.h b/sys/dev/cxgb/common/cxgb_tcb.h index 196708b0ea6d..28f96dd8cd06 100644 --- a/sys/dev/cxgb/common/cxgb_tcb.h +++ b/sys/dev/cxgb/common/cxgb_tcb.h @@ -26,8 +26,6 @@ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -$FreeBSD$ - ***************************************************************************/ /* This file is automatically generated --- do not edit */ diff --git a/sys/dev/cxgb/cxgb_adapter.h b/sys/dev/cxgb/cxgb_adapter.h index ab5a41e47081..b003b0a05d9f 100644 --- a/sys/dev/cxgb/cxgb_adapter.h +++ b/sys/dev/cxgb/cxgb_adapter.h @@ -26,8 +26,6 @@ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -$FreeBSD$ - ***************************************************************************/ diff --git a/sys/dev/cxgb/cxgb_ioctl.h b/sys/dev/cxgb/cxgb_ioctl.h index 68b936f69916..608eb77d2a8f 100644 --- a/sys/dev/cxgb/cxgb_ioctl.h +++ b/sys/dev/cxgb/cxgb_ioctl.h @@ -26,8 +26,6 @@ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -$FreeBSD$ - ***************************************************************************/ #ifndef __CHIOCTL_H__ #define __CHIOCTL_H__ diff --git a/sys/dev/cxgb/cxgb_offload.h b/sys/dev/cxgb/cxgb_offload.h index 548065b56d60..fe9b31ab7101 100644 --- a/sys/dev/cxgb/cxgb_offload.h +++ b/sys/dev/cxgb/cxgb_offload.h @@ -26,8 +26,6 @@ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -$FreeBSD$ - ***************************************************************************/ #ifndef _CXGB_OFFLOAD_H diff --git a/sys/dev/cxgb/cxgb_osdep.h b/sys/dev/cxgb/cxgb_osdep.h index 6179da8ec920..d14f6008a6cb 100644 --- a/sys/dev/cxgb/cxgb_osdep.h +++ b/sys/dev/cxgb/cxgb_osdep.h @@ -26,9 +26,6 @@ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -$FreeBSD$ - ***************************************************************************/ #include diff --git a/sys/dev/cxgb/cxgb_t3fw.h b/sys/dev/cxgb/cxgb_t3fw.h index 5a4c036605db..100e67c0f197 100644 --- a/sys/dev/cxgb/cxgb_t3fw.h +++ b/sys/dev/cxgb/cxgb_t3fw.h @@ -26,9 +26,6 @@ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -$FreeBSD$ - ***************************************************************************/ #define U (unsigned char) diff --git a/sys/dev/cxgb/t3b_protocol_sram.h b/sys/dev/cxgb/t3b_protocol_sram.h index 1db209e0137e..18f9ec4aff1e 100644 --- a/sys/dev/cxgb/t3b_protocol_sram.h +++ b/sys/dev/cxgb/t3b_protocol_sram.h @@ -26,9 +26,6 @@ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -$FreeBSD$ - ***************************************************************************/ #define U (unsigned char) diff --git a/sys/dev/cxgb/t3b_tp_eeprom.h b/sys/dev/cxgb/t3b_tp_eeprom.h index 8b68c80f4d92..e6c4045da6ff 100644 --- a/sys/dev/cxgb/t3b_tp_eeprom.h +++ b/sys/dev/cxgb/t3b_tp_eeprom.h @@ -26,9 +26,6 @@ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -$FreeBSD$ - ***************************************************************************/ #define U (unsigned char) diff --git a/sys/dev/cxgb/t3c_protocol_sram.h b/sys/dev/cxgb/t3c_protocol_sram.h index 542fc22b3e5a..afb2d1b5482c 100644 --- a/sys/dev/cxgb/t3c_protocol_sram.h +++ b/sys/dev/cxgb/t3c_protocol_sram.h @@ -26,9 +26,6 @@ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -$FreeBSD$ - ***************************************************************************/ #define U (unsigned char) diff --git a/sys/dev/cxgb/t3c_tp_eeprom.h b/sys/dev/cxgb/t3c_tp_eeprom.h index c0224f850c7d..d6daead7acf2 100644 --- a/sys/dev/cxgb/t3c_tp_eeprom.h +++ b/sys/dev/cxgb/t3c_tp_eeprom.h @@ -26,9 +26,6 @@ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -$FreeBSD$ - ***************************************************************************/ #define U (unsigned char) diff --git a/sys/dev/cxgbe/cudbg/fastlz.h b/sys/dev/cxgbe/cudbg/fastlz.h index 5aa474fa5a87..5a3d73e3735e 100644 --- a/sys/dev/cxgbe/cudbg/fastlz.h +++ b/sys/dev/cxgbe/cudbg/fastlz.h @@ -22,8 +22,6 @@ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - - $FreeBSD$ */ #ifndef FASTLZ_H #define FASTLZ_H diff --git a/sys/dev/e1000/LICENSE b/sys/dev/e1000/LICENSE index 51a32a819633..9deb4b1db9e6 100644 --- a/sys/dev/e1000/LICENSE +++ b/sys/dev/e1000/LICENSE @@ -1,4 +1,3 @@ -$FreeBSD$ Copyright (c) 2001-2020, Intel Corporation All rights reserved. diff --git a/sys/dev/e1000/README b/sys/dev/e1000/README index d734be75e758..4a61e0669122 100644 --- a/sys/dev/e1000/README +++ b/sys/dev/e1000/README @@ -1,4 +1,3 @@ -$FreeBSD$ FreeBSD* Driver for Intel(R) Ethernet ===================================== diff --git a/sys/dev/firewire/00README b/sys/dev/firewire/00README index 17f5c5d119d3..d7879c505f80 100644 --- a/sys/dev/firewire/00README +++ b/sys/dev/firewire/00README @@ -1,4 +1,3 @@ -$FreeBSD$ IEEE 1394 support for FreeBSD-5.X and 4.X. diff --git a/sys/dev/hpt27xx/README b/sys/dev/hpt27xx/README index aad14945d2d8..244016ea391f 100644 --- a/sys/dev/hpt27xx/README +++ b/sys/dev/hpt27xx/README @@ -216,5 +216,3 @@ Technical support and service NOTE: Before you send an e-mail, please visit our Web Site (http://www.highpoint-tech.com) to check if there is a new or updated device driver for your system. - -$FreeBSD$ diff --git a/sys/dev/hptmv/readme.txt b/sys/dev/hptmv/readme.txt index 177f9f94e168..ce2b9f5884f0 100644 --- a/sys/dev/hptmv/readme.txt +++ b/sys/dev/hptmv/readme.txt @@ -1,6 +1,5 @@ RocketRAID 18xx Driver for FreeBSD Copyright (C) 2007-2008 HighPoint Technologies, Inc. All rights reserved. -$FreeBSD$ ############################################################################# Revision History: diff --git a/sys/dev/hptnr/README b/sys/dev/hptnr/README index f48071c25320..afa67700fe5c 100644 --- a/sys/dev/hptnr/README +++ b/sys/dev/hptnr/README @@ -219,5 +219,3 @@ Technical support and service NOTE: Before you send an e-mail, please visit our Web Site (http://www.highpoint-tech.com) to check if there is a new or updated device driver for your system. - -$FreeBSD$ diff --git a/sys/dev/mii/miidevs b/sys/dev/mii/miidevs index 6e2f83263e4f..900fa80546b2 100644 --- a/sys/dev/mii/miidevs +++ b/sys/dev/mii/miidevs @@ -1,4 +1,3 @@ -$FreeBSD$ /*$NetBSD: miidevs,v 1.105 2011/11/25 23:28:14 jakllsch Exp $*/ /*- diff --git a/sys/dev/mxge/eth_z8e.h b/sys/dev/mxge/eth_z8e.h index c553aaf59f44..9905923c7360 100644 --- a/sys/dev/mxge/eth_z8e.h +++ b/sys/dev/mxge/eth_z8e.h @@ -25,8 +25,6 @@ INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -$FreeBSD$ ***************************************************************************/ static unsigned int eth_z8e_uncompressed_length = 377284 ; diff --git a/sys/dev/mxge/ethp_z8e.h b/sys/dev/mxge/ethp_z8e.h index 355854520a0e..6fda4ae978f2 100644 --- a/sys/dev/mxge/ethp_z8e.h +++ b/sys/dev/mxge/ethp_z8e.h @@ -25,8 +25,6 @@ INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -$FreeBSD$ ***************************************************************************/ static unsigned int ethp_z8e_uncompressed_length = 387604 ; diff --git a/sys/dev/mxge/if_mxge_var.h b/sys/dev/mxge/if_mxge_var.h index 885e4e2fc215..504f2de038bc 100644 --- a/sys/dev/mxge/if_mxge_var.h +++ b/sys/dev/mxge/if_mxge_var.h @@ -26,8 +26,6 @@ CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -$FreeBSD$ - ***************************************************************************/ #define MXGE_ETH_STOPPED 0 diff --git a/sys/dev/mxge/mcp_gen_header.h b/sys/dev/mxge/mcp_gen_header.h index 07c3f83bf2d2..59fb111bd47e 100644 --- a/sys/dev/mxge/mcp_gen_header.h +++ b/sys/dev/mxge/mcp_gen_header.h @@ -25,8 +25,6 @@ INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -$FreeBSD$ ***************************************************************************/ #ifndef _mcp_gen_header_h diff --git a/sys/dev/mxge/mxge_mcp.h b/sys/dev/mxge/mxge_mcp.h index 9f7ae28f2afd..09e8e7ace4c3 100644 --- a/sys/dev/mxge/mxge_mcp.h +++ b/sys/dev/mxge/mxge_mcp.h @@ -25,8 +25,6 @@ INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -$FreeBSD$ ***************************************************************************/ #ifndef _myri10ge_mcp_h diff --git a/sys/dev/mxge/rss_eth_z8e.h b/sys/dev/mxge/rss_eth_z8e.h index c04e9f6dbbfb..9c3a791b0f7d 100644 --- a/sys/dev/mxge/rss_eth_z8e.h +++ b/sys/dev/mxge/rss_eth_z8e.h @@ -25,8 +25,6 @@ INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -$FreeBSD$ ***************************************************************************/ static unsigned int rss_eth_z8e_uncompressed_length = 534724 ; diff --git a/sys/dev/mxge/rss_ethp_z8e.h b/sys/dev/mxge/rss_ethp_z8e.h index 4c5d86270c9c..459dd165fe37 100644 --- a/sys/dev/mxge/rss_ethp_z8e.h +++ b/sys/dev/mxge/rss_ethp_z8e.h @@ -25,8 +25,6 @@ INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -$FreeBSD$ ***************************************************************************/ static unsigned int rss_ethp_z8e_uncompressed_length = 544468 ; diff --git a/sys/dev/ow/README.txt b/sys/dev/ow/README.txt index 5263710964a8..d40ec3545dcb 100644 --- a/sys/dev/ow/README.txt +++ b/sys/dev/ow/README.txt @@ -15,5 +15,3 @@ responsibility of the client device drivers to implement. Client drivers may only call the own(9) interface. The ow(4) driver calls the owll(9) interface and implements the own(9). - -$FreeBSD$ diff --git a/sys/dev/sdio/sdiodevs b/sys/dev/sdio/sdiodevs index 2fe01f111ffb..194ef8e5d901 100644 --- a/sys/dev/sdio/sdiodevs +++ b/sys/dev/sdio/sdiodevs @@ -1,4 +1,3 @@ -$FreeBSD$ /*- * SPDX-License-Identifier: BSD-2-Clause * diff --git a/sys/dev/usb/usbdevs b/sys/dev/usb/usbdevs index 84b5c8f9b9ce..da712c5a5954 100644 --- a/sys/dev/usb/usbdevs +++ b/sys/dev/usb/usbdevs @@ -1,4 +1,3 @@ -$FreeBSD$ /* $NetBSD: usbdevs,v 1.392 2004/12/29 08:38:44 imp Exp $ */ /*- diff --git a/sys/dev/videomode/ediddevs b/sys/dev/videomode/ediddevs index 0029704edf48..fc60fe3a0c82 100644 --- a/sys/dev/videomode/ediddevs +++ b/sys/dev/videomode/ediddevs @@ -1,5 +1,4 @@ $NetBSD: ediddevs,v 1.2 2007/03/07 18:47:13 macallan Exp $ -$FreeBSD$ /*- * Copyright (c) 2006 Itronix Inc. diff --git a/sys/dev/vmware/pvscsi/LICENSE b/sys/dev/vmware/pvscsi/LICENSE index a736cc1324a7..f22d3b36cff6 100644 --- a/sys/dev/vmware/pvscsi/LICENSE +++ b/sys/dev/vmware/pvscsi/LICENSE @@ -1,4 +1,3 @@ -$FreeBSD$ These files are provided under a dual BSD-2 Clause/GPLv2 license. When using or redistributing this file, you may do so under either license. diff --git a/sys/dev/vmware/vmci/LICENSE b/sys/dev/vmware/vmci/LICENSE index a736cc1324a7..f22d3b36cff6 100644 --- a/sys/dev/vmware/vmci/LICENSE +++ b/sys/dev/vmware/vmci/LICENSE @@ -1,4 +1,3 @@ -$FreeBSD$ These files are provided under a dual BSD-2 Clause/GPLv2 license. When using or redistributing this file, you may do so under either license. diff --git a/sys/dts/bindings-gpio.txt b/sys/dts/bindings-gpio.txt index 89e6fc0b9311..5057167405c5 100644 --- a/sys/dts/bindings-gpio.txt +++ b/sys/dts/bindings-gpio.txt @@ -1,4 +1,3 @@ -$FreeBSD$ GPIO configuration. =================== diff --git a/sys/dts/bindings-localbus.txt b/sys/dts/bindings-localbus.txt index d960fefcf75d..a4d800dc8a1a 100644 --- a/sys/dts/bindings-localbus.txt +++ b/sys/dts/bindings-localbus.txt @@ -1,4 +1,3 @@ -$FreeBSD$ Marvell Device bus (localbus) configuration. ============================================ diff --git a/sys/dts/bindings-mpp.txt b/sys/dts/bindings-mpp.txt index 5da776e43cfc..6feefd4360e2 100644 --- a/sys/dts/bindings-mpp.txt +++ b/sys/dts/bindings-mpp.txt @@ -1,4 +1,3 @@ -$FreeBSD$ * Multi purpose pin (MPP) configuration. diff --git a/sys/fs/cd9660/TODO.hibler b/sys/fs/cd9660/TODO.hibler index e0842da82d5a..ac04c266345b 100644 --- a/sys/fs/cd9660/TODO.hibler +++ b/sys/fs/cd9660/TODO.hibler @@ -1,4 +1,3 @@ -$FreeBSD$ 1. Investiate making ISOFS another UFS shared filesystem (ala FFS/MFS/LFS). Since it was modelled after the inode code, we might be able to merge diff --git a/sys/geom/notes b/sys/geom/notes index 4fcacaefbc40..016614f7dce6 100644 --- a/sys/geom/notes +++ b/sys/geom/notes @@ -1,4 +1,3 @@ -$FreeBSD$ For the lack of a better place to put them, this file will contain notes on some of the more intricate details of geom. diff --git a/sys/i386/linux/syscalls.master b/sys/i386/linux/syscalls.master index 1fd02302ae37..65a5aa69fce5 100644 --- a/sys/i386/linux/syscalls.master +++ b/sys/i386/linux/syscalls.master @@ -1,4 +1,3 @@ - $FreeBSD$ ; @(#)syscalls.master 8.1 (Berkeley) 7/19/93 ; System call name/number master file (or rather, slave, from LINUX). diff --git a/sys/kern/syscalls.master b/sys/kern/syscalls.master index c3e2a0343fde..209c3c2fd6db 100644 --- a/sys/kern/syscalls.master +++ b/sys/kern/syscalls.master @@ -1,4 +1,3 @@ - $FreeBSD$ ; from: @(#)syscalls.master 8.2 (Berkeley) 1/13/94 ; ; System call name/number master file. diff --git a/sys/netgraph/NOTES b/sys/netgraph/NOTES index eb3a54c56145..8a1a2ff28048 100644 --- a/sys/netgraph/NOTES +++ b/sys/netgraph/NOTES @@ -1,4 +1,3 @@ -$FreeBSD$ Development ideas.. Archie's suggestions... :-) diff --git a/sys/netgraph/bluetooth/hci/TODO b/sys/netgraph/bluetooth/hci/TODO index 6f66d7b84d0f..4fb50a956b37 100644 --- a/sys/netgraph/bluetooth/hci/TODO +++ b/sys/netgraph/bluetooth/hci/TODO @@ -1,5 +1,4 @@ $Id: TODO,v 1.2 2003/04/26 22:36:29 max Exp $ -$FreeBSD$ FIXME/TODO list diff --git a/sys/netgraph/bluetooth/l2cap/TODO b/sys/netgraph/bluetooth/l2cap/TODO index 7c7bb27c59aa..8a5c6d1f3431 100644 --- a/sys/netgraph/bluetooth/l2cap/TODO +++ b/sys/netgraph/bluetooth/l2cap/TODO @@ -1,5 +1,4 @@ $Id: TODO,v 1.1 2002/11/24 19:47:06 max Exp $ -$FreeBSD$ FIXME/TODO list diff --git a/sys/netgraph/bluetooth/socket/TODO b/sys/netgraph/bluetooth/socket/TODO index c1aa3b2d476d..a0135e141a10 100644 --- a/sys/netgraph/bluetooth/socket/TODO +++ b/sys/netgraph/bluetooth/socket/TODO @@ -1,5 +1,4 @@ $Id: TODO,v 1.1 2002/11/24 19:47:07 max Exp $ -$FreeBSD$ FIXME/TODO list diff --git a/sys/netinet/libalias/HISTORY b/sys/netinet/libalias/HISTORY index 87d5b6f8ed76..34feba25edc4 100644 --- a/sys/netinet/libalias/HISTORY +++ b/sys/netinet/libalias/HISTORY @@ -1,4 +1,3 @@ -$FreeBSD$ Version 1.0: August 11, 1996 (cjm) diff --git a/sys/netpfil/ipfilter/netinet/IPFILTER.LICENCE b/sys/netpfil/ipfilter/netinet/IPFILTER.LICENCE index 1ee473da33f1..628a24ad8baa 100644 --- a/sys/netpfil/ipfilter/netinet/IPFILTER.LICENCE +++ b/sys/netpfil/ipfilter/netinet/IPFILTER.LICENCE @@ -1,4 +1,3 @@ -$FreeBSD$ Copyright (C) 1993-2002 by Darren Reed. diff --git a/sys/ufs/ufs/README.acls b/sys/ufs/ufs/README.acls index 28a9d4f59d87..ad3bb951bf40 100644 --- a/sys/ufs/ufs/README.acls +++ b/sys/ufs/ufs/README.acls @@ -1,4 +1,3 @@ -$FreeBSD$ UFS Access Control Lists Copyright diff --git a/sys/ufs/ufs/README.extattr b/sys/ufs/ufs/README.extattr index a3be6e6a45dc..368fdd704ce9 100644 --- a/sys/ufs/ufs/README.extattr +++ b/sys/ufs/ufs/README.extattr @@ -1,4 +1,3 @@ -$FreeBSD$ UFS Extended Attributes Copyright From nobody Wed Aug 16 17:57:16 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RQwnn4z8sz4qvZM; Wed, 16 Aug 2023 17:57: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RQwnm5gfBz3VbG; Wed, 16 Aug 2023 17:57:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692208636; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=PrRyjcdoo13YKKTHVm2oYkCX811GwJsZ2e0IjHDr1mM=; b=y0jmxJHACmhTvcZXULQKddfG7mhkoj1M8gT3ATtQ22fI8qMbzOZaowVJymafJBGB8nk/O5 NFO4T2mDWhECpB4AifYEDrYzaSHjZcU4XOvucwPPhJC1dpYbZ/FLq4CS5IyNx7LHg9aPXj txVz3s7zKkm4kiF1wRmJPOELrQcj2jq+VAwkRompDctsTWozqCcalnCj7RbPdHytKhNJWt S61+Tiykxhq6SLjCZxkDsPHm6c2ctIri/kOhjSJQT3mK81xJ/5YBWNo2krhPUvf3Uzl0q0 q4Fx8UcPCkNYJl27Mp3HNg5D/Tg9uHIxsx226xFNo+270wVrHKIZzkJG2iEB1g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692208636; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=PrRyjcdoo13YKKTHVm2oYkCX811GwJsZ2e0IjHDr1mM=; b=yP2DedVEFq51t2VW+/cqiy992RXLZ/cm7wxTw/+25ygud0Tdg/DeHaDMTJQK3F3YuhlmBw mt6p8ApbB0ERMCeSeAD8Vi84qW2OnsjVSTLJrbpAaHK3Yd6JYXHEcuQDJOycPgDDo42fNs JBspRhznV6+znx1+u8y5pDZlqviM6Z8uxIIzglBklnAhzwTeU1mm+R5eOpHDAQjBpI0Bzf dqJnTXDUcVu1hHJ7HhOMiJzRmyFnLJR8Uj+lGfFa4XkfVnU3tNmizTt1WVr5tY4ynFenOj nXTxVeW0Ag7IXORx0r1oKYOjBUjw27Svv+ZR+1YolPyQd1NQ8ySDjSqNfIw2Ow== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692208636; a=rsa-sha256; cv=none; b=NpnTtau2wImqHf0yDf3VS4MQBuxQawDX77FHj3zNLcM90tiTEz9szuFf7035j3uQjyi7Bv EV7KVpzunKe9UmRz/d0XVtm4aZVM3CTPICFu/qwaSDs/wXJx72Q7kTiXqoCwxdJbjiao4L l5K6zCutukKjEv6LKNfjOFjJT0B91Ndupwl/g4WjQokDue+hPuaIjbf2F8RHe46xbeOz44 7zZvvGHghOIyptDob+bZmVEC7JRvum/w01QloI/uzQ4imDmG+s+SFjz3E5YfLWfxV8ZZ1V CKPEqM32gRF5u2xZn1UeTpjXXgNEs4RqXt+JpVMqwJpWzjJkt9L+CJQwwPRkIg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RQwnm4KQGz11dQ; Wed, 16 Aug 2023 17:57:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37GHvGa1059838; Wed, 16 Aug 2023 17:57:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37GHvG2N059835; Wed, 16 Aug 2023 17:57:16 GMT (envelope-from git) Date: Wed, 16 Aug 2023 17:57:16 GMT Message-Id: <202308161757.37GHvG2N059835@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: 05248206f720 - main - Remove $FreeBSD$: one-line bare tag List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 05248206f720394d95c2a7475429311df670a2e9 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=05248206f720394d95c2a7475429311df670a2e9 commit 05248206f720394d95c2a7475429311df670a2e9 Author: Warner Losh AuthorDate: 2023-08-16 17:55:20 +0000 Commit: Warner Losh CommitDate: 2023-08-16 17:55:20 +0000 Remove $FreeBSD$: one-line bare tag Remove /^\s*\$FreeBSD\$$\n/ --- LOCKS | 1 - MAINTAINERS | 1 - UPDATING | 2 -- bin/dd/ref.ascii | 1 - bin/dd/ref.ebcdic | 1 - bin/dd/ref.ibm | 1 - bin/dd/ref.lcase | 1 - bin/dd/ref.obs_zeroes | 1 - bin/dd/ref.oldascii | 1 - bin/dd/ref.oldebcdic | 1 - bin/dd/ref.oldibm | 1 - bin/dd/ref.pareven | 1 - bin/dd/ref.parnone | 1 - bin/dd/ref.parodd | 1 - bin/dd/ref.parset | 1 - bin/dd/ref.swab | 1 - bin/dd/ref.ucase | 1 - bin/ed/POSIX | 1 - bin/ed/README | 1 - etc/mtree/README | 1 - lib/lib80211/regdomain.xml | 2 -- lib/libc/locale/DESIGN.xlocale | 1 - lib/libc/rpc/README | 1 - lib/libc/softfloat/README.NetBSD | 1 - lib/libc/softfloat/README.txt | 1 - lib/libc/softfloat/softfloat-history.txt | 1 - lib/libc/softfloat/softfloat-source.txt | 1 - lib/libc/softfloat/softfloat.txt | 1 - lib/libc/softfloat/timesoftfloat.txt | 1 - lib/libnetbsd/README | 1 - lib/libopenbsd/README | 1 - lib/libpam/pam.d/README | 2 -- lib/libsecureboot/README.rst | 1 - libexec/bootpd/hash.c | 2 -- libexec/bootpd/readfile.c | 2 -- libexec/bootpd/tools/bootpef/bootpef.c | 2 -- release/powerpc/boot.tbxi | 1 - release/powerpc/hfs-boot.bz2.uu | 1 - rescue/README | 2 -- sbin/gbde/image.uu | 1 - share/dict/freebsd | 1 - share/doc/IPv6/IMPLEMENTATION | 1 - share/dtrace/README | 1 - share/examples/IPv6/USAGE | 1 - share/examples/bootforth/README | 2 -- share/examples/drivers/README | 1 - share/examples/etc/README.examples | 1 - share/examples/ipfilter/examples.txt | 1 - share/examples/ipfilter/ipf-howto.txt | 1 - share/examples/kld/dyn_sysctl/README | 2 -- share/examples/kld/firmware/README | 1 - share/examples/kld/firmware/fwimage/firmware.img.uu | 1 - share/examples/kld/khelp/README | 1 - share/examples/perfmon/README | 2 -- share/examples/tests/README | 1 - share/examples/ypldap/ypldap.conf | 1 - share/misc/bsd-family-tree | 2 -- share/misc/operator | 2 -- stand/efi/loader/version | 1 - stand/fdt/help.fdt | 1 - stand/i386/loader/version | 1 - stand/powerpc/boot1.chrp/hfs.tmpl.bz2.uu | 1 - stand/powerpc/ofw/version | 1 - stand/uboot/help.uboot | 1 - stand/uboot/version | 1 - stand/userboot/userboot/version | 1 - tests/README | 1 - tests/sys/mac/portacl/LICENSE | 1 - tests/sys/opencrypto/blake2-kat.h | 2 -- tools/README | 1 - tools/bsdbox/README | 1 - tools/debugscripts/README | 1 - tools/diag/README | 1 - tools/kerneldoc/subsys/README | 1 - tools/regression/README | 1 - tools/regression/TODO | 1 - tools/regression/ccd/layout/ref.128k_128k_128k_128k_0_0 | 1 - tools/regression/ccd/layout/ref.128k_128k_128k_128k_0_4 | 1 - tools/regression/ccd/layout/ref.128k_128k_128k_128k_4_0 | 1 - tools/regression/ccd/layout/ref.128k_128k_128k_128k_4_2 | 1 - tools/regression/ccd/layout/ref.128k_128k_128k_128k_4_4 | 1 - tools/regression/ccd/layout/ref.256k_128k_128k_128k_0_0 | 1 - tools/regression/ccd/layout/ref.256k_128k_128k_128k_0_4 | 1 - tools/regression/ccd/layout/ref.256k_128k_128k_128k_4_0 | 1 - tools/regression/ccd/layout/ref.256k_128k_128k_128k_4_2 | 1 - tools/regression/ccd/layout/ref.256k_128k_128k_128k_4_4 | 1 - tools/regression/ccd/layout/ref.256k_128k_384k_128k_0_0 | 1 - tools/regression/ccd/layout/ref.256k_128k_384k_128k_0_4 | 1 - tools/regression/ccd/layout/ref.256k_128k_384k_128k_16_0 | 1 - tools/regression/ccd/layout/ref.256k_128k_384k_128k_16_2 | 1 - tools/regression/ccd/layout/ref.256k_128k_384k_128k_16_4 | 1 - tools/regression/ccd/layout/ref.256k_128k_384k_128k_4_0 | 1 - tools/regression/ccd/layout/ref.256k_128k_384k_128k_4_2 | 1 - tools/regression/ccd/layout/ref.256k_128k_384k_128k_4_4 | 1 - tools/regression/doat/README | 1 - tools/regression/geom/Data/disk.beast.da0.xml | 1 - tools/regression/geom/Data/disk.critter.ad0.xml | 1 - tools/regression/geom/Data/disk.empty.flp.xml | 1 - tools/regression/geom/Data/disk.far.ad0.xml | 1 - tools/regression/geom/Data/disk.flat.da1.xml | 1 - tools/regression/geom/Data/disk.kern.flp.xml | 1 - tools/regression/geom/Data/disk.msdos.ext.xml | 1 - tools/regression/geom/Data/disk.msdos.flp.xml | 1 - tools/regression/geom/Data/disk.typo.ad0.xml | 1 - tools/regression/geom/Ref/disk.apple.xml | 1 - tools/regression/geom/Ref/disk.beast.da0.xml | 1 - tools/regression/geom/Ref/disk.critter.ad0.xml | 1 - tools/regression/geom/Ref/disk.empty.flp.xml | 1 - tools/regression/geom/Ref/disk.far.ad0.xml | 1 - tools/regression/geom/Ref/disk.flat.da1.xml | 1 - tools/regression/geom/Ref/disk.kern.flp.xml | 1 - tools/regression/geom/Ref/disk.msdos.ext.xml | 1 - tools/regression/geom/Ref/disk.msdos.flp.xml | 1 - tools/regression/geom/Ref/disk.typo.ad0.xml | 1 - tools/regression/netinet/tcpfullwindowrst/tcpfullwindowrsttest.c | 2 -- tools/regression/netinet/tcpstream/README | 2 -- tools/regression/nfsmmap/README | 1 - tools/regression/p1003_1b/README | 1 - tools/regression/poll/Readme | 1 - tools/regression/redzone9/README | 1 - tools/regression/security/proc_to_proc/README | 1 - tools/regression/sockets/unix_cmsg/README | 1 - tools/regression/sysvmsg/README | 1 - tools/regression/sysvsem/README | 1 - tools/regression/sysvshm/README | 1 - tools/regression/zfs/LICENSE | 1 - tools/test/README | 1 - tools/test/iconv/ref/ARMSCII-8 | 1 - tools/test/iconv/ref/ARMSCII-8-rev | 1 - tools/test/iconv/ref/ASCII | 1 - tools/test/iconv/ref/ASCII-rev | 1 - tools/test/iconv/ref/ATARIST | 1 - tools/test/iconv/ref/ATARIST-rev | 1 - tools/test/iconv/ref/BIG5 | 1 - tools/test/iconv/ref/BIG5-2003 | 1 - tools/test/iconv/ref/BIG5-2003-rev | 1 - tools/test/iconv/ref/BIG5-HKSCS | 1 - tools/test/iconv/ref/BIG5-HKSCS-rev | 1 - tools/test/iconv/ref/BIG5-rev | 1 - tools/test/iconv/ref/BIG5HKSCS | 1 - tools/test/iconv/ref/BIG5HKSCS-rev | 1 - tools/test/iconv/ref/C99 | 1 - tools/test/iconv/ref/C99-rev | 1 - tools/test/iconv/ref/CP1046 | 1 - tools/test/iconv/ref/CP1046-rev | 1 - tools/test/iconv/ref/CP1124 | 1 - tools/test/iconv/ref/CP1124-rev | 1 - tools/test/iconv/ref/CP1125 | 1 - tools/test/iconv/ref/CP1125-rev | 1 - tools/test/iconv/ref/CP1129 | 1 - tools/test/iconv/ref/CP1129-rev | 1 - tools/test/iconv/ref/CP1131 | 1 - tools/test/iconv/ref/CP1131-rev | 1 - tools/test/iconv/ref/CP1133 | 1 - tools/test/iconv/ref/CP1133-rev | 1 - tools/test/iconv/ref/CP1161 | 1 - tools/test/iconv/ref/CP1161-rev | 1 - tools/test/iconv/ref/CP1162 | 1 - tools/test/iconv/ref/CP1162-rev | 1 - tools/test/iconv/ref/CP1163 | 1 - tools/test/iconv/ref/CP1163-rev | 1 - tools/test/iconv/ref/CP1250 | 1 - tools/test/iconv/ref/CP1250-rev | 1 - tools/test/iconv/ref/CP1251 | 1 - tools/test/iconv/ref/CP1251-rev | 1 - tools/test/iconv/ref/CP1252 | 1 - tools/test/iconv/ref/CP1252-rev | 1 - tools/test/iconv/ref/CP1253 | 1 - tools/test/iconv/ref/CP1253-rev | 1 - tools/test/iconv/ref/CP1254 | 1 - tools/test/iconv/ref/CP1254-rev | 1 - tools/test/iconv/ref/CP1255 | 1 - tools/test/iconv/ref/CP1255-rev | 1 - tools/test/iconv/ref/CP1256 | 1 - tools/test/iconv/ref/CP1256-rev | 1 - tools/test/iconv/ref/CP1257 | 1 - tools/test/iconv/ref/CP1257-rev | 1 - tools/test/iconv/ref/CP1258 | 1 - tools/test/iconv/ref/CP1258-rev | 1 - tools/test/iconv/ref/CP437 | 1 - tools/test/iconv/ref/CP437-rev | 1 - tools/test/iconv/ref/CP737 | 1 - tools/test/iconv/ref/CP737-rev | 1 - tools/test/iconv/ref/CP775 | 1 - tools/test/iconv/ref/CP775-rev | 1 - tools/test/iconv/ref/CP850 | 1 - tools/test/iconv/ref/CP850-rev | 1 - tools/test/iconv/ref/CP852 | 1 - tools/test/iconv/ref/CP852-rev | 1 - tools/test/iconv/ref/CP853 | 1 - tools/test/iconv/ref/CP853-rev | 1 - tools/test/iconv/ref/CP855 | 1 - tools/test/iconv/ref/CP855-rev | 1 - tools/test/iconv/ref/CP856 | 1 - tools/test/iconv/ref/CP856-rev | 1 - tools/test/iconv/ref/CP857 | 1 - tools/test/iconv/ref/CP857-rev | 1 - tools/test/iconv/ref/CP858 | 1 - tools/test/iconv/ref/CP858-rev | 1 - tools/test/iconv/ref/CP860 | 1 - tools/test/iconv/ref/CP860-rev | 1 - tools/test/iconv/ref/CP861 | 1 - tools/test/iconv/ref/CP861-rev | 1 - tools/test/iconv/ref/CP862 | 1 - tools/test/iconv/ref/CP862-rev | 1 - tools/test/iconv/ref/CP863 | 1 - tools/test/iconv/ref/CP863-rev | 1 - tools/test/iconv/ref/CP864 | 1 - tools/test/iconv/ref/CP864-rev | 1 - tools/test/iconv/ref/CP865 | 1 - tools/test/iconv/ref/CP865-rev | 1 - tools/test/iconv/ref/CP866 | 1 - tools/test/iconv/ref/CP866-rev | 1 - tools/test/iconv/ref/CP869 | 1 - tools/test/iconv/ref/CP869-rev | 1 - tools/test/iconv/ref/CP874 | 1 - tools/test/iconv/ref/CP874-rev | 1 - tools/test/iconv/ref/CP922 | 1 - tools/test/iconv/ref/CP922-rev | 1 - tools/test/iconv/ref/CP932 | 1 - tools/test/iconv/ref/CP932-rev | 1 - tools/test/iconv/ref/CP936 | 1 - tools/test/iconv/ref/CP936-rev | 1 - tools/test/iconv/ref/CP943 | 1 - tools/test/iconv/ref/CP943-rev | 1 - tools/test/iconv/ref/CP949 | 1 - tools/test/iconv/ref/CP949-rev | 1 - tools/test/iconv/ref/CP950 | 1 - tools/test/iconv/ref/CP950-rev | 1 - tools/test/iconv/ref/DEC-HANYU | 1 - tools/test/iconv/ref/DEC-HANYU-rev | 1 - tools/test/iconv/ref/EUC-CN | 1 - tools/test/iconv/ref/EUC-CN-rev | 1 - tools/test/iconv/ref/EUC-JIS-2004 | 1 - tools/test/iconv/ref/EUC-JIS-2004-rev | 1 - tools/test/iconv/ref/EUC-JP | 1 - tools/test/iconv/ref/EUC-JP-rev | 1 - tools/test/iconv/ref/EUC-KR | 1 - tools/test/iconv/ref/EUC-KR-rev | 1 - tools/test/iconv/ref/EUC-TW | 1 - tools/test/iconv/ref/EUC-TW-rev | 1 - tools/test/iconv/ref/GB18030 | 1 - tools/test/iconv/ref/GB18030-rev | 1 - tools/test/iconv/ref/GB2312 | 1 - tools/test/iconv/ref/GB2312-rev | 1 - tools/test/iconv/ref/GBK | 1 - tools/test/iconv/ref/GBK-rev | 1 - tools/test/iconv/ref/GEORGIAN-ACADEMY | 1 - tools/test/iconv/ref/GEORGIAN-ACADEMY-rev | 1 - tools/test/iconv/ref/GEORGIAN-PS | 1 - tools/test/iconv/ref/GEORGIAN-PS-rev | 1 - tools/test/iconv/ref/HP-ROMAN8 | 1 - tools/test/iconv/ref/HP-ROMAN8-rev | 1 - tools/test/iconv/ref/HZ | 1 - tools/test/iconv/ref/HZ-rev | 1 - tools/test/iconv/ref/ISO-2022-CN | 1 - tools/test/iconv/ref/ISO-2022-CN-EXT | 1 - tools/test/iconv/ref/ISO-2022-CN-EXT-rev | 1 - tools/test/iconv/ref/ISO-2022-CN-rev | 1 - tools/test/iconv/ref/ISO-2022-JP | 1 - tools/test/iconv/ref/ISO-2022-JP-1 | 1 - tools/test/iconv/ref/ISO-2022-JP-1-rev | 1 - tools/test/iconv/ref/ISO-2022-JP-2 | 1 - tools/test/iconv/ref/ISO-2022-JP-2-rev | 1 - tools/test/iconv/ref/ISO-2022-JP-2004 | 1 - tools/test/iconv/ref/ISO-2022-JP-2004-rev | 1 - tools/test/iconv/ref/ISO-2022-JP-rev | 1 - tools/test/iconv/ref/ISO-2022-KR | 1 - tools/test/iconv/ref/ISO-2022-KR-rev | 1 - tools/test/iconv/ref/ISO-IR-14 | 1 - tools/test/iconv/ref/ISO-IR-14-rev | 1 - tools/test/iconv/ref/ISO-IR-165 | 1 - tools/test/iconv/ref/ISO-IR-165-rev | 1 - tools/test/iconv/ref/ISO-IR-57 | 1 - tools/test/iconv/ref/ISO-IR-57-rev | 1 - tools/test/iconv/ref/ISO8859-1 | 1 - tools/test/iconv/ref/ISO8859-1-rev | 1 - tools/test/iconv/ref/ISO8859-10 | 1 - tools/test/iconv/ref/ISO8859-10-rev | 1 - tools/test/iconv/ref/ISO8859-11 | 1 - tools/test/iconv/ref/ISO8859-11-rev | 1 - tools/test/iconv/ref/ISO8859-13 | 1 - tools/test/iconv/ref/ISO8859-13-rev | 1 - tools/test/iconv/ref/ISO8859-14 | 1 - tools/test/iconv/ref/ISO8859-14-rev | 1 - tools/test/iconv/ref/ISO8859-15 | 1 - tools/test/iconv/ref/ISO8859-15-rev | 1 - tools/test/iconv/ref/ISO8859-16 | 1 - tools/test/iconv/ref/ISO8859-16-rev | 1 - tools/test/iconv/ref/ISO8859-2 | 1 - tools/test/iconv/ref/ISO8859-2-rev | 1 - tools/test/iconv/ref/ISO8859-3 | 1 - tools/test/iconv/ref/ISO8859-3-rev | 1 - tools/test/iconv/ref/ISO8859-4 | 1 - tools/test/iconv/ref/ISO8859-4-rev | 1 - tools/test/iconv/ref/ISO8859-5 | 1 - tools/test/iconv/ref/ISO8859-5-rev | 1 - tools/test/iconv/ref/ISO8859-6 | 1 - tools/test/iconv/ref/ISO8859-6-rev | 1 - tools/test/iconv/ref/ISO8859-7 | 1 - tools/test/iconv/ref/ISO8859-7-rev | 1 - tools/test/iconv/ref/ISO8859-8 | 1 - tools/test/iconv/ref/ISO8859-8-rev | 1 - tools/test/iconv/ref/ISO8859-9 | 1 - tools/test/iconv/ref/ISO8859-9-rev | 1 - tools/test/iconv/ref/JAVA | 1 - tools/test/iconv/ref/JAVA-rev | 1 - tools/test/iconv/ref/JIS_X0201 | 1 - tools/test/iconv/ref/JIS_X0201-rev | 1 - tools/test/iconv/ref/JIS_X0208-1990 | 1 - tools/test/iconv/ref/JIS_X0208-1990-rev | 1 - tools/test/iconv/ref/JOHAB | 1 - tools/test/iconv/ref/JOHAB-rev | 1 - tools/test/iconv/ref/KOI8-R | 1 - tools/test/iconv/ref/KOI8-R-rev | 1 - tools/test/iconv/ref/KOI8-RU | 1 - tools/test/iconv/ref/KOI8-RU-rev | 1 - tools/test/iconv/ref/KOI8-T | 1 - tools/test/iconv/ref/KOI8-T-rev | 1 - tools/test/iconv/ref/KOI8-U | 1 - tools/test/iconv/ref/KOI8-U-rev | 1 - tools/test/iconv/ref/KZ-1048 | 1 - tools/test/iconv/ref/KZ-1048-rev | 1 - tools/test/iconv/ref/MACARABIC | 1 - tools/test/iconv/ref/MACARABIC-rev | 1 - tools/test/iconv/ref/MACCENTRALEUROPE | 1 - tools/test/iconv/ref/MACCENTRALEUROPE-rev | 1 - tools/test/iconv/ref/MACCROATIAN | 1 - tools/test/iconv/ref/MACCROATIAN-rev | 1 - tools/test/iconv/ref/MACCYRILLIC | 1 - tools/test/iconv/ref/MACCYRILLIC-rev | 1 - tools/test/iconv/ref/MACGREEK | 1 - tools/test/iconv/ref/MACGREEK-rev | 1 - tools/test/iconv/ref/MACHEBREW | 1 - tools/test/iconv/ref/MACHEBREW-rev | 1 - tools/test/iconv/ref/MACICELAND | 1 - tools/test/iconv/ref/MACICELAND-rev | 1 - tools/test/iconv/ref/MACROMAN | 1 - tools/test/iconv/ref/MACROMAN-rev | 1 - tools/test/iconv/ref/MACROMANIA | 1 - tools/test/iconv/ref/MACROMANIA-rev | 1 - tools/test/iconv/ref/MACTHAI | 1 - tools/test/iconv/ref/MACTHAI-rev | 1 - tools/test/iconv/ref/MACTURKISH | 1 - tools/test/iconv/ref/MACTURKISH-rev | 1 - tools/test/iconv/ref/MACUKRAINE | 1 - tools/test/iconv/ref/MACUKRAINE-rev | 1 - tools/test/iconv/ref/MULELAO-1 | 1 - tools/test/iconv/ref/MULELAO-1-rev | 1 - tools/test/iconv/ref/NEXTSTEP | 1 - tools/test/iconv/ref/NEXTSTEP-rev | 1 - tools/test/iconv/ref/PT154 | 1 - tools/test/iconv/ref/PT154-rev | 1 - tools/test/iconv/ref/RISCOS-LATIN1 | 1 - tools/test/iconv/ref/RISCOS-LATIN1-rev | 1 - tools/test/iconv/ref/SHIFT_JIS | 1 - tools/test/iconv/ref/SHIFT_JIS-rev | 1 - tools/test/iconv/ref/TCVN5712-1 | 1 - tools/test/iconv/ref/TCVN5712-1-rev | 1 - tools/test/iconv/ref/TDS565 | 1 - tools/test/iconv/ref/TDS565-rev | 1 - tools/test/iconv/ref/UTF-16BE | 1 - tools/test/iconv/ref/UTF-16BE-rev | 1 - tools/test/iconv/ref/UTF-16LE | 1 - tools/test/iconv/ref/UTF-16LE-rev | 1 - tools/test/iconv/ref/UTF-32BE | 1 - tools/test/iconv/ref/UTF-32BE-rev | 1 - tools/test/iconv/ref/UTF-32LE | 1 - tools/test/iconv/ref/UTF-32LE-rev | 1 - tools/test/iconv/ref/UTF-7 | 1 - tools/test/iconv/ref/UTF-7-rev | 1 - tools/test/iconv/ref/UTF-8 | 1 - tools/test/iconv/ref/UTF-8-rev | 1 - tools/test/iconv/ref/VISCII | 1 - tools/test/iconv/ref/VISCII-rev | 1 - tools/tools/crypto/README | 1 - tools/tools/find-sb/README | 1 - tools/tools/kttcp/README | 1 - tools/tools/locale/etc/charmaps/charmaps.txt | 1 - tools/tools/man/README | 2 -- tools/tools/nanobsd/dhcpd/README | 1 - tools/tools/nanobsd/embedded/README | 1 - tools/tools/net80211/README | 1 - tools/tools/net80211/w00t/README | 1 - tools/tools/net80211/wesside/README | 1 - tools/tools/net80211/wlaninject/README | 1 - tools/tools/netmap/README | 1 - tools/tools/netrate/README | 2 -- tools/tools/netrate/tcpp/README | 3 --- tools/tools/sortbench/README | 1 - tools/tools/sortbench/bench.py | 2 -- tools/tools/sysbuild/README | 1 - tools/tools/vhba/README | 1 - usr.bin/bmake/tests/README | 1 - usr.bin/compress/doc/NOTES | 2 -- usr.bin/compress/doc/README | 1 - usr.bin/dtc/HACKING | 1 - usr.bin/indent/README | 2 -- usr.bin/lastcomm/tests/README | 1 - usr.bin/login/README | 2 -- usr.bin/m4/tests/ff_after_dnl.m4.uu | 1 - usr.bin/m4/tests/strangequotes.m4.uu | 1 - usr.bin/ministat/README | 1 - usr.sbin/apmd/README | 2 -- usr.sbin/bluetooth/bcmfw/BCM-LEGAL.txt | 1 - usr.sbin/bluetooth/bcmfw/README | 1 - usr.sbin/bootparamd/bootparamd/README | 1 - usr.sbin/cron/doc/CHANGES | 1 - usr.sbin/cron/doc/CONVERSION | 1 - usr.sbin/cron/doc/FEATURES | 1 - usr.sbin/cron/doc/MAIL | 2 -- usr.sbin/kbdmap/TODO | 1 - usr.sbin/kldxref/fileformat | 1 - usr.sbin/newsyslog/pathnames.h | 2 -- usr.sbin/ppp/README.changes | 2 -- usr.sbin/ppp/README.nat | 2 -- usr.sbin/pw/README | 2 -- 417 files changed, 446 deletions(-) diff --git a/LOCKS b/LOCKS index 1e2effdfca34..ceebb8e131df 100644 --- a/LOCKS +++ b/LOCKS @@ -1,4 +1,3 @@ -$FreeBSD$ This file documents formal review/approval requirements that have been approved by core. diff --git a/MAINTAINERS b/MAINTAINERS index 809a5d70c775..50d5bf28639b 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -1,4 +1,3 @@ -$FreeBSD$ Please note that the content of this file is strictly advisory. No locks listed here are valid. The only strict review requirements diff --git a/UPDATING b/UPDATING index fbe932db2aa9..c05670e14f7c 100644 --- a/UPDATING +++ b/UPDATING @@ -2004,5 +2004,3 @@ POSSIBILITY OF SUCH DAMAGE. Contact Warner Losh if you have any questions about your use of this document. - -$FreeBSD$ diff --git a/bin/dd/ref.ascii b/bin/dd/ref.ascii index 7ff13e5a80ed..a8299b6cb056 100644 --- a/bin/dd/ref.ascii +++ b/bin/dd/ref.ascii @@ -1,4 +1,3 @@ -$FreeBSD$ 00000000 00 01 02 03 9c 09 86 7f 97 8d 8e 0b 0c 0d 0e 0f |................| 00000010 10 11 12 13 9d 85 08 87 18 19 92 8f 1c 1d 1e 1f |................| 00000020 80 81 82 83 84 0a 17 1b 88 89 8a 8b 8c 05 06 07 |................| diff --git a/bin/dd/ref.ebcdic b/bin/dd/ref.ebcdic index 605716552cab..b2428c8517ce 100644 --- a/bin/dd/ref.ebcdic +++ b/bin/dd/ref.ebcdic @@ -1,4 +1,3 @@ -$FreeBSD$ 00000000 00 01 02 03 37 2d 2e 2f 16 05 25 0b 0c 0d 0e 0f |....7-./..%.....| 00000010 10 11 12 13 3c 3d 32 26 18 19 3f 27 1c 1d 1e 1f |....<=2&..?'....| 00000020 40 5a 7f 7b 5b 6c 50 7d 4d 5d 5c 4e 6b 60 4b 61 |@Z.{[lP}M]\Nk`Ka| diff --git a/bin/dd/ref.ibm b/bin/dd/ref.ibm index 4836baf221aa..3d05cf9a9ef0 100644 --- a/bin/dd/ref.ibm +++ b/bin/dd/ref.ibm @@ -1,4 +1,3 @@ -$FreeBSD$ 00000000 00 01 02 03 37 2d 2e 2f 16 05 25 0b 0c 0d 0e 0f |....7-./..%.....| 00000010 10 11 12 13 3c 3d 32 26 18 19 3f 27 1c 1d 1e 1f |....<=2&..?'....| 00000020 40 5a 7f 7b 5b 6c 50 7d 4d 5d 5c 4e 6b 60 4b 61 |@Z.{[lP}M]\Nk`Ka| diff --git a/bin/dd/ref.lcase b/bin/dd/ref.lcase index 9f9567296468..a653527f8c63 100644 --- a/bin/dd/ref.lcase +++ b/bin/dd/ref.lcase @@ -1,4 +1,3 @@ -$FreeBSD$ 00000000 00 01 02 03 04 05 06 07 08 09 0a 0b 0c 0d 0e 0f |................| 00000010 10 11 12 13 14 15 16 17 18 19 1a 1b 1c 1d 1e 1f |................| 00000020 20 21 22 23 24 25 26 27 28 29 2a 2b 2c 2d 2e 2f | !"#$%&'()*+,-./| diff --git a/bin/dd/ref.obs_zeroes b/bin/dd/ref.obs_zeroes index 473ff7cc4108..e26380a1e7d3 100644 --- a/bin/dd/ref.obs_zeroes +++ b/bin/dd/ref.obs_zeroes @@ -1,3 +1,2 @@ -$FreeBSD$ 00000000 41 42 43 44 45 46 47 48 00 00 00 00 00 00 00 00 |ABCDEFGH........| 00000010 diff --git a/bin/dd/ref.oldascii b/bin/dd/ref.oldascii index bb1ad0a7242b..a748a9d6361f 100644 --- a/bin/dd/ref.oldascii +++ b/bin/dd/ref.oldascii @@ -1,4 +1,3 @@ -$FreeBSD$ 00000000 00 01 02 03 9c 09 86 7f 97 8d 8e 0b 0c 0d 0e 0f |................| 00000010 10 11 12 13 9d 85 08 87 18 19 92 8f 1c 1d 1e 1f |................| 00000020 80 81 82 83 84 0a 17 1b 88 89 8a 8b 8c 05 06 07 |................| diff --git a/bin/dd/ref.oldebcdic b/bin/dd/ref.oldebcdic index 4a7fde7e65b6..122f463b5cf4 100644 --- a/bin/dd/ref.oldebcdic +++ b/bin/dd/ref.oldebcdic @@ -1,4 +1,3 @@ -$FreeBSD$ 00000000 00 01 02 03 37 2d 2e 2f 16 05 25 0b 0c 0d 0e 0f |....7-./..%.....| 00000010 10 11 12 13 3c 3d 32 26 18 19 3f 27 1c 1d 1e 1f |....<=2&..?'....| 00000020 40 4f 7f 7b 5b 6c 50 7d 4d 5d 5c 4e 6b 60 4b 61 |@O.{[lP}M]\Nk`Ka| diff --git a/bin/dd/ref.oldibm b/bin/dd/ref.oldibm index 4836baf221aa..3d05cf9a9ef0 100644 --- a/bin/dd/ref.oldibm +++ b/bin/dd/ref.oldibm @@ -1,4 +1,3 @@ -$FreeBSD$ 00000000 00 01 02 03 37 2d 2e 2f 16 05 25 0b 0c 0d 0e 0f |....7-./..%.....| 00000010 10 11 12 13 3c 3d 32 26 18 19 3f 27 1c 1d 1e 1f |....<=2&..?'....| 00000020 40 5a 7f 7b 5b 6c 50 7d 4d 5d 5c 4e 6b 60 4b 61 |@Z.{[lP}M]\Nk`Ka| diff --git a/bin/dd/ref.pareven b/bin/dd/ref.pareven index c64e63e30660..3c7c240d6f2f 100644 --- a/bin/dd/ref.pareven +++ b/bin/dd/ref.pareven @@ -1,4 +1,3 @@ -$FreeBSD$ 00000000 00 81 82 03 84 05 06 87 88 09 0a 8b 0c 8d 8e 0f |................| 00000010 90 11 12 93 14 95 96 17 18 99 9a 1b 9c 1d 1e 9f |................| 00000020 a0 21 22 a3 24 a5 a6 27 28 a9 aa 2b ac 2d 2e af |.!".$..'(..+.-..| diff --git a/bin/dd/ref.parnone b/bin/dd/ref.parnone index fba31c142448..c6e394f59d8c 100644 --- a/bin/dd/ref.parnone +++ b/bin/dd/ref.parnone @@ -1,4 +1,3 @@ -$FreeBSD$ 00000000 00 01 02 03 04 05 06 07 08 09 0a 0b 0c 0d 0e 0f |................| 00000010 10 11 12 13 14 15 16 17 18 19 1a 1b 1c 1d 1e 1f |................| 00000020 20 21 22 23 24 25 26 27 28 29 2a 2b 2c 2d 2e 2f | !"#$%&'()*+,-./| diff --git a/bin/dd/ref.parodd b/bin/dd/ref.parodd index f0bc449e3648..ada582f87265 100644 --- a/bin/dd/ref.parodd +++ b/bin/dd/ref.parodd @@ -1,4 +1,3 @@ -$FreeBSD$ 00000000 80 01 02 83 04 85 86 07 08 89 8a 0b 8c 0d 0e 8f |................| 00000010 10 91 92 13 94 15 16 97 98 19 1a 9b 1c 9d 9e 1f |................| 00000020 20 a1 a2 23 a4 25 26 a7 a8 29 2a ab 2c ad ae 2f | ..#.%&..)*.,../| diff --git a/bin/dd/ref.parset b/bin/dd/ref.parset index baa1c57163a2..742ed22642d8 100644 --- a/bin/dd/ref.parset +++ b/bin/dd/ref.parset @@ -1,4 +1,3 @@ -$FreeBSD$ 00000000 80 81 82 83 84 85 86 87 88 89 8a 8b 8c 8d 8e 8f |................| 00000010 90 91 92 93 94 95 96 97 98 99 9a 9b 9c 9d 9e 9f |................| 00000020 a0 a1 a2 a3 a4 a5 a6 a7 a8 a9 aa ab ac ad ae af |................| diff --git a/bin/dd/ref.swab b/bin/dd/ref.swab index 79e57b79b738..07cf9ffafa8f 100644 --- a/bin/dd/ref.swab +++ b/bin/dd/ref.swab @@ -1,4 +1,3 @@ -$FreeBSD$ 00000000 01 00 03 02 05 04 07 06 09 08 0b 0a 0d 0c 0f 0e |................| 00000010 11 10 13 12 15 14 17 16 19 18 1b 1a 1d 1c 1f 1e |................| 00000020 21 20 23 22 25 24 27 26 29 28 2b 2a 2d 2c 2f 2e |! #"%$'&)(+*-,/.| diff --git a/bin/dd/ref.ucase b/bin/dd/ref.ucase index 70d8a903c354..a761c99431f5 100644 --- a/bin/dd/ref.ucase +++ b/bin/dd/ref.ucase @@ -1,4 +1,3 @@ -$FreeBSD$ 00000000 00 01 02 03 04 05 06 07 08 09 0a 0b 0c 0d 0e 0f |................| 00000010 10 11 12 13 14 15 16 17 18 19 1a 1b 1c 1d 1e 1f |................| 00000020 20 21 22 23 24 25 26 27 28 29 2a 2b 2c 2d 2e 2f | !"#$%&'()*+,-./| diff --git a/bin/ed/POSIX b/bin/ed/POSIX index 53d6b5328ca5..1c8ac2b3b212 100644 --- a/bin/ed/POSIX +++ b/bin/ed/POSIX @@ -1,4 +1,3 @@ -$FreeBSD$ This version of ed(1) is not strictly POSIX compliant, as described in the POSIX 1003.2 document. The following is a summary of the omissions, diff --git a/bin/ed/README b/bin/ed/README index da11f9b0f32a..8f5234179119 100644 --- a/bin/ed/README +++ b/bin/ed/README @@ -1,4 +1,3 @@ -$FreeBSD$ ed is an 8-bit-clean, POSIX-compliant line editor. It should work with any regular expression package that conforms to the POSIX interface diff --git a/etc/mtree/README b/etc/mtree/README index 1b2b0d4bd5e1..fd4a062552d9 100644 --- a/etc/mtree/README +++ b/etc/mtree/README @@ -1,4 +1,3 @@ -$FreeBSD$ Note: If you modify these files, please keep hier(7) updated! diff --git a/lib/lib80211/regdomain.xml b/lib/lib80211/regdomain.xml index 38ef48fa3b69..5a432f39ccf6 100644 --- a/lib/lib80211/regdomain.xml +++ b/lib/lib80211/regdomain.xml @@ -21,8 +21,6 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - - $FreeBSD$ --> diff --git a/lib/libc/locale/DESIGN.xlocale b/lib/libc/locale/DESIGN.xlocale index 5d998d32314d..03e065d82d73 100644 --- a/lib/libc/locale/DESIGN.xlocale +++ b/lib/libc/locale/DESIGN.xlocale @@ -1,4 +1,3 @@ -$FreeBSD$ Design of xlocale ================= diff --git a/lib/libc/rpc/README b/lib/libc/rpc/README index 129fe0082d6d..60e9f2649bba 100644 --- a/lib/libc/rpc/README +++ b/lib/libc/rpc/README @@ -1,4 +1,3 @@ -$FreeBSD$ PLEASE READ THE DISCLAIMER FILE. DO NOT CALL THE SUN MICROSYSTEMS SUPPORT LINE WITH QUESTIONS ON THIS RELEASE. THEY CANNOT ANSWER QUESTIONS ABOUT THIS diff --git a/lib/libc/softfloat/README.NetBSD b/lib/libc/softfloat/README.NetBSD index c6ca7a8753cc..e486eba748d0 100644 --- a/lib/libc/softfloat/README.NetBSD +++ b/lib/libc/softfloat/README.NetBSD @@ -1,5 +1,4 @@ $NetBSD: README.NetBSD,v 1.2 2002/05/21 23:51:05 bjh21 Exp $ -$FreeBSD$ This is a modified version of part of John Hauser's SoftFloat 2a package. This version has been heavily modified to support its use with GCC to diff --git a/lib/libc/softfloat/README.txt b/lib/libc/softfloat/README.txt index fe28ccc294fb..b771b8c8e118 100644 --- a/lib/libc/softfloat/README.txt +++ b/lib/libc/softfloat/README.txt @@ -1,5 +1,4 @@ $NetBSD: README.txt,v 1.1 2000/06/06 08:15:02 bjh21 Exp $ -$FreeBSD$ Package Overview for SoftFloat Release 2a diff --git a/lib/libc/softfloat/softfloat-history.txt b/lib/libc/softfloat/softfloat-history.txt index d8c98db56ed4..14fe06687950 100644 --- a/lib/libc/softfloat/softfloat-history.txt +++ b/lib/libc/softfloat/softfloat-history.txt @@ -1,5 +1,4 @@ $NetBSD: softfloat-history.txt,v 1.1 2000/06/06 08:15:08 bjh21 Exp $ -$FreeBSD$ History of Major Changes to SoftFloat, up to Release 2a diff --git a/lib/libc/softfloat/softfloat-source.txt b/lib/libc/softfloat/softfloat-source.txt index 2a15f2add95b..49de2e021f0c 100644 --- a/lib/libc/softfloat/softfloat-source.txt +++ b/lib/libc/softfloat/softfloat-source.txt @@ -1,5 +1,4 @@ $NetBSD: softfloat-source.txt,v 1.2 2006/11/24 19:46:58 christos Exp $ -$FreeBSD$ SoftFloat Release 2a Source Documentation diff --git a/lib/libc/softfloat/softfloat.txt b/lib/libc/softfloat/softfloat.txt index 414506f7fef2..a3ad43e20401 100644 --- a/lib/libc/softfloat/softfloat.txt +++ b/lib/libc/softfloat/softfloat.txt @@ -1,5 +1,4 @@ $NetBSD: softfloat.txt,v 1.2 2006/11/24 19:46:58 christos Exp $ -$FreeBSD$ SoftFloat Release 2a General Documentation diff --git a/lib/libc/softfloat/timesoftfloat.txt b/lib/libc/softfloat/timesoftfloat.txt index ae992f983c11..53dfbf484a19 100644 --- a/lib/libc/softfloat/timesoftfloat.txt +++ b/lib/libc/softfloat/timesoftfloat.txt @@ -1,5 +1,4 @@ $NetBSD: timesoftfloat.txt,v 1.1 2000/06/06 08:15:11 bjh21 Exp $ -$FreeBSD$ Documentation for the `timesoftfloat' Program of SoftFloat Release 2a diff --git a/lib/libnetbsd/README b/lib/libnetbsd/README index 49afa0b436bf..0eccbe8616d9 100644 --- a/lib/libnetbsd/README +++ b/lib/libnetbsd/README @@ -1,4 +1,3 @@ -$FreeBSD$ libnetbsd is a thin compatibility layer intended to allow a limited set of NetBSD software to compile as part of the FreeBSD build with diff --git a/lib/libopenbsd/README b/lib/libopenbsd/README index e9f6d70b5fc5..f3ffe54a5797 100644 --- a/lib/libopenbsd/README +++ b/lib/libopenbsd/README @@ -1,4 +1,3 @@ -$FreeBSD$ libopenbsd is a thin compatibility layer intended to allow a limited set of OpenBSD software to compile as part of the FreeBSD build with diff --git a/lib/libpam/pam.d/README b/lib/libpam/pam.d/README index 2824c054fe85..c7a5e65ebcef 100644 --- a/lib/libpam/pam.d/README +++ b/lib/libpam/pam.d/README @@ -58,5 +58,3 @@ Note that having a "sufficient" module as the last entry for a particular service and module type may result in surprising behaviour. To get the intended semantics, add a "required" entry listing the pam_deny module at the end of the chain. - -$FreeBSD$ diff --git a/lib/libsecureboot/README.rst b/lib/libsecureboot/README.rst index 8e6f7580faaf..85b949db58cc 100644 --- a/lib/libsecureboot/README.rst +++ b/lib/libsecureboot/README.rst @@ -131,4 +131,3 @@ from the relevant chain - which is sure to be a valid certificate signed by the corresponding trust anchor. -------------------- -$FreeBSD$ diff --git a/libexec/bootpd/hash.c b/libexec/bootpd/hash.c index 89b113bc6031..735373c2f654 100644 --- a/libexec/bootpd/hash.c +++ b/libexec/bootpd/hash.c @@ -19,8 +19,6 @@ PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - $FreeBSD$ - ************************************************************************/ /* diff --git a/libexec/bootpd/readfile.c b/libexec/bootpd/readfile.c index 8511dd1bb18f..1d9ff2163395 100644 --- a/libexec/bootpd/readfile.c +++ b/libexec/bootpd/readfile.c @@ -19,8 +19,6 @@ PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - $FreeBSD$ - ************************************************************************/ /* diff --git a/libexec/bootpd/tools/bootpef/bootpef.c b/libexec/bootpd/tools/bootpef/bootpef.c index 51e5e581f7d7..f8b2eeeaaf2d 100644 --- a/libexec/bootpd/tools/bootpef/bootpef.c +++ b/libexec/bootpd/tools/bootpef/bootpef.c @@ -19,8 +19,6 @@ PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - $FreeBSD$ - ************************************************************************/ /* diff --git a/release/powerpc/boot.tbxi b/release/powerpc/boot.tbxi index 70897866bec8..adf76e1c6e07 100644 --- a/release/powerpc/boot.tbxi +++ b/release/powerpc/boot.tbxi @@ -1,6 +1,5 @@ -$FreeBSD$ MacRISC MacRISC3 MacRISC4 diff --git a/release/powerpc/hfs-boot.bz2.uu b/release/powerpc/hfs-boot.bz2.uu index dccd3fa4906e..fbae44dcb432 100644 --- a/release/powerpc/hfs-boot.bz2.uu +++ b/release/powerpc/hfs-boot.bz2.uu @@ -1,6 +1,5 @@ HFS boot filesystem created by generate-hfs.sh DO NOT EDIT -$FreeBSD$ begin 644 hfs-boot.bz2 M0EIH.3%!62936=IZTD$``"__]__O_G)7!_Y]OV??5']UW\1$0`$$0```P&`@ M`$A`3,`"L#DRUJM"4E,32>D\*>4\HS2-`:`#0````>IH`>H!H-`$B23)H"8% diff --git a/rescue/README b/rescue/README index 496575e1a323..4603aec98477 100644 --- a/rescue/README +++ b/rescue/README @@ -39,5 +39,3 @@ To compile: Note that rebuilds don't always work correctly; if you run into trouble, try 'make clean' before recompiling. - -$FreeBSD$ diff --git a/sbin/gbde/image.uu b/sbin/gbde/image.uu index 82e6f2e47489..1c06d84f1e45 100644 --- a/sbin/gbde/image.uu +++ b/sbin/gbde/image.uu @@ -1,4 +1,3 @@ -$FreeBSD$ begin 644 gbde.image.bz2 M0EIH.3%!629364"&9H\`Y1=_____________________________________ diff --git a/share/dict/freebsd b/share/dict/freebsd index 2321038fa384..8033e9abf529 100644 --- a/share/dict/freebsd +++ b/share/dict/freebsd @@ -1,4 +1,3 @@ -$FreeBSD$ ABI ACL ACPI diff --git a/share/doc/IPv6/IMPLEMENTATION b/share/doc/IPv6/IMPLEMENTATION index 04a0e5279424..179073383886 100644 --- a/share/doc/IPv6/IMPLEMENTATION +++ b/share/doc/IPv6/IMPLEMENTATION @@ -3,7 +3,6 @@ KAME Project https://www.kame.net/ $KAME: IMPLEMENTATION,v 1.216 2001/05/25 07:43:01 jinmei Exp $ - $FreeBSD$ NOTE: The document tries to describe behaviors/implementation choices of the latest KAME/*BSD stack. The description here may not be diff --git a/share/dtrace/README b/share/dtrace/README index 6855c6aee721..fd07a00587c7 100644 --- a/share/dtrace/README +++ b/share/dtrace/README @@ -1,4 +1,3 @@ -$FreeBSD$ This directory contains scripts for use with the DTrace system. These files and directories contain code generated by the FreeBSD diff --git a/share/examples/IPv6/USAGE b/share/examples/IPv6/USAGE index 57ff00962bb8..83cfb43595c8 100644 --- a/share/examples/IPv6/USAGE +++ b/share/examples/IPv6/USAGE @@ -1,7 +1,6 @@ USAGE KAME Project $KAME: USAGE,v 1.33 2000/11/22 10:22:57 itojun Exp $ - $FreeBSD$ This is an introduction of how to use the commands provided in the KAME kit. For more information, please refer to each man page. diff --git a/share/examples/bootforth/README b/share/examples/bootforth/README index 1ac13420c9ee..69db86ee8806 100644 --- a/share/examples/bootforth/README +++ b/share/examples/bootforth/README @@ -31,5 +31,3 @@ configuration to distinguish one from the other. Daniel C. Sobral - -$FreeBSD$ diff --git a/share/examples/drivers/README b/share/examples/drivers/README index 6f7e9dc2b091..8628029a62f8 100644 --- a/share/examples/drivers/README +++ b/share/examples/drivers/README @@ -1,4 +1,3 @@ -$FreeBSD$ Author: Julian Elischer diff --git a/share/examples/etc/README.examples b/share/examples/etc/README.examples index 606b2b40d60c..b0dc2b83ad66 100644 --- a/share/examples/etc/README.examples +++ b/share/examples/etc/README.examples @@ -1,4 +1,3 @@ -$FreeBSD$ The /usr/share/examples/etc directory contains the original distribution versions of the files which are shipped in /etc. This is diff --git a/share/examples/ipfilter/examples.txt b/share/examples/ipfilter/examples.txt index a323a8457752..2faf50a16a0b 100644 --- a/share/examples/ipfilter/examples.txt +++ b/share/examples/ipfilter/examples.txt @@ -512,4 +512,3 @@ pass in quick proto tcp from any to any port = WWW keep state group 100 ------------------------------------------------------------------------ Return to the IP Filter home page -$FreeBSD$ diff --git a/share/examples/ipfilter/ipf-howto.txt b/share/examples/ipfilter/ipf-howto.txt index ca14538f1b67..66f67bd96bf1 100644 --- a/share/examples/ipfilter/ipf-howto.txt +++ b/share/examples/ipfilter/ipf-howto.txt @@ -8,7 +8,6 @@ Brendan Conoboy Erik Fichtner - $FreeBSD$ Fri Apr 20 09:31:14 EDT 2001 diff --git a/share/examples/kld/dyn_sysctl/README b/share/examples/kld/dyn_sysctl/README index 4dfa3c6bdfbd..054a6e2328f7 100644 --- a/share/examples/kld/dyn_sysctl/README +++ b/share/examples/kld/dyn_sysctl/README @@ -4,5 +4,3 @@ wrong place, i.e. to a dynamic oid that could belong to someone else. The framework should deal with this case gracefully. Andrzej Bialecki - -$FreeBSD$ diff --git a/share/examples/kld/firmware/README b/share/examples/kld/firmware/README index 075c5e5723b5..473245a8e2ae 100644 --- a/share/examples/kld/firmware/README +++ b/share/examples/kld/firmware/README @@ -1,4 +1,3 @@ -$FreeBSD$ This is a simple example of the firmware(9) system. It consists of two parts: diff --git a/share/examples/kld/firmware/fwimage/firmware.img.uu b/share/examples/kld/firmware/fwimage/firmware.img.uu index 889fa7ebd4b1..075877e0bcb3 100644 --- a/share/examples/kld/firmware/fwimage/firmware.img.uu +++ b/share/examples/kld/firmware/fwimage/firmware.img.uu @@ -1,4 +1,3 @@ -$FreeBSD$ begin 644 firmware.img M("`@("`@("`@("`@("`L("`@("`@("`L"B`@("`@("`@("`@("`O*"`@("`@ M("`@*0H@("`@("`@("`@("`@7"!<7U]?("`@+R!\"B`@("`@("`@("`@("`O diff --git a/share/examples/kld/khelp/README b/share/examples/kld/khelp/README index 89a2a333fb6e..af201809864c 100644 --- a/share/examples/kld/khelp/README +++ b/share/examples/kld/khelp/README @@ -1,4 +1,3 @@ -$FreeBSD$ An example Khelp module which uses the helper hook points available in the TCP stack to calculate a per-connection count of inbound and outbound packets when diff --git a/share/examples/perfmon/README b/share/examples/perfmon/README index ffa2cafa92c8..25452813f3db 100644 --- a/share/examples/perfmon/README +++ b/share/examples/perfmon/README @@ -21,5 +21,3 @@ The following options are not implemented on Pentium CPUs: There is one mandatory argument, which is the event number to be monitored, defined in . All numbers can be specified in any format acceptable to strtol(3). - -$FreeBSD$ diff --git a/share/examples/tests/README b/share/examples/tests/README index 0465cbe79889..ecf3c36a01f1 100644 --- a/share/examples/tests/README +++ b/share/examples/tests/README @@ -1,4 +1,3 @@ -$FreeBSD$ This directory contains sample test programs along the Makefile and Kyuafile logic to get them build and installed. diff --git a/share/examples/ypldap/ypldap.conf b/share/examples/ypldap/ypldap.conf index 83d25ac60ba8..46c6cf0d83eb 100644 --- a/share/examples/ypldap/ypldap.conf +++ b/share/examples/ypldap/ypldap.conf @@ -1,4 +1,3 @@ -$FreeBSD$ domain "freebsd.org" interval 60 provide map "passwd.byname" diff --git a/share/misc/bsd-family-tree b/share/misc/bsd-family-tree index c3b0baa26d8d..208523bd1fcb 100644 --- a/share/misc/bsd-family-tree +++ b/share/misc/bsd-family-tree @@ -935,5 +935,3 @@ Steven M. Schultz for providing 2.8BSD, 2.10BSD, 2.11BSD manual pages. -- Copyright (c) 1997-2012 Wolfram Schneider URL: https://cgit.freebsd.org/src/tree/share/misc/bsd-family-tree - *** 3303 LINES SKIPPED *** From nobody Wed Aug 16 17:57:17 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RQwnp1NxCz4qvD2; Wed, 16 Aug 2023 17:57: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RQwnp0GYHz3Vrn; Wed, 16 Aug 2023 17:57:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692208638; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=phuzJi+nZsFxF0uJTa+iDSwDbY3IQFgixQ9636E7EMs=; b=tXLpzGN7owFy7pk0ZQrzGFjE1QksoDlQhFsPmOChrQMO8P/GsmnI9LzlB3vzrz7BUoAwb+ scG52hje0HWlW4wJSvkogPYFxMjS6mboyL3oK9QmDkz2qIsQqMl7tHgYtKZtf8dOD+eEh+ ASVQs6f2RJQfyyQWI4NeJvZZ4FzAS99ERdHu02ng2rSC8bk2H634fDh9ocXSx1bvvyQay3 HlNcQODhHqyinx22Pcu8aWu6CEqwYHlvn3J+d6tmzCIZx2q60AXyMM2g3wmYtK/lAza5M8 1wMRXHtOWHftl73eaCOVKHPtWEcw5FTXX5UwhTju3OhA1UuEANzJHgFG7W75cA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692208638; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=phuzJi+nZsFxF0uJTa+iDSwDbY3IQFgixQ9636E7EMs=; b=TxvOJiXhLjFdXr9gWyXHqZv9cYvfo5JkR8WiG7RAd79VMtTD2zfgi4tOPlYNlMrx2PSozU O21r7klrn1EQbjCJX6mBHlc6aBdIIDBWNjXEzEekGIII4ogQh7UAgtx88AbDtfN7oadDLB 5pj5c/6B+UR0ajj9bz719MKa18C+F+Prs540xmDDtH4iKaPUmx+Xt9DA29SbJ9dsB6GO56 wHr3Yhtj2kVHb8WRUHlfgMYFAZv2aGmcKpf6SeJUWy+dyRGkcDsXq4J79255YJhjshP0zN T/oUGiCn8LZsH4/FdkNhrh+buE13NJOdpz1uTlRcB1AQ3dA1Pexcv7Wd5EgDZQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692208638; a=rsa-sha256; cv=none; b=EPLB8vFpxBg+Q3xqokA0nD8AKBb3H7/Yc6ODMHAXkn8ckvFi6RnHmFEFfR/mSSo7D7Z4+k gsxfVIQj1M1y3ARaBWXWsTBKhbxdnFyjLFaDp3OT/wbMKYMi2v5q1z8C9pLhxNEI3BT6jp WjzwhL2AKIznlQ67q8452ZB09GcBpph4lKZx00Lnm8eLL/AIWh7lmrHcnTMqR3eI9Ioyn0 I4DhySUAN1rbtzXiPP87YPFIXhAlD4ZmmKRGYybW22UgiDF83/tbNwkWZyxwe4vdPgUGU7 Kurs6427xEFvQ8QahNYyoO+CBRWOotU0ZogQ8oORn5jqGW8CufiNJ+jG/eFFOQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RQwnn5HWbz11Vk; Wed, 16 Aug 2023 17:57:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37GHvHfF059883; Wed, 16 Aug 2023 17:57:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37GHvH09059880; Wed, 16 Aug 2023 17:57:17 GMT (envelope-from git) Date: Wed, 16 Aug 2023 17:57:17 GMT Message-Id: <202308161757.37GHvH09059880@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: 2063df147163 - main - sys: Remove $FreeBSD$: one-line catalog List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2063df147163c4e00d224daa5b9368a91bae437e Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=2063df147163c4e00d224daa5b9368a91bae437e commit 2063df147163c4e00d224daa5b9368a91bae437e Author: Warner Losh AuthorDate: 2023-08-16 17:55:22 +0000 Commit: Warner Losh CommitDate: 2023-08-16 17:55:22 +0000 sys: Remove $FreeBSD$: one-line catalog Remove /^\s*\$\s*\$FreeBSD\$$\n/ --- sys/cddl/compat/opensolaris/sys/policy.h | 1 - sys/cddl/compat/opensolaris/sys/refstr.h | 1 - 2 files changed, 2 deletions(-) diff --git a/sys/cddl/compat/opensolaris/sys/policy.h b/sys/cddl/compat/opensolaris/sys/policy.h index 0b968aead205..ea7aec50e149 100644 --- a/sys/cddl/compat/opensolaris/sys/policy.h +++ b/sys/cddl/compat/opensolaris/sys/policy.h @@ -23,7 +23,6 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - $ $FreeBSD$ */ #ifndef _OPENSOLARIS_SYS_POLICY_H_ diff --git a/sys/cddl/compat/opensolaris/sys/refstr.h b/sys/cddl/compat/opensolaris/sys/refstr.h index e4e177bf435c..ef0f483d51e6 100644 --- a/sys/cddl/compat/opensolaris/sys/refstr.h +++ b/sys/cddl/compat/opensolaris/sys/refstr.h @@ -23,7 +23,6 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - $ $FreeBSD$ */ #ifndef _OPENSOLARIS_SYS_REFSTR_H_ From nobody Wed Aug 16 17:57:18 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RQwnq1BbHz4qvVH; Wed, 16 Aug 2023 17:57: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RQwnq08ttz3Vv6; Wed, 16 Aug 2023 17:57:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692208639; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=DT9RXXM65dLA0Dk+GIii5ULaX04mxOx9H+SMWBZYGs8=; b=XHhcKAuAZU6k2jMWQPnl8sOGXpY9bdrYG/1ZkhcLDtxW+pfRo3bC9wkOSoyWQah8yJ1AGp iAAxbA9qEYG35eJHHo/AdC1tmG7ScIhLHLE1ZjiAsBO9o7QkEGwWytw6XqJJCdr0FeSdmU ro/MAtgRsyh50LMRVMjIUmGpIPptrEiHctrTFqUBAYkn3BWRpN7UUa2qlMn2RFUbIRj3oU Z+2CtTorVAI7nYTfcsgRaS2VwuQTyIquUmxk8triKQcTOnpAcClYZhnfFdI1MXXS4VZjDE s3bRFZzUwYI2EWGlnUnzilmqLqMDsafX94LoKd68kDBhkRttahaKgY5ByOM9Cg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692208639; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=DT9RXXM65dLA0Dk+GIii5ULaX04mxOx9H+SMWBZYGs8=; b=GRlN8yTT015//dH8QgmgejBcehV38ASTWh9jC2iq82LIzvv56fJIb1Y+hFMoru5ifvgiET 0hZmWrqe9EcEG1XYf9UzmsuITu4T1OGb1IzX2G/SzVxqIG8RVasN14YMZFJcbNvmqtqmOY 7WBlSGFXj6qdoTYCIAOz3DpISwu4+PaRSfFUnbAAxDV2ftmp2qeXXOUeIHMXxb8abLGZFz gz20vWYJq3jAffdIiQ3saang8I3CSeTzqTFUgOMwB26m7n+CZ8txzml+4JA/wWBmkoj7IS zaHR7ECOt2kpEDaqePxszOR9NdUwYnAcMD+PyYGq154vvvsHynCKYPPzJGzWbw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692208639; a=rsa-sha256; cv=none; b=qMljKPknvymQoVP+hd1+Yp049wE9C+VFj8w7H4V32ZiEJEmLvwzSWfK97P4UFkYioOUwEp nmdL7Wc/q/7l9TyJlqUFsm20iRBzbNOISS12lhG5W8syVRw6iY0vLNZZPAHrE2+vwZ5vqP QsoePl83vgwqiJl5m404U25YwSOcS9UE3lWDDt4AT6B5s28AJeY3JSZFytI+K6cO0powwm Yh1Xjw/pjDpkrtFg57drairi2aRe5RkXEIDRz/XCzelHFtKTwPY7oU8qHp+cRgUaamcoOs v5TUQcmfg37YbafSu4mxsTOhdL2Gj2+1Oz3z2O27Ny/4Q0LnXPZWSq4NAIuMrA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RQwnp6L9Hz11dR; Wed, 16 Aug 2023 17:57:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37GHvIQi059922; Wed, 16 Aug 2023 17:57:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37GHvIRh059919; Wed, 16 Aug 2023 17:57:18 GMT (envelope-from git) Date: Wed, 16 Aug 2023 17:57:18 GMT Message-Id: <202308161757.37GHvIRh059919@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: ae992a336e8d - main - Remove $FreeBSD$: one-line catalog List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ae992a336e8dc2df69de986581a6fd45be68f8dd Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=ae992a336e8dc2df69de986581a6fd45be68f8dd commit ae992a336e8dc2df69de986581a6fd45be68f8dd Author: Warner Losh AuthorDate: 2023-08-16 17:55:26 +0000 Commit: Warner Losh CommitDate: 2023-08-16 17:55:26 +0000 Remove $FreeBSD$: one-line catalog Remove /^\s*\$\s*\$FreeBSD\$$\n/ --- lib/libc/nls/C.msg | 1 - lib/libc/nls/be_BY.UTF-8.msg | 1 - lib/libc/nls/ca_ES.ISO8859-1.msg | 1 - lib/libc/nls/de_DE.ISO8859-1.msg | 1 - lib/libc/nls/el_GR.ISO8859-7.msg | 1 - lib/libc/nls/es_ES.ISO8859-1.msg | 1 - lib/libc/nls/fi_FI.ISO8859-1.msg | 1 - lib/libc/nls/fr_FR.ISO8859-1.msg | 1 - lib/libc/nls/gl_ES.ISO8859-1.msg | 1 - lib/libc/nls/hu_HU.ISO8859-2.msg | 1 - lib/libc/nls/it_IT.ISO8859-15.msg | 1 - lib/libc/nls/ja_JP.UTF-8.msg | 1 - lib/libc/nls/ja_JP.eucJP.msg | 1 - lib/libc/nls/ko_KR.UTF-8.msg | 1 - lib/libc/nls/ko_KR.eucKR.msg | 1 - lib/libc/nls/mn_MN.UTF-8.msg | 1 - lib/libc/nls/nl_NL.ISO8859-1.msg | 1 - lib/libc/nls/no_NO.ISO8859-1.msg | 1 - lib/libc/nls/pl_PL.ISO8859-2.msg | 1 - lib/libc/nls/pt_BR.ISO8859-1.msg | 1 - lib/libc/nls/ru_RU.KOI8-R.msg | 1 - lib/libc/nls/sk_SK.ISO8859-2.msg | 1 - lib/libc/nls/sv_SE.ISO8859-1.msg | 1 - lib/libc/nls/uk_UA.UTF-8.msg | 1 - lib/libc/nls/zh_CN.GB18030.msg | 1 - lib/libc/nls/zh_CN.GB2312.msg | 1 - lib/libc/nls/zh_CN.UTF-8.msg | 1 - usr.bin/ee/nls/de_DE.ISO8859-1/ee.msg | 1 - usr.bin/ee/nls/fr_FR.ISO8859-1/ee.msg | 1 - usr.bin/ee/nls/hu_HU.ISO8859-2/ee.msg | 1 - usr.bin/ee/nls/pl_PL.ISO8859-2/ee.msg | 1 - usr.bin/ee/nls/pt_BR.ISO8859-1/ee.msg | 1 - usr.bin/ee/nls/ru_RU.KOI8-R/ee.msg | 1 - usr.bin/ee/nls/uk_UA.KOI8-U/ee.msg | 1 - 34 files changed, 34 deletions(-) diff --git a/lib/libc/nls/C.msg b/lib/libc/nls/C.msg index 4004011d260f..7feea372ed86 100644 --- a/lib/libc/nls/C.msg +++ b/lib/libc/nls/C.msg @@ -1,4 +1,3 @@ -$ $FreeBSD$ $ $ Message catalog for C locale (template) $ diff --git a/lib/libc/nls/be_BY.UTF-8.msg b/lib/libc/nls/be_BY.UTF-8.msg index 56bd038aca48..5498580e19a4 100644 --- a/lib/libc/nls/be_BY.UTF-8.msg +++ b/lib/libc/nls/be_BY.UTF-8.msg @@ -1,4 +1,3 @@ -$ $FreeBSD$ $ $ Message catalog for be_BY.UTF-8 locale $ diff --git a/lib/libc/nls/ca_ES.ISO8859-1.msg b/lib/libc/nls/ca_ES.ISO8859-1.msg index e786c29c6b26..5d7556f1b15e 100644 --- a/lib/libc/nls/ca_ES.ISO8859-1.msg +++ b/lib/libc/nls/ca_ES.ISO8859-1.msg @@ -1,4 +1,3 @@ -$ $FreeBSD$ $ $ Message catalog for ca_ES.ISO8859-1 locale $ diff --git a/lib/libc/nls/de_DE.ISO8859-1.msg b/lib/libc/nls/de_DE.ISO8859-1.msg index 1bb4a3b45334..d2af2c51a807 100644 --- a/lib/libc/nls/de_DE.ISO8859-1.msg +++ b/lib/libc/nls/de_DE.ISO8859-1.msg @@ -1,4 +1,3 @@ -$ $FreeBSD$ $ $ Message catalog for de_DE.ISO8859-1 locale $ diff --git a/lib/libc/nls/el_GR.ISO8859-7.msg b/lib/libc/nls/el_GR.ISO8859-7.msg index ca84929b9eed..b8de3f70b84d 100644 --- a/lib/libc/nls/el_GR.ISO8859-7.msg +++ b/lib/libc/nls/el_GR.ISO8859-7.msg @@ -1,4 +1,3 @@ -$ $FreeBSD$ $ $ Message catalog for C locale (template) $ diff --git a/lib/libc/nls/es_ES.ISO8859-1.msg b/lib/libc/nls/es_ES.ISO8859-1.msg index 2687c177fd57..01182d7c6e44 100644 --- a/lib/libc/nls/es_ES.ISO8859-1.msg +++ b/lib/libc/nls/es_ES.ISO8859-1.msg @@ -1,4 +1,3 @@ -$ $FreeBSD$ $ $ Message catalog for es_ES.ISO8859-1 locale $ diff --git a/lib/libc/nls/fi_FI.ISO8859-1.msg b/lib/libc/nls/fi_FI.ISO8859-1.msg index 491f9a13ab6e..8325f762776c 100644 --- a/lib/libc/nls/fi_FI.ISO8859-1.msg +++ b/lib/libc/nls/fi_FI.ISO8859-1.msg @@ -1,4 +1,3 @@ -$ $FreeBSD$ $ $ Message catalog for fi_FI.ISO8859-1 locale $ diff --git a/lib/libc/nls/fr_FR.ISO8859-1.msg b/lib/libc/nls/fr_FR.ISO8859-1.msg index ebc1739ea28c..758e1106ee99 100644 --- a/lib/libc/nls/fr_FR.ISO8859-1.msg +++ b/lib/libc/nls/fr_FR.ISO8859-1.msg @@ -1,4 +1,3 @@ -$ $FreeBSD$ $ $ Message catalog for fr_FR.ISO8859-1 locale $ diff --git a/lib/libc/nls/gl_ES.ISO8859-1.msg b/lib/libc/nls/gl_ES.ISO8859-1.msg index 4255dc8a959a..b5b208d99f66 100644 --- a/lib/libc/nls/gl_ES.ISO8859-1.msg +++ b/lib/libc/nls/gl_ES.ISO8859-1.msg @@ -1,4 +1,3 @@ -$ $FreeBSD$ $ $ Message catalog for gl_ES.ISO8859-1 locale $ diff --git a/lib/libc/nls/hu_HU.ISO8859-2.msg b/lib/libc/nls/hu_HU.ISO8859-2.msg index 330d486a7b8e..a131eea163c5 100644 --- a/lib/libc/nls/hu_HU.ISO8859-2.msg +++ b/lib/libc/nls/hu_HU.ISO8859-2.msg @@ -1,4 +1,3 @@ -$ $FreeBSD$ $ $ Message catalog for hu_HU.ISO8859-2 locale $ diff --git a/lib/libc/nls/it_IT.ISO8859-15.msg b/lib/libc/nls/it_IT.ISO8859-15.msg index da3734d04d50..df376bf7ac6b 100644 --- a/lib/libc/nls/it_IT.ISO8859-15.msg +++ b/lib/libc/nls/it_IT.ISO8859-15.msg @@ -1,4 +1,3 @@ -$ $FreeBSD$ $ $ Message catalog for it_IT.ISO8859-15 locale $ diff --git a/lib/libc/nls/ja_JP.UTF-8.msg b/lib/libc/nls/ja_JP.UTF-8.msg index 6be65fbb5c0a..e22f834b6669 100644 --- a/lib/libc/nls/ja_JP.UTF-8.msg +++ b/lib/libc/nls/ja_JP.UTF-8.msg @@ -1,4 +1,3 @@ -$ $FreeBSD$ $ $ Message catalog for ja_JP.UTF-8 locale $ diff --git a/lib/libc/nls/ja_JP.eucJP.msg b/lib/libc/nls/ja_JP.eucJP.msg index e3fac48c6a13..51fb8e22a389 100644 --- a/lib/libc/nls/ja_JP.eucJP.msg +++ b/lib/libc/nls/ja_JP.eucJP.msg @@ -1,4 +1,3 @@ -$ $FreeBSD$ $ $ Message catalog for ja_JP.eucJP locale $ diff --git a/lib/libc/nls/ko_KR.UTF-8.msg b/lib/libc/nls/ko_KR.UTF-8.msg index 60e8a121dfe4..20d368a226b0 100644 --- a/lib/libc/nls/ko_KR.UTF-8.msg +++ b/lib/libc/nls/ko_KR.UTF-8.msg @@ -1,4 +1,3 @@ -$ $FreeBSD$ $ $ Message catalog for ko_KR.UTF-8 locale $ diff --git a/lib/libc/nls/ko_KR.eucKR.msg b/lib/libc/nls/ko_KR.eucKR.msg index bb1fa300b164..7cdaddd01f51 100644 --- a/lib/libc/nls/ko_KR.eucKR.msg +++ b/lib/libc/nls/ko_KR.eucKR.msg @@ -1,4 +1,3 @@ -$ $FreeBSD$ $ $ Message catalog for ko_KR.eucKR locale $ diff --git a/lib/libc/nls/mn_MN.UTF-8.msg b/lib/libc/nls/mn_MN.UTF-8.msg index 29ab4c15f50d..429757367ee0 100644 --- a/lib/libc/nls/mn_MN.UTF-8.msg +++ b/lib/libc/nls/mn_MN.UTF-8.msg @@ -1,4 +1,3 @@ -$ $FreeBSD$ $ $ Message catalog for mn_MN.UTF-8 locale $ diff --git a/lib/libc/nls/nl_NL.ISO8859-1.msg b/lib/libc/nls/nl_NL.ISO8859-1.msg index 2939116fc97c..0048a2ff35cb 100644 --- a/lib/libc/nls/nl_NL.ISO8859-1.msg +++ b/lib/libc/nls/nl_NL.ISO8859-1.msg @@ -1,4 +1,3 @@ -$ $FreeBSD$ $ $ Message catalog for nl_NL.ISO8859-1 locale $ diff --git a/lib/libc/nls/no_NO.ISO8859-1.msg b/lib/libc/nls/no_NO.ISO8859-1.msg index 2598f4d9357e..415a01dedfbf 100644 --- a/lib/libc/nls/no_NO.ISO8859-1.msg +++ b/lib/libc/nls/no_NO.ISO8859-1.msg @@ -1,4 +1,3 @@ -$ $FreeBSD$ $ $ Message catalog for no_NO.ISO8859-1 locale $ diff --git a/lib/libc/nls/pl_PL.ISO8859-2.msg b/lib/libc/nls/pl_PL.ISO8859-2.msg index 1c184b30997d..ea8951aed15c 100644 --- a/lib/libc/nls/pl_PL.ISO8859-2.msg +++ b/lib/libc/nls/pl_PL.ISO8859-2.msg @@ -1,4 +1,3 @@ -$ $FreeBSD$ $ $ Message catalog for pl_PL.ISO8859-2 locale $ diff --git a/lib/libc/nls/pt_BR.ISO8859-1.msg b/lib/libc/nls/pt_BR.ISO8859-1.msg index fb1c10056ccf..8e15c82916b8 100644 --- a/lib/libc/nls/pt_BR.ISO8859-1.msg +++ b/lib/libc/nls/pt_BR.ISO8859-1.msg @@ -1,4 +1,3 @@ -$ $FreeBSD$ $ $ Message catalog for pt_BR.ISO8859-1 locale $ diff --git a/lib/libc/nls/ru_RU.KOI8-R.msg b/lib/libc/nls/ru_RU.KOI8-R.msg index 48bc1d400150..0fcd0e9b1225 100644 --- a/lib/libc/nls/ru_RU.KOI8-R.msg +++ b/lib/libc/nls/ru_RU.KOI8-R.msg @@ -1,4 +1,3 @@ -$ $FreeBSD$ $ $ Message catalog for ru_RU.KOI8-R locale $ diff --git a/lib/libc/nls/sk_SK.ISO8859-2.msg b/lib/libc/nls/sk_SK.ISO8859-2.msg index 8efa17d754a1..ba657382f66d 100644 --- a/lib/libc/nls/sk_SK.ISO8859-2.msg +++ b/lib/libc/nls/sk_SK.ISO8859-2.msg @@ -1,4 +1,3 @@ -$ $FreeBSD$ $ $ Message catalog for sk_SK.ISO8859-2 locale $ diff --git a/lib/libc/nls/sv_SE.ISO8859-1.msg b/lib/libc/nls/sv_SE.ISO8859-1.msg index 13cdd23f87f7..a1aa781dda7d 100644 --- a/lib/libc/nls/sv_SE.ISO8859-1.msg +++ b/lib/libc/nls/sv_SE.ISO8859-1.msg @@ -1,4 +1,3 @@ -$ $FreeBSD$ $ $ Message catalog for sv_SE.ISO8859-1 locale $ diff --git a/lib/libc/nls/uk_UA.UTF-8.msg b/lib/libc/nls/uk_UA.UTF-8.msg index af871d942766..f6e4b1781ede 100644 --- a/lib/libc/nls/uk_UA.UTF-8.msg +++ b/lib/libc/nls/uk_UA.UTF-8.msg @@ -1,4 +1,3 @@ -$ $FreeBSD$ $ $ Message catalog for uk_UA.UTF-8 locale $ diff --git a/lib/libc/nls/zh_CN.GB18030.msg b/lib/libc/nls/zh_CN.GB18030.msg index 0e35d7e9eb73..dbaedd5d0a52 100644 --- a/lib/libc/nls/zh_CN.GB18030.msg +++ b/lib/libc/nls/zh_CN.GB18030.msg @@ -1,4 +1,3 @@ -$ $FreeBSD$ $ $ Message catalog for zh_CN.GB18030 locale $ diff --git a/lib/libc/nls/zh_CN.GB2312.msg b/lib/libc/nls/zh_CN.GB2312.msg index 46ebb422ff84..27f07d98e3e2 100644 --- a/lib/libc/nls/zh_CN.GB2312.msg +++ b/lib/libc/nls/zh_CN.GB2312.msg @@ -1,4 +1,3 @@ -$ $FreeBSD$ $ $ Message catalog for zh_CN.GB2312 locale $ diff --git a/lib/libc/nls/zh_CN.UTF-8.msg b/lib/libc/nls/zh_CN.UTF-8.msg index 9475ea8e82da..46e26d6824f5 100644 --- a/lib/libc/nls/zh_CN.UTF-8.msg +++ b/lib/libc/nls/zh_CN.UTF-8.msg @@ -1,4 +1,3 @@ -$ $FreeBSD$ $ $ Message catalog for zh_CN.UTF-8 locale $ diff --git a/usr.bin/ee/nls/de_DE.ISO8859-1/ee.msg b/usr.bin/ee/nls/de_DE.ISO8859-1/ee.msg index 73aa620183c3..5574a2fcab89 100644 --- a/usr.bin/ee/nls/de_DE.ISO8859-1/ee.msg +++ b/usr.bin/ee/nls/de_DE.ISO8859-1/ee.msg @@ -3,7 +3,6 @@ $ ee.i18n.guide for more information $ $ For ee patchlevel 3 $ -$ $FreeBSD$ $ $ $set 1 diff --git a/usr.bin/ee/nls/fr_FR.ISO8859-1/ee.msg b/usr.bin/ee/nls/fr_FR.ISO8859-1/ee.msg index 31bfe6ebc39b..8bd0e3eb5f11 100644 --- a/usr.bin/ee/nls/fr_FR.ISO8859-1/ee.msg +++ b/usr.bin/ee/nls/fr_FR.ISO8859-1/ee.msg @@ -3,7 +3,6 @@ $ ee.i18n.guide for more information $ $ For ee patchlevel 3 $ -$ $FreeBSD$ $ $ $set 1 diff --git a/usr.bin/ee/nls/hu_HU.ISO8859-2/ee.msg b/usr.bin/ee/nls/hu_HU.ISO8859-2/ee.msg index ca6253e9235e..f313ba3a629d 100644 --- a/usr.bin/ee/nls/hu_HU.ISO8859-2/ee.msg +++ b/usr.bin/ee/nls/hu_HU.ISO8859-2/ee.msg @@ -3,7 +3,6 @@ $ ee.i18n.guide for more information $ $ For ee patchlevel 3 $ -$ $FreeBSD$ $ $ $set 1 diff --git a/usr.bin/ee/nls/pl_PL.ISO8859-2/ee.msg b/usr.bin/ee/nls/pl_PL.ISO8859-2/ee.msg index 94a1eabc414b..13f5cc0e2095 100644 --- a/usr.bin/ee/nls/pl_PL.ISO8859-2/ee.msg +++ b/usr.bin/ee/nls/pl_PL.ISO8859-2/ee.msg @@ -3,7 +3,6 @@ $ ee.i18n.guide for more information $ $ For ee patchlevel 3 $ -$ $FreeBSD$ $ $ $set 1 diff --git a/usr.bin/ee/nls/pt_BR.ISO8859-1/ee.msg b/usr.bin/ee/nls/pt_BR.ISO8859-1/ee.msg index 592ea171bc52..80adc64e1b38 100644 --- a/usr.bin/ee/nls/pt_BR.ISO8859-1/ee.msg +++ b/usr.bin/ee/nls/pt_BR.ISO8859-1/ee.msg @@ -4,7 +4,6 @@ $ $ For ee patchlevel 3 $ $ $Header: /home/hugh/sources/old_ae/RCS/ee.msg,v 1.8 1996/11/30 03:23:40 hugh Exp $ -$ $FreeBSD$ $ $ $set 1 diff --git a/usr.bin/ee/nls/ru_RU.KOI8-R/ee.msg b/usr.bin/ee/nls/ru_RU.KOI8-R/ee.msg index bfced0f57204..21f787b989b0 100644 --- a/usr.bin/ee/nls/ru_RU.KOI8-R/ee.msg +++ b/usr.bin/ee/nls/ru_RU.KOI8-R/ee.msg @@ -5,7 +5,6 @@ $ Based on uk_UA.KOI8-U translation by Olexander Kunytsa $ $ For ee patchlevel 3 $ -$ $FreeBSD$ $ $ $set 1 diff --git a/usr.bin/ee/nls/uk_UA.KOI8-U/ee.msg b/usr.bin/ee/nls/uk_UA.KOI8-U/ee.msg index a9d7fcf1a962..c97de5faf239 100644 --- a/usr.bin/ee/nls/uk_UA.KOI8-U/ee.msg +++ b/usr.bin/ee/nls/uk_UA.KOI8-U/ee.msg @@ -3,7 +3,6 @@ $ ee.i18n.guide for more information $ $ For ee patchlevel 3 $ -$ $FreeBSD$ $ $ $set 1 From nobody Wed Aug 16 17:57:19 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RQwnr2G72z4qvD4; Wed, 16 Aug 2023 17: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RQwnr0th9z3VxT; Wed, 16 Aug 2023 17: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=1692208640; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Dys+M5B8/611dFSPzOZlOnb0ZceiLERl5+yu5aCAPWM=; b=DxR3Gam/SL3z4dNCjEwDCyDd+WEVIu9DBJZM27QFU58yaZcKTl497swpl5ENXbONn7lWk/ tx394EbySk1SdIBf2x0uafDYpwuc7g/NM3OqUHTjuBJzbVzTy4Rbg18W5wULfrodzLXF5k gAxtfoTVfw+ECq+VXnka9KV4COPjufV8jHIJFlqQeaSU20ntTl9TOPNYpxy1kQq6E/WO+z ukN8a6Dt07t0ovQ3YYmyUclCUsGM8OJbYyC8INgN96e7vMmdXIwpPrKDROjcF8C4CH4KQx Uop40hhyTMMQYxBlOCmY215v4q3yIyu4EXzWNzi6ZZjKrzdfJMrqGBBT48yKTQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692208640; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Dys+M5B8/611dFSPzOZlOnb0ZceiLERl5+yu5aCAPWM=; b=hOnZRcLckf2u1Ny2kYGePKqGmc4P384JoU8xXUXVzLcDgjTXEqAbMMHz31YrX/eaqqK8h8 45SkKSULC9zXQYYVM4/Ox5BR7dqFbfk2bFWiIgLoBXlYEMfwlAcmLPbFeDNkqZ5gJ5t+/S CiY1SW5OMfh3ubAY06QhhYlHlx57Oaavlpg6jtGcugCqdeSlAVu49QQP3pxjUoQp0wUHFq CGqrLoqNt6vcl9LZo/0C37Ohjnh2Lggf7k5kMZSeVH9yOi8nKqpUVNi0wXKf4+0yzjie60 Joj2p1q57IWAULuVT997XI9ArPLlSxP4Y24ObMz5x50UZGbR1Yn/SLRVIbQFTg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692208640; a=rsa-sha256; cv=none; b=K7bNO6Q4Tagj3YTzxUaGkua6irFfKdRtcgnUSjGthV1rEVhcbyvSd+DHTs+gInZePK6Ncw 9V1DrePHD5T+14Id1R+ycAMXFtR6aHklqI9zUGxSmkHtTr3tJ4zKjNum6p80EDIwpalgOe livc284jtRb4mW64gJG7SS7asbeiiZYn1CTepw6V41N2LLG7jz42RjvFul4GCG+1iZikda NBHrXqDtrEu9y5LTFej0OXyr6Xopg51U8UWGS25mM1Ul+N0gMLUv9nTO+8orAZrx5tny5t nt48raX9k85KnExQtYKC5/2o9heJM03qMJdhv72fqflwj/RSzTqOhIwFcNGAvA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RQwnq74c6z11gg; Wed, 16 Aug 2023 17:57:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37GHvJjU059972; Wed, 16 Aug 2023 17:57:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37GHvJR7059969; Wed, 16 Aug 2023 17:57:19 GMT (envelope-from git) Date: Wed, 16 Aug 2023 17:57:19 GMT Message-Id: <202308161757.37GHvJR7059969@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: 8c99d94c900f - main - sys: Remove $FreeBSD$: two-line lua tag List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8c99d94c900fd563140f430706638d449288d92d Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=8c99d94c900fd563140f430706638d449288d92d commit 8c99d94c900fd563140f430706638d449288d92d Author: Warner Losh AuthorDate: 2023-08-16 17:55:27 +0000 Commit: Warner Losh CommitDate: 2023-08-16 17:55:27 +0000 sys: Remove $FreeBSD$: two-line lua tag Remove /^--\n--\s*\$FreeBSD\$.*$\n/ --- sys/tools/makesyscalls.lua | 2 -- 1 file changed, 2 deletions(-) diff --git a/sys/tools/makesyscalls.lua b/sys/tools/makesyscalls.lua index 97fdca6dcde4..f2d8f1a609b6 100644 --- a/sys/tools/makesyscalls.lua +++ b/sys/tools/makesyscalls.lua @@ -24,8 +24,6 @@ -- OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF -- SUCH DAMAGE. -- --- $FreeBSD$ --- -- We generally assume that this script will be run by flua, however we've From nobody Wed Aug 16 17:57:21 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RQwns3qRMz4qvch; Wed, 16 Aug 2023 17:57:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RQwns1tVlz3VvW; Wed, 16 Aug 2023 17:57:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692208641; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=yP3eLpg5eFeQEqdEPFu97m9kJah615PAuuCTibn8nnw=; b=RAwLZYdNA7NZDzwTwU8ika6quG2AKAA/c5L+UmsHxL056Ui1NaFE/cIhQ19VbBWWwjkG+n 2A838/4QDiKOKjq9AsaQ52em5OkYyko4h9flm2nQ5GHlx3Q0UkxJ4W0o5MucKkCwCySQBv MkmSFShpxn5HkSJpm4JK1cLifb3sSVAoKAVIEixXMSLtMnmJmNV+zDKVJya3DKDWQTKvR9 zXrd7+/izLMoQo/dd9TCn2guJz+gh6UjHla45xDCzHRV4DkhKHOpGJajW++sSghgdSJe2P YQ4xTZ7PVedQMHg50MwT2Cpb8lZRz9oQCJ9JXP1GnsqE+aGSmnMndbpodDbVlA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692208641; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=yP3eLpg5eFeQEqdEPFu97m9kJah615PAuuCTibn8nnw=; b=nLssAbzms87aaV2g8P7bGrpqF/7I3Pw5m7UPaRQjDpwRw0FzZLPgCVXw5U3nFB1jYaXcyy hEAgqMshohzXEV08R5Z0g0ld27bWtlhg/TZl6EOtzl6E2BdaJMD/FmaougOiYE5AIDJNcu 3vTlBuMv3OhCSQjJmOM8KBhOFdlYkwO1GGsk40P3NvuH1hqhARiv8+N2tSMkKWnRCRLUIc RICL2P7d0NjkAtlDMPGh2bRA4QPy072INN/SVznin1GNhA9bvU8X/osLoxqAPoGP9DbHCx bWbxmNYq1PvpbefpEHQaJq99uL0eVb8jkPT/T66YR+qfpcEzuR9pfl8ICvPyWA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692208641; a=rsa-sha256; cv=none; b=XBIQOhBo8883q5hoPXiAYZN8YBDJyDOD1/0fO/JDVibZH7wuWXB67QQDGmypbLKDkkZlpz NFepT1EcXBUHLzwoYT3BY+E/ntq/L4umQLXPU+BuxVd2Is2KZmY7/nmarsfB9AksF/PZue 2IyuGgSMsB8eba6bJMRZsbOxAc77zxXvtaj58nScUOXtaAdQ8v+G1LS7mFpSFSgEyE3FP8 A4JfTpzQUEDSNDSZjWd0BJQkMz7muTARsXHuUwuInWMVh7AN52wFsu5qX+H8U98QFTtib6 /VBNRcQibJnCbXFUAHF1ZDjebGBzUuMF60YqDC97LF6VHcGvcNO+MLvBVZH2og== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RQwns108Vz11Qh; Wed, 16 Aug 2023 17:57:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37GHvLbi060017; Wed, 16 Aug 2023 17:57:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37GHvLAD060014; Wed, 16 Aug 2023 17:57:21 GMT (envelope-from git) Date: Wed, 16 Aug 2023 17:57:21 GMT Message-Id: <202308161757.37GHvLAD060014@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: 9636a14538f5 - main - Remove $FreeBSD$: two-line lua tag List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9636a14538f56ad9b59c9d77abd9a06d0510d7b9 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=9636a14538f56ad9b59c9d77abd9a06d0510d7b9 commit 9636a14538f56ad9b59c9d77abd9a06d0510d7b9 Author: Warner Losh AuthorDate: 2023-08-16 17:55:30 +0000 Commit: Warner Losh CommitDate: 2023-08-16 17:55:30 +0000 Remove $FreeBSD$: two-line lua tag Remove /^--\n--\s*\$FreeBSD\$.*$\n/ --- share/snmp/mibs/FREEBSD-MIB.txt | 2 -- stand/lua/cli.lua | 2 -- stand/lua/color.lua | 2 -- stand/lua/config.lua | 2 -- stand/lua/core.lua | 2 -- stand/lua/drawer.lua | 2 -- stand/lua/gfx-beastie.lua | 2 -- stand/lua/gfx-beastiebw.lua | 2 -- stand/lua/gfx-fbsdbw.lua | 2 -- stand/lua/gfx-orb.lua | 2 -- stand/lua/gfx-orbbw.lua | 2 -- stand/lua/hook.lua | 2 -- stand/lua/loader.lua | 2 -- stand/lua/menu.lua | 2 -- stand/lua/password.lua | 2 -- stand/lua/screen.lua | 2 -- usr.sbin/bsnmpd/modules/snmp_bridge/BEGEMOT-BRIDGE-MIB.txt | 2 -- usr.sbin/bsnmpd/modules/snmp_bridge/BRIDGE-MIB.txt | 2 -- usr.sbin/bsnmpd/modules/snmp_bridge/RSTP-MIB.txt | 2 -- usr.sbin/bsnmpd/modules/snmp_hast/BEGEMOT-HAST-MIB.txt | 2 -- usr.sbin/bsnmpd/modules/snmp_hostres/BEGEMOT-HOSTRES-MIB.txt | 2 -- usr.sbin/bsnmpd/modules/snmp_lm75/BEGEMOT-LM75-MIB.txt | 2 -- usr.sbin/bsnmpd/modules/snmp_netgraph/BEGEMOT-NETGRAPH.txt | 2 -- usr.sbin/bsnmpd/modules/snmp_pf/BEGEMOT-PF-MIB.txt | 2 -- usr.sbin/bsnmpd/modules/snmp_wlan/BEGEMOT-WIRELESS-MIB.txt | 2 -- 25 files changed, 50 deletions(-) diff --git a/share/snmp/mibs/FREEBSD-MIB.txt b/share/snmp/mibs/FREEBSD-MIB.txt index 0a745c3a3754..71cf67b23f78 100644 --- a/share/snmp/mibs/FREEBSD-MIB.txt +++ b/share/snmp/mibs/FREEBSD-MIB.txt @@ -3,8 +3,6 @@ -- -- FreeBSD SMI { enterprises 2238 } -- --- $FreeBSD$ --- -- ***************************************************************** FREEBSD-MIB DEFINITIONS ::= BEGIN diff --git a/stand/lua/cli.lua b/stand/lua/cli.lua index 11f3b41a7fed..6832da0a31a5 100644 --- a/stand/lua/cli.lua +++ b/stand/lua/cli.lua @@ -24,8 +24,6 @@ -- OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF -- SUCH DAMAGE. -- --- $FreeBSD$ --- local config = require("config") local core = require("core") diff --git a/stand/lua/color.lua b/stand/lua/color.lua index 72024e241d10..bdb29e6de670 100644 --- a/stand/lua/color.lua +++ b/stand/lua/color.lua @@ -25,8 +25,6 @@ -- OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF -- SUCH DAMAGE. -- --- $FreeBSD$ --- local core = require("core") local hook = require("hook") diff --git a/stand/lua/config.lua b/stand/lua/config.lua index fe45664d66d1..3f8fbc52cb40 100644 --- a/stand/lua/config.lua +++ b/stand/lua/config.lua @@ -26,8 +26,6 @@ -- OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF -- SUCH DAMAGE. -- --- $FreeBSD$ --- local hook = require("hook") diff --git a/stand/lua/core.lua b/stand/lua/core.lua index 83a522febffe..8a481ee0b782 100644 --- a/stand/lua/core.lua +++ b/stand/lua/core.lua @@ -26,8 +26,6 @@ -- OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF -- SUCH DAMAGE. -- --- $FreeBSD$ --- local config = require("config") local hook = require("hook") diff --git a/stand/lua/drawer.lua b/stand/lua/drawer.lua index 24f2f0ddb3b3..2dcf7d5de0f8 100644 --- a/stand/lua/drawer.lua +++ b/stand/lua/drawer.lua @@ -26,8 +26,6 @@ -- OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF -- SUCH DAMAGE. -- --- $FreeBSD$ --- local color = require("color") local config = require("config") diff --git a/stand/lua/gfx-beastie.lua b/stand/lua/gfx-beastie.lua index c806cdb86fa1..443f0fd888ba 100644 --- a/stand/lua/gfx-beastie.lua +++ b/stand/lua/gfx-beastie.lua @@ -24,8 +24,6 @@ -- OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF -- SUCH DAMAGE. -- --- $FreeBSD$ --- return { logo = { diff --git a/stand/lua/gfx-beastiebw.lua b/stand/lua/gfx-beastiebw.lua index ffda4c114447..c71e53a9c4e3 100644 --- a/stand/lua/gfx-beastiebw.lua +++ b/stand/lua/gfx-beastiebw.lua @@ -24,8 +24,6 @@ -- OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF -- SUCH DAMAGE. -- --- $FreeBSD$ --- return { logo = { diff --git a/stand/lua/gfx-fbsdbw.lua b/stand/lua/gfx-fbsdbw.lua index 7062a0a61e0d..470af71a07b5 100644 --- a/stand/lua/gfx-fbsdbw.lua +++ b/stand/lua/gfx-fbsdbw.lua @@ -24,8 +24,6 @@ -- OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF -- SUCH DAMAGE. -- --- $FreeBSD$ --- return { logo = { diff --git a/stand/lua/gfx-orb.lua b/stand/lua/gfx-orb.lua index c313fc1617b7..00f4aeb3bceb 100644 --- a/stand/lua/gfx-orb.lua +++ b/stand/lua/gfx-orb.lua @@ -24,8 +24,6 @@ -- OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF -- SUCH DAMAGE. -- --- $FreeBSD$ --- return { logo = { diff --git a/stand/lua/gfx-orbbw.lua b/stand/lua/gfx-orbbw.lua index 641c7eef268a..93ffd2366196 100644 --- a/stand/lua/gfx-orbbw.lua +++ b/stand/lua/gfx-orbbw.lua @@ -24,8 +24,6 @@ -- OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF -- SUCH DAMAGE. -- --- $FreeBSD$ --- return { logo = { diff --git a/stand/lua/hook.lua b/stand/lua/hook.lua index c1b200e8c4b4..796189eeef18 100644 --- a/stand/lua/hook.lua +++ b/stand/lua/hook.lua @@ -24,8 +24,6 @@ -- OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF -- SUCH DAMAGE. -- --- $FreeBSD$ --- local hook = {} diff --git a/stand/lua/loader.lua b/stand/lua/loader.lua index 8910af4673f9..454cd7e6332f 100644 --- a/stand/lua/loader.lua +++ b/stand/lua/loader.lua @@ -26,8 +26,6 @@ -- OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF -- SUCH DAMAGE. -- --- $FreeBSD$ --- -- The cli module should be included first here. Some of the functions that it -- defines are necessary for the Lua-based loader to operate in general. diff --git a/stand/lua/menu.lua b/stand/lua/menu.lua index 5fa8c23f0e67..7da03ad9e673 100644 --- a/stand/lua/menu.lua +++ b/stand/lua/menu.lua @@ -26,8 +26,6 @@ -- OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF -- SUCH DAMAGE. -- --- $FreeBSD$ --- local cli = require("cli") local core = require("core") diff --git a/stand/lua/password.lua b/stand/lua/password.lua index a47a617944d7..3d3060f5cab3 100644 --- a/stand/lua/password.lua +++ b/stand/lua/password.lua @@ -26,8 +26,6 @@ -- OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF -- SUCH DAMAGE. -- --- $FreeBSD$ --- local core = require("core") local screen = require("screen") diff --git a/stand/lua/screen.lua b/stand/lua/screen.lua index 34c78ca28725..4437a34f95f1 100644 --- a/stand/lua/screen.lua +++ b/stand/lua/screen.lua @@ -25,8 +25,6 @@ -- OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF -- SUCH DAMAGE. -- --- $FreeBSD$ --- local color = require("color") local core = require("core") diff --git a/usr.sbin/bsnmpd/modules/snmp_bridge/BEGEMOT-BRIDGE-MIB.txt b/usr.sbin/bsnmpd/modules/snmp_bridge/BEGEMOT-BRIDGE-MIB.txt index bde89b6ee73b..77de04446a54 100644 --- a/usr.sbin/bsnmpd/modules/snmp_bridge/BEGEMOT-BRIDGE-MIB.txt +++ b/usr.sbin/bsnmpd/modules/snmp_bridge/BEGEMOT-BRIDGE-MIB.txt @@ -23,8 +23,6 @@ -- OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF -- SUCH DAMAGE. -- --- $FreeBSD$ --- BEGEMOT-BRIDGE-MIB DEFINITIONS ::= BEGIN diff --git a/usr.sbin/bsnmpd/modules/snmp_bridge/BRIDGE-MIB.txt b/usr.sbin/bsnmpd/modules/snmp_bridge/BRIDGE-MIB.txt index 9f87b6557c0a..345117db2e39 100644 --- a/usr.sbin/bsnmpd/modules/snmp_bridge/BRIDGE-MIB.txt +++ b/usr.sbin/bsnmpd/modules/snmp_bridge/BRIDGE-MIB.txt @@ -13,8 +13,6 @@ -- INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OR ANY IMPLIED -- WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. -- --- $FreeBSD$ --- BRIDGE-MIB DEFINITIONS ::= BEGIN diff --git a/usr.sbin/bsnmpd/modules/snmp_bridge/RSTP-MIB.txt b/usr.sbin/bsnmpd/modules/snmp_bridge/RSTP-MIB.txt index ea6648e031b2..b0a44858ff32 100644 --- a/usr.sbin/bsnmpd/modules/snmp_bridge/RSTP-MIB.txt +++ b/usr.sbin/bsnmpd/modules/snmp_bridge/RSTP-MIB.txt @@ -13,8 +13,6 @@ -- INFORMATION HEREIN WILL NOT INFRINGE ANY RIGHTS OR ANY IMPLIED -- WARRANTIES OF MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. -- --- $FreeBSD$ --- RSTP-MIB DEFINITIONS ::= BEGIN diff --git a/usr.sbin/bsnmpd/modules/snmp_hast/BEGEMOT-HAST-MIB.txt b/usr.sbin/bsnmpd/modules/snmp_hast/BEGEMOT-HAST-MIB.txt index 0f330c171aaf..44ada542a69d 100644 --- a/usr.sbin/bsnmpd/modules/snmp_hast/BEGEMOT-HAST-MIB.txt +++ b/usr.sbin/bsnmpd/modules/snmp_hast/BEGEMOT-HAST-MIB.txt @@ -23,8 +23,6 @@ -- OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF -- SUCH DAMAGE. -- --- $FreeBSD$ --- BEGEMOT-HAST-MIB DEFINITIONS ::= BEGIN diff --git a/usr.sbin/bsnmpd/modules/snmp_hostres/BEGEMOT-HOSTRES-MIB.txt b/usr.sbin/bsnmpd/modules/snmp_hostres/BEGEMOT-HOSTRES-MIB.txt index 3c15e090e1fd..f05ae47f081d 100644 --- a/usr.sbin/bsnmpd/modules/snmp_hostres/BEGEMOT-HOSTRES-MIB.txt +++ b/usr.sbin/bsnmpd/modules/snmp_hostres/BEGEMOT-HOSTRES-MIB.txt @@ -26,8 +26,6 @@ -- OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF -- SUCH DAMAGE. -- --- $FreeBSD$ --- -- Additional stuff for the HOST-RESOURCES MIB. -- BEGEMOT-HOSTRES-MIB DEFINITIONS ::= BEGIN diff --git a/usr.sbin/bsnmpd/modules/snmp_lm75/BEGEMOT-LM75-MIB.txt b/usr.sbin/bsnmpd/modules/snmp_lm75/BEGEMOT-LM75-MIB.txt index f8f52a639be0..c4cf536e5043 100644 --- a/usr.sbin/bsnmpd/modules/snmp_lm75/BEGEMOT-LM75-MIB.txt +++ b/usr.sbin/bsnmpd/modules/snmp_lm75/BEGEMOT-LM75-MIB.txt @@ -23,8 +23,6 @@ -- OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF -- SUCH DAMAGE. -- --- $FreeBSD$ --- BEGEMOT-LM75-MIB DEFINITIONS ::= BEGIN diff --git a/usr.sbin/bsnmpd/modules/snmp_netgraph/BEGEMOT-NETGRAPH.txt b/usr.sbin/bsnmpd/modules/snmp_netgraph/BEGEMOT-NETGRAPH.txt index b4f0e2a3f993..572fe1820e0c 100644 --- a/usr.sbin/bsnmpd/modules/snmp_netgraph/BEGEMOT-NETGRAPH.txt +++ b/usr.sbin/bsnmpd/modules/snmp_netgraph/BEGEMOT-NETGRAPH.txt @@ -27,8 +27,6 @@ -- NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, -- EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -- --- $FreeBSD$ --- -- Private MIB for netgraph part of Begemot SNMP daemon. -- BEGEMOT-NETGRAPH-MIB DEFINITIONS ::= BEGIN diff --git a/usr.sbin/bsnmpd/modules/snmp_pf/BEGEMOT-PF-MIB.txt b/usr.sbin/bsnmpd/modules/snmp_pf/BEGEMOT-PF-MIB.txt index d92b6ac7d0c6..13a4a646a669 100644 --- a/usr.sbin/bsnmpd/modules/snmp_pf/BEGEMOT-PF-MIB.txt +++ b/usr.sbin/bsnmpd/modules/snmp_pf/BEGEMOT-PF-MIB.txt @@ -6,8 +6,6 @@ -- this stuff is worth it, you can buy me a beer in return. -Philip Paeps -- ---------------------------------------------------------------------------- -- --- $FreeBSD$ --- BEGEMOT-PF-MIB DEFINITIONS ::= BEGIN diff --git a/usr.sbin/bsnmpd/modules/snmp_wlan/BEGEMOT-WIRELESS-MIB.txt b/usr.sbin/bsnmpd/modules/snmp_wlan/BEGEMOT-WIRELESS-MIB.txt index 69873eddf33d..a377b7b6988d 100644 --- a/usr.sbin/bsnmpd/modules/snmp_wlan/BEGEMOT-WIRELESS-MIB.txt +++ b/usr.sbin/bsnmpd/modules/snmp_wlan/BEGEMOT-WIRELESS-MIB.txt @@ -25,8 +25,6 @@ -- OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF -- SUCH DAMAGE. -- --- $FreeBSD$ --- BEGEMOT-WIRELESS-MIB DEFINITIONS ::= BEGIN From nobody Wed Aug 16 17:57:22 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RQwnv2XkZz4qvXd; Wed, 16 Aug 2023 17:57: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RQwnt3Hbhz3W3V; Wed, 16 Aug 2023 17:57:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692208642; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=yHggwmcg4h1P7p5uSUvlROmBz87wcgnNCxUwrVxn8ms=; b=PwmbLhE5Bi2tar9xqHgsI9BXcTBX7w85ZPnbs28vxzNYneH4x53nN+mbzwE92eGRYpPqJ1 lTQmPMmNKy7hnjdFKXZFDzCcFJBHI3i06RcPmOpI1jVkd/Os5pMhCAUHQMYYZ3M+F4z13l Ylc06sNDdeq/FhXmAKB+YbyqEOqlDjK929baRhzqoUcdshMQxVgC9l+nvW1EnFjzcP+HRL 7400IeyEpQIYegehkz5GjK4nYPdhQt1vw+du5b55tXjPuuna5RMzIN69g3J12P2iTOQKrH 0E4SshbR9B1CGmu2w3+M8WnzsgyZmCNNmRTAlqnfJz1cMI1NL1G5zkJphIDu1g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692208642; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=yHggwmcg4h1P7p5uSUvlROmBz87wcgnNCxUwrVxn8ms=; b=fgHvdkb+hKKmA9a9kR5MacZkYglEa5Iq8qFHBfrPf8Mr3qS5R8yCl8jgtvJZHhe3Lw4osN QCeqVqGpjApSI+2ROLNztmU0ENtbDzQYL9ikeGAOD3aYg8Tg0L7dC8FGbW8Kqd2oZQyHMR fBgL9YsY1H3SGbTyBBbWNqNac1iTpQWCc+2vzumdf5GiOS6LPkzBrg+kidGeROnJAAcg1Q NuA3dnH/hPMv1nDzMQffgzgHuxKv2imuyCS3mwXD/E6WAWaQMCtU85MkbNxFY21U2tiYH3 /KHzpV8TcN4ONSE4VPF2ffoOEkXdxKbyZ4y93y+UmGKIWOOWCdjJGesPFSszAQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692208642; a=rsa-sha256; cv=none; b=YsH7vfN4ZeP7Y1Ib66miWXG6EMliQ3L6cQVwFC9yJRdQUHuS0fAe/kQ3rl5NSV1W0H/pnn 2bAdwD8Y63yNCLUQ89rv8pInXLpYoktQojOCYwpEeFTfyTxp0oFlb3+s0IXf1zBv7Ne2gr XKeFeIiJ2Z9shsl6NyLBjyx5kCcgQQR5a9ur2lpwQV0fCQpZDh6Q8TvPtRN1rDh2NWqt8f DkxoNu0RjfQSr9FWSxvjFIhLiusTYeMmfOCTyiM7zQFC/7aakt5DUJ7wquyj7cikWK5UT7 4NucH13Avvo/Wn+mIdHs67EhrARKLxBcQ5OmCKg7IxU8xesswhDwxqI7tT8Csg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RQwnt2Dcbz11qf; Wed, 16 Aug 2023 17:57:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37GHvM5O060060; Wed, 16 Aug 2023 17:57:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37GHvMBG060057; Wed, 16 Aug 2023 17:57:22 GMT (envelope-from git) Date: Wed, 16 Aug 2023 17:57:22 GMT Message-Id: <202308161757.37GHvMBG060057@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: 6ef644f5889a - main - Remove $FreeBSD$: one-line lua tag List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6ef644f5889afbd0f681b08ed1a2f369524af83e Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=6ef644f5889afbd0f681b08ed1a2f369524af83e commit 6ef644f5889afbd0f681b08ed1a2f369524af83e Author: Warner Losh AuthorDate: 2023-08-16 17:55:34 +0000 Commit: Warner Losh CommitDate: 2023-08-16 17:55:34 +0000 Remove $FreeBSD$: one-line lua tag Remove /^--\s*\$FreeBSD\$.*$\n/ --- share/examples/tests/tests/atf/Kyuafile | 1 - share/examples/tests/tests/plain/Kyuafile | 1 - share/examples/tests/tests/tap/Kyuafile | 1 - share/man/man9/style.lua.9 | 1 - tests/Kyuafile | 1 - tools/lua/template.lua | 1 - tools/pkgbase/metalog_reader.lua | 1 - usr.bin/kyua/kyua.conf-default | 1 - 8 files changed, 8 deletions(-) diff --git a/share/examples/tests/tests/atf/Kyuafile b/share/examples/tests/tests/atf/Kyuafile index 8c60947d1082..ef2407d0f11c 100644 --- a/share/examples/tests/tests/atf/Kyuafile +++ b/share/examples/tests/tests/atf/Kyuafile @@ -1,4 +1,3 @@ --- $FreeBSD$ -- -- Copyright 2013 Google Inc. -- All rights reserved. diff --git a/share/examples/tests/tests/plain/Kyuafile b/share/examples/tests/tests/plain/Kyuafile index c9301b0ef97e..c427a6045e95 100644 --- a/share/examples/tests/tests/plain/Kyuafile +++ b/share/examples/tests/tests/plain/Kyuafile @@ -1,4 +1,3 @@ --- $FreeBSD$ -- -- Copyright 2013 Google Inc. -- All rights reserved. diff --git a/share/examples/tests/tests/tap/Kyuafile b/share/examples/tests/tests/tap/Kyuafile index 032d9a91d8da..64339c54c012 100644 --- a/share/examples/tests/tests/tap/Kyuafile +++ b/share/examples/tests/tests/tap/Kyuafile @@ -1,4 +1,3 @@ --- $FreeBSD$ -- -- Copyright 2013 Google Inc. -- All rights reserved. diff --git a/share/man/man9/style.lua.9 b/share/man/man9/style.lua.9 index d6067ddeb4df..0417efc83c45 100644 --- a/share/man/man9/style.lua.9 +++ b/share/man/man9/style.lua.9 @@ -52,7 +52,6 @@ The preferred method of including other files and modules is with .Fn require name , such as: .Bd -literal --- $FreeBSD$ config = require("config"); menu = require("menu"); diff --git a/tests/Kyuafile b/tests/Kyuafile index 10cf039ae041..3e97c4ce5cde 100644 --- a/tests/Kyuafile +++ b/tests/Kyuafile @@ -1,4 +1,3 @@ --- $FreeBSD$ -- -- Copyright 2011 Google Inc. -- All rights reserved. diff --git a/tools/lua/template.lua b/tools/lua/template.lua index 3662953b0f2e..6c7d33c8ab0f 100644 --- a/tools/lua/template.lua +++ b/tools/lua/template.lua @@ -28,7 +28,6 @@ ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ]]-- --- $FreeBSD$ local setmetatable = setmetatable local loadstring = loadstring diff --git a/tools/pkgbase/metalog_reader.lua b/tools/pkgbase/metalog_reader.lua index be0ccf293869..6a5b33f308ae 100644 --- a/tools/pkgbase/metalog_reader.lua +++ b/tools/pkgbase/metalog_reader.lua @@ -25,7 +25,6 @@ -- OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF -- SUCH DAMAGE. --- $FreeBSD$ function main(args) if #args == 0 then usage() end diff --git a/usr.bin/kyua/kyua.conf-default b/usr.bin/kyua/kyua.conf-default index 9c1e8286eb53..e2e73c66515c 100644 --- a/usr.bin/kyua/kyua.conf-default +++ b/usr.bin/kyua/kyua.conf-default @@ -1,4 +1,3 @@ --- $FreeBSD$ -- -- System-wide configuration file for kyua(1). See kyua.conf(5) for details -- on the syntax. From nobody Wed Aug 16 17:57:23 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RQwnw4M2Dz4qv79; Wed, 16 Aug 2023 17:57:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RQwnv496Wz3Vvv; Wed, 16 Aug 2023 17:57:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692208643; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=nTSl4eXRsgKndraWlY4hb9h8y94lem400HBSwIfl6hw=; b=ueqIgr15ZweZZSjNzUxYUmhSaBqcZrrMtQsgXwsbwSrx2UcPPu+JKODAU6Rw8A4PrwVUxD dx9vh+DjlkCYHP8sFZ3pHV6VUn1OkfjK8D/jRkZZb0XxN/sC8V4W/9ydcV5Ktws0ykCq+2 na26ARgTWZhB3u7YKT0H4C/8wmP0YWaIAEyrMetePHVtSysls4fnx/k9N0vGaBstlZeFPK Ga10KQibhwqxSy+mTExjn6R1WEbKNEJp80PxEOhG+4Cuj5DUTxO2L51TL75nsKAoKcxFYW gdNbaGGm+UpOFJAwFPhoATXzP8szOHQ+1XV736TyKac6+U5A+GaDVECbw9N+1g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692208643; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=nTSl4eXRsgKndraWlY4hb9h8y94lem400HBSwIfl6hw=; b=DrsEVVvi7IArqLWobR5J+sfxinrmoQBd6Pr05FBfaupLfP0c4VQ+QHysIV+nRG0WvnEBqi yGk88E52VKNt7hwh48s3cQEFk8qBEYtBJXa5iMDiQWXVNjWITjEt8ux5APuOxuDtf/+Ivh zNL3G+BJB/z+vCtjKcwxuZnvWO2S5O6dOcL8fVFDHapvlyvWEduj24X217oBlUcTAoTUOl Y5C+uJ9dB0qsSL/9e94Ul8gUvurrufOrH5ooVa2jM+V6tuPir4xAAhDvK52UPPkbCUeXT5 X+RVefOT44ZY0V9v3gKyAe1AkrzjhJn94XV8M4F0hAorlb9bBo/HO3o7nmd0OQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692208643; a=rsa-sha256; cv=none; b=gwmSFwwujl2HILGZRb4KMzVcIfbmx1fNlCf3Tofm7uZuHkEgFue5fN2f+C7xNWzsn1hbnH CZfvlvPEfZVewg0l8CgA1MUcV1Ch3MosjvB//RjtK5AqwprZycX7BAR0HujhwUrypclr9f P7+vUF69XOQTMiP5mReQtH534LqhiivCzOX7v0q9dQu+oQR5x+9mITb0WbzCSzZZQ7EiVU DlySuNj6y+1+kZMflWGTxwSlmyzi5Xx4FOR02sH0Ek0sZwc5/ee9+zFOfMAWwNYQ8Fa0bY tOH8QTDXUzIbG3jqxy3nKTledo4Vn+/ubZIJXEhRZ0qjF/ZSmlcJFMYFxYfoJA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RQwnv3H4Nz11KM; Wed, 16 Aug 2023 17:57:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37GHvNZM060102; Wed, 16 Aug 2023 17:57:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37GHvNoI060099; Wed, 16 Aug 2023 17:57:23 GMT (envelope-from git) Date: Wed, 16 Aug 2023 17:57:23 GMT Message-Id: <202308161757.37GHvNoI060099@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: 401ab69cff8f - main - Remove $FreeBSD$: one-line ps tag List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 401ab69cff8fa2320a9f8ea4baa114a6da6c952b Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=401ab69cff8fa2320a9f8ea4baa114a6da6c952b commit 401ab69cff8fa2320a9f8ea4baa114a6da6c952b Author: Warner Losh AuthorDate: 2023-08-16 17:55:39 +0000 Commit: Warner Losh CommitDate: 2023-08-16 17:55:39 +0000 Remove $FreeBSD$: one-line ps tag Remove /^%\s*RCSID:\s*\$FreeBSD\$.*$\n/ --- lib/libc/db/docs/hash.usenix.ps | 1 - lib/libc/db/docs/libtp.usenix.ps | 1 - 2 files changed, 2 deletions(-) diff --git a/lib/libc/db/docs/hash.usenix.ps b/lib/libc/db/docs/hash.usenix.ps index 3a0cf444b1ac..e050cdeba59f 100644 --- a/lib/libc/db/docs/hash.usenix.ps +++ b/lib/libc/db/docs/hash.usenix.ps @@ -7,7 +7,6 @@ % lib/psdit.pro -- prolog for psdit (ditroff) files % Copyright (c) 1984, 1985 Adobe Systems Incorporated. All Rights Reserved. % last edit: shore Sat Nov 23 20:28:03 1985 -% RCSID: $FreeBSD$ % Changed by Edward Wang (edward@ucbarpa.berkeley.edu) to handle graphics, % 17 Feb, 87. diff --git a/lib/libc/db/docs/libtp.usenix.ps b/lib/libc/db/docs/libtp.usenix.ps index b7e441a5755e..57df42730902 100644 --- a/lib/libc/db/docs/libtp.usenix.ps +++ b/lib/libc/db/docs/libtp.usenix.ps @@ -7,7 +7,6 @@ % lib/psdit.pro -- prolog for psdit (ditroff) files % Copyright (c) 1984, 1985 Adobe Systems Incorporated. All Rights Reserved. % last edit: shore Sat Nov 23 20:28:03 1985 -% RCSID: $FreeBSD$ % Changed by Edward Wang (edward@ucbarpa.berkeley.edu) to handle graphics, % 17 Feb, 87. From nobody Wed Aug 16 17:57:24 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RQwnx22dkz4qvDD; Wed, 16 Aug 2023 17:57:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RQwnw4Nk2z3W8k; Wed, 16 Aug 2023 17:57:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692208644; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=U+B2JtlgYJ/dks4yO90DLkR2m/EyBgxWXh1Dr2ghHMI=; b=kyyhbBRpDV32muhSwdhnIPtDmO66vKve3N7vy1AKrh15T54DwSXgKAUQRrTWhU6o9IEjb+ 2dI6Ajy4QOkgLHEtcAa0puKPUAfcCJL8ioZXZHO+ht7naHPjSSASjWE5eNZE7uC8K/GFtl 5xiG4UJ99b5Sh1VQkXfQMkbCqOehbBn7+GAw1TQc93v3NPXE5MnrJ+exokcnk7wy3xu3jb 0PUXRlCzqS+NPiPh0IYhmCYZKInd7r+QjO9lRGpA/uNRoCcjq99I5wzIZ6kMMB39q4Qg6f GRUqv1tr4cHm5Yhse3smMJ6Runv4crLocqyyXD1Q4v+vFgwoLMtUVIcGCLES0w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692208644; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=U+B2JtlgYJ/dks4yO90DLkR2m/EyBgxWXh1Dr2ghHMI=; b=of7FihUpUyBrq+eXFAtD5S2AbVi2iEoy8G6Irn2f9yuC7QcnSAqKcFmIckfy7qSrwy7UL5 9pJaBk6Ye6tW4zjQFnTxB+y3gq7RrMoQ2cHJWbXRNQVBHoSMNuK04Hw7WjmC5cUtmKFG2b S0XMjgosFkNW2AWW4QNi7vAKbaaXQI7YXMV4e6obWcR9bWNaw3Olf9wv28O69if2RPymjh 1VpKQxwYsjN9gqlJI0IIPYT9qO1bMKD4FjVA5ptUWKlHHAVIcU06v5yzJFDXlDHavE/9yd QqZ29ufXDIk5JpDk83FZEFGEkIzaW1zZ7XApop3V9Zj8n1U/3zfZNpFmDVlyzw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692208644; a=rsa-sha256; cv=none; b=LNwY59XtLYQv7ipqd2WKneuuUfgykB+MvnMX5XbaPjJ1XfvvlEjWsjbtGU/JB6tXDkmkQY OF8chHcPlVGoRWU5HFEgX5cVJlDd7vb8FCrWfW8Hm9fYi8DZtmV9uy66D3Y1S4F4lopsLa Ja4d/uDkuOlC951iFHLhKf9ZXRiWnjWPC3ETCblVT2TpCHZE6ISaB0EfY3Zyw5qpiqna4O fdqS6+pmTQJSzDMvCAUPdb4ImeriXL0FchEfdvxOsE7ZSPFrxrpfOHyOlVa/FZCONQpBh/ Df3SPb9rXdhC6TXK+EV3S9ikSR/2Iur7UqqwAJjNJsF1nN8kqO23UMGJiNWTdg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RQwnw3T7xz11qg; Wed, 16 Aug 2023 17:57:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37GHvOde060144; Wed, 16 Aug 2023 17:57:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37GHvOUh060141; Wed, 16 Aug 2023 17:57:24 GMT (envelope-from git) Date: Wed, 16 Aug 2023 17:57:24 GMT Message-Id: <202308161757.37GHvOUh060141@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: 26a58599a09a - main - Remove $FreeBSD$: one-line forth tag List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 26a58599a09a6181e0f5abe624021865a0c23186 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=26a58599a09a6181e0f5abe624021865a0c23186 commit 26a58599a09a6181e0f5abe624021865a0c23186 Author: Warner Losh AuthorDate: 2023-08-16 17:55:43 +0000 Commit: Warner Losh CommitDate: 2023-08-16 17:55:43 +0000 Remove $FreeBSD$: one-line forth tag Remove /^\\[\s*]*\$FreeBSD\$.*$\n/ --- share/examples/bootforth/boot.4th | 1 - share/examples/bootforth/frames.4th | 1 - share/examples/bootforth/loader.rc | 1 - share/examples/bootforth/menu.4th | 1 - share/examples/bootforth/menuconf.4th | 1 - share/examples/bootforth/screen.4th | 1 - stand/ficl/softwords/classes.fr | 1 - stand/ficl/softwords/ficlclass.fr | 1 - stand/ficl/softwords/ficllocal.fr | 1 - stand/ficl/softwords/fileaccess.fr | 1 - stand/ficl/softwords/forml.fr | 1 - stand/ficl/softwords/freebsd.fr | 1 - stand/ficl/softwords/ifbrack.fr | 1 - stand/ficl/softwords/jhlocal.fr | 1 - stand/ficl/softwords/marker.fr | 1 - stand/ficl/softwords/oo.fr | 1 - stand/ficl/softwords/prefix.fr | 1 - stand/ficl/softwords/softcore.fr | 1 - stand/ficl/softwords/string.fr | 1 - stand/forth/beastie.4th | 1 - stand/forth/brand-fbsd.4th | 1 - stand/forth/brand.4th | 1 - stand/forth/check-password.4th | 1 - stand/forth/color.4th | 1 - stand/forth/delay.4th | 1 - stand/forth/efi.4th | 1 - stand/forth/frames.4th | 1 - stand/forth/loader.4th | 1 - stand/forth/loader.rc | 1 - stand/forth/logo-beastie.4th | 1 - stand/forth/logo-beastiebw.4th | 1 - stand/forth/logo-fbsdbw.4th | 1 - stand/forth/logo-orb.4th | 1 - stand/forth/logo-orbbw.4th | 1 - stand/forth/menu-commands.4th | 1 - stand/forth/menu.4th | 1 - stand/forth/menu.rc | 1 - stand/forth/menusets.4th | 1 - stand/forth/screen.4th | 1 - stand/forth/shortcuts.4th | 1 - stand/forth/support.4th | 1 - stand/forth/version.4th | 1 - stand/i386/loader/loader.rc | 1 - 43 files changed, 43 deletions(-) diff --git a/share/examples/bootforth/boot.4th b/share/examples/bootforth/boot.4th index 8f26e0d0a38d..3f75424e46c5 100644 --- a/share/examples/bootforth/boot.4th +++ b/share/examples/bootforth/boot.4th @@ -1,6 +1,5 @@ \ Example of the file which is automatically loaded by /boot/loader \ on startup. -\ $FreeBSD$ \ Load the screen manipulation words diff --git a/share/examples/bootforth/frames.4th b/share/examples/bootforth/frames.4th index 4f1f9b812a03..0adcf9ef648b 100644 --- a/share/examples/bootforth/frames.4th +++ b/share/examples/bootforth/frames.4th @@ -1,6 +1,5 @@ \ Words implementing frame drawing \ XXX Filled boxes are left as an exercise for the reader... ;-/ -\ $FreeBSD$ marker task-frames.4th diff --git a/share/examples/bootforth/loader.rc b/share/examples/bootforth/loader.rc index 617bc3db4104..e8aa549f5905 100644 --- a/share/examples/bootforth/loader.rc +++ b/share/examples/bootforth/loader.rc @@ -1,6 +1,5 @@ \ Example of the file which is automatically loaded by /boot/loader \ on startup. -\ $FreeBSD$ cr .( Loading Forth extensions:) diff --git a/share/examples/bootforth/menu.4th b/share/examples/bootforth/menu.4th index 5c5c3e98c74e..3462ea9fc5a9 100644 --- a/share/examples/bootforth/menu.4th +++ b/share/examples/bootforth/menu.4th @@ -1,7 +1,6 @@ \ Simple greeting screen, presenting basic options. \ XXX This is far too trivial - I don't have time now to think \ XXX about something more fancy... :-/ -\ $FreeBSD$ : title f_single diff --git a/share/examples/bootforth/menuconf.4th b/share/examples/bootforth/menuconf.4th index a769f77e3543..df53e812aabc 100644 --- a/share/examples/bootforth/menuconf.4th +++ b/share/examples/bootforth/menuconf.4th @@ -1,7 +1,6 @@ \ Simple greeting screen, presenting basic options. \ XXX This is far too trivial - I don't have time now to think \ XXX about something more fancy... :-/ -\ $FreeBSD$ : title f_single diff --git a/share/examples/bootforth/screen.4th b/share/examples/bootforth/screen.4th index 3ea79e453d80..8bd873f48884 100644 --- a/share/examples/bootforth/screen.4th +++ b/share/examples/bootforth/screen.4th @@ -1,5 +1,4 @@ \ Screen manipulation related words. -\ $FreeBSD$ marker task-screen.4th diff --git a/stand/ficl/softwords/classes.fr b/stand/ficl/softwords/classes.fr index b56da378e970..72524b0b9fa5 100644 --- a/stand/ficl/softwords/classes.fr +++ b/stand/ficl/softwords/classes.fr @@ -4,7 +4,6 @@ \ john sadler 1 sep 98 \ Needs oop.fr \ -\ $FreeBSD$ also oop definitions diff --git a/stand/ficl/softwords/ficlclass.fr b/stand/ficl/softwords/ficlclass.fr index 6d75efb0d3c5..471820c1ac8f 100644 --- a/stand/ficl/softwords/ficlclass.fr +++ b/stand/ficl/softwords/ficlclass.fr @@ -7,7 +7,6 @@ \ ** C - W O R D \ Models a FICL_WORD \ -\ $FreeBSD$ object subclass c-word c-word ref: .link diff --git a/stand/ficl/softwords/ficllocal.fr b/stand/ficl/softwords/ficllocal.fr index c916089696c1..86de6f9b6ea5 100644 --- a/stand/ficl/softwords/ficllocal.fr +++ b/stand/ficl/softwords/ficllocal.fr @@ -7,7 +7,6 @@ \ locstate: 0 = looking for -- or }} \ 1 = found -- \ -\ $FreeBSD$ hide 0 constant zero diff --git a/stand/ficl/softwords/fileaccess.fr b/stand/ficl/softwords/fileaccess.fr index 7297df681cf3..137058572f47 100644 --- a/stand/ficl/softwords/fileaccess.fr +++ b/stand/ficl/softwords/fileaccess.fr @@ -4,7 +4,6 @@ \ ** submitted by Larry Hastings, larry@hastings.org \ ** \ -\ $FreeBSD$ : r/o 1 ; : r/w 3 ; diff --git a/stand/ficl/softwords/forml.fr b/stand/ficl/softwords/forml.fr index 1144ef536792..3e7e56ca2ec1 100644 --- a/stand/ficl/softwords/forml.fr +++ b/stand/ficl/softwords/forml.fr @@ -1,7 +1,6 @@ \ examples from FORML conference paper Nov 98 \ sadler \ -\ $FreeBSD$ .( loading FORML examples ) cr object --> sub c-example diff --git a/stand/ficl/softwords/freebsd.fr b/stand/ficl/softwords/freebsd.fr index 96205c0808dd..948398b4e462 100644 --- a/stand/ficl/softwords/freebsd.fr +++ b/stand/ficl/softwords/freebsd.fr @@ -22,7 +22,6 @@ \ ** OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF \ ** SUCH DAMAGE. \ ** -\ ** $FreeBSD$ \ Words for use in scripts: \ % ignore errors here diff --git a/stand/ficl/softwords/ifbrack.fr b/stand/ficl/softwords/ifbrack.fr index a8c60626c4f8..b29b8fa08433 100644 --- a/stand/ficl/softwords/ifbrack.fr +++ b/stand/ficl/softwords/ifbrack.fr @@ -2,7 +2,6 @@ \ ** ANS conditional compile directives [if] [else] [then] \ ** Requires ficl 2.0 or greater... \ -\ $FreeBSD$ hide diff --git a/stand/ficl/softwords/jhlocal.fr b/stand/ficl/softwords/jhlocal.fr index 12ccb9fea753..3cbeb78ff9a1 100644 --- a/stand/ficl/softwords/jhlocal.fr +++ b/stand/ficl/softwords/jhlocal.fr @@ -14,7 +14,6 @@ \ \ revised 2 June 2000 - { | a -- } now works correctly \ -\ $FreeBSD$ hide diff --git a/stand/ficl/softwords/marker.fr b/stand/ficl/softwords/marker.fr index ee3c9bdf2f64..3b9e86acaaf0 100644 --- a/stand/ficl/softwords/marker.fr +++ b/stand/ficl/softwords/marker.fr @@ -3,7 +3,6 @@ \ John Sadler, 4 Oct 98 \ Requires ficl 2.02 FORGET-WID !! \ -\ $FreeBSD$ : marker ( "name" -- ) create diff --git a/stand/ficl/softwords/oo.fr b/stand/ficl/softwords/oo.fr index b1c8e214e5bd..0857cbe4b9fb 100644 --- a/stand/ficl/softwords/oo.fr +++ b/stand/ficl/softwords/oo.fr @@ -3,7 +3,6 @@ \ ** F I C L O - O E X T E N S I O N S \ ** john sadler aug 1998 \ -\ $FreeBSD$ 17 ficl-vocabulary oop also oop definitions diff --git a/stand/ficl/softwords/prefix.fr b/stand/ficl/softwords/prefix.fr index ae1727fc00bc..b1491a384425 100644 --- a/stand/ficl/softwords/prefix.fr +++ b/stand/ficl/softwords/prefix.fr @@ -5,7 +5,6 @@ \ (jws) To make a prefix, simply create a new definition in the \ wordlist. start-prefixes and end-prefixes handle the bookkeeping \ -\ $FreeBSD$ variable save-current diff --git a/stand/ficl/softwords/softcore.fr b/stand/ficl/softwords/softcore.fr index 3ec74d8cbece..1350f859f3a2 100644 --- a/stand/ficl/softwords/softcore.fr +++ b/stand/ficl/softwords/softcore.fr @@ -3,7 +3,6 @@ \ ** John Sadler (john_sadler@alum.mit.edu) \ ** September, 1998 \ -\ $FreeBSD$ \ ** Ficl USER variables \ ** See words.c for primitive def'n of USER diff --git a/stand/ficl/softwords/string.fr b/stand/ficl/softwords/string.fr index dabb3900892f..bf6c997c70a7 100644 --- a/stand/ficl/softwords/string.fr +++ b/stand/ficl/softwords/string.fr @@ -11,7 +11,6 @@ \ s" woof woof woof " str --> cat \ str --> type cr \ -\ $FreeBSD$ also oop definitions diff --git a/stand/forth/beastie.4th b/stand/forth/beastie.4th index f64cf9f8720b..8aab8214d37e 100644 --- a/stand/forth/beastie.4th +++ b/stand/forth/beastie.4th @@ -24,7 +24,6 @@ \ OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF \ SUCH DAMAGE. \ -\ $FreeBSD$ marker task-beastie.4th diff --git a/stand/forth/brand-fbsd.4th b/stand/forth/brand-fbsd.4th index 84245ef232b6..ba84ae0d509a 100644 --- a/stand/forth/brand-fbsd.4th +++ b/stand/forth/brand-fbsd.4th @@ -22,7 +22,6 @@ \ OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF \ SUCH DAMAGE. \ -\ $FreeBSD$ 2 brandX ! 1 brandY ! \ Initialize brand placement defaults diff --git a/stand/forth/brand.4th b/stand/forth/brand.4th index 034e4eb40445..6c7cea584eba 100644 --- a/stand/forth/brand.4th +++ b/stand/forth/brand.4th @@ -22,7 +22,6 @@ \ OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF \ SUCH DAMAGE. \ -\ $FreeBSD$ marker task-brand.4th diff --git a/stand/forth/check-password.4th b/stand/forth/check-password.4th index e7996227c5f9..cb938625f4d0 100644 --- a/stand/forth/check-password.4th +++ b/stand/forth/check-password.4th @@ -22,7 +22,6 @@ \ OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF \ SUCH DAMAGE. \ -\ $FreeBSD$ marker task-check-password.4th diff --git a/stand/forth/color.4th b/stand/forth/color.4th index e73e8b725c31..d3371c17884a 100644 --- a/stand/forth/color.4th +++ b/stand/forth/color.4th @@ -22,7 +22,6 @@ \ OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF \ SUCH DAMAGE. \ -\ $FreeBSD$ marker task-color.4th diff --git a/stand/forth/delay.4th b/stand/forth/delay.4th index 28cfa5c26eb9..45c1c5064827 100644 --- a/stand/forth/delay.4th +++ b/stand/forth/delay.4th @@ -22,7 +22,6 @@ \ OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF \ SUCH DAMAGE. \ -\ $FreeBSD$ marker task-delay.4th diff --git a/stand/forth/efi.4th b/stand/forth/efi.4th index abcf12cffccd..5d4ed912281d 100644 --- a/stand/forth/efi.4th +++ b/stand/forth/efi.4th @@ -22,7 +22,6 @@ \ OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF \ SUCH DAMAGE. \ -\ $FreeBSD$ only forth definitions diff --git a/stand/forth/frames.4th b/stand/forth/frames.4th index 8d2421c758d9..9103f0f0aa3e 100644 --- a/stand/forth/frames.4th +++ b/stand/forth/frames.4th @@ -23,7 +23,6 @@ \ OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF \ SUCH DAMAGE. \ -\ $FreeBSD$ marker task-frames.4th diff --git a/stand/forth/loader.4th b/stand/forth/loader.4th index 89ea9efc4171..574077ea5710 100644 --- a/stand/forth/loader.4th +++ b/stand/forth/loader.4th @@ -23,7 +23,6 @@ \ OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF \ SUCH DAMAGE. \ -\ $FreeBSD$ only forth definitions diff --git a/stand/forth/loader.rc b/stand/forth/loader.rc index c15b0f5ce23b..06f2edbd787d 100644 --- a/stand/forth/loader.rc +++ b/stand/forth/loader.rc @@ -1,5 +1,4 @@ \ Loader.rc -\ $FreeBSD$ \ \ You should not edit this file! Put any overrides in loader.rc.local \ instead as this file can be replaced during system updates. diff --git a/stand/forth/logo-beastie.4th b/stand/forth/logo-beastie.4th index 671eb5e496b2..cd049089a44d 100644 --- a/stand/forth/logo-beastie.4th +++ b/stand/forth/logo-beastie.4th @@ -24,7 +24,6 @@ \ OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF \ SUCH DAMAGE. \ -\ $FreeBSD$ 46 logoX ! 4 logoY ! \ Initialize logo placement defaults diff --git a/stand/forth/logo-beastiebw.4th b/stand/forth/logo-beastiebw.4th index 197099cda0bc..f465dd3d3aa9 100644 --- a/stand/forth/logo-beastiebw.4th +++ b/stand/forth/logo-beastiebw.4th @@ -23,7 +23,6 @@ \ OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF \ SUCH DAMAGE. \ -\ $FreeBSD$ 46 logoX ! 4 logoY ! \ Initialize logo placement defaults diff --git a/stand/forth/logo-fbsdbw.4th b/stand/forth/logo-fbsdbw.4th index d4a532b78f4f..67c16930c750 100644 --- a/stand/forth/logo-fbsdbw.4th +++ b/stand/forth/logo-fbsdbw.4th @@ -23,7 +23,6 @@ \ OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF \ SUCH DAMAGE. \ -\ $FreeBSD$ 52 logoX ! 9 logoY ! \ Initialize logo placement defaults diff --git a/stand/forth/logo-orb.4th b/stand/forth/logo-orb.4th index 289353a46926..51efdeaec826 100644 --- a/stand/forth/logo-orb.4th +++ b/stand/forth/logo-orb.4th @@ -22,7 +22,6 @@ \ OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF \ SUCH DAMAGE. \ -\ $FreeBSD$ 46 logoX ! 7 logoY ! \ Initialize logo placement defaults diff --git a/stand/forth/logo-orbbw.4th b/stand/forth/logo-orbbw.4th index 11dc11cabb77..9e49a979f911 100644 --- a/stand/forth/logo-orbbw.4th +++ b/stand/forth/logo-orbbw.4th @@ -22,7 +22,6 @@ \ OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF \ SUCH DAMAGE. \ -\ $FreeBSD$ 46 logoX ! 7 logoY ! \ Initialize logo placement defaults diff --git a/stand/forth/menu-commands.4th b/stand/forth/menu-commands.4th index 9adf30a46b66..decf3fdf6fa4 100644 --- a/stand/forth/menu-commands.4th +++ b/stand/forth/menu-commands.4th @@ -22,7 +22,6 @@ \ OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF \ SUCH DAMAGE. \ -\ $FreeBSD$ marker task-menu-commands.4th diff --git a/stand/forth/menu.4th b/stand/forth/menu.4th index 75e75e3e3654..87b4efb8c185 100644 --- a/stand/forth/menu.4th +++ b/stand/forth/menu.4th @@ -24,7 +24,6 @@ \ OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF \ SUCH DAMAGE. \ -\ $FreeBSD$ marker task-menu.4th diff --git a/stand/forth/menu.rc b/stand/forth/menu.rc index d640e803e61f..da9ef49c84cd 100644 --- a/stand/forth/menu.rc +++ b/stand/forth/menu.rc @@ -1,5 +1,4 @@ \ Menu.rc -\ $FreeBSD$ \ \ You should not edit this file! Put any overrides in menu.rc.local \ instead as this file can be replaced during system updates. diff --git a/stand/forth/menusets.4th b/stand/forth/menusets.4th index 9335b80d511a..c3a4f8e8adb2 100644 --- a/stand/forth/menusets.4th +++ b/stand/forth/menusets.4th @@ -22,7 +22,6 @@ \ OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF \ SUCH DAMAGE. \ -\ $FreeBSD$ marker task-menusets.4th diff --git a/stand/forth/screen.4th b/stand/forth/screen.4th index e27482248b57..02eff4dd1b5b 100644 --- a/stand/forth/screen.4th +++ b/stand/forth/screen.4th @@ -23,7 +23,6 @@ \ OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF \ SUCH DAMAGE. \ -\ $FreeBSD$ marker task-screen.4th diff --git a/stand/forth/shortcuts.4th b/stand/forth/shortcuts.4th index 33a1cf678988..6ea885102140 100644 --- a/stand/forth/shortcuts.4th +++ b/stand/forth/shortcuts.4th @@ -22,7 +22,6 @@ \ OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF \ SUCH DAMAGE. \ -\ $FreeBSD$ \ FICL words intended to be used as shortcuts for carrying out common tasks or \ producing common results. Generally, words defined here are simply groupings diff --git a/stand/forth/support.4th b/stand/forth/support.4th index 999ac5005f5d..49318e067678 100644 --- a/stand/forth/support.4th +++ b/stand/forth/support.4th @@ -22,7 +22,6 @@ \ OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF \ SUCH DAMAGE. \ -\ $FreeBSD$ \ Loader.rc support functions: \ diff --git a/stand/forth/version.4th b/stand/forth/version.4th index a5311b4442ac..e92d77b321c8 100644 --- a/stand/forth/version.4th +++ b/stand/forth/version.4th @@ -22,7 +22,6 @@ \ OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF \ SUCH DAMAGE. \ -\ $FreeBSD$ marker task-version.4th diff --git a/stand/i386/loader/loader.rc b/stand/i386/loader/loader.rc index 9f1ebe635971..4bac6ef6801d 100644 --- a/stand/i386/loader/loader.rc +++ b/stand/i386/loader/loader.rc @@ -1,5 +1,4 @@ \ Loader.rc -\ $FreeBSD$ \ \ Includes additional commands include /boot/loader.4th From nobody Wed Aug 16 17:57:25 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RQwny4qskz4qvcn; Wed, 16 Aug 2023 17:57: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RQwnx65mhz3W8x; Wed, 16 Aug 2023 17:57:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692208646; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=lY3WveXtVm/rvjZhyiiXH7t3Q7Z/rYA8s8s+w8sKv0Q=; b=UAsH5cS1MiJYiqxM5nTBWdr1+ZugRlndJhVkYQN0VnkToovMB/WheSvNwoF09bvDbEjdUt JDV2LyS7MB6xSHaGnuSDylgsMhU/otcB7VIYXfQeLYdkubSE7NWOiSoaMLTGXFx/hfBIJH JIJ+AwX50Gge8/d9IUL5IRE4WwSX8lNlzs47CRGxy2EXbZ/E8uI0NaOWwhwKeGVIzGoZAy Dd9Vz/PenZeH8NKMAEy/NXjfygyYffxVzBC47JAPAFNbOlH/wjeUcVOzytuQNXv10ARRGN npf35lrmIBht0sxgTg0FdRC1YHIBOMjeNyx/NjGpQGDpVHhOPgZvrpZ9lhQfmw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692208646; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=lY3WveXtVm/rvjZhyiiXH7t3Q7Z/rYA8s8s+w8sKv0Q=; b=mjulZm5GqkW6Z/tcGE+1RR7dbAdWZDUPUGibImFdQV+1ZpWVVTSOEdFhv+bJ8ll7pj87OX qlRxj8h7O+rgrTR+ams7006Ppcb/MXzdgUgl+GZ6T6kh/iYBoBamRnBIJiPMRh03CoTrPh 2flVCvqZNzEFG6goYre1ZKJCRxiODEGYgzAvF0oFsko9Z3Ej620wmQuqp7MtpSyoHkayku WcsFZTAgV/o9y1g8zq7wo23gG/YNU9MJJx78p+UrrP4QEdZcZXi03AG6tJ7bed9KE/YTq+ uFIkQ0tIJ5JF+4RAyVII26kg4W2qUOQABFlRYtDVzurv4HWX3sE1nZmfp5GEtQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692208646; a=rsa-sha256; cv=none; b=RXJKK1v+0yJFzSdoQl2jBs63ymTvq+VltKqbPM+nzHHMX5j9lJj+tDfK+R9NXZR4jGFPky 7nrWoE7bj9YLRkO2h2coSvLen1shmSfOgrOPWFpQfRmemoT7C7rdvRVHQYIjphkq6d+XOB Im1GSo6N0SGVKGEogMnJKd2WZSPFz3nn7aEiEBypgYHSwfgaQLPg7rrhxu197Q7yPvne/Z yJ25CSc2iHuOK40k+Q7h/+N3Z1hv5pMAkOUrjMSXZ6EOAcvSB52UnLZFp/QgvUTj9wI+Xx wgqXPPD96bJdtezotwHHILnneFxNWXH1Q6A3w7qf3ZAgmCm0bbmynHeBW5Rxew== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RQwnx4jw7z11KN; Wed, 16 Aug 2023 17:57:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37GHvPtR060189; Wed, 16 Aug 2023 17:57:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37GHvPBb060186; Wed, 16 Aug 2023 17:57:25 GMT (envelope-from git) Date: Wed, 16 Aug 2023 17:57:25 GMT Message-Id: <202308161757.37GHvPBb060186@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: 9524e274b548 - main - Remove $FreeBSD$: one-line xdr pattern List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9524e274b5484ac8b43bacd90d4029183ccf6476 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=9524e274b5484ac8b43bacd90d4029183ccf6476 commit 9524e274b5484ac8b43bacd90d4029183ccf6476 Author: Warner Losh AuthorDate: 2023-08-16 17:55:47 +0000 Commit: Warner Losh CommitDate: 2023-08-16 17:55:47 +0000 Remove $FreeBSD$: one-line xdr pattern Remove /^\s*%\s*__FBSDID\("\$FreeBSD\$"\);?\s*\n/ --- include/rpcsvc/bootparam_prot.x | 1 - include/rpcsvc/crypt.x | 1 - include/rpcsvc/key_prot.x | 1 - include/rpcsvc/klm_prot.x | 1 - include/rpcsvc/mount.x | 1 - include/rpcsvc/nfs_prot.x | 1 - include/rpcsvc/nis.x | 1 - include/rpcsvc/nis_cache.x | 1 - include/rpcsvc/nis_callback.x | 1 - include/rpcsvc/nlm_prot.x | 1 - include/rpcsvc/pmap_prot.x | 1 - include/rpcsvc/rex.x | 1 - include/rpcsvc/rnusers.x | 1 - include/rpcsvc/rquota.x | 1 - include/rpcsvc/rstat.x | 2 -- include/rpcsvc/sm_inter.x | 1 - include/rpcsvc/spray.x | 1 - include/rpcsvc/yp.x | 1 - include/rpcsvc/yppasswd.x | 1 - include/rpcsvc/ypupdate_prot.x | 1 - include/rpcsvc/ypxfrd.x | 1 - usr.sbin/rpc.yppasswdd/yppasswd_private.x | 1 - 22 files changed, 23 deletions(-) diff --git a/include/rpcsvc/bootparam_prot.x b/include/rpcsvc/bootparam_prot.x index 548d618755d7..6e47bdb218d3 100644 --- a/include/rpcsvc/bootparam_prot.x +++ b/include/rpcsvc/bootparam_prot.x @@ -51,7 +51,6 @@ %/*static char sccsid[] = "from: @(#)bootparam_prot.x 2.1 88/08/01 4.0 RPCSRC";*/ %#endif /* not lint */ %#include -%__FBSDID("$FreeBSD$"); #endif const MAX_MACHINE_NAME = 255; diff --git a/include/rpcsvc/crypt.x b/include/rpcsvc/crypt.x index 3b296c0ddf1d..7d6b94d96067 100644 --- a/include/rpcsvc/crypt.x +++ b/include/rpcsvc/crypt.x @@ -32,7 +32,6 @@ #ifndef RPC_HDR %#include -%__FBSDID("$FreeBSD$"); #endif /* diff --git a/include/rpcsvc/key_prot.x b/include/rpcsvc/key_prot.x index 1fccd957941d..09a20049832e 100644 --- a/include/rpcsvc/key_prot.x +++ b/include/rpcsvc/key_prot.x @@ -48,7 +48,6 @@ %/* From: #pragma ident "@(#)key_prot.x 1.7 94/04/29 SMI" */ %/* Copyright (c) 1990, 1991 Sun Microsystems, Inc. */ %#include -%__FBSDID("$FreeBSD$"); % %/* % * Compiled from key_prot.x using rpcgen. diff --git a/include/rpcsvc/klm_prot.x b/include/rpcsvc/klm_prot.x index 5860f3251c17..b78dbfc20c3c 100644 --- a/include/rpcsvc/klm_prot.x +++ b/include/rpcsvc/klm_prot.x @@ -44,7 +44,6 @@ %/*static char sccsid[] = "from: @(#)klm_prot.x 2.1 88/08/01 4.0 RPCSRC";*/ %#endif /* not lint */ %#include -%__FBSDID("$FreeBSD$"); #endif const LM_MAXSTRLEN = 1024; diff --git a/include/rpcsvc/mount.x b/include/rpcsvc/mount.x index 9ebee835b273..e67cbc73d867 100644 --- a/include/rpcsvc/mount.x +++ b/include/rpcsvc/mount.x @@ -39,7 +39,6 @@ %/*static char sccsid[] = "from: @(#)mount.x 2.1 88/08/01 4.0 RPCSRC";*/ %#endif /* not lint */ %#include -%__FBSDID("$FreeBSD$"); #endif const MNTPATHLEN = 1024; /* maximum bytes in a pathname argument */ diff --git a/include/rpcsvc/nfs_prot.x b/include/rpcsvc/nfs_prot.x index 17791b6a18b2..9706c5a03bbd 100644 --- a/include/rpcsvc/nfs_prot.x +++ b/include/rpcsvc/nfs_prot.x @@ -35,7 +35,6 @@ %/*static char sccsid[] = "from: @(#)nfs_prot.x 2.1 88/08/01 4.0 RPCSRC";*/ %#endif /* not lint */ %#include -%__FBSDID("$FreeBSD$"); #endif const NFS_PORT = 2049; diff --git a/include/rpcsvc/nis.x b/include/rpcsvc/nis.x index ee822d039b86..bd1e61828dec 100644 --- a/include/rpcsvc/nis.x +++ b/include/rpcsvc/nis.x @@ -31,7 +31,6 @@ #ifndef RPC_HDR %#include -%__FBSDID("$FreeBSD$"); #endif /* diff --git a/include/rpcsvc/nis_cache.x b/include/rpcsvc/nis_cache.x index 6edaea92c38b..e55173994c13 100644 --- a/include/rpcsvc/nis_cache.x +++ b/include/rpcsvc/nis_cache.x @@ -39,7 +39,6 @@ #ifndef RPC_HDR %#include -%__FBSDID("$FreeBSD$"); #endif #ifdef RPC_HDR diff --git a/include/rpcsvc/nis_callback.x b/include/rpcsvc/nis_callback.x index 74a555b4f16b..7b717e918dcc 100644 --- a/include/rpcsvc/nis_callback.x +++ b/include/rpcsvc/nis_callback.x @@ -40,7 +40,6 @@ #ifndef RPC_HDR %#include -%__FBSDID("$FreeBSD$"); #endif /* diff --git a/include/rpcsvc/nlm_prot.x b/include/rpcsvc/nlm_prot.x index 87bf6c844359..f53d81996801 100644 --- a/include/rpcsvc/nlm_prot.x +++ b/include/rpcsvc/nlm_prot.x @@ -15,7 +15,6 @@ %/*static char sccsid[] = "from: * @(#)nlm_prot.x 2.1 88/08/01 4.0 RPCSRC";*/ %__RCSID("$NetBSD: nlm_prot.x,v 1.6 2000/06/07 14:30:15 bouyer Exp $"); %#endif /* not lint */ -%__FBSDID("$FreeBSD$"); #endif /* diff --git a/include/rpcsvc/pmap_prot.x b/include/rpcsvc/pmap_prot.x index 19a4d8c5a2fd..fb8a3bbde044 100644 --- a/include/rpcsvc/pmap_prot.x +++ b/include/rpcsvc/pmap_prot.x @@ -36,7 +36,6 @@ % %#pragma ident "@(#)pmap_prot.x 1.6 94/04/29 SMI" %#include -%__FBSDID("$FreeBSD$"); % %#ifndef _KERNEL % diff --git a/include/rpcsvc/rex.x b/include/rpcsvc/rex.x index 4d4bda65f283..20cce24e0ffa 100644 --- a/include/rpcsvc/rex.x +++ b/include/rpcsvc/rex.x @@ -39,7 +39,6 @@ %/*static char sccsid[] = "from: @(#)rex.x 2.1 88/08/01 4.0 RPCSRC";*/ %#endif /* not lint */ %#include -%__FBSDID("$FreeBSD$"); #endif const STRINGSIZE = 1024; diff --git a/include/rpcsvc/rnusers.x b/include/rpcsvc/rnusers.x index 421a515ac725..1b6dcada2ff1 100644 --- a/include/rpcsvc/rnusers.x +++ b/include/rpcsvc/rnusers.x @@ -39,7 +39,6 @@ %/*static char sccsid[] = "from: @(#)rnusers.x 2.1 88/08/01 4.0 RPCSRC";*/ %#endif /* not lint */ %#include -%__FBSDID("$FreeBSD$"); #endif const MAXUSERS = 100; diff --git a/include/rpcsvc/rquota.x b/include/rpcsvc/rquota.x index 8c8dfe452b54..b4ef0d3a6dda 100644 --- a/include/rpcsvc/rquota.x +++ b/include/rpcsvc/rquota.x @@ -8,7 +8,6 @@ #ifndef RPC_HDR %#include -%__FBSDID("$FreeBSD$"); #endif const RQ_PATHLEN = 1024; diff --git a/include/rpcsvc/rstat.x b/include/rpcsvc/rstat.x index a34456082afa..1b62470777e8 100644 --- a/include/rpcsvc/rstat.x +++ b/include/rpcsvc/rstat.x @@ -51,8 +51,6 @@ %/*static char sccsid[] = "from: @(#)rstat.x 2.2 88/08/01 4.0 RPCSRC";*/ %#endif /* not lint */ %#include -%__FBSDID("$FreeBSD$"); - #endif /* def RPC_HDR */ const RSTAT_CPUSTATES = 4; diff --git a/include/rpcsvc/sm_inter.x b/include/rpcsvc/sm_inter.x index 42a00915e8f7..a9a69c8b24eb 100644 --- a/include/rpcsvc/sm_inter.x +++ b/include/rpcsvc/sm_inter.x @@ -40,7 +40,6 @@ #ifndef RPC_HDR %#include -%__FBSDID("$FreeBSD$"); #endif program SM_PROG { diff --git a/include/rpcsvc/spray.x b/include/rpcsvc/spray.x index b6a5b849a079..406d318a4943 100644 --- a/include/rpcsvc/spray.x +++ b/include/rpcsvc/spray.x @@ -40,7 +40,6 @@ %/*static char sccsid[] = "from: @(#)spray.x 2.1 88/08/01 4.0 RPCSRC";*/ %#endif /* not lint */ %#include -%__FBSDID("$FreeBSD$"); #endif const SPRAYMAX = 8845; /* max amount can spray */ diff --git a/include/rpcsvc/yp.x b/include/rpcsvc/yp.x index 91614b20486f..d11902c4a279 100644 --- a/include/rpcsvc/yp.x +++ b/include/rpcsvc/yp.x @@ -37,7 +37,6 @@ #ifndef RPC_HDR %#include -%__FBSDID("$FreeBSD$"); #endif const YPMAXRECORD = 16777216; diff --git a/include/rpcsvc/yppasswd.x b/include/rpcsvc/yppasswd.x index 1b39a632fa94..2ad2215689f3 100644 --- a/include/rpcsvc/yppasswd.x +++ b/include/rpcsvc/yppasswd.x @@ -40,7 +40,6 @@ %/*static char sccsid[] = "from: @(#)yppasswd.x 2.1 88/08/01 4.0 RPCSRC";*/ %#endif /* not lint */ %#include -%__FBSDID("$FreeBSD$"); #endif program YPPASSWDPROG { diff --git a/include/rpcsvc/ypupdate_prot.x b/include/rpcsvc/ypupdate_prot.x index 90648a023e6e..328a07432f0d 100644 --- a/include/rpcsvc/ypupdate_prot.x +++ b/include/rpcsvc/ypupdate_prot.x @@ -35,7 +35,6 @@ %/* from @(#)ypupdate_prot.x 1.3 91/03/11 TIRPC 1.0 */ #ifndef RPC_HDR %#include -%__FBSDID("$FreeBSD$"); #endif % %/* diff --git a/include/rpcsvc/ypxfrd.x b/include/rpcsvc/ypxfrd.x index e6ff902a1dfe..44ce886f64f5 100644 --- a/include/rpcsvc/ypxfrd.x +++ b/include/rpcsvc/ypxfrd.x @@ -66,7 +66,6 @@ #ifndef RPC_HDR %#include -%__FBSDID("$FreeBSD$"); #endif /* XXX cribbed from yp.x */ diff --git a/usr.sbin/rpc.yppasswdd/yppasswd_private.x b/usr.sbin/rpc.yppasswdd/yppasswd_private.x index a1d6be51f369..d1e32f8819b5 100644 --- a/usr.sbin/rpc.yppasswdd/yppasswd_private.x +++ b/usr.sbin/rpc.yppasswdd/yppasswd_private.x @@ -32,7 +32,6 @@ #ifndef RPC_HDR %#include -%__FBSDID("$FreeBSD$"); #endif #ifdef RPC_HDR From nobody Wed Aug 16 18:07:50 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RQx1y51N7z4qvwk; Wed, 16 Aug 2023 18:07: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RQx1y4M1Xz4Cnj; Wed, 16 Aug 2023 18:07:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692209270; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=OJwYxEZg21MJKTW5xFqgt2E+hRHMOMJylofyA+6vLzI=; b=pSziNQA0sX1BEd5mriqUSaZu9wUZtZkZNOdxC1Sns3hZpShuWuZoxmB51bHCyaKR+dPnJy 3PxnDVPG/Nv6ItNHeUQZNhNM/dmV3RloWJEi/X+U0AR0rJH9mXgmZ86BB6jtvsdO4rO+PY 4nNqT1ZyqSJrB/jz3aEs4Xxsh6+NhHQ63imCniig07+uFQLjDlnT1tU6gBiFztZlWSVIsQ hJozHWmXFa5+A+P1pRQpyilH63yGBBQcTnOMex5c0g7EYcAJzg3/9Sy+7tUgR9b+/F1x3q TkzucWYdlnQQPb+CIY0lb4WVhjPjL3XgxSIvZakpURZgyt31ReBny0QK5LCz3g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692209270; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=OJwYxEZg21MJKTW5xFqgt2E+hRHMOMJylofyA+6vLzI=; b=pNGunjm9eGjZGtf0D2iIshLMPk90vqccIPQRkJrVP5rbhxDMN9GkTEjvg3xN5pnshQ0b2d Cp/mJE/HfXLHMbWt/fj1O9sBu9f+z6AqVUuNfuq99wDPOeQd/p8B0gbqySD2CLKD1/8eDn KBgfP3/y5Ld65YJAmWOsYJzZDTkHuC0O9K8cQGyem3bJomdYFX5E+xjh8x9hPwEQ9A9s19 grCewgpLbHCf/Gxxe/cEeqyU1ApN72oAt+AxKAl0g0V595tRw88jG0Z2Sx97mhj9Dgamr3 AqC+Xs+KA0etOMSGD6z7xTIL3WT64K+daAYOr0Uu9Zgsccq3Jn/nWNPAyDzcjQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692209270; a=rsa-sha256; cv=none; b=XsS3Quu6tbJ8Cokl/DdHxwL1VyX+qxEoyeOLSFOrSO1xBGEEvyGmAPre8CUdV9mXBKoi1a HSNU7HmCyuf/j5Sc3K5uat6yTOMKTzSoqXA4MPzCTUJLAiETqWnbWueucb5yui3yJsgBlg VjBvv6bZuTqFbA18XLvjTutFKYWRyhM1P7H8/atibYShwscStqTigykKElxPoo4f9/N+9v ZkiltsAa/scv28OMDNfEL7Ig9Ljj6XXq0DuJMgwLobds3IladkFwiM0E578cX5i2ueBsFV yTn/kYW5w/P//FDGLAUyAathL36cuFiigg5x3iGfSF7B9d4g3FSmKPNdjLBtiA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RQx1y3PvWz11rD; Wed, 16 Aug 2023 18:07:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37GI7ohZ078060; Wed, 16 Aug 2023 18:07:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37GI7oJN078057; Wed, 16 Aug 2023 18:07:50 GMT (envelope-from git) Date: Wed, 16 Aug 2023 18:07:50 GMT Message-Id: <202308161807.37GI7oJN078057@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: 3b6b4765499f - main - freebsd-yeet: Tool to remove $FreeBSD$ from tree List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3b6b4765499f73ff4c31b8042bab67747ab41686 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=3b6b4765499f73ff4c31b8042bab67747ab41686 commit 3b6b4765499f73ff4c31b8042bab67747ab41686 Author: Warner Losh AuthorDate: 2023-08-16 18:06:37 +0000 Commit: Warner Losh CommitDate: 2023-08-16 18:06:37 +0000 freebsd-yeet: Tool to remove $FreeBSD$ from tree Use at your own risk, but this will remove $FreeBSD$ from your tree. It does commits and tries to be at least a little smart about it. Sponsored by: Netflix --- tools/build/freebsd-yeet.pl | 107 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 107 insertions(+) diff --git a/tools/build/freebsd-yeet.pl b/tools/build/freebsd-yeet.pl new file mode 100644 index 000000000000..ee7f27f81637 --- /dev/null +++ b/tools/build/freebsd-yeet.pl @@ -0,0 +1,107 @@ +# Remove almost all of the $ FreeBSD $ tags in the tree. +# +# Copyright (c) 2023, Warner Losh +# SPDX-License-Identifier: BSD-2-Clause +# +# Needs p5-File-Lib package +# Caveat Emptor +# +use strict; +use warnings; +use File::Find; + +sub skip_list +{ + my $fn = $_[0]; + + if ($fn =~ m=^./contrib/=) { + return 1; + } + if ($fn =~ m=^./sys/contrib/=) { + return 1; + } + if ($fn =~ m=^./cddl/contrib/=) { + return 1; + } + if ($fn =~ m=^./crypto/=) { + return 1; + } + if ($fn =~ m=^./.git/=) { + return 1; + } + if ($fn =~ m=~$=) { + return 1; + } + return 0; +} + +my $pretty; +my $pattern; +my $repl; +my $count; + +sub do_one +{ + $pretty = $_[0]; + $pattern = $_[1]; + $repl = ""; + $repl = $_[2] if defined($_[2]); + $count = 0; + + sub findfiles + { + return unless -f; + my $fn="$File::Find::name"; + return if skip_list($fn); + open my $fh, '<', $_ or die "Can't open $fn: $!\n"; + local $/; + my $file = <$fh>; + close $fh; + my $len = length($file); + + $file =~ s=$pattern=$repl=gm; + my $len2 = length($file); + return if $len2 == $len; + print "$pretty: $fn\n"; + open my $fhw, '>', $_ or die "Can't write $fn: $!\n"; + print $fhw $file; + close $fhw; + $count++; + } + + $count = 0; + find({ wanted => \&findfiles, }, './sys'); + if ($count > 0) { + print "Changed $pretty\n"; + system("git commit -a -m'sys: Remove \$FreeBSD\$: $pretty\n\nRemove /$pattern/'"); + } + $count = 0; + find({ wanted => \&findfiles, }, '.'); + if ($count > 0) { + print "Changed $pretty\n"; + system("git commit -a -m'Remove \$FreeBSD\$: $pretty\n\nRemove /$pattern/'"); + } +} + +# Note: Do two line before one line +do_one("sound driver version", 'SND_DECLARE_FILE\("\$FreeBSD\$"\);', 'SND_DECLARE_FILE("");'); +do_one("one-line m4 tag", '^dnl\s*\$FreeBSD\$.*$\n'); +do_one("two-line .h pattern", '^\s*\*\n \*\s+\$FreeBSD\$$\n'); +do_one("one-line .h pattern", '^\s*\*+\s*\$FreeBSD\$.*$\n'); +do_one("one-line .c comment pattern", '^/[*/]\s*\$FreeBSD\$.*\n'); +do_one("two-line .c pattern", '^#include\s+.*$\n\s+__FBSDID\("\$FreeBSD\$"\);\n'); +do_one("one-line .c pattern", '^[\s*]*__FBSDID\("\$FreeBSD\$"\);?\s*\n'); +do_one("alt two-line .c pattern", '^\s*__RCSID\("\$FreeBSD\$"\);\n\n'); +do_one("alt one-line .c pattern", '^\s*__RCSID\("\$FreeBSD\$"\);\n'); +do_one("one-line .S pattern", '^\s\.(asciz|ident)\s+\"\$FreeBSD\$\".*\n'); +do_one("one-line sh pattern", '^\s*#[#!]?\s*\$FreeBSD\$.*$\n'); +do_one("two-line nroff pattern", '^\.\\\\"\n\.\\\\"\s*\$FreeBSD\$$\n'); +do_one("one-line nroff pattern", '^\.\\\\"\s*\$FreeBSD\$$\n'); +do_one("one-line bare tag", '^\s*\$FreeBSD\$$\n'); +do_one("one-line catalog", '^\s*\$\s*\$FreeBSD\$$\n'); +do_one("two-line lua tag", '^--\n--\s*\$FreeBSD\$.*$\n'); +do_one("one-line lua tag", '^--\s*\$FreeBSD\$.*$\n'); +do_one("one-line ps tag", '^%\s*RCSID:\s*\$FreeBSD\$.*$\n'); +do_one("one-line forth tag", '^\\\\[\s*]*\$FreeBSD\$.*$\n'); +do_one("one-line xdr pattern", '^\s*%\s*__FBSDID\("\$FreeBSD\$"\);?\s*\n'); +exit; From nobody Wed Aug 16 18:11:51 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RQx6w5MtGz4qwQC for ; Wed, 16 Aug 2023 18:12:08 +0000 (UTC) (envelope-from kevin.bowling@kev009.com) Received: from mail-pf1-x42b.google.com (mail-pf1-x42b.google.com [IPv6:2607:f8b0:4864:20::42b]) (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 "GTS CA 1D4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RQx6v4jtYz4H5D for ; Wed, 16 Aug 2023 18:12:07 +0000 (UTC) (envelope-from kevin.bowling@kev009.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-pf1-x42b.google.com with SMTP id d2e1a72fcca58-6886d6895a9so1433876b3a.0 for ; Wed, 16 Aug 2023 11:12:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kev009.com; s=google; t=1692209524; x=1692814324; h=content-transfer-encoding:cc:to:subject:message-id:date:from :in-reply-to:references:mime-version:from:to:cc:subject:date :message-id:reply-to; bh=Tu/uC5EvzXJBOe2Yjky+O2PjHst9n7TywAwyATpyKnw=; b=ZBx2ZD/WyrYYrh+bP94WyxkUsXTkLJDx/sbqBsA3iWdXU4N7m66Sa/o2SS4OsTVLxt h8E4fQEzlaRBlamVjSVyFZJEuIkiMzQsFWFhcuwyHq1hmqSzXzM2ngG1BIRoDqQBIS1G 9Cfwgkk+z6zshytf1JpE5G+FYQSa5ZUJXYYhA= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1692209524; x=1692814324; h=content-transfer-encoding:cc:to:subject:message-id:date:from :in-reply-to:references:mime-version:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=Tu/uC5EvzXJBOe2Yjky+O2PjHst9n7TywAwyATpyKnw=; b=WC0oEduX5kvHM6wVp51d6JFtNDsCVX6cnMRp2MC8Iq2oPTKT/dP6wPdZmfH+wRTgQt XCU0xsu2dRU/bdqpNQ57duMD/bT5/rf2OeAPkFe7qmDDEvDLfZanZkmyexh7Ih/rYbB4 uaQS8jmOSj0Ul9fzguAQaus5s5dbBBh80MgiOpgJl73bWs7TitZiKW5NHk5GQKRLJmhf FlnerHhDsf5vyIYyH8OeEj/qVKMQeC7vXIEdA4yyOZFGTL+lREtdn63lr40oC+dwrQOS VwoVjt9nvCzA3Du1qo8zcL5u00LIeFnQHWOe6OV5B1ZaEEbqThFp9Kg4OjgHi/e7Kz8/ ELlg== X-Gm-Message-State: AOJu0YydPF+0XZ/nSfR/lkVICRhyx6FNQM7j/wTAG7xjj8rp0cz+UNjB LBrwkCyBF/N/CLxlLuH1qt1PH2SeYLGDQVJzAN57/Q== X-Google-Smtp-Source: AGHT+IEJxib4G8j7z12zx2JugR0aBqYrCMZr2DkAdr8RBKoVkI32ID//4i0HVVnzoGRvi1Bpjq78OyhS7VjIMXOtaAg= X-Received: by 2002:a05:6a00:a17:b0:687:596e:fa72 with SMTP id p23-20020a056a000a1700b00687596efa72mr3137590pfh.5.1692209523652; Wed, 16 Aug 2023 11:12:03 -0700 (PDT) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 References: <202308161756.37GHufPp058798@gitrepo.freebsd.org> In-Reply-To: <202308161756.37GHufPp058798@gitrepo.freebsd.org> From: Kevin Bowling Date: Wed, 16 Aug 2023 11:11:51 -0700 Message-ID: Subject: Re: git: 82a265ad9bad - main - sys: Remove $FreeBSD$: sound driver version To: Warner Losh Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-Rspamd-Queue-Id: 4RQx6v4jtYz4H5D X-Spamd-Bar: ---- 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] On Wed, Aug 16, 2023 at 10:56=E2=80=AFAM Warner Losh wrot= e: > > The branch main has been updated by imp: > > URL: https://cgit.FreeBSD.org/src/commit/?id=3D82a265ad9bad315000a2d60b85= 3c4669f1600cd0 > > commit 82a265ad9bad315000a2d60b853c4669f1600cd0 > Author: Warner Losh > AuthorDate: 2023-08-16 17:53:59 +0000 > Commit: Warner Losh > CommitDate: 2023-08-16 17:53:59 +0000 > > sys: Remove $FreeBSD$: sound driver version > > Remove /SND_DECLARE_FILE\("\$FreeBSD\$"\);/ It seems like SND_DECLARE_FILE(""); should probably go away or the string within shall be dropped. Its idea of 'uniq' is a little concerning. > --- > sys/arm/broadcom/bcm2835/bcm2835_audio.c | 2 +- > sys/dev/sound/pci/als4000.c | 2 +- > sys/dev/sound/pci/atiixp.c | 2 +- > sys/dev/sound/pci/cmi.c | 2 +- > sys/dev/sound/pci/cs4281.c | 2 +- > sys/dev/sound/pci/csa.c | 2 +- > sys/dev/sound/pci/csamidi.c | 2 +- > sys/dev/sound/pci/csapcm.c | 2 +- > sys/dev/sound/pci/emu10k1.c | 2 +- > sys/dev/sound/pci/envy24.c | 2 +- > sys/dev/sound/pci/envy24ht.c | 2 +- > sys/dev/sound/pci/es137x.c | 2 +- > sys/dev/sound/pci/fm801.c | 2 +- > sys/dev/sound/pci/hda/hdaa.c | 2 +- > sys/dev/sound/pci/hda/hdaa_patches.c | 2 +- > sys/dev/sound/pci/hda/hdac.c | 2 +- > sys/dev/sound/pci/hda/hdacc.c | 2 +- > sys/dev/sound/pci/hdspe-pcm.c | 2 +- > sys/dev/sound/pci/hdspe.c | 2 +- > sys/dev/sound/pci/ich.c | 2 +- > sys/dev/sound/pci/maestro3.c | 2 +- > sys/dev/sound/pci/neomagic.c | 2 +- > sys/dev/sound/pci/solo.c | 2 +- > sys/dev/sound/pci/t4dwave.c | 2 +- > sys/dev/sound/pci/via8233.c | 2 +- > sys/dev/sound/pci/via82c686.c | 2 +- > sys/dev/sound/pci/vibes.c | 2 +- > sys/dev/sound/pcm/ac97.c | 2 +- > sys/dev/sound/pcm/ac97_patch.c | 2 +- > sys/dev/sound/pcm/buffer.c | 2 +- > sys/dev/sound/pcm/channel.c | 2 +- > sys/dev/sound/pcm/dsp.c | 2 +- > sys/dev/sound/pcm/feeder.c | 2 +- > sys/dev/sound/pcm/feeder_chain.c | 2 +- > sys/dev/sound/pcm/feeder_eq.c | 2 +- > sys/dev/sound/pcm/feeder_format.c | 2 +- > sys/dev/sound/pcm/feeder_matrix.c | 2 +- > sys/dev/sound/pcm/feeder_mixer.c | 2 +- > sys/dev/sound/pcm/feeder_rate.c | 2 +- > sys/dev/sound/pcm/feeder_volume.c | 2 +- > sys/dev/sound/pcm/mixer.c | 2 +- > sys/dev/sound/pcm/sndstat.c | 2 +- > sys/dev/sound/pcm/sound.c | 2 +- > sys/dev/sound/pcm/vchan.c | 2 +- > 44 files changed, 44 insertions(+), 44 deletions(-) > > diff --git a/sys/arm/broadcom/bcm2835/bcm2835_audio.c b/sys/arm/broadcom/= bcm2835/bcm2835_audio.c > index 36b1dc86535b..0d430cf19df7 100644 > --- a/sys/arm/broadcom/bcm2835/bcm2835_audio.c > +++ b/sys/arm/broadcom/bcm2835/bcm2835_audio.c > @@ -38,7 +38,7 @@ > > #include "vc_vchi_audioserv_defs.h" > > -SND_DECLARE_FILE("$FreeBSD$"); > +SND_DECLARE_FILE(""); > > /* Audio destination */ > #define DEST_AUTO 0 > diff --git a/sys/dev/sound/pci/als4000.c b/sys/dev/sound/pci/als4000.c > index 71f6c4f909c7..89f7d6385493 100644 > --- a/sys/dev/sound/pci/als4000.c > +++ b/sys/dev/sound/pci/als4000.c > @@ -48,7 +48,7 @@ > > #include "mixer_if.h" > > -SND_DECLARE_FILE("$FreeBSD$"); > +SND_DECLARE_FILE(""); > > /* Debugging macro's */ > #undef DEB > diff --git a/sys/dev/sound/pci/atiixp.c b/sys/dev/sound/pci/atiixp.c > index 83eee21a333e..99468367c998 100644 > --- a/sys/dev/sound/pci/atiixp.c > +++ b/sys/dev/sound/pci/atiixp.c > @@ -69,7 +69,7 @@ > > #include > > -SND_DECLARE_FILE("$FreeBSD$"); > +SND_DECLARE_FILE(""); > > #define ATI_IXP_DMA_RETRY_MAX 100 > > diff --git a/sys/dev/sound/pci/cmi.c b/sys/dev/sound/pci/cmi.c > index 6b4acbb4ddae..89a1eb24d878 100644 > --- a/sys/dev/sound/pci/cmi.c > +++ b/sys/dev/sound/pci/cmi.c > @@ -61,7 +61,7 @@ > #include "mixer_if.h" > #include "mpufoi_if.h" > > -SND_DECLARE_FILE("$FreeBSD$"); > +SND_DECLARE_FILE(""); > > /* Supported chip ID's */ > #define CMI8338A_PCI_ID 0x010013f6 > diff --git a/sys/dev/sound/pci/cs4281.c b/sys/dev/sound/pci/cs4281.c > index b011f67e763e..fccbf807d965 100644 > --- a/sys/dev/sound/pci/cs4281.c > +++ b/sys/dev/sound/pci/cs4281.c > @@ -45,7 +45,7 @@ > > #include > > -SND_DECLARE_FILE("$FreeBSD$"); > +SND_DECLARE_FILE(""); > > #define CS4281_DEFAULT_BUFSZ 16384 > > diff --git a/sys/dev/sound/pci/csa.c b/sys/dev/sound/pci/csa.c > index a03f319d85d5..68edfd9338c2 100644 > --- a/sys/dev/sound/pci/csa.c > +++ b/sys/dev/sound/pci/csa.c > @@ -54,7 +54,7 @@ > > #include > > -SND_DECLARE_FILE("$FreeBSD$"); > +SND_DECLARE_FILE(""); > > /* This is the pci device id. */ > #define CS4610_PCI_ID 0x60011013 > diff --git a/sys/dev/sound/pci/csamidi.c b/sys/dev/sound/pci/csamidi.c > index e9d6006544b3..cc4b41f86af9 100644 > --- a/sys/dev/sound/pci/csamidi.c > +++ b/sys/dev/sound/pci/csamidi.c > @@ -54,7 +54,7 @@ > > #include "mpufoi_if.h" > > -SND_DECLARE_FILE("$FreeBSD$"); > +SND_DECLARE_FILE(""); > > /* pulled from mpu401.c */ > #define MPU_DATAPORT 0 > diff --git a/sys/dev/sound/pci/csapcm.c b/sys/dev/sound/pci/csapcm.c > index d915a14a536f..14820a9c2216 100644 > --- a/sys/dev/sound/pci/csapcm.c > +++ b/sys/dev/sound/pci/csapcm.c > @@ -43,7 +43,7 @@ > #include > #include > > -SND_DECLARE_FILE("$FreeBSD$"); > +SND_DECLARE_FILE(""); > > /* Buffer size on dma transfer. Fixed for CS416x. */ > #define CS461x_BUFFSIZE (4 * 1024) > diff --git a/sys/dev/sound/pci/emu10k1.c b/sys/dev/sound/pci/emu10k1.c > index abb586e34525..d4624a549e42 100644 > --- a/sys/dev/sound/pci/emu10k1.c > +++ b/sys/dev/sound/pci/emu10k1.c > @@ -43,7 +43,7 @@ > #include > #include "mpufoi_if.h" > > -SND_DECLARE_FILE("$FreeBSD$"); > +SND_DECLARE_FILE(""); > > /* -------------------------------------------------------------------- = */ > > diff --git a/sys/dev/sound/pci/envy24.c b/sys/dev/sound/pci/envy24.c > index b95a3438ce79..8039d4e3186c 100644 > --- a/sys/dev/sound/pci/envy24.c > +++ b/sys/dev/sound/pci/envy24.c > @@ -41,7 +41,7 @@ > > #include "mixer_if.h" > > -SND_DECLARE_FILE("$FreeBSD$"); > +SND_DECLARE_FILE(""); > > static MALLOC_DEFINE(M_ENVY24, "envy24", "envy24 audio"); > > diff --git a/sys/dev/sound/pci/envy24ht.c b/sys/dev/sound/pci/envy24ht.c > index 4bfef99f600f..e9b6771e2162 100644 > --- a/sys/dev/sound/pci/envy24ht.c > +++ b/sys/dev/sound/pci/envy24ht.c > @@ -53,7 +53,7 @@ > > #include "mixer_if.h" > > -SND_DECLARE_FILE("$FreeBSD$"); > +SND_DECLARE_FILE(""); > > static MALLOC_DEFINE(M_ENVY24HT, "envy24ht", "envy24ht audio"); > > diff --git a/sys/dev/sound/pci/es137x.c b/sys/dev/sound/pci/es137x.c > index f1c94f16a123..a11a106fee2f 100644 > --- a/sys/dev/sound/pci/es137x.c > +++ b/sys/dev/sound/pci/es137x.c > @@ -90,7 +90,7 @@ > > #include "mixer_if.h" > > -SND_DECLARE_FILE("$FreeBSD$"); > +SND_DECLARE_FILE(""); > > #define MEM_MAP_REG 0x14 > > diff --git a/sys/dev/sound/pci/fm801.c b/sys/dev/sound/pci/fm801.c > index 2469fdba967f..34fb1f6f1bf6 100644 > --- a/sys/dev/sound/pci/fm801.c > +++ b/sys/dev/sound/pci/fm801.c > @@ -35,7 +35,7 @@ > #include > #include > > -SND_DECLARE_FILE("$FreeBSD$"); > +SND_DECLARE_FILE(""); > > #define PCI_VENDOR_FORTEMEDIA 0x1319 > #define PCI_DEVICE_FORTEMEDIA1 0x08011319 /* Audio controller */ > diff --git a/sys/dev/sound/pci/hda/hdaa.c b/sys/dev/sound/pci/hda/hdaa.c > index c7706d2bd967..ef8f634ac8e8 100644 > --- a/sys/dev/sound/pci/hda/hdaa.c > +++ b/sys/dev/sound/pci/hda/hdaa.c > @@ -47,7 +47,7 @@ > > #include "mixer_if.h" > > -SND_DECLARE_FILE("$FreeBSD$"); > +SND_DECLARE_FILE(""); > > #define hdaa_lock(devinfo) snd_mtxlock((devinfo)->lock) > #define hdaa_unlock(devinfo) snd_mtxunlock((devinfo)->lock) > diff --git a/sys/dev/sound/pci/hda/hdaa_patches.c b/sys/dev/sound/pci/hda= /hdaa_patches.c > index bec8590745c5..8331312b69c9 100644 > --- a/sys/dev/sound/pci/hda/hdaa_patches.c > +++ b/sys/dev/sound/pci/hda/hdaa_patches.c > @@ -47,7 +47,7 @@ > #include "pin_patch.h" > #include "pin_patch_realtek.h" > > -SND_DECLARE_FILE("$FreeBSD$"); > +SND_DECLARE_FILE(""); > > static const struct { > uint32_t model; > diff --git a/sys/dev/sound/pci/hda/hdac.c b/sys/dev/sound/pci/hda/hdac.c > index aca9bd7ac9ab..79ab71516cd9 100644 > --- a/sys/dev/sound/pci/hda/hdac.c > +++ b/sys/dev/sound/pci/hda/hdac.c > @@ -51,7 +51,7 @@ > > #define HDA_DRV_TEST_REV "20120126_0002" > > -SND_DECLARE_FILE("$FreeBSD$"); > +SND_DECLARE_FILE(""); > > #define hdac_lock(sc) snd_mtxlock((sc)->lock) > #define hdac_unlock(sc) snd_mtxunlock((sc)->lock) > diff --git a/sys/dev/sound/pci/hda/hdacc.c b/sys/dev/sound/pci/hda/hdacc.= c > index 33eea6ef67c5..4616b3b23a48 100644 > --- a/sys/dev/sound/pci/hda/hdacc.c > +++ b/sys/dev/sound/pci/hda/hdacc.c > @@ -43,7 +43,7 @@ > #include > #include > > -SND_DECLARE_FILE("$FreeBSD$"); > +SND_DECLARE_FILE(""); > > struct hdacc_fg { > device_t dev; > diff --git a/sys/dev/sound/pci/hdspe-pcm.c b/sys/dev/sound/pci/hdspe-pcm.= c > index 6de5b353ab5b..b23304d32fc7 100644 > --- a/sys/dev/sound/pci/hdspe-pcm.c > +++ b/sys/dev/sound/pci/hdspe-pcm.c > @@ -40,7 +40,7 @@ > > #include > > -SND_DECLARE_FILE("$FreeBSD$"); > +SND_DECLARE_FILE(""); > > struct hdspe_latency { > uint32_t n; > diff --git a/sys/dev/sound/pci/hdspe.c b/sys/dev/sound/pci/hdspe.c > index 943c20bba4f1..ac253b28df3a 100644 > --- a/sys/dev/sound/pci/hdspe.c > +++ b/sys/dev/sound/pci/hdspe.c > @@ -40,7 +40,7 @@ > > #include > > -SND_DECLARE_FILE("$FreeBSD$"); > +SND_DECLARE_FILE(""); > > static struct hdspe_channel chan_map_aio[] =3D { > { 0, 1, "line", 1, 1 }, > diff --git a/sys/dev/sound/pci/ich.c b/sys/dev/sound/pci/ich.c > index feb0175d2839..d5e8a48a186c 100644 > --- a/sys/dev/sound/pci/ich.c > +++ b/sys/dev/sound/pci/ich.c > @@ -38,7 +38,7 @@ > #include > #include > > -SND_DECLARE_FILE("$FreeBSD$"); > +SND_DECLARE_FILE(""); > > /* -------------------------------------------------------------------- = */ > > diff --git a/sys/dev/sound/pci/maestro3.c b/sys/dev/sound/pci/maestro3.c > index f46b587daf7c..c60c69b6baf5 100644 > --- a/sys/dev/sound/pci/maestro3.c > +++ b/sys/dev/sound/pci/maestro3.c > @@ -69,7 +69,7 @@ > #include > #include > > -SND_DECLARE_FILE("$FreeBSD$"); > +SND_DECLARE_FILE(""); > > /* -------------------------------------------------------------------- = */ > > diff --git a/sys/dev/sound/pci/neomagic.c b/sys/dev/sound/pci/neomagic.c > index 5616223b7590..162d99b57c70 100644 > --- a/sys/dev/sound/pci/neomagic.c > +++ b/sys/dev/sound/pci/neomagic.c > @@ -40,7 +40,7 @@ > #include > #include > > -SND_DECLARE_FILE("$FreeBSD$"); > +SND_DECLARE_FILE(""); > > /* -------------------------------------------------------------------- = */ > > diff --git a/sys/dev/sound/pci/solo.c b/sys/dev/sound/pci/solo.c > index dc8351e9c117..1788929811ed 100644 > --- a/sys/dev/sound/pci/solo.c > +++ b/sys/dev/sound/pci/solo.c > @@ -39,7 +39,7 @@ > > #include "mixer_if.h" > > -SND_DECLARE_FILE("$FreeBSD$"); > +SND_DECLARE_FILE(""); > > #define SOLO_DEFAULT_BUFSZ 16384 > #define ABS(x) (((x) < 0)? -(x) : (x)) > diff --git a/sys/dev/sound/pci/t4dwave.c b/sys/dev/sound/pci/t4dwave.c > index fc99a90b94e7..b7363402ba8b 100644 > --- a/sys/dev/sound/pci/t4dwave.c > +++ b/sys/dev/sound/pci/t4dwave.c > @@ -37,7 +37,7 @@ > #include > #include > > -SND_DECLARE_FILE("$FreeBSD$"); > +SND_DECLARE_FILE(""); > > /* -------------------------------------------------------------------- = */ > > diff --git a/sys/dev/sound/pci/via8233.c b/sys/dev/sound/pci/via8233.c > index 9de5b18cd031..6656670c9e1c 100644 > --- a/sys/dev/sound/pci/via8233.c > +++ b/sys/dev/sound/pci/via8233.c > @@ -50,7 +50,7 @@ > > #include > > -SND_DECLARE_FILE("$FreeBSD$"); > +SND_DECLARE_FILE(""); > > #define VIA8233_PCI_ID 0x30591106 > > diff --git a/sys/dev/sound/pci/via82c686.c b/sys/dev/sound/pci/via82c686.= c > index 6bd604941cf8..076df8c81aa0 100644 > --- a/sys/dev/sound/pci/via82c686.c > +++ b/sys/dev/sound/pci/via82c686.c > @@ -39,7 +39,7 @@ > > #include > > -SND_DECLARE_FILE("$FreeBSD$"); > +SND_DECLARE_FILE(""); > > #define VIA_PCI_ID 0x30581106 > #define NSEGS 4 /* Number of segments in SGD tabl= e */ > diff --git a/sys/dev/sound/pci/vibes.c b/sys/dev/sound/pci/vibes.c > index 81401796d68c..1299f15dc814 100644 > --- a/sys/dev/sound/pci/vibes.c > +++ b/sys/dev/sound/pci/vibes.c > @@ -44,7 +44,7 @@ > > #include "mixer_if.h" > > -SND_DECLARE_FILE("$FreeBSD$"); > +SND_DECLARE_FILE(""); > > /* ---------------------------------------------------------------------= ---- */ > /* Constants */ > diff --git a/sys/dev/sound/pcm/ac97.c b/sys/dev/sound/pcm/ac97.c > index 763188291009..d83e3f2fefa5 100644 > --- a/sys/dev/sound/pcm/ac97.c > +++ b/sys/dev/sound/pcm/ac97.c > @@ -38,7 +38,7 @@ > > #include "mixer_if.h" > > -SND_DECLARE_FILE("$FreeBSD$"); > +SND_DECLARE_FILE(""); > > static MALLOC_DEFINE(M_AC97, "ac97", "ac97 codec"); > > diff --git a/sys/dev/sound/pcm/ac97_patch.c b/sys/dev/sound/pcm/ac97_patc= h.c > index f1a358b50958..aff8075fe96c 100644 > --- a/sys/dev/sound/pcm/ac97_patch.c > +++ b/sys/dev/sound/pcm/ac97_patch.c > @@ -34,7 +34,7 @@ > #include > #include > > -SND_DECLARE_FILE("$FreeBSD$"); > +SND_DECLARE_FILE(""); > > void ad1886_patch(struct ac97_info* codec) > { > diff --git a/sys/dev/sound/pcm/buffer.c b/sys/dev/sound/pcm/buffer.c > index d75890eaddfb..d5a519362c5e 100644 > --- a/sys/dev/sound/pcm/buffer.c > +++ b/sys/dev/sound/pcm/buffer.c > @@ -40,7 +40,7 @@ > #define SND_DECLARE_FXDIV > #include "snd_fxdiv_gen.h" > > -SND_DECLARE_FILE("$FreeBSD$"); > +SND_DECLARE_FILE(""); > > struct snd_dbuf * > sndbuf_create(device_t dev, char *drv, char *desc, struct pcm_channel *c= hannel) > diff --git a/sys/dev/sound/pcm/channel.c b/sys/dev/sound/pcm/channel.c > index 1d192de54712..d56f5fb51dc9 100644 > --- a/sys/dev/sound/pcm/channel.c > +++ b/sys/dev/sound/pcm/channel.c > @@ -38,7 +38,7 @@ > > #include "feeder_if.h" > > -SND_DECLARE_FILE("$FreeBSD$"); > +SND_DECLARE_FILE(""); > > int report_soft_formats =3D 1; > SYSCTL_INT(_hw_snd, OID_AUTO, report_soft_formats, CTLFLAG_RW, > diff --git a/sys/dev/sound/pcm/dsp.c b/sys/dev/sound/pcm/dsp.c > index bb435bc3925c..98d241e65a52 100644 > --- a/sys/dev/sound/pcm/dsp.c > +++ b/sys/dev/sound/pcm/dsp.c > @@ -43,7 +43,7 @@ > #include > #include > > -SND_DECLARE_FILE("$FreeBSD$"); > +SND_DECLARE_FILE(""); > > static int dsp_mmap_allow_prot_exec =3D 0; > SYSCTL_INT(_hw_snd, OID_AUTO, compat_linux_mmap, CTLFLAG_RWTUN, > diff --git a/sys/dev/sound/pcm/feeder.c b/sys/dev/sound/pcm/feeder.c > index d379d06b8664..8fb377533907 100644 > --- a/sys/dev/sound/pcm/feeder.c > +++ b/sys/dev/sound/pcm/feeder.c > @@ -35,7 +35,7 @@ > > #include "feeder_if.h" > > -SND_DECLARE_FILE("$FreeBSD$"); > +SND_DECLARE_FILE(""); > > static MALLOC_DEFINE(M_FEEDER, "feeder", "pcm feeder"); > > diff --git a/sys/dev/sound/pcm/feeder_chain.c b/sys/dev/sound/pcm/feeder_= chain.c > index 9c3baaf282b5..01def5f6e9cb 100644 > --- a/sys/dev/sound/pcm/feeder_chain.c > +++ b/sys/dev/sound/pcm/feeder_chain.c > @@ -34,7 +34,7 @@ > > #include "feeder_if.h" > > -SND_DECLARE_FILE("$FreeBSD$"); > +SND_DECLARE_FILE(""); > > /* chain state */ > struct feeder_chain_state { > diff --git a/sys/dev/sound/pcm/feeder_eq.c b/sys/dev/sound/pcm/feeder_eq.= c > index bc39d33c03fb..70797a706367 100644 > --- a/sys/dev/sound/pcm/feeder_eq.c > +++ b/sys/dev/sound/pcm/feeder_eq.c > @@ -46,7 +46,7 @@ > #define SND_USE_FXDIV > #include "snd_fxdiv_gen.h" > > -SND_DECLARE_FILE("$FreeBSD$"); > +SND_DECLARE_FILE(""); > #endif > > #include "feeder_eq_gen.h" > diff --git a/sys/dev/sound/pcm/feeder_format.c b/sys/dev/sound/pcm/feeder= _format.c > index 8a9054561b2b..3a741430e0ca 100644 > --- a/sys/dev/sound/pcm/feeder_format.c > +++ b/sys/dev/sound/pcm/feeder_format.c > @@ -44,7 +44,7 @@ > #define SND_USE_FXDIV > #include "snd_fxdiv_gen.h" > > -SND_DECLARE_FILE("$FreeBSD$"); > +SND_DECLARE_FILE(""); > #endif > > #define FEEDFORMAT_RESERVOIR (SND_CHN_MAX * PCM_32_BPS) > diff --git a/sys/dev/sound/pcm/feeder_matrix.c b/sys/dev/sound/pcm/feeder= _matrix.c > index 33bf3ec11ee0..0afdb47c04d8 100644 > --- a/sys/dev/sound/pcm/feeder_matrix.c > +++ b/sys/dev/sound/pcm/feeder_matrix.c > @@ -54,7 +54,7 @@ > #define SND_USE_FXDIV > #include "snd_fxdiv_gen.h" > > -SND_DECLARE_FILE("$FreeBSD$"); > +SND_DECLARE_FILE(""); > #endif > > #define FEEDMATRIX_RESERVOIR (SND_CHN_MAX * PCM_32_BPS) > diff --git a/sys/dev/sound/pcm/feeder_mixer.c b/sys/dev/sound/pcm/feeder_= mixer.c > index 13afceabf28e..42ebe89d7c09 100644 > --- a/sys/dev/sound/pcm/feeder_mixer.c > +++ b/sys/dev/sound/pcm/feeder_mixer.c > @@ -38,7 +38,7 @@ > #define SND_USE_FXDIV > #include "snd_fxdiv_gen.h" > > -SND_DECLARE_FILE("$FreeBSD$"); > +SND_DECLARE_FILE(""); > #endif > > #undef SND_FEEDER_MULTIFORMAT > diff --git a/sys/dev/sound/pcm/feeder_rate.c b/sys/dev/sound/pcm/feeder_r= ate.c > index 0784c477197a..b2afe0651bf5 100644 > --- a/sys/dev/sound/pcm/feeder_rate.c > +++ b/sys/dev/sound/pcm/feeder_rate.c > @@ -61,7 +61,7 @@ > #define SND_USE_FXDIV > #include "snd_fxdiv_gen.h" > > -SND_DECLARE_FILE("$FreeBSD$"); > +SND_DECLARE_FILE(""); > #endif > > #include "feeder_rate_gen.h" > diff --git a/sys/dev/sound/pcm/feeder_volume.c b/sys/dev/sound/pcm/feeder= _volume.c > index 724d5a0922e8..fa11a089af76 100644 > --- a/sys/dev/sound/pcm/feeder_volume.c > +++ b/sys/dev/sound/pcm/feeder_volume.c > @@ -39,7 +39,7 @@ > #define SND_USE_FXDIV > #include "snd_fxdiv_gen.h" > > -SND_DECLARE_FILE("$FreeBSD$"); > +SND_DECLARE_FILE(""); > #endif > > typedef void (*feed_volume_t)(int *, int *, uint32_t, uint8_t *, uint32_= t); > diff --git a/sys/dev/sound/pcm/mixer.c b/sys/dev/sound/pcm/mixer.c > index 080daeced12d..0c7576390b72 100644 > --- a/sys/dev/sound/pcm/mixer.c > +++ b/sys/dev/sound/pcm/mixer.c > @@ -37,7 +37,7 @@ > #include "feeder_if.h" > #include "mixer_if.h" > > -SND_DECLARE_FILE("$FreeBSD$"); > +SND_DECLARE_FILE(""); > > static MALLOC_DEFINE(M_MIXER, "mixer", "mixer"); > > diff --git a/sys/dev/sound/pcm/sndstat.c b/sys/dev/sound/pcm/sndstat.c > index 64e0a1ca5d82..fc92bd783587 100644 > --- a/sys/dev/sound/pcm/sndstat.c > +++ b/sys/dev/sound/pcm/sndstat.c > @@ -50,7 +50,7 @@ > #include > > > -SND_DECLARE_FILE("$FreeBSD$"); > +SND_DECLARE_FILE(""); > > #define SS_TYPE_MODULE 0 > #define SS_TYPE_PCM 1 > diff --git a/sys/dev/sound/pcm/sound.c b/sys/dev/sound/pcm/sound.c > index 1a7f8dc2fa68..17dc8d968b3c 100644 > --- a/sys/dev/sound/pcm/sound.c > +++ b/sys/dev/sound/pcm/sound.c > @@ -44,7 +44,7 @@ > > #include "feeder_if.h" > > -SND_DECLARE_FILE("$FreeBSD$"); > +SND_DECLARE_FILE(""); > > devclass_t pcm_devclass; > > diff --git a/sys/dev/sound/pcm/vchan.c b/sys/dev/sound/pcm/vchan.c > index 0b0ddc224094..c84d8f14e075 100644 > --- a/sys/dev/sound/pcm/vchan.c > +++ b/sys/dev/sound/pcm/vchan.c > @@ -36,7 +36,7 @@ > #include > #include > > -SND_DECLARE_FILE("$FreeBSD$"); > +SND_DECLARE_FILE(""); > > /* > * [ac3 , dts , linear , 0, linear, 0] > From nobody Wed Aug 16 18:15:28 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RQxC23PWbz4qwlM for ; Wed, 16 Aug 2023 18:15:42 +0000 (UTC) (envelope-from jrtc27@jrtc27.com) Received: from mail-wm1-f52.google.com (mail-wm1-f52.google.com [209.85.128.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 "GTS CA 1D4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RQxC160GZz4JB0 for ; Wed, 16 Aug 2023 18:15:41 +0000 (UTC) (envelope-from jrtc27@jrtc27.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-wm1-f52.google.com with SMTP id 5b1f17b1804b1-3fe2fb9b4d7so62218705e9.1 for ; Wed, 16 Aug 2023 11:15:41 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1692209740; x=1692814540; 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=QPqvxb4antVtbb4mnZFLOfjj1hQnL0BmMWaMF216vcw=; b=DZQi9t8VG6Bivr4bzRHEsgKKCZKLHKqO+YL7v2jqSrtpQWJat8DL/qrICCZLSYNNM7 61V+ekbZI4PVoV/87bs9tHpaHuxi9kYaJOX7QhSOQwhS5kr+h0gn6asEfjF0jErVpK9H S5jA66zHkZDVEMAzEvCmfYiGYXaaZ36axew8TlA6aU2k8jRJq7/nr8VbCzkU/Rwfe+a2 hd0tVrd7Sm9vP44/+5jkz5SC50MybLYnsXOnX9GyhxynJdT8dhOs4z9JkKeRf/Xph9wU 8p+ZPJeYoOqeK4disvSANJ83b/PcBF9pH/+Es4yRNGVaClGxS69hY/dF3kN2ywkI+yBH s5dA== X-Gm-Message-State: AOJu0Yz9d/nyhpd0HUoNy+wC+CKemNl8eZqhaO7YoEZ5EIK+l/ELIm0r jHz5p55aJtPpwS8SZNLWj/EK8A== X-Google-Smtp-Source: AGHT+IEcH7fY8dIyq8se9oPlgR2lWTAaFcvsyQVzHJv5G+YU4B1QamyiZuAMGdqDQwHxx0yy1UGI7Q== X-Received: by 2002:a5d:6508:0:b0:317:dd94:ed38 with SMTP id x8-20020a5d6508000000b00317dd94ed38mr2117960wru.42.1692209739933; Wed, 16 Aug 2023 11:15:39 -0700 (PDT) Received: from smtpclient.apple ([131.111.5.246]) by smtp.gmail.com with ESMTPSA id s2-20020adfecc2000000b0031433443265sm21987984wro.53.2023.08.16.11.15.39 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 16 Aug 2023 11:15:39 -0700 (PDT) Content-Type: text/plain; charset=utf-8 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org Mime-Version: 1.0 (Mac OS X Mail 16.0 \(3731.600.7\)) Subject: Re: git: da5432eda807 - main - Remove $FreeBSD$: alt two-line .c pattern From: Jessica Clarke In-Reply-To: <202308161757.37GHv2ca059368@gitrepo.freebsd.org> Date: Wed, 16 Aug 2023 19:15:28 +0100 Cc: "src-committers@freebsd.org" , "dev-commits-src-all@freebsd.org" , "dev-commits-src-main@freebsd.org" Content-Transfer-Encoding: quoted-printable Message-Id: <83CE52EE-11ED-4650-A515-F4CE19345BB9@freebsd.org> References: <202308161757.37GHv2ca059368@gitrepo.freebsd.org> To: Warner Losh X-Mailer: Apple Mail (2.3731.600.7) X-Rspamd-Queue-Id: 4RQxC160GZz4JB0 X-Spamd-Bar: ---- 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] On 16 Aug 2023, at 18:57, Warner Losh wrote: >=20 > The branch main has been updated by imp: >=20 > URL: = https://cgit.FreeBSD.org/src/commit/?id=3Dda5432eda807c4b7232d030d5157d5b4= 17ea4f52 >=20 > commit da5432eda807c4b7232d030d5157d5b417ea4f52 > Author: Warner Losh > AuthorDate: 2023-08-16 17:54:48 +0000 > Commit: Warner Losh > CommitDate: 2023-08-16 17:54:48 +0000 >=20 > Remove $FreeBSD$: alt two-line .c pattern >=20 > Remove /^\s*__RCSID\("\$FreeBSD\$"\);\n\n/ > --- > sbin/routed/if.c | 3 --- > sbin/routed/input.c | 3 --- > sbin/routed/main.c | 2 -- > sbin/routed/output.c | 3 --- > sbin/routed/parms.c | 3 --- > sbin/routed/radix.c | 3 --- > sbin/routed/rdisc.c | 3 --- > sbin/routed/table.c | 3 --- > sbin/routed/trace.c | 3 --- > usr.bin/getconf/tests/arch_type.c | 2 -- > usr.bin/procstat/tests/while1.c | 2 -- > usr.sbin/mpsutil/mps_cmd.c | 2 -- > usr.sbin/mpsutil/mps_debug.c | 2 -- > usr.sbin/mpsutil/mps_flash.c | 2 -- > usr.sbin/mpsutil/mps_set.c | 2 -- > usr.sbin/mpsutil/mps_show.c | 2 -- > usr.sbin/mpsutil/mps_slot.c | 2 -- > usr.sbin/mpsutil/mpsutil.c | 2 -- > usr.sbin/mptutil/mpt_cam.c | 2 -- > usr.sbin/mptutil/mpt_cmd.c | 2 -- > usr.sbin/mptutil/mpt_config.c | 2 -- > usr.sbin/mptutil/mpt_drive.c | 2 -- > usr.sbin/mptutil/mpt_evt.c | 2 -- > usr.sbin/mptutil/mpt_show.c | 2 -- > usr.sbin/mptutil/mpt_volume.c | 2 -- > usr.sbin/mptutil/mptutil.c | 2 -- > 26 files changed, 60 deletions(-) >=20 > diff --git a/sbin/routed/if.c b/sbin/routed/if.c > index 83d8fe503893..72894942fe05 100644 > --- a/sbin/routed/if.c > +++ b/sbin/routed/if.c > @@ -33,9 +33,6 @@ >=20 > #include "defs.h" > #include "pathnames.h" > - > -__RCSID("$FreeBSD$"); > - > struct ifhead ifnet =3D LIST_HEAD_INITIALIZER(ifnet); /* all = interfaces */ > struct ifhead remote_if =3D LIST_HEAD_INITIALIZER(remote_if); /* = remote interfaces */ Alas these diffs aren=E2=80=99t style(9)-compliant. Jess From nobody Wed Aug 16 18:16:02 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RQxCg4RK0z4qwgR for ; Wed, 16 Aug 2023 18:16:15 +0000 (UTC) (envelope-from jrtc27@jrtc27.com) Received: from mail-wr1-f45.google.com (mail-wr1-f45.google.com [209.85.221.45]) (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 "GTS CA 1D4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RQxCf6yF8z4JZL for ; Wed, 16 Aug 2023 18:16:14 +0000 (UTC) (envelope-from jrtc27@jrtc27.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-wr1-f45.google.com with SMTP id ffacd0b85a97d-3178dd81ac4so5755950f8f.3 for ; Wed, 16 Aug 2023 11:16:14 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1692209773; x=1692814573; 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=2PWAl6qzH9NoF24l5AA05ZAeAyf6f6BGrC1IiIi/B0s=; b=lc0zlVWEjqHoHRPTCqvI/eWnghMfl1OEQKnkV8YjMY6lgAtIqkN+pnqprYzkOsNUFT 7lUMZlzhUnQ5KRVj+LiRIlGCpOpWt75WeMpb9/m4FpBqtTUQRI4POUyHjeJgUsVlXddu XwYMbS4NyTdrCD5Yr/D1hM2bYk/1NFGFmzX/cOdY/ryTOWZ7rGljyXEdqNczn+J/7MkL U4BDRRtpiymNk3+G24n+PXVh2ejP0/wq1c0NdHj+LgGYjG3iB9BWxXYjr990xVs/5Eag I0eH6yQ/slU9TEgtL/CezDZw2iz180AryMERahSrbil4kQcwuNvFhiFB/r7h6pXXepCV +Rkw== X-Gm-Message-State: AOJu0YwBrSLnxAuGwPXFQBuxKZmPqnd+ujMQc0M7jjRaw+GruDUhV9OR y2h9+QyFhPaNfWSAR3Yz2VjaDQ== X-Google-Smtp-Source: AGHT+IFElGL0Zst59keIaNoGtm6x/qM1ytkEHF7dm3z39w8nsOxizMaFvBgLpxUuLelizCKapOMX8A== X-Received: by 2002:adf:ce8b:0:b0:313:f61c:42ab with SMTP id r11-20020adfce8b000000b00313f61c42abmr2301979wrn.56.1692209773253; Wed, 16 Aug 2023 11:16:13 -0700 (PDT) Received: from smtpclient.apple ([131.111.5.246]) by smtp.gmail.com with ESMTPSA id s2-20020adfecc2000000b0031433443265sm21987984wro.53.2023.08.16.11.16.12 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 16 Aug 2023 11:16:12 -0700 (PDT) Content-Type: text/plain; charset=us-ascii List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org Mime-Version: 1.0 (Mac OS X Mail 16.0 \(3731.600.7\)) Subject: Re: git: d4bf8003ee42 - main - sys: Remove $FreeBSD$: one-line .S pattern From: Jessica Clarke In-Reply-To: <202308161757.37GHv4hJ059464@gitrepo.freebsd.org> Date: Wed, 16 Aug 2023 19:16:02 +0100 Cc: "src-committers@freebsd.org" , "dev-commits-src-all@freebsd.org" , "dev-commits-src-main@freebsd.org" Content-Transfer-Encoding: quoted-printable Message-Id: <1F3128CA-40A1-4D38-AE42-5CE466CC46B2@freebsd.org> References: <202308161757.37GHv4hJ059464@gitrepo.freebsd.org> To: Warner Losh X-Mailer: Apple Mail (2.3731.600.7) X-Rspamd-Queue-Id: 4RQxCf6yF8z4JZL X-Spamd-Bar: ---- 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] On 16 Aug 2023, at 18:57, Warner Losh wrote: >=20 > The branch main has been updated by imp: >=20 > URL: = https://cgit.FreeBSD.org/src/commit/?id=3Dd4bf8003ee42e88f6108195ae100c835= 83ee6c44 >=20 > commit d4bf8003ee42e88f6108195ae100c83583ee6c44 > Author: Warner Losh > AuthorDate: 2023-08-16 17:54:54 +0000 > Commit: Warner Losh > CommitDate: 2023-08-16 17:54:54 +0000 >=20 > sys: Remove $FreeBSD$: one-line .S pattern >=20 > Remove /^\s\.(asciz|ident)\s+\"\$FreeBSD\$\".*\n/ > --- > sys/crypto/aesni/aeskeys_amd64.S | 1 - > sys/crypto/aesni/aeskeys_i386.S | 1 - > 2 files changed, 2 deletions(-) >=20 > diff --git a/sys/crypto/aesni/aeskeys_amd64.S = b/sys/crypto/aesni/aeskeys_amd64.S > index 9b3e98c8437e..83f704c9ae53 100644 > --- a/sys/crypto/aesni/aeskeys_amd64.S > +++ b/sys/crypto/aesni/aeskeys_amd64.S > @@ -220,4 +220,3 @@ ENTRY(aesni_set_deckey) > .cfi_endproc > END(aesni_set_deckey) >=20 > - .ident "$FreeBSD$" Some trailing blank lines left to fix here. Jess > diff --git a/sys/crypto/aesni/aeskeys_i386.S = b/sys/crypto/aesni/aeskeys_i386.S > index f9be26d2197c..346014412640 100644 > --- a/sys/crypto/aesni/aeskeys_i386.S > +++ b/sys/crypto/aesni/aeskeys_i386.S > @@ -270,4 +270,3 @@ ENTRY(aesni_set_deckey) > .cfi_endproc > END(aesni_set_deckey) >=20 > - .ident "$FreeBSD$" From nobody Wed Aug 16 18:16:53 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RQxDf0qTsz4qwFf for ; Wed, 16 Aug 2023 18:17:06 +0000 (UTC) (envelope-from jrtc27@jrtc27.com) Received: from mail-wm1-f45.google.com (mail-wm1-f45.google.com [209.85.128.45]) (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 "GTS CA 1D4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RQxDd58dKz4KFH for ; Wed, 16 Aug 2023 18:17:05 +0000 (UTC) (envelope-from jrtc27@jrtc27.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-wm1-f45.google.com with SMTP id 5b1f17b1804b1-3fe2fb9b4d7so62231785e9.1 for ; Wed, 16 Aug 2023 11:17:05 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1692209824; x=1692814624; 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=BBObicq+qkFcHBdLePd0QRetNfJs/FxXxdJg5rI2aFw=; b=BYwd4pNg7z73qqL6PeFzLl78WaJurUETxQjvRUv4cFhMSG7ow/PDg0buV3InhcC1zy RTWUaen8cQJQ0DfwHMeCexhPTNegpG4pqVHG76ZzXHiwBBu1tZz4sF7ADeGZmzGZ093Q 7WXxny9iaWBD/UXEYWzSRrcwt/N865jRkiU+WQlaTYVDhtB0aCUSK+jZzDmwK3svSlTl DEG+M2HzdVWfgFvXd69k0OCKaVL00DuDqtRFY1p1nAwed3wZLUG9q/+F5xABv5j2dxyC e5LmPewY6HDEbF8IavDwoMVy5+2o612J6boLmjV8dxKIXBd4mUUmbsAb01f1UYztdi57 RYwQ== X-Gm-Message-State: AOJu0YyF6TmQwaG8MsSdho9vn4dhQgiq1jQxVvrLclMReTD3rQ1kyiH6 R9c0GJHEo1huPudfXk/q1hHqxLNViD+JO/xqeKc= X-Google-Smtp-Source: AGHT+IGyb/61gKsjIiOVoNYb3VSrdzPUhK2rItcdFsq7JBuQQVslLFm5dy+x7EQ7joTyQXSlsgLljA== X-Received: by 2002:a5d:4710:0:b0:319:68ce:2c53 with SMTP id y16-20020a5d4710000000b0031968ce2c53mr2176775wrq.25.1692209824116; Wed, 16 Aug 2023 11:17:04 -0700 (PDT) Received: from smtpclient.apple ([131.111.5.246]) by smtp.gmail.com with ESMTPSA id s2-20020adfecc2000000b0031433443265sm21987984wro.53.2023.08.16.11.17.03 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 16 Aug 2023 11:17:03 -0700 (PDT) Content-Type: text/plain; charset=us-ascii List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org Mime-Version: 1.0 (Mac OS X Mail 16.0 \(3731.600.7\)) Subject: Re: git: b1cfcffa89e6 - main - Remove $FreeBSD$: one-line .S pattern From: Jessica Clarke In-Reply-To: <202308161757.37GHv5q8059506@gitrepo.freebsd.org> Date: Wed, 16 Aug 2023 19:16:53 +0100 Cc: "src-committers@freebsd.org" , "dev-commits-src-all@freebsd.org" , "dev-commits-src-main@freebsd.org" Content-Transfer-Encoding: quoted-printable Message-Id: <4D4F49F1-7A92-483F-988C-FF731A91A2A0@freebsd.org> References: <202308161757.37GHv5q8059506@gitrepo.freebsd.org> To: Warner Losh X-Mailer: Apple Mail (2.3731.600.7) X-Rspamd-Queue-Id: 4RQxDd58dKz4KFH X-Spamd-Bar: ---- 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] On 16 Aug 2023, at 18:57, Warner Losh wrote: >=20 > The branch main has been updated by imp: >=20 > URL: = https://cgit.FreeBSD.org/src/commit/?id=3Db1cfcffa89e66caedb84d6e92a92e382= 8bc08f04 >=20 > commit b1cfcffa89e66caedb84d6e92a92e3828bc08f04 > Author: Warner Losh > AuthorDate: 2023-08-16 17:54:57 +0000 > Commit: Warner Losh > CommitDate: 2023-08-16 17:54:57 +0000 >=20 > Remove $FreeBSD$: one-line .S pattern >=20 > Remove /^\s\.(asciz|ident)\s+\"\$FreeBSD\$\".*\n/ > --- > lib/libc/arm/gen/_ctx_start.S | 2 -- > stand/libsa/i386/_setjmp.S | 1 - > 2 files changed, 3 deletions(-) >=20 > diff --git a/lib/libc/arm/gen/_ctx_start.S = b/lib/libc/arm/gen/_ctx_start.S > index faedfb5c6443..39c282bf30c7 100644 > --- a/lib/libc/arm/gen/_ctx_start.S > +++ b/lib/libc/arm/gen/_ctx_start.S > @@ -1,6 +1,4 @@ > #include > - > -.ident "$FreeBSD$" style(9) as before. Jess > ENTRY(_ctx_start) > mov lr, pc > mov pc, r4 > diff --git a/stand/libsa/i386/_setjmp.S b/stand/libsa/i386/_setjmp.S > index 5766b25816ae..a1bd8d55834b 100644 > --- a/stand/libsa/i386/_setjmp.S > +++ b/stand/libsa/i386/_setjmp.S > @@ -32,7 +32,6 @@ >=20 > #if defined(LIBC_RCS) && !defined(lint) > .text > - .asciz "$FreeBSD$" > #endif /* LIBC_RCS and not lint */ >=20 > /* From nobody Wed Aug 16 18:18:16 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RQxGF0h6dz4qwrS for ; Wed, 16 Aug 2023 18:18:29 +0000 (UTC) (envelope-from jrtc27@jrtc27.com) Received: from mail-wr1-f48.google.com (mail-wr1-f48.google.com [209.85.221.48]) (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 "GTS CA 1D4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RQxGD5WrWz4KH1 for ; Wed, 16 Aug 2023 18:18:28 +0000 (UTC) (envelope-from jrtc27@jrtc27.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-wr1-f48.google.com with SMTP id ffacd0b85a97d-3197a71a9c0so78024f8f.1 for ; Wed, 16 Aug 2023 11:18:28 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1692209907; x=1692814707; 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=5n7OIS3QO6kp5WwDAe2d0iR/BlECx5mTojF85FSuK0w=; b=kJk+6Lwvs8Dv4xshtN1jnMtXtDWSuKrgyetfuRRAxCrKT+VLQVy9dYMNQbbwSW0X9E ZFNgFPbPkZb40TDP8mZrKpzbdQCCa76igABCthij2pJgU50K0dl6mhJSZ5caWh8AWqrn 81gQ6eP2/vWnMBXxMboaUfyKxWWh5CL99y4OimQNgHiDF9jSi9ESa+MniqDJAqKS5Xma zaJnIxEJrPfY7YD89iGIINDzdBWpPJJKJhazUJ9J4Iq0OsZiQng3+yq24Ujo0WMSCsW3 OuSVdQ5qP+RfsihsRqSNl9AjLJqXoXeuxO6rt2txNwXSEoyTl7uIudJNnSbMmsytxBbt vibQ== X-Gm-Message-State: AOJu0YzThnioOyKbteOHiREcA/9G2jaFt1S/82FJ0ygopx7OWPtkG6NN BKuEBIVMq6ZU0ywrGiZWA+Ycog== X-Google-Smtp-Source: AGHT+IFAZD7sAh15n5e8J5/0SOCffEmgj41x3aHrBuRM+HB1zO03SShvzefRlUflmgIfWcbeNXb33A== X-Received: by 2002:a5d:526b:0:b0:316:fc03:3c66 with SMTP id l11-20020a5d526b000000b00316fc033c66mr329417wrc.3.1692209907165; Wed, 16 Aug 2023 11:18:27 -0700 (PDT) Received: from smtpclient.apple ([131.111.5.246]) by smtp.gmail.com with ESMTPSA id d3-20020a5d5383000000b003196e992567sm14819762wrv.115.2023.08.16.11.18.26 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Wed, 16 Aug 2023 11:18:26 -0700 (PDT) Content-Type: text/plain; charset=us-ascii List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org Mime-Version: 1.0 (Mac OS X Mail 16.0 \(3731.600.7\)) Subject: Re: git: 05248206f720 - main - Remove $FreeBSD$: one-line bare tag From: Jessica Clarke In-Reply-To: <202308161757.37GHvG2N059835@gitrepo.freebsd.org> Date: Wed, 16 Aug 2023 19:18:16 +0100 Cc: "src-committers@freebsd.org" , "dev-commits-src-all@freebsd.org" , "dev-commits-src-main@freebsd.org" Content-Transfer-Encoding: quoted-printable Message-Id: <66050224-BD00-4652-8612-6FA4F14B37B9@freebsd.org> References: <202308161757.37GHvG2N059835@gitrepo.freebsd.org> To: Warner Losh X-Mailer: Apple Mail (2.3731.600.7) X-Rspamd-Queue-Id: 4RQxGD5WrWz4KH1 X-Spamd-Bar: ---- 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] On 16 Aug 2023, at 18:57, Warner Losh wrote: >=20 > The branch main has been updated by imp: >=20 > URL: = https://cgit.FreeBSD.org/src/commit/?id=3D05248206f720394d95c2a7475429311d= f670a2e9 >=20 > commit 05248206f720394d95c2a7475429311df670a2e9 > Author: Warner Losh > AuthorDate: 2023-08-16 17:55:20 +0000 > Commit: Warner Losh > CommitDate: 2023-08-16 17:55:20 +0000 >=20 > Remove $FreeBSD$: one-line bare tag >=20 > Remove /^\s*\$FreeBSD\$$\n/ > --- > LOCKS | 1 - > MAINTAINERS | 1 - > UPDATING | 2 = -- > bin/dd/ref.ascii | 1 - > bin/dd/ref.ebcdic | 1 - > bin/dd/ref.ibm | 1 - > bin/dd/ref.lcase | 1 - > bin/dd/ref.obs_zeroes | 1 - > bin/dd/ref.oldascii | 1 - > bin/dd/ref.oldebcdic | 1 - > bin/dd/ref.oldibm | 1 - > bin/dd/ref.pareven | 1 - > bin/dd/ref.parnone | 1 - > bin/dd/ref.parodd | 1 - > bin/dd/ref.parset | 1 - > bin/dd/ref.swab | 1 - > bin/dd/ref.ucase | 1 - > bin/ed/POSIX | 1 - > bin/ed/README | 1 - > etc/mtree/README | 1 - > lib/lib80211/regdomain.xml | 2 = -- > lib/libc/locale/DESIGN.xlocale | 1 - > lib/libc/rpc/README | 1 - > lib/libc/softfloat/README.NetBSD | 1 - > lib/libc/softfloat/README.txt | 1 - > lib/libc/softfloat/softfloat-history.txt | 1 - > lib/libc/softfloat/softfloat-source.txt | 1 - > lib/libc/softfloat/softfloat.txt | 1 - > lib/libc/softfloat/timesoftfloat.txt | 1 - > lib/libnetbsd/README | 1 - > lib/libopenbsd/README | 1 - > lib/libpam/pam.d/README | 2 = -- > lib/libsecureboot/README.rst | 1 - > libexec/bootpd/hash.c | 2 = -- > libexec/bootpd/readfile.c | 2 = -- > libexec/bootpd/tools/bootpef/bootpef.c | 2 = -- > release/powerpc/boot.tbxi | 1 - > release/powerpc/hfs-boot.bz2.uu | 1 - > rescue/README | 2 = -- > sbin/gbde/image.uu | 1 - > share/dict/freebsd | 1 - > share/doc/IPv6/IMPLEMENTATION | 1 - > share/dtrace/README | 1 - > share/examples/IPv6/USAGE | 1 - > share/examples/bootforth/README | 2 = -- > share/examples/drivers/README | 1 - > share/examples/etc/README.examples | 1 - > share/examples/ipfilter/examples.txt | 1 - > share/examples/ipfilter/ipf-howto.txt | 1 - > share/examples/kld/dyn_sysctl/README | 2 = -- > share/examples/kld/firmware/README | 1 - > share/examples/kld/firmware/fwimage/firmware.img.uu | 1 - > share/examples/kld/khelp/README | 1 - > share/examples/perfmon/README | 2 = -- > share/examples/tests/README | 1 - > share/examples/ypldap/ypldap.conf | 1 - > share/misc/bsd-family-tree | 2 = -- > share/misc/operator | 2 = -- > stand/efi/loader/version | 1 - > stand/fdt/help.fdt | 1 - > stand/i386/loader/version | 1 - > stand/powerpc/boot1.chrp/hfs.tmpl.bz2.uu | 1 - > stand/powerpc/ofw/version | 1 - > stand/uboot/help.uboot | 1 - > stand/uboot/version | 1 - > stand/userboot/userboot/version | 1 - > tests/README | 1 - > tests/sys/mac/portacl/LICENSE | 1 - > tests/sys/opencrypto/blake2-kat.h | 2 = -- > tools/README | 1 - > tools/bsdbox/README | 1 - > tools/debugscripts/README | 1 - > tools/diag/README | 1 - > tools/kerneldoc/subsys/README | 1 - > tools/regression/README | 1 - > tools/regression/TODO | 1 - > tools/regression/ccd/layout/ref.128k_128k_128k_128k_0_0 | 1 - > tools/regression/ccd/layout/ref.128k_128k_128k_128k_0_4 | 1 - > tools/regression/ccd/layout/ref.128k_128k_128k_128k_4_0 | 1 - > tools/regression/ccd/layout/ref.128k_128k_128k_128k_4_2 | 1 - > tools/regression/ccd/layout/ref.128k_128k_128k_128k_4_4 | 1 - > tools/regression/ccd/layout/ref.256k_128k_128k_128k_0_0 | 1 - > tools/regression/ccd/layout/ref.256k_128k_128k_128k_0_4 | 1 - > tools/regression/ccd/layout/ref.256k_128k_128k_128k_4_0 | 1 - > tools/regression/ccd/layout/ref.256k_128k_128k_128k_4_2 | 1 - > tools/regression/ccd/layout/ref.256k_128k_128k_128k_4_4 | 1 - > tools/regression/ccd/layout/ref.256k_128k_384k_128k_0_0 | 1 - > tools/regression/ccd/layout/ref.256k_128k_384k_128k_0_4 | 1 - > tools/regression/ccd/layout/ref.256k_128k_384k_128k_16_0 | 1 - > tools/regression/ccd/layout/ref.256k_128k_384k_128k_16_2 | 1 - > tools/regression/ccd/layout/ref.256k_128k_384k_128k_16_4 | 1 - > tools/regression/ccd/layout/ref.256k_128k_384k_128k_4_0 | 1 - > tools/regression/ccd/layout/ref.256k_128k_384k_128k_4_2 | 1 - > tools/regression/ccd/layout/ref.256k_128k_384k_128k_4_4 | 1 - > tools/regression/doat/README | 1 - > tools/regression/geom/Data/disk.beast.da0.xml | 1 - > tools/regression/geom/Data/disk.critter.ad0.xml | 1 - > tools/regression/geom/Data/disk.empty.flp.xml | 1 - > tools/regression/geom/Data/disk.far.ad0.xml | 1 - > tools/regression/geom/Data/disk.flat.da1.xml | 1 - > tools/regression/geom/Data/disk.kern.flp.xml | 1 - > tools/regression/geom/Data/disk.msdos.ext.xml | 1 - > tools/regression/geom/Data/disk.msdos.flp.xml | 1 - > tools/regression/geom/Data/disk.typo.ad0.xml | 1 - > tools/regression/geom/Ref/disk.apple.xml | 1 - > tools/regression/geom/Ref/disk.beast.da0.xml | 1 - > tools/regression/geom/Ref/disk.critter.ad0.xml | 1 - > tools/regression/geom/Ref/disk.empty.flp.xml | 1 - > tools/regression/geom/Ref/disk.far.ad0.xml | 1 - > tools/regression/geom/Ref/disk.flat.da1.xml | 1 - > tools/regression/geom/Ref/disk.kern.flp.xml | 1 - > tools/regression/geom/Ref/disk.msdos.ext.xml | 1 - > tools/regression/geom/Ref/disk.msdos.flp.xml | 1 - > tools/regression/geom/Ref/disk.typo.ad0.xml | 1 - > tools/regression/netinet/tcpfullwindowrst/tcpfullwindowrsttest.c | 2 = -- > tools/regression/netinet/tcpstream/README | 2 = -- > tools/regression/nfsmmap/README | 1 - > tools/regression/p1003_1b/README | 1 - > tools/regression/poll/Readme | 1 - > tools/regression/redzone9/README | 1 - > tools/regression/security/proc_to_proc/README | 1 - > tools/regression/sockets/unix_cmsg/README | 1 - > tools/regression/sysvmsg/README | 1 - > tools/regression/sysvsem/README | 1 - > tools/regression/sysvshm/README | 1 - > tools/regression/zfs/LICENSE | 1 - > tools/test/README | 1 - > tools/test/iconv/ref/ARMSCII-8 | 1 - > tools/test/iconv/ref/ARMSCII-8-rev | 1 - > tools/test/iconv/ref/ASCII | 1 - > tools/test/iconv/ref/ASCII-rev | 1 - > tools/test/iconv/ref/ATARIST | 1 - > tools/test/iconv/ref/ATARIST-rev | 1 - > tools/test/iconv/ref/BIG5 | 1 - > tools/test/iconv/ref/BIG5-2003 | 1 - > tools/test/iconv/ref/BIG5-2003-rev | 1 - > tools/test/iconv/ref/BIG5-HKSCS | 1 - > tools/test/iconv/ref/BIG5-HKSCS-rev | 1 - > tools/test/iconv/ref/BIG5-rev | 1 - > tools/test/iconv/ref/BIG5HKSCS | 1 - > tools/test/iconv/ref/BIG5HKSCS-rev | 1 - > tools/test/iconv/ref/C99 | 1 - > tools/test/iconv/ref/C99-rev | 1 - > tools/test/iconv/ref/CP1046 | 1 - > tools/test/iconv/ref/CP1046-rev | 1 - > tools/test/iconv/ref/CP1124 | 1 - > tools/test/iconv/ref/CP1124-rev | 1 - > tools/test/iconv/ref/CP1125 | 1 - > tools/test/iconv/ref/CP1125-rev | 1 - > tools/test/iconv/ref/CP1129 | 1 - > tools/test/iconv/ref/CP1129-rev | 1 - > tools/test/iconv/ref/CP1131 | 1 - > tools/test/iconv/ref/CP1131-rev | 1 - > tools/test/iconv/ref/CP1133 | 1 - > tools/test/iconv/ref/CP1133-rev | 1 - > tools/test/iconv/ref/CP1161 | 1 - > tools/test/iconv/ref/CP1161-rev | 1 - > tools/test/iconv/ref/CP1162 | 1 - > tools/test/iconv/ref/CP1162-rev | 1 - > tools/test/iconv/ref/CP1163 | 1 - > tools/test/iconv/ref/CP1163-rev | 1 - > tools/test/iconv/ref/CP1250 | 1 - > tools/test/iconv/ref/CP1250-rev | 1 - > tools/test/iconv/ref/CP1251 | 1 - > tools/test/iconv/ref/CP1251-rev | 1 - > tools/test/iconv/ref/CP1252 | 1 - > tools/test/iconv/ref/CP1252-rev | 1 - > tools/test/iconv/ref/CP1253 | 1 - > tools/test/iconv/ref/CP1253-rev | 1 - > tools/test/iconv/ref/CP1254 | 1 - > tools/test/iconv/ref/CP1254-rev | 1 - > tools/test/iconv/ref/CP1255 | 1 - > tools/test/iconv/ref/CP1255-rev | 1 - > tools/test/iconv/ref/CP1256 | 1 - > tools/test/iconv/ref/CP1256-rev | 1 - > tools/test/iconv/ref/CP1257 | 1 - > tools/test/iconv/ref/CP1257-rev | 1 - > tools/test/iconv/ref/CP1258 | 1 - > tools/test/iconv/ref/CP1258-rev | 1 - > tools/test/iconv/ref/CP437 | 1 - > tools/test/iconv/ref/CP437-rev | 1 - > tools/test/iconv/ref/CP737 | 1 - > tools/test/iconv/ref/CP737-rev | 1 - > tools/test/iconv/ref/CP775 | 1 - > tools/test/iconv/ref/CP775-rev | 1 - > tools/test/iconv/ref/CP850 | 1 - > tools/test/iconv/ref/CP850-rev | 1 - > tools/test/iconv/ref/CP852 | 1 - > tools/test/iconv/ref/CP852-rev | 1 - > tools/test/iconv/ref/CP853 | 1 - > tools/test/iconv/ref/CP853-rev | 1 - > tools/test/iconv/ref/CP855 | 1 - > tools/test/iconv/ref/CP855-rev | 1 - > tools/test/iconv/ref/CP856 | 1 - > tools/test/iconv/ref/CP856-rev | 1 - > tools/test/iconv/ref/CP857 | 1 - > tools/test/iconv/ref/CP857-rev | 1 - > tools/test/iconv/ref/CP858 | 1 - > tools/test/iconv/ref/CP858-rev | 1 - > tools/test/iconv/ref/CP860 | 1 - > tools/test/iconv/ref/CP860-rev | 1 - > tools/test/iconv/ref/CP861 | 1 - > tools/test/iconv/ref/CP861-rev | 1 - > tools/test/iconv/ref/CP862 | 1 - > tools/test/iconv/ref/CP862-rev | 1 - > tools/test/iconv/ref/CP863 | 1 - > tools/test/iconv/ref/CP863-rev | 1 - > tools/test/iconv/ref/CP864 | 1 - > tools/test/iconv/ref/CP864-rev | 1 - > tools/test/iconv/ref/CP865 | 1 - > tools/test/iconv/ref/CP865-rev | 1 - > tools/test/iconv/ref/CP866 | 1 - > tools/test/iconv/ref/CP866-rev | 1 - > tools/test/iconv/ref/CP869 | 1 - > tools/test/iconv/ref/CP869-rev | 1 - > tools/test/iconv/ref/CP874 | 1 - > tools/test/iconv/ref/CP874-rev | 1 - > tools/test/iconv/ref/CP922 | 1 - > tools/test/iconv/ref/CP922-rev | 1 - > tools/test/iconv/ref/CP932 | 1 - > tools/test/iconv/ref/CP932-rev | 1 - > tools/test/iconv/ref/CP936 | 1 - > tools/test/iconv/ref/CP936-rev | 1 - > tools/test/iconv/ref/CP943 | 1 - > tools/test/iconv/ref/CP943-rev | 1 - > tools/test/iconv/ref/CP949 | 1 - > tools/test/iconv/ref/CP949-rev | 1 - > tools/test/iconv/ref/CP950 | 1 - > tools/test/iconv/ref/CP950-rev | 1 - > tools/test/iconv/ref/DEC-HANYU | 1 - > tools/test/iconv/ref/DEC-HANYU-rev | 1 - > tools/test/iconv/ref/EUC-CN | 1 - > tools/test/iconv/ref/EUC-CN-rev | 1 - > tools/test/iconv/ref/EUC-JIS-2004 | 1 - > tools/test/iconv/ref/EUC-JIS-2004-rev | 1 - > tools/test/iconv/ref/EUC-JP | 1 - > tools/test/iconv/ref/EUC-JP-rev | 1 - > tools/test/iconv/ref/EUC-KR | 1 - > tools/test/iconv/ref/EUC-KR-rev | 1 - > tools/test/iconv/ref/EUC-TW | 1 - > tools/test/iconv/ref/EUC-TW-rev | 1 - > tools/test/iconv/ref/GB18030 | 1 - > tools/test/iconv/ref/GB18030-rev | 1 - > tools/test/iconv/ref/GB2312 | 1 - > tools/test/iconv/ref/GB2312-rev | 1 - > tools/test/iconv/ref/GBK | 1 - > tools/test/iconv/ref/GBK-rev | 1 - > tools/test/iconv/ref/GEORGIAN-ACADEMY | 1 - > tools/test/iconv/ref/GEORGIAN-ACADEMY-rev | 1 - > tools/test/iconv/ref/GEORGIAN-PS | 1 - > tools/test/iconv/ref/GEORGIAN-PS-rev | 1 - > tools/test/iconv/ref/HP-ROMAN8 | 1 - > tools/test/iconv/ref/HP-ROMAN8-rev | 1 - > tools/test/iconv/ref/HZ | 1 - > tools/test/iconv/ref/HZ-rev | 1 - > tools/test/iconv/ref/ISO-2022-CN | 1 - > tools/test/iconv/ref/ISO-2022-CN-EXT | 1 - > tools/test/iconv/ref/ISO-2022-CN-EXT-rev | 1 - > tools/test/iconv/ref/ISO-2022-CN-rev | 1 - > tools/test/iconv/ref/ISO-2022-JP | 1 - > tools/test/iconv/ref/ISO-2022-JP-1 | 1 - > tools/test/iconv/ref/ISO-2022-JP-1-rev | 1 - > tools/test/iconv/ref/ISO-2022-JP-2 | 1 - > tools/test/iconv/ref/ISO-2022-JP-2-rev | 1 - > tools/test/iconv/ref/ISO-2022-JP-2004 | 1 - > tools/test/iconv/ref/ISO-2022-JP-2004-rev | 1 - > tools/test/iconv/ref/ISO-2022-JP-rev | 1 - > tools/test/iconv/ref/ISO-2022-KR | 1 - > tools/test/iconv/ref/ISO-2022-KR-rev | 1 - > tools/test/iconv/ref/ISO-IR-14 | 1 - > tools/test/iconv/ref/ISO-IR-14-rev | 1 - > tools/test/iconv/ref/ISO-IR-165 | 1 - > tools/test/iconv/ref/ISO-IR-165-rev | 1 - > tools/test/iconv/ref/ISO-IR-57 | 1 - > tools/test/iconv/ref/ISO-IR-57-rev | 1 - > tools/test/iconv/ref/ISO8859-1 | 1 - > tools/test/iconv/ref/ISO8859-1-rev | 1 - > tools/test/iconv/ref/ISO8859-10 | 1 - > tools/test/iconv/ref/ISO8859-10-rev | 1 - > tools/test/iconv/ref/ISO8859-11 | 1 - > tools/test/iconv/ref/ISO8859-11-rev | 1 - > tools/test/iconv/ref/ISO8859-13 | 1 - > tools/test/iconv/ref/ISO8859-13-rev | 1 - > tools/test/iconv/ref/ISO8859-14 | 1 - > tools/test/iconv/ref/ISO8859-14-rev | 1 - > tools/test/iconv/ref/ISO8859-15 | 1 - > tools/test/iconv/ref/ISO8859-15-rev | 1 - > tools/test/iconv/ref/ISO8859-16 | 1 - > tools/test/iconv/ref/ISO8859-16-rev | 1 - > tools/test/iconv/ref/ISO8859-2 | 1 - > tools/test/iconv/ref/ISO8859-2-rev | 1 - > tools/test/iconv/ref/ISO8859-3 | 1 - > tools/test/iconv/ref/ISO8859-3-rev | 1 - > tools/test/iconv/ref/ISO8859-4 | 1 - > tools/test/iconv/ref/ISO8859-4-rev | 1 - > tools/test/iconv/ref/ISO8859-5 | 1 - > tools/test/iconv/ref/ISO8859-5-rev | 1 - > tools/test/iconv/ref/ISO8859-6 | 1 - > tools/test/iconv/ref/ISO8859-6-rev | 1 - > tools/test/iconv/ref/ISO8859-7 | 1 - > tools/test/iconv/ref/ISO8859-7-rev | 1 - > tools/test/iconv/ref/ISO8859-8 | 1 - > tools/test/iconv/ref/ISO8859-8-rev | 1 - > tools/test/iconv/ref/ISO8859-9 | 1 - > tools/test/iconv/ref/ISO8859-9-rev | 1 - > tools/test/iconv/ref/JAVA | 1 - > tools/test/iconv/ref/JAVA-rev | 1 - > tools/test/iconv/ref/JIS_X0201 | 1 - > tools/test/iconv/ref/JIS_X0201-rev | 1 - > tools/test/iconv/ref/JIS_X0208-1990 | 1 - > tools/test/iconv/ref/JIS_X0208-1990-rev | 1 - > tools/test/iconv/ref/JOHAB | 1 - > tools/test/iconv/ref/JOHAB-rev | 1 - > tools/test/iconv/ref/KOI8-R | 1 - > tools/test/iconv/ref/KOI8-R-rev | 1 - > tools/test/iconv/ref/KOI8-RU | 1 - > tools/test/iconv/ref/KOI8-RU-rev | 1 - > tools/test/iconv/ref/KOI8-T | 1 - > tools/test/iconv/ref/KOI8-T-rev | 1 - > tools/test/iconv/ref/KOI8-U | 1 - > tools/test/iconv/ref/KOI8-U-rev | 1 - > tools/test/iconv/ref/KZ-1048 | 1 - > tools/test/iconv/ref/KZ-1048-rev | 1 - > tools/test/iconv/ref/MACARABIC | 1 - > tools/test/iconv/ref/MACARABIC-rev | 1 - > tools/test/iconv/ref/MACCENTRALEUROPE | 1 - > tools/test/iconv/ref/MACCENTRALEUROPE-rev | 1 - > tools/test/iconv/ref/MACCROATIAN | 1 - > tools/test/iconv/ref/MACCROATIAN-rev | 1 - > tools/test/iconv/ref/MACCYRILLIC | 1 - > tools/test/iconv/ref/MACCYRILLIC-rev | 1 - > tools/test/iconv/ref/MACGREEK | 1 - > tools/test/iconv/ref/MACGREEK-rev | 1 - > tools/test/iconv/ref/MACHEBREW | 1 - > tools/test/iconv/ref/MACHEBREW-rev | 1 - > tools/test/iconv/ref/MACICELAND | 1 - > tools/test/iconv/ref/MACICELAND-rev | 1 - > tools/test/iconv/ref/MACROMAN | 1 - > tools/test/iconv/ref/MACROMAN-rev | 1 - > tools/test/iconv/ref/MACROMANIA | 1 - > tools/test/iconv/ref/MACROMANIA-rev | 1 - > tools/test/iconv/ref/MACTHAI | 1 - > tools/test/iconv/ref/MACTHAI-rev | 1 - > tools/test/iconv/ref/MACTURKISH | 1 - > tools/test/iconv/ref/MACTURKISH-rev | 1 - > tools/test/iconv/ref/MACUKRAINE | 1 - > tools/test/iconv/ref/MACUKRAINE-rev | 1 - > tools/test/iconv/ref/MULELAO-1 | 1 - > tools/test/iconv/ref/MULELAO-1-rev | 1 - > tools/test/iconv/ref/NEXTSTEP | 1 - > tools/test/iconv/ref/NEXTSTEP-rev | 1 - > tools/test/iconv/ref/PT154 | 1 - > tools/test/iconv/ref/PT154-rev | 1 - > tools/test/iconv/ref/RISCOS-LATIN1 | 1 - > tools/test/iconv/ref/RISCOS-LATIN1-rev | 1 - > tools/test/iconv/ref/SHIFT_JIS | 1 - > tools/test/iconv/ref/SHIFT_JIS-rev | 1 - > tools/test/iconv/ref/TCVN5712-1 | 1 - > tools/test/iconv/ref/TCVN5712-1-rev | 1 - > tools/test/iconv/ref/TDS565 | 1 - > tools/test/iconv/ref/TDS565-rev | 1 - > tools/test/iconv/ref/UTF-16BE | 1 - > tools/test/iconv/ref/UTF-16BE-rev | 1 - > tools/test/iconv/ref/UTF-16LE | 1 - > tools/test/iconv/ref/UTF-16LE-rev | 1 - > tools/test/iconv/ref/UTF-32BE | 1 - > tools/test/iconv/ref/UTF-32BE-rev | 1 - > tools/test/iconv/ref/UTF-32LE | 1 - > tools/test/iconv/ref/UTF-32LE-rev | 1 - > tools/test/iconv/ref/UTF-7 | 1 - > tools/test/iconv/ref/UTF-7-rev | 1 - > tools/test/iconv/ref/UTF-8 | 1 - > tools/test/iconv/ref/UTF-8-rev | 1 - > tools/test/iconv/ref/VISCII | 1 - > tools/test/iconv/ref/VISCII-rev | 1 - > tools/tools/crypto/README | 1 - > tools/tools/find-sb/README | 1 - > tools/tools/kttcp/README | 1 - > tools/tools/locale/etc/charmaps/charmaps.txt | 1 - > tools/tools/man/README | 2 = -- > tools/tools/nanobsd/dhcpd/README | 1 - > tools/tools/nanobsd/embedded/README | 1 - > tools/tools/net80211/README | 1 - > tools/tools/net80211/w00t/README | 1 - > tools/tools/net80211/wesside/README | 1 - > tools/tools/net80211/wlaninject/README | 1 - > tools/tools/netmap/README | 1 - > tools/tools/netrate/README | 2 = -- > tools/tools/netrate/tcpp/README | 3 = --- > tools/tools/sortbench/README | 1 - > tools/tools/sortbench/bench.py | 2 = -- > tools/tools/sysbuild/README | 1 - > tools/tools/vhba/README | 1 - > usr.bin/bmake/tests/README | 1 - > usr.bin/compress/doc/NOTES | 2 = -- > usr.bin/compress/doc/README | 1 - > usr.bin/dtc/HACKING | 1 - > usr.bin/indent/README | 2 = -- > usr.bin/lastcomm/tests/README | 1 - > usr.bin/login/README | 2 = -- > usr.bin/m4/tests/ff_after_dnl.m4.uu | 1 - > usr.bin/m4/tests/strangequotes.m4.uu | 1 - > usr.bin/ministat/README | 1 - > usr.sbin/apmd/README | 2 = -- > usr.sbin/bluetooth/bcmfw/BCM-LEGAL.txt | 1 - > usr.sbin/bluetooth/bcmfw/README | 1 - > usr.sbin/bootparamd/bootparamd/README | 1 - > usr.sbin/cron/doc/CHANGES | 1 - > usr.sbin/cron/doc/CONVERSION | 1 - > usr.sbin/cron/doc/FEATURES | 1 - > usr.sbin/cron/doc/MAIL | 2 = -- > usr.sbin/kbdmap/TODO | 1 - > usr.sbin/kldxref/fileformat | 1 - > usr.sbin/newsyslog/pathnames.h | 2 = -- > usr.sbin/ppp/README.changes | 2 = -- > usr.sbin/ppp/README.nat | 2 = -- > usr.sbin/pw/README | 2 = -- > 417 files changed, 446 deletions(-) >=20 > diff --git a/LOCKS b/LOCKS > index 1e2effdfca34..ceebb8e131df 100644 > --- a/LOCKS > +++ b/LOCKS > @@ -1,4 +1,3 @@ > -$FreeBSD$ >=20 Do we not want to ditch these blank lines? Jess > This file documents formal review/approval requirements that have been > approved by core. From nobody Wed Aug 16 18:20:11 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RQxJC5VRnz4qwdg; Wed, 16 Aug 2023 18:20: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RQxJC4Z8vz4KhS; Wed, 16 Aug 2023 18:20:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692210011; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=I2ewuOiAJxK8lawCBDJqMMtl1WK6GlTZsxtsBDwuDxI=; b=ujqNJn6h0Ww7UDbkSXVInvZHN0uauXVyW1SHQCp58Ri3jc7RY14DeXNm6TqoMciVVKK1a5 JA2ha+Dv96IJrG8O+ZAi+gkxefksbgyFeS1sVA5bvUTEV9kOrl2z7S0rIlKITRUIET0onl cWiWM/p1Rxp79PmAFdZP8gB+AQ0gYjgqJir0U5jfoltyKqUQfvgEqGYRsraEJpIPtjDGhs nBpmpjxueZE4plh6gWurH88sSEYsCq+oyiqv+M7U1fZ7X/ORZ1TTUbJG/rXOJmynH8bmYR MD/gLy+6DpD9HTkNolJtite/mJ5iaeoeX4eVsWCvhuZBw9LhdrZst236rvllUg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692210011; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=I2ewuOiAJxK8lawCBDJqMMtl1WK6GlTZsxtsBDwuDxI=; b=s4ZQXW66U0vRUVhfsPGhk+MZXRC6kNPQlO53U7oX+PkCC6kFKlG15Yf1lBXN7tKLGmr0Ea TxIu2cuhsgad9y7NL31tCZpJIx7lsa4ih/iRSU7CG6N+R2LV5gG+AGLN1Z8l0hs942LIN3 4tZZPAqm5NqEbqzbMBSH1Br7pJf7b1GcQhwj0/YV1pZqsZtLuzdw0iL7xtRQhbj2VRiG4V zjmMoxEvBLTVgIPeWT2zBNJyXNlgmqjTpJTjnpShCHy+gdb+PxmXO5Ep/EdFQUJxYFdqaE tqtqSzhjkixiWf1tfxdqEAhsDCmYLJdwBQRsHJeXz8zhX0CDfAekcoafHgJZEA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692210011; a=rsa-sha256; cv=none; b=w5BIwStsx80ojLznhT7t40UVIRYKRzqS81JzoZJD86ONWAyTLHXfsk7h/qkw0zdYKFk7cO LHnLGCHsJan3hyLpbzTcf5/Z4+7VvNUPHZ/2860zxXmMvWmvC4vr+saPqrB2UVXQ4/yPWc 6wdXcWsZx8QMAfWxPSvNOeSJTNMjYNpRajHWhHhECXATfWviEi9HL1F3qNwniToShpE9CT DH+ta/e7TNo929etWZU3xTOYdJ8T09v6G2Pqe7twzoUNGQqlwBrj5txjH1fVEGGWYgiRNd eE0VBbiBI7GbL11Sh9MJc8OFomEUwAG0wJyIdj+70LSnP9a4DLohi7Ip74QQeA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RQxJC3fbtz11Wq; Wed, 16 Aug 2023 18:20:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37GIKBxe099655; Wed, 16 Aug 2023 18:20:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37GIKBJq099643; Wed, 16 Aug 2023 18:20:11 GMT (envelope-from git) Date: Wed, 16 Aug 2023 18:20:11 GMT Message-Id: <202308161820.37GIKBJq099643@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Brooks Davis Subject: git: 4c757938e4f2 - main - libc: include malloc via stdlib/Makefile.inc List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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/main X-Git-Reftype: branch X-Git-Commit: 4c757938e4f28adfd57cc1e7271c2dd174d0ce9e Auto-Submitted: auto-generated The branch main has been updated by brooks: URL: https://cgit.FreeBSD.org/src/commit/?id=4c757938e4f28adfd57cc1e7271c2dd174d0ce9e commit 4c757938e4f28adfd57cc1e7271c2dd174d0ce9e Author: Brooks Davis AuthorDate: 2023-08-16 18:16:26 +0000 Commit: Brooks Davis CommitDate: 2023-08-16 18:16:26 +0000 libc: include malloc via stdlib/Makefile.inc There's a hierarchy here and we should use it. Improves: cbeacb7c46f3a3650e5dbefa9a1a18bc9943a8cc Reviewed by: jrtc27, jhb, emaste Sponsored by: DARPA Differential Revision: https://reviews.freebsd.org/D41456 --- lib/libc/Makefile | 1 - lib/libc/stdlib/Makefile.inc | 2 ++ 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/libc/Makefile b/lib/libc/Makefile index d121d7be605a..a26215324332 100644 --- a/lib/libc/Makefile +++ b/lib/libc/Makefile @@ -113,7 +113,6 @@ NOASM= .include "${LIBC_SRCTOP}/resolv/Makefile.inc" .include "${LIBC_SRCTOP}/stdio/Makefile.inc" .include "${LIBC_SRCTOP}/stdlib/Makefile.inc" -.include "${LIBC_SRCTOP}/stdlib/jemalloc/Makefile.inc" .include "${LIBC_SRCTOP}/stdtime/Makefile.inc" .include "${LIBC_SRCTOP}/string/Makefile.inc" .include "${LIBC_SRCTOP}/sys/Makefile.inc" diff --git a/lib/libc/stdlib/Makefile.inc b/lib/libc/stdlib/Makefile.inc index e13ba020bad5..caa95bf53951 100644 --- a/lib/libc/stdlib/Makefile.inc +++ b/lib/libc/stdlib/Makefile.inc @@ -28,6 +28,8 @@ C99_Exit.c: ${LIBC_SRCTOP}/stdlib/_Exit.c .NOMETA SYM_MAPS+= ${LIBC_SRCTOP}/stdlib/Symbol.map +.include "${LIBC_SRCTOP}/stdlib/jemalloc/Makefile.inc" + # machine-dependent stdlib sources .sinclude "${LIBC_SRCTOP}/${LIBC_ARCH}/stdlib/Makefile.inc" From nobody Wed Aug 16 18:20:12 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RQxJD6DNgz4qwFv; Wed, 16 Aug 2023 18:20:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RQxJD5JQbz4KWr; Wed, 16 Aug 2023 18:20:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692210012; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5bS05LJ0LUt5R9gZHPCXSWyYFeebxFU1o28vjiUvEwc=; b=a3yNrTOeKSy5GTQXNPpDEHEU/BkFnal0U+3VKdjPy42EWfEW9U8s6QJfpcg7uOp097O1oP 0j/NIJ4Ya8Ejk+A3fMRS83KDtCENvb6cOIl6mNu9RLDFxIwQvPbqe3ypiEsEzN3RqhKr7J HG75fGEQbPeKV9vUu5FkNWkzI5F7/i3U22iPYplYjP0rFuxNqS9S5jdU7VQd+3vJk+l5n3 e1HVmRSVeaU2+3NkRWFv9IJtys54fLUPkDEele7lhH6U1C7uQX1bJm4Rphs0SaRot0zNAF 9AssqsEve+2wO7znraa1+4bS8nn9NnYKtaIRYq3YKO4ySG6UuPrPBf9FLy0rAQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692210012; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5bS05LJ0LUt5R9gZHPCXSWyYFeebxFU1o28vjiUvEwc=; b=OvB3JaQt7/1X4K27iE6VmZBfg6xQJVVb/cmzaSlMGpvMs/3jJlHQgsr+iu48jfxfrr26u7 3XL+LUXU6xtHfUlEEaUKtj3qHYOb35YasfaWG91mSRotOJLWbzWTonRUzn+C+FZNsT6ByL aa6CT6wkfTxsyfuHPJeHIC+OnVWjf7R8HQx0ro00rfksnTJXl4ZHNEIrbVK7uxWTtqOMeS 28z1llUlcz8GUkQab0dPzTNrQ/zck4YxOpTJzU36gKnUqmkA2ivFlvwAhJaOvsfjk/TDMh rpVlfT1vCP0zyCWSmgEfgjfhifZ5cktbtOjmFGccnWvabNX4TrS87U/wTXu4dA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692210012; a=rsa-sha256; cv=none; b=kXWtRo91WqNUIlSEAW2Wf6HwOPKityUOHWj1nKx3AwhlTOfMLNczrx2zNpXgZ43fLWunRr rhBzGQHg+4HPczgN1vjGOFKdBNm4sbDfhlQb2YzzTlQGJewvtzibVeG7FuE+VnOw1bab7c xCKsDKIWhH2FrEnbg9V3ljpyWdXfbPQfEQdVqUXfsXFhLRcBDxcqYv7aXQI2lzFGr5pckr eNqrosN7MNxz7Y6g1OcN2/qGbS7FcG+Pp1EWqBPj07duhxmIiv9BKnS6PIHsYR8WTBP8eo qrFjHaDHYTYIhWofIeLoZMXZXD39Zm40OtsHloY151v0upZruJ7r0MVMseghlg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RQxJD48wYz11Wr; Wed, 16 Aug 2023 18:20:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37GIKCGn000334; Wed, 16 Aug 2023 18:20:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37GIKClv000326; Wed, 16 Aug 2023 18:20:12 GMT (envelope-from git) Date: Wed, 16 Aug 2023 18:20:12 GMT Message-Id: <202308161820.37GIKClv000326@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Brooks Davis Subject: git: 075c71655807 - main - jemalloc: drop unused .PATH List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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/main X-Git-Reftype: branch X-Git-Commit: 075c716558072a54f6dca6f5a9f50d32418c04b8 Auto-Submitted: auto-generated The branch main has been updated by brooks: URL: https://cgit.FreeBSD.org/src/commit/?id=075c716558072a54f6dca6f5a9f50d32418c04b8 commit 075c716558072a54f6dca6f5a9f50d32418c04b8 Author: Brooks Davis AuthorDate: 2023-08-16 18:16:43 +0000 Commit: Brooks Davis CommitDate: 2023-08-16 18:16:43 +0000 jemalloc: drop unused .PATH All jemalloc sources are in contrib so don't look for them in the jemalloc subdirectory. Reviewed by: jrtc27, emaste Sponsored by: DARPA Differential Revision: https://reviews.freebsd.org/D41481 --- lib/libc/stdlib/jemalloc/Makefile.inc | 3 --- 1 file changed, 3 deletions(-) diff --git a/lib/libc/stdlib/jemalloc/Makefile.inc b/lib/libc/stdlib/jemalloc/Makefile.inc index 2f5e43e963fb..edaa92790c5b 100644 --- a/lib/libc/stdlib/jemalloc/Makefile.inc +++ b/lib/libc/stdlib/jemalloc/Makefile.inc @@ -1,6 +1,3 @@ - -.PATH: ${LIBC_SRCTOP}/stdlib/jemalloc - JEMALLOCSRCS:= jemalloc.c arena.c background_thread.c base.c bin.c bitmap.c \ ckh.c ctl.c div.c extent.c extent_dss.c extent_mmap.c hash.c hook.c \ large.c log.c malloc_io.c mutex.c mutex_pool.c nstime.c pages.c \ From nobody Wed Aug 16 18:20:13 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RQxJG2zPpz4qwkv; Wed, 16 Aug 2023 18:20:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RQxJG252Bz4Kqv; Wed, 16 Aug 2023 18:20:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692210014; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=H27OnfOkcIHKhgkLynVHvdUA+WqGMu5dBLqXdMFnsGM=; b=KpyiCUqyN3RogfvxwEu1twM+hQDs5yjRrU78hOAuvUdnHVPdM6IQaT+4lQ/vsKEtZfT/K8 C+stj5X1iWt/h9aLCOOu9S5A0RzljITT97sV+tr2ov+QkP6KWQCR9sSH9p+pMCuoqynqQN IVAsbcMb1Tmw/bTqRaWqDCTTiwt7lDGfARwM8VwUUEv2kGn/mGuHBvoh2ET2xG8O6OTTgN HGGaeH+8VGuArIcuFkHveBxQ5D+EJi2qxtnYzkhcAh2NbfnKUpfPHjXwAsZA+MeiQnDuwm v8EHSesSMc9X/RBNsKYnHpr8SUyjGUZcRmxIwx+5E6Ih6PHknGMy5xMJagm1gQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692210014; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=H27OnfOkcIHKhgkLynVHvdUA+WqGMu5dBLqXdMFnsGM=; b=yHfab9XnWBagVlyBxiYfUjuIzeVZrDMJyGoqzKQvacnQ1JuuDrHHVXB5MVf2GSMPCLiGAu JsRttqJ907BjMa/FwQvKqQy6HeM0VBu+TpKjhhHwdOR1tK2l1D07jJjAn10s30++rAjrNB nELK6ZqJlEP65i8PRw/y/eQovFbEzuERORYUPZdS00z/JbP1O6Nj+lGBqV238K7OELf2KD xfz6n7f9ZjaFE2dtjiw3FWTcv6czhSJj5oHrhjcnxhmN0DcWNAzj/3qiAs2fwnZzSAUyT2 9XB02lMhmfj3KqHLWBqSFyHIUUD2iVOz+DWgPQ9L3cDRbhwCRRL2ezzEoW3qYQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692210014; a=rsa-sha256; cv=none; b=U+AmkeQyEJyIjr2Ke7TvHUlQJREqy2fJkfythDP6hgqTkDEE+wpss581riVtzIKwOA5g15 TSqTzRlChgC9qRzNhGDGrjYB5WYmIYbP44WyKympXIrPlEW1kawsLCNOvleUcJlPLqx3Wd e9oLAW0QfgxjIusy9Z/eHS/Gk3ez56mugcq/NDZIE8GLVdC555uJ0aEmMRYdBAj5JO4Osz CRKpd4/qNn4Xf5c7jb8Qj1kwPIlh+KEHZXd0fbre/KJU0SqCSU8eLCBpFgQlDBa1cZ6SxY XPEufSqC0R6VGpPskRRDBx+DasMoHA4wqw/FsMoEo3ODv4JgsIWvzku7R5pPdg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RQxJF4ldsz11rb; Wed, 16 Aug 2023 18:20:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37GIKDrC000998; Wed, 16 Aug 2023 18:20:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37GIKDgB000991; Wed, 16 Aug 2023 18:20:13 GMT (envelope-from git) Date: Wed, 16 Aug 2023 18:20:13 GMT Message-Id: <202308161820.37GIKDgB000991@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Brooks Davis Subject: git: c5f49ece16a9 - main - libc: regoranize malloc build List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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/main X-Git-Reftype: branch X-Git-Commit: c5f49ece16a92380092191fad13cb1da72af5d37 Auto-Submitted: auto-generated The branch main has been updated by brooks: URL: https://cgit.FreeBSD.org/src/commit/?id=c5f49ece16a92380092191fad13cb1da72af5d37 commit c5f49ece16a92380092191fad13cb1da72af5d37 Author: Brooks Davis AuthorDate: 2023-08-16 18:16:51 +0000 Commit: Brooks Davis CommitDate: 2023-08-16 18:16:51 +0000 libc: regoranize malloc build Create a stdlib/malloc to hold the definition of the malloc interface (e.g., the Symbol.map file) and make jemalloc a subdirectory. This will make it easier to integrate alternative allocators such as snmalloc while making it clear that the current jemalloc symbols are the FreeBSD API/ABI (for better or worse). Suggested by: jrtc27 Reviewed by: jrtc27, emaste Sponsored by: DARPA Differential Revision: https://reviews.freebsd.org/D41457 --- lib/libc/stdlib/Makefile.inc | 2 +- lib/libc/stdlib/malloc/Makefile.inc | 3 +++ lib/libc/stdlib/{jemalloc => malloc}/Symbol.map | 0 lib/libc/stdlib/{ => malloc}/jemalloc/Makefile.inc | 2 -- 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/lib/libc/stdlib/Makefile.inc b/lib/libc/stdlib/Makefile.inc index caa95bf53951..413c9421c0ee 100644 --- a/lib/libc/stdlib/Makefile.inc +++ b/lib/libc/stdlib/Makefile.inc @@ -28,7 +28,7 @@ C99_Exit.c: ${LIBC_SRCTOP}/stdlib/_Exit.c .NOMETA SYM_MAPS+= ${LIBC_SRCTOP}/stdlib/Symbol.map -.include "${LIBC_SRCTOP}/stdlib/jemalloc/Makefile.inc" +.include "${LIBC_SRCTOP}/stdlib/malloc/Makefile.inc" # machine-dependent stdlib sources .sinclude "${LIBC_SRCTOP}/${LIBC_ARCH}/stdlib/Makefile.inc" diff --git a/lib/libc/stdlib/malloc/Makefile.inc b/lib/libc/stdlib/malloc/Makefile.inc new file mode 100644 index 000000000000..bce4353fe80a --- /dev/null +++ b/lib/libc/stdlib/malloc/Makefile.inc @@ -0,0 +1,3 @@ +SYM_MAPS+=${LIBC_SRCTOP}/stdlib/malloc/Symbol.map + +.include "${LIBC_SRCTOP}/stdlib/malloc/jemalloc/Makefile.inc" diff --git a/lib/libc/stdlib/jemalloc/Symbol.map b/lib/libc/stdlib/malloc/Symbol.map similarity index 100% rename from lib/libc/stdlib/jemalloc/Symbol.map rename to lib/libc/stdlib/malloc/Symbol.map diff --git a/lib/libc/stdlib/jemalloc/Makefile.inc b/lib/libc/stdlib/malloc/jemalloc/Makefile.inc similarity index 96% rename from lib/libc/stdlib/jemalloc/Makefile.inc rename to lib/libc/stdlib/malloc/jemalloc/Makefile.inc index edaa92790c5b..1ba7725fe8a8 100644 --- a/lib/libc/stdlib/jemalloc/Makefile.inc +++ b/lib/libc/stdlib/malloc/jemalloc/Makefile.inc @@ -4,8 +4,6 @@ JEMALLOCSRCS:= jemalloc.c arena.c background_thread.c base.c bin.c bitmap.c \ prng.c prof.c rtree.c safety_check.c sc.c stats.c sz.c tcache.c \ test_hooks.c ticker.c tsd.c witness.c -SYM_MAPS+=${LIBC_SRCTOP}/stdlib/jemalloc/Symbol.map - CFLAGS+=-I${SRCTOP}/contrib/jemalloc/include .for src in ${JEMALLOCSRCS} From nobody Wed Aug 16 18:30:58 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RQxXx4kLSz4qxWl for ; Wed, 16 Aug 2023 18:31:13 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-lf1-x12f.google.com (mail-lf1-x12f.google.com [IPv6:2a00:1450:4864:20::12f]) (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 "GTS CA 1D4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RQxXx08tHz4RLV for ; Wed, 16 Aug 2023 18:31:13 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-lf1-x12f.google.com with SMTP id 2adb3069b0e04-4fe0c566788so10860934e87.0 for ; Wed, 16 Aug 2023 11:31:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20221208.gappssmtp.com; s=20221208; t=1692210670; x=1692815470; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:from:to:cc:subject:date:message-id:reply-to; bh=FGTqmj1LzXquj/aEYsn5z73IlHgXB2uoNaAfhaWYqro=; b=ea5mWYkuttjWmfwNcdX1cDul+Rhp4zVuD1y1LWlEgvEqd7GACYBNbgi0NFNftWVWYf aB9I10BiV/OTsX2jcVhIRzl/9w3QMuBrySMty/j+v++VVsA5Mwkouu/AvMyXzzEtpGFy FWebKdJAgP4iZKYbseIJC20813ZEyQ1eJALX1GkciYifuqTeJXCDEZke4UsUUXTfF3B7 pZRdq7PBpL4R01iTUbQwVpMXBDrWUkp7eXkkEHtCKRKmJpnAqJBF6QiJWSvV3buN/6ch zUp3gyJiByCFmWWTZQbHC9y0lXCsXuHBE9KYcdPZw6Gc0YGWY3xZeZMRhpPE1ePPcsAs pFnA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1692210670; x=1692815470; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=FGTqmj1LzXquj/aEYsn5z73IlHgXB2uoNaAfhaWYqro=; b=J0EuLdRP7QvukISX2OLx6s2/pitxe6IodvJEzNsGEuJjrcZDdeIiH5iZvq9dSSsZrc wg4pKpN7I6SL/fZ6k+xYVaF6U2+tMHdG8ZSAazesuebDjO6z38vBboA2RRE7EyQK1WSB hKLSa1X/Z5dFHL3EAvfWCkdXM66TV5xBCZ2NFhZQsFGLoMCU3xNS+4AxrEzV/GKWxuRx hwb3TeGKNclCyXNRftX3slsJzGwWLypHgPFmzxZ6s9AOOojyxg5wUrDVpuk91c3FDoOf jSLV3plXWuGJZd+27aP01r2MT7hCXaU4BhCz25pI9OkyMX9zMD4S5URLFVKr9aRo/pdR cthw== X-Gm-Message-State: AOJu0Yy8Wt2TsnnRA8yIT1Mmu+yD7+btjE9FwMp8QL8WKjGW2funfXJb oAjJJH/8kDrY84IPmQjdgSMgBQuDFcYkymjOqt+0yg== X-Google-Smtp-Source: AGHT+IEqJz3WMIt1tSNFs1KJ3jO/+X2n9Y6C67sa0P2DbxzdBbZnwTLUTHTYu9/rCQkTRBdPy0ijOlfGeeLOW0Gx8NI= X-Received: by 2002:a19:5e02:0:b0:4fe:1d71:6076 with SMTP id s2-20020a195e02000000b004fe1d716076mr1680338lfb.46.1692210669924; Wed, 16 Aug 2023 11:31:09 -0700 (PDT) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 References: <202308161757.37GHv2ca059368@gitrepo.freebsd.org> <83CE52EE-11ED-4650-A515-F4CE19345BB9@freebsd.org> In-Reply-To: <83CE52EE-11ED-4650-A515-F4CE19345BB9@freebsd.org> From: Warner Losh Date: Wed, 16 Aug 2023 12:30:58 -0600 Message-ID: Subject: Re: git: da5432eda807 - main - Remove $FreeBSD$: alt two-line .c pattern To: Jessica Clarke Cc: Warner Losh , src-committers , "" , "" Content-Type: multipart/alternative; boundary="000000000000ddd39506030e7fce" X-Rspamd-Queue-Id: 4RQxXx08tHz4RLV X-Spamd-Bar: ---- 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:2a00:1450::/32, country:US] --000000000000ddd39506030e7fce Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable On Wed, Aug 16, 2023, 12:15 PM Jessica Clarke wrote: > On 16 Aug 2023, at 18:57, Warner Losh wrote: > > > > The branch main has been updated by imp: > > > > URL: > https://cgit.FreeBSD.org/src/commit/?id=3Dda5432eda807c4b7232d030d5157d5b= 417ea4f52 > > > > commit da5432eda807c4b7232d030d5157d5b417ea4f52 > > Author: Warner Losh > > AuthorDate: 2023-08-16 17:54:48 +0000 > > Commit: Warner Losh > > CommitDate: 2023-08-16 17:54:48 +0000 > > > > Remove $FreeBSD$: alt two-line .c pattern > > > > Remove /^\s*__RCSID\("\$FreeBSD\$"\);\n\n/ > > --- > > sbin/routed/if.c | 3 --- > > sbin/routed/input.c | 3 --- > > sbin/routed/main.c | 2 -- > > sbin/routed/output.c | 3 --- > > sbin/routed/parms.c | 3 --- > > sbin/routed/radix.c | 3 --- > > sbin/routed/rdisc.c | 3 --- > > sbin/routed/table.c | 3 --- > > sbin/routed/trace.c | 3 --- > > usr.bin/getconf/tests/arch_type.c | 2 -- > > usr.bin/procstat/tests/while1.c | 2 -- > > usr.sbin/mpsutil/mps_cmd.c | 2 -- > > usr.sbin/mpsutil/mps_debug.c | 2 -- > > usr.sbin/mpsutil/mps_flash.c | 2 -- > > usr.sbin/mpsutil/mps_set.c | 2 -- > > usr.sbin/mpsutil/mps_show.c | 2 -- > > usr.sbin/mpsutil/mps_slot.c | 2 -- > > usr.sbin/mpsutil/mpsutil.c | 2 -- > > usr.sbin/mptutil/mpt_cam.c | 2 -- > > usr.sbin/mptutil/mpt_cmd.c | 2 -- > > usr.sbin/mptutil/mpt_config.c | 2 -- > > usr.sbin/mptutil/mpt_drive.c | 2 -- > > usr.sbin/mptutil/mpt_evt.c | 2 -- > > usr.sbin/mptutil/mpt_show.c | 2 -- > > usr.sbin/mptutil/mpt_volume.c | 2 -- > > usr.sbin/mptutil/mptutil.c | 2 -- > > 26 files changed, 60 deletions(-) > > > > diff --git a/sbin/routed/if.c b/sbin/routed/if.c > > index 83d8fe503893..72894942fe05 100644 > > --- a/sbin/routed/if.c > > +++ b/sbin/routed/if.c > > @@ -33,9 +33,6 @@ > > > > #include "defs.h" > > #include "pathnames.h" > > - > > -__RCSID("$FreeBSD$"); > > - > > struct ifhead ifnet =3D LIST_HEAD_INITIALIZER(ifnet); /* all interfaces= */ > > struct ifhead remote_if =3D LIST_HEAD_INITIALIZER(remote_if); /* remote > interfaces */ > > Alas these diffs aren=E2=80=99t style(9)-compliant. Fixes welcome. I'm sure there's a hundred errors in the 32k changes I made. I tried to catch as many as I could... Warner > --000000000000ddd39506030e7fce Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable


On Wed, Aug 16, 2023, 12:15 PM Jessica Clarke <jrtc27@freebsd.org> wrote:
On 16 Aug 2023, at 18:57, Warner Losh <= imp@FreeBSD.org> wrote:
>
> The branch main has been updated by imp:
>
> URL: https://cgit.FreeBSD.org/src/commit/?id=3Dda5432eda807c4b7232d030d5157d5= b417ea4f52
>
> commit da5432eda807c4b7232d030d5157d5b417ea4f52
> Author:=C2=A0 =C2=A0 =C2=A0Warner Losh <imp@FreeBSD.org>
> AuthorDate: 2023-08-16 17:54:48 +0000
> Commit:=C2=A0 =C2=A0 =C2=A0Warner Losh <imp@FreeBSD.org>
> CommitDate: 2023-08-16 17:54:48 +0000
>
>=C2=A0 =C2=A0 Remove $FreeBSD$: alt two-line .c pattern
>
>=C2=A0 =C2=A0 Remove /^\s*__RCSID\("\$FreeBSD\$"\);\n\n/
> ---
> sbin/routed/if.c=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 | 3 ---
> sbin/routed/input.c=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0| 3 ---
> sbin/routed/main.c=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 | 2 --
> sbin/routed/output.c=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 |= 3 ---
> sbin/routed/parms.c=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0| 3 ---
> sbin/routed/radix.c=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0| 3 ---
> sbin/routed/rdisc.c=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0| 3 ---
> sbin/routed/table.c=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0| 3 ---
> sbin/routed/trace.c=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0| 3 ---
> usr.bin/getconf/tests/arch_type.c | 2 --
> usr.bin/procstat/tests/while1.c=C2=A0 =C2=A0| 2 --
> usr.sbin/mpsutil/mps_cmd.c=C2=A0 =C2=A0 =C2=A0 =C2=A0 | 2 --
> usr.sbin/mpsutil/mps_debug.c=C2=A0 =C2=A0 =C2=A0 | 2 --
> usr.sbin/mpsutil/mps_flash.c=C2=A0 =C2=A0 =C2=A0 | 2 --
> usr.sbin/mpsutil/mps_set.c=C2=A0 =C2=A0 =C2=A0 =C2=A0 | 2 --
> usr.sbin/mpsutil/mps_show.c=C2=A0 =C2=A0 =C2=A0 =C2=A0| 2 --
> usr.sbin/mpsutil/mps_slot.c=C2=A0 =C2=A0 =C2=A0 =C2=A0| 2 --
> usr.sbin/mpsutil/mpsutil.c=C2=A0 =C2=A0 =C2=A0 =C2=A0 | 2 --
> usr.sbin/mptutil/mpt_cam.c=C2=A0 =C2=A0 =C2=A0 =C2=A0 | 2 --
> usr.sbin/mptutil/mpt_cmd.c=C2=A0 =C2=A0 =C2=A0 =C2=A0 | 2 --
> usr.sbin/mptutil/mpt_config.c=C2=A0 =C2=A0 =C2=A0| 2 --
> usr.sbin/mptutil/mpt_drive.c=C2=A0 =C2=A0 =C2=A0 | 2 --
> usr.sbin/mptutil/mpt_evt.c=C2=A0 =C2=A0 =C2=A0 =C2=A0 | 2 --
> usr.sbin/mptutil/mpt_show.c=C2=A0 =C2=A0 =C2=A0 =C2=A0| 2 --
> usr.sbin/mptutil/mpt_volume.c=C2=A0 =C2=A0 =C2=A0| 2 --
> usr.sbin/mptutil/mptutil.c=C2=A0 =C2=A0 =C2=A0 =C2=A0 | 2 --
> 26 files changed, 60 deletions(-)
>
> diff --git a/sbin/routed/if.c b/sbin/routed/if.c
> index 83d8fe503893..72894942fe05 100644
> --- a/sbin/routed/if.c
> +++ b/sbin/routed/if.c
> @@ -33,9 +33,6 @@
>
> #include "defs.h"
> #include "pathnames.h"
> -
> -__RCSID("$FreeBSD$");
> -
> struct ifhead ifnet =3D LIST_HEAD_INITIALIZER(ifnet); /* all interface= s */
> struct ifhead remote_if =3D LIST_HEAD_INITIALIZER(remote_if); /* remot= e interfaces */

Alas these diffs aren=E2=80=99t style(9)-compliant.

Fixes welcome. I'm sure = there's a hundred errors in the 32k changes I made. I tried to catch as= many as I could...

Warn= er=C2=A0
--000000000000ddd39506030e7fce-- From nobody Wed Aug 16 18:32:56 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RQxbB20dsz4qy8s for ; Wed, 16 Aug 2023 18:33:10 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-ed1-x534.google.com (mail-ed1-x534.google.com [IPv6:2a00:1450:4864:20::534]) (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 "GTS CA 1D4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RQxb95kH6z4WRj for ; Wed, 16 Aug 2023 18:33:09 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-ed1-x534.google.com with SMTP id 4fb4d7f45d1cf-523ba00a581so8418872a12.2 for ; Wed, 16 Aug 2023 11:33:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20221208.gappssmtp.com; s=20221208; t=1692210788; x=1692815588; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:from:to:cc:subject:date:message-id:reply-to; bh=ItnCvExFzIXPgtYiPRTqgUxBZCaQtx0O2+j5d38wedE=; b=C+e8rXTvZqx7THwM+rZtV/Z2YkWQ31byezZV/3eTsapGDw5csOWnl7SISl+6HmpVst BGRy7T+4+WaCWTd8WeOA0prP3p+ECIkxet5hnq4cYSgx9CY1IaOxOc/toPF3e5BOUu90 YDOwV+wb/noEGjDghi8TXOatiHzUjOVUqcc/QUMsCwbRRQ7tSt55ptHVdg0q3daG7Kq0 H3aiki9S/z0aKYh4bDwlT4nliS/8MGSLQFYz0HfKEFWWmWbbz2KmYeA8KVef2eYKT7Md TqzbHs8Lnw/bgha5jbnoPMdyO5C9wPa6i1K9U16GpkhOvcPlhl7ZK1j7XJ3L/lr6JCy2 uUEQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1692210788; x=1692815588; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=ItnCvExFzIXPgtYiPRTqgUxBZCaQtx0O2+j5d38wedE=; b=hvfHSGXLPF//0hb6AN2f7qoS85FXgTydXaMcVrseCqbd0RZejhRrHbMrA0Ouk5zjow ftvk8Gd0np+IF1JKOuA0zd/FpPLwMGZUlOGkc7QGZbA1ei8ljsFvpFTdPfz960iVEYiF Ym+LZ7VV85+HlLZnDXqb57RhEypJo5L+IZO0bXYfgo3DY2iCX1UfT2YOv9HSWgaJ1LYE UwTOM9zxtp1Lb1bkTI4jtg6MzXnE7jx0jPokfRzbrDW4TAf+Li0obbmDtPClzT7nFgeq nhbVZFGWqvTQwa63liE1aGx3dP4uJUBYZTlsRI5/dxOJRmrh3i/3VHCwh70t2qKHVZ3l FQ5A== X-Gm-Message-State: AOJu0YzJJbiV8rpIXWOTWtn+8jdI9clwsnAz8HF03f2iblkkJzVqVx2D x6RYUMcfSF3MQDO045dS7odF54/Ya6DGL2VEnIygXpRHPSbfPruM X-Google-Smtp-Source: AGHT+IEkuS0zEgQLIDrDbsXUddAiWUlOe/f5WKAI+mtl+UrRdgFtduMjojqOa2BRxFyy/5+o3KkEVsTDTa6Y1SVgkIA= X-Received: by 2002:aa7:c38d:0:b0:523:bfec:4913 with SMTP id k13-20020aa7c38d000000b00523bfec4913mr2458226edq.0.1692210788175; Wed, 16 Aug 2023 11:33:08 -0700 (PDT) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 References: <202308161756.37GHufPp058798@gitrepo.freebsd.org> In-Reply-To: From: Warner Losh Date: Wed, 16 Aug 2023 12:32:56 -0600 Message-ID: Subject: Re: git: 82a265ad9bad - main - sys: Remove $FreeBSD$: sound driver version To: Kevin Bowling Cc: Warner Losh , src-committers , "" , "" Content-Type: multipart/alternative; boundary="000000000000ea271906030e8687" X-Rspamd-Queue-Id: 4RQxb95kH6z4WRj X-Spamd-Bar: ---- 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:2a00:1450::/32, country:US] --000000000000ea271906030e8687 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable On Wed, Aug 16, 2023, 12:12 PM Kevin Bowling wrote: > On Wed, Aug 16, 2023 at 10:56=E2=80=AFAM Warner Losh wr= ote: > > > > The branch main has been updated by imp: > > > > URL: > https://cgit.FreeBSD.org/src/commit/?id=3D82a265ad9bad315000a2d60b853c466= 9f1600cd0 > > > > commit 82a265ad9bad315000a2d60b853c4669f1600cd0 > > Author: Warner Losh > > AuthorDate: 2023-08-16 17:53:59 +0000 > > Commit: Warner Losh > > CommitDate: 2023-08-16 17:53:59 +0000 > > > > sys: Remove $FreeBSD$: sound driver version > > > > Remove /SND_DECLARE_FILE\("\$FreeBSD\$"\);/ > > It seems like SND_DECLARE_FILE(""); should probably go away or the > string within shall be dropped. Its idea of 'uniq' is a little > concerning. > Likely. It actually adds the driver to a list, so I didn't just remove it. Warner > --- > > sys/arm/broadcom/bcm2835/bcm2835_audio.c | 2 +- > > sys/dev/sound/pci/als4000.c | 2 +- > > sys/dev/sound/pci/atiixp.c | 2 +- > > sys/dev/sound/pci/cmi.c | 2 +- > > sys/dev/sound/pci/cs4281.c | 2 +- > > sys/dev/sound/pci/csa.c | 2 +- > > sys/dev/sound/pci/csamidi.c | 2 +- > > sys/dev/sound/pci/csapcm.c | 2 +- > > sys/dev/sound/pci/emu10k1.c | 2 +- > > sys/dev/sound/pci/envy24.c | 2 +- > > sys/dev/sound/pci/envy24ht.c | 2 +- > > sys/dev/sound/pci/es137x.c | 2 +- > > sys/dev/sound/pci/fm801.c | 2 +- > > sys/dev/sound/pci/hda/hdaa.c | 2 +- > > sys/dev/sound/pci/hda/hdaa_patches.c | 2 +- > > sys/dev/sound/pci/hda/hdac.c | 2 +- > > sys/dev/sound/pci/hda/hdacc.c | 2 +- > > sys/dev/sound/pci/hdspe-pcm.c | 2 +- > > sys/dev/sound/pci/hdspe.c | 2 +- > > sys/dev/sound/pci/ich.c | 2 +- > > sys/dev/sound/pci/maestro3.c | 2 +- > > sys/dev/sound/pci/neomagic.c | 2 +- > > sys/dev/sound/pci/solo.c | 2 +- > > sys/dev/sound/pci/t4dwave.c | 2 +- > > sys/dev/sound/pci/via8233.c | 2 +- > > sys/dev/sound/pci/via82c686.c | 2 +- > > sys/dev/sound/pci/vibes.c | 2 +- > > sys/dev/sound/pcm/ac97.c | 2 +- > > sys/dev/sound/pcm/ac97_patch.c | 2 +- > > sys/dev/sound/pcm/buffer.c | 2 +- > > sys/dev/sound/pcm/channel.c | 2 +- > > sys/dev/sound/pcm/dsp.c | 2 +- > > sys/dev/sound/pcm/feeder.c | 2 +- > > sys/dev/sound/pcm/feeder_chain.c | 2 +- > > sys/dev/sound/pcm/feeder_eq.c | 2 +- > > sys/dev/sound/pcm/feeder_format.c | 2 +- > > sys/dev/sound/pcm/feeder_matrix.c | 2 +- > > sys/dev/sound/pcm/feeder_mixer.c | 2 +- > > sys/dev/sound/pcm/feeder_rate.c | 2 +- > > sys/dev/sound/pcm/feeder_volume.c | 2 +- > > sys/dev/sound/pcm/mixer.c | 2 +- > > sys/dev/sound/pcm/sndstat.c | 2 +- > > sys/dev/sound/pcm/sound.c | 2 +- > > sys/dev/sound/pcm/vchan.c | 2 +- > > 44 files changed, 44 insertions(+), 44 deletions(-) > > > > diff --git a/sys/arm/broadcom/bcm2835/bcm2835_audio.c > b/sys/arm/broadcom/bcm2835/bcm2835_audio.c > > index 36b1dc86535b..0d430cf19df7 100644 > > --- a/sys/arm/broadcom/bcm2835/bcm2835_audio.c > > +++ b/sys/arm/broadcom/bcm2835/bcm2835_audio.c > > @@ -38,7 +38,7 @@ > > > > #include "vc_vchi_audioserv_defs.h" > > > > -SND_DECLARE_FILE("$FreeBSD$"); > > +SND_DECLARE_FILE(""); > > > > /* Audio destination */ > > #define DEST_AUTO 0 > > diff --git a/sys/dev/sound/pci/als4000.c b/sys/dev/sound/pci/als4000.c > > index 71f6c4f909c7..89f7d6385493 100644 > > --- a/sys/dev/sound/pci/als4000.c > > +++ b/sys/dev/sound/pci/als4000.c > > @@ -48,7 +48,7 @@ > > > > #include "mixer_if.h" > > > > -SND_DECLARE_FILE("$FreeBSD$"); > > +SND_DECLARE_FILE(""); > > > > /* Debugging macro's */ > > #undef DEB > > diff --git a/sys/dev/sound/pci/atiixp.c b/sys/dev/sound/pci/atiixp.c > > index 83eee21a333e..99468367c998 100644 > > --- a/sys/dev/sound/pci/atiixp.c > > +++ b/sys/dev/sound/pci/atiixp.c > > @@ -69,7 +69,7 @@ > > > > #include > > > > -SND_DECLARE_FILE("$FreeBSD$"); > > +SND_DECLARE_FILE(""); > > > > #define ATI_IXP_DMA_RETRY_MAX 100 > > > > diff --git a/sys/dev/sound/pci/cmi.c b/sys/dev/sound/pci/cmi.c > > index 6b4acbb4ddae..89a1eb24d878 100644 > > --- a/sys/dev/sound/pci/cmi.c > > +++ b/sys/dev/sound/pci/cmi.c > > @@ -61,7 +61,7 @@ > > #include "mixer_if.h" > > #include "mpufoi_if.h" > > > > -SND_DECLARE_FILE("$FreeBSD$"); > > +SND_DECLARE_FILE(""); > > > > /* Supported chip ID's */ > > #define CMI8338A_PCI_ID 0x010013f6 > > diff --git a/sys/dev/sound/pci/cs4281.c b/sys/dev/sound/pci/cs4281.c > > index b011f67e763e..fccbf807d965 100644 > > --- a/sys/dev/sound/pci/cs4281.c > > +++ b/sys/dev/sound/pci/cs4281.c > > @@ -45,7 +45,7 @@ > > > > #include > > > > -SND_DECLARE_FILE("$FreeBSD$"); > > +SND_DECLARE_FILE(""); > > > > #define CS4281_DEFAULT_BUFSZ 16384 > > > > diff --git a/sys/dev/sound/pci/csa.c b/sys/dev/sound/pci/csa.c > > index a03f319d85d5..68edfd9338c2 100644 > > --- a/sys/dev/sound/pci/csa.c > > +++ b/sys/dev/sound/pci/csa.c > > @@ -54,7 +54,7 @@ > > > > #include > > > > -SND_DECLARE_FILE("$FreeBSD$"); > > +SND_DECLARE_FILE(""); > > > > /* This is the pci device id. */ > > #define CS4610_PCI_ID 0x60011013 > > diff --git a/sys/dev/sound/pci/csamidi.c b/sys/dev/sound/pci/csamidi.c > > index e9d6006544b3..cc4b41f86af9 100644 > > --- a/sys/dev/sound/pci/csamidi.c > > +++ b/sys/dev/sound/pci/csamidi.c > > @@ -54,7 +54,7 @@ > > > > #include "mpufoi_if.h" > > > > -SND_DECLARE_FILE("$FreeBSD$"); > > +SND_DECLARE_FILE(""); > > > > /* pulled from mpu401.c */ > > #define MPU_DATAPORT 0 > > diff --git a/sys/dev/sound/pci/csapcm.c b/sys/dev/sound/pci/csapcm.c > > index d915a14a536f..14820a9c2216 100644 > > --- a/sys/dev/sound/pci/csapcm.c > > +++ b/sys/dev/sound/pci/csapcm.c > > @@ -43,7 +43,7 @@ > > #include > > #include > > > > -SND_DECLARE_FILE("$FreeBSD$"); > > +SND_DECLARE_FILE(""); > > > > /* Buffer size on dma transfer. Fixed for CS416x. */ > > #define CS461x_BUFFSIZE (4 * 1024) > > diff --git a/sys/dev/sound/pci/emu10k1.c b/sys/dev/sound/pci/emu10k1.c > > index abb586e34525..d4624a549e42 100644 > > --- a/sys/dev/sound/pci/emu10k1.c > > +++ b/sys/dev/sound/pci/emu10k1.c > > @@ -43,7 +43,7 @@ > > #include > > #include "mpufoi_if.h" > > > > -SND_DECLARE_FILE("$FreeBSD$"); > > +SND_DECLARE_FILE(""); > > > > /* -------------------------------------------------------------------= - > */ > > > > diff --git a/sys/dev/sound/pci/envy24.c b/sys/dev/sound/pci/envy24.c > > index b95a3438ce79..8039d4e3186c 100644 > > --- a/sys/dev/sound/pci/envy24.c > > +++ b/sys/dev/sound/pci/envy24.c > > @@ -41,7 +41,7 @@ > > > > #include "mixer_if.h" > > > > -SND_DECLARE_FILE("$FreeBSD$"); > > +SND_DECLARE_FILE(""); > > > > static MALLOC_DEFINE(M_ENVY24, "envy24", "envy24 audio"); > > > > diff --git a/sys/dev/sound/pci/envy24ht.c b/sys/dev/sound/pci/envy24ht.= c > > index 4bfef99f600f..e9b6771e2162 100644 > > --- a/sys/dev/sound/pci/envy24ht.c > > +++ b/sys/dev/sound/pci/envy24ht.c > > @@ -53,7 +53,7 @@ > > > > #include "mixer_if.h" > > > > -SND_DECLARE_FILE("$FreeBSD$"); > > +SND_DECLARE_FILE(""); > > > > static MALLOC_DEFINE(M_ENVY24HT, "envy24ht", "envy24ht audio"); > > > > diff --git a/sys/dev/sound/pci/es137x.c b/sys/dev/sound/pci/es137x.c > > index f1c94f16a123..a11a106fee2f 100644 > > --- a/sys/dev/sound/pci/es137x.c > > +++ b/sys/dev/sound/pci/es137x.c > > @@ -90,7 +90,7 @@ > > > > #include "mixer_if.h" > > > > -SND_DECLARE_FILE("$FreeBSD$"); > > +SND_DECLARE_FILE(""); > > > > #define MEM_MAP_REG 0x14 > > > > diff --git a/sys/dev/sound/pci/fm801.c b/sys/dev/sound/pci/fm801.c > > index 2469fdba967f..34fb1f6f1bf6 100644 > > --- a/sys/dev/sound/pci/fm801.c > > +++ b/sys/dev/sound/pci/fm801.c > > @@ -35,7 +35,7 @@ > > #include > > #include > > > > -SND_DECLARE_FILE("$FreeBSD$"); > > +SND_DECLARE_FILE(""); > > > > #define PCI_VENDOR_FORTEMEDIA 0x1319 > > #define PCI_DEVICE_FORTEMEDIA1 0x08011319 /* Audio controller */ > > diff --git a/sys/dev/sound/pci/hda/hdaa.c b/sys/dev/sound/pci/hda/hdaa.= c > > index c7706d2bd967..ef8f634ac8e8 100644 > > --- a/sys/dev/sound/pci/hda/hdaa.c > > +++ b/sys/dev/sound/pci/hda/hdaa.c > > @@ -47,7 +47,7 @@ > > > > #include "mixer_if.h" > > > > -SND_DECLARE_FILE("$FreeBSD$"); > > +SND_DECLARE_FILE(""); > > > > #define hdaa_lock(devinfo) snd_mtxlock((devinfo)->lock) > > #define hdaa_unlock(devinfo) snd_mtxunlock((devinfo)->lock) > > diff --git a/sys/dev/sound/pci/hda/hdaa_patches.c > b/sys/dev/sound/pci/hda/hdaa_patches.c > > index bec8590745c5..8331312b69c9 100644 > > --- a/sys/dev/sound/pci/hda/hdaa_patches.c > > +++ b/sys/dev/sound/pci/hda/hdaa_patches.c > > @@ -47,7 +47,7 @@ > > #include "pin_patch.h" > > #include "pin_patch_realtek.h" > > > > -SND_DECLARE_FILE("$FreeBSD$"); > > +SND_DECLARE_FILE(""); > > > > static const struct { > > uint32_t model; > > diff --git a/sys/dev/sound/pci/hda/hdac.c b/sys/dev/sound/pci/hda/hdac.= c > > index aca9bd7ac9ab..79ab71516cd9 100644 > > --- a/sys/dev/sound/pci/hda/hdac.c > > +++ b/sys/dev/sound/pci/hda/hdac.c > > @@ -51,7 +51,7 @@ > > > > #define HDA_DRV_TEST_REV "20120126_0002" > > > > -SND_DECLARE_FILE("$FreeBSD$"); > > +SND_DECLARE_FILE(""); > > > > #define hdac_lock(sc) snd_mtxlock((sc)->lock) > > #define hdac_unlock(sc) snd_mtxunlock((sc)->lock) > > diff --git a/sys/dev/sound/pci/hda/hdacc.c > b/sys/dev/sound/pci/hda/hdacc.c > > index 33eea6ef67c5..4616b3b23a48 100644 > > --- a/sys/dev/sound/pci/hda/hdacc.c > > +++ b/sys/dev/sound/pci/hda/hdacc.c > > @@ -43,7 +43,7 @@ > > #include > > #include > > > > -SND_DECLARE_FILE("$FreeBSD$"); > > +SND_DECLARE_FILE(""); > > > > struct hdacc_fg { > > device_t dev; > > diff --git a/sys/dev/sound/pci/hdspe-pcm.c > b/sys/dev/sound/pci/hdspe-pcm.c > > index 6de5b353ab5b..b23304d32fc7 100644 > > --- a/sys/dev/sound/pci/hdspe-pcm.c > > +++ b/sys/dev/sound/pci/hdspe-pcm.c > > @@ -40,7 +40,7 @@ > > > > #include > > > > -SND_DECLARE_FILE("$FreeBSD$"); > > +SND_DECLARE_FILE(""); > > > > struct hdspe_latency { > > uint32_t n; > > diff --git a/sys/dev/sound/pci/hdspe.c b/sys/dev/sound/pci/hdspe.c > > index 943c20bba4f1..ac253b28df3a 100644 > > --- a/sys/dev/sound/pci/hdspe.c > > +++ b/sys/dev/sound/pci/hdspe.c > > @@ -40,7 +40,7 @@ > > > > #include > > > > -SND_DECLARE_FILE("$FreeBSD$"); > > +SND_DECLARE_FILE(""); > > > > static struct hdspe_channel chan_map_aio[] =3D { > > { 0, 1, "line", 1, 1 }, > > diff --git a/sys/dev/sound/pci/ich.c b/sys/dev/sound/pci/ich.c > > index feb0175d2839..d5e8a48a186c 100644 > > --- a/sys/dev/sound/pci/ich.c > > +++ b/sys/dev/sound/pci/ich.c > > @@ -38,7 +38,7 @@ > > #include > > #include > > > > -SND_DECLARE_FILE("$FreeBSD$"); > > +SND_DECLARE_FILE(""); > > > > /* -------------------------------------------------------------------= - > */ > > > > diff --git a/sys/dev/sound/pci/maestro3.c b/sys/dev/sound/pci/maestro3.= c > > index f46b587daf7c..c60c69b6baf5 100644 > > --- a/sys/dev/sound/pci/maestro3.c > > +++ b/sys/dev/sound/pci/maestro3.c > > @@ -69,7 +69,7 @@ > > #include > > #include > > > > -SND_DECLARE_FILE("$FreeBSD$"); > > +SND_DECLARE_FILE(""); > > > > /* -------------------------------------------------------------------= - > */ > > > > diff --git a/sys/dev/sound/pci/neomagic.c b/sys/dev/sound/pci/neomagic.= c > > index 5616223b7590..162d99b57c70 100644 > > --- a/sys/dev/sound/pci/neomagic.c > > +++ b/sys/dev/sound/pci/neomagic.c > > @@ -40,7 +40,7 @@ > > #include > > #include > > > > -SND_DECLARE_FILE("$FreeBSD$"); > > +SND_DECLARE_FILE(""); > > > > /* -------------------------------------------------------------------= - > */ > > > > diff --git a/sys/dev/sound/pci/solo.c b/sys/dev/sound/pci/solo.c > > index dc8351e9c117..1788929811ed 100644 > > --- a/sys/dev/sound/pci/solo.c > > +++ b/sys/dev/sound/pci/solo.c > > @@ -39,7 +39,7 @@ > > > > #include "mixer_if.h" > > > > -SND_DECLARE_FILE("$FreeBSD$"); > > +SND_DECLARE_FILE(""); > > > > #define SOLO_DEFAULT_BUFSZ 16384 > > #define ABS(x) (((x) < 0)? -(x) : (x)) > > diff --git a/sys/dev/sound/pci/t4dwave.c b/sys/dev/sound/pci/t4dwave.c > > index fc99a90b94e7..b7363402ba8b 100644 > > --- a/sys/dev/sound/pci/t4dwave.c > > +++ b/sys/dev/sound/pci/t4dwave.c > > @@ -37,7 +37,7 @@ > > #include > > #include > > > > -SND_DECLARE_FILE("$FreeBSD$"); > > +SND_DECLARE_FILE(""); > > > > /* -------------------------------------------------------------------= - > */ > > > > diff --git a/sys/dev/sound/pci/via8233.c b/sys/dev/sound/pci/via8233.c > > index 9de5b18cd031..6656670c9e1c 100644 > > --- a/sys/dev/sound/pci/via8233.c > > +++ b/sys/dev/sound/pci/via8233.c > > @@ -50,7 +50,7 @@ > > > > #include > > > > -SND_DECLARE_FILE("$FreeBSD$"); > > +SND_DECLARE_FILE(""); > > > > #define VIA8233_PCI_ID 0x30591106 > > > > diff --git a/sys/dev/sound/pci/via82c686.c > b/sys/dev/sound/pci/via82c686.c > > index 6bd604941cf8..076df8c81aa0 100644 > > --- a/sys/dev/sound/pci/via82c686.c > > +++ b/sys/dev/sound/pci/via82c686.c > > @@ -39,7 +39,7 @@ > > > > #include > > > > -SND_DECLARE_FILE("$FreeBSD$"); > > +SND_DECLARE_FILE(""); > > > > #define VIA_PCI_ID 0x30581106 > > #define NSEGS 4 /* Number of segments in SGD > table */ > > diff --git a/sys/dev/sound/pci/vibes.c b/sys/dev/sound/pci/vibes.c > > index 81401796d68c..1299f15dc814 100644 > > --- a/sys/dev/sound/pci/vibes.c > > +++ b/sys/dev/sound/pci/vibes.c > > @@ -44,7 +44,7 @@ > > > > #include "mixer_if.h" > > > > -SND_DECLARE_FILE("$FreeBSD$"); > > +SND_DECLARE_FILE(""); > > > > /* > -------------------------------------------------------------------------= */ > > /* Constants */ > > diff --git a/sys/dev/sound/pcm/ac97.c b/sys/dev/sound/pcm/ac97.c > > index 763188291009..d83e3f2fefa5 100644 > > --- a/sys/dev/sound/pcm/ac97.c > > +++ b/sys/dev/sound/pcm/ac97.c > > @@ -38,7 +38,7 @@ > > > > #include "mixer_if.h" > > > > -SND_DECLARE_FILE("$FreeBSD$"); > > +SND_DECLARE_FILE(""); > > > > static MALLOC_DEFINE(M_AC97, "ac97", "ac97 codec"); > > > > diff --git a/sys/dev/sound/pcm/ac97_patch.c > b/sys/dev/sound/pcm/ac97_patch.c > > index f1a358b50958..aff8075fe96c 100644 > > --- a/sys/dev/sound/pcm/ac97_patch.c > > +++ b/sys/dev/sound/pcm/ac97_patch.c > > @@ -34,7 +34,7 @@ > > #include > > #include > > > > -SND_DECLARE_FILE("$FreeBSD$"); > > +SND_DECLARE_FILE(""); > > > > void ad1886_patch(struct ac97_info* codec) > > { > > diff --git a/sys/dev/sound/pcm/buffer.c b/sys/dev/sound/pcm/buffer.c > > index d75890eaddfb..d5a519362c5e 100644 > > --- a/sys/dev/sound/pcm/buffer.c > > +++ b/sys/dev/sound/pcm/buffer.c > > @@ -40,7 +40,7 @@ > > #define SND_DECLARE_FXDIV > > #include "snd_fxdiv_gen.h" > > > > -SND_DECLARE_FILE("$FreeBSD$"); > > +SND_DECLARE_FILE(""); > > > > struct snd_dbuf * > > sndbuf_create(device_t dev, char *drv, char *desc, struct pcm_channel > *channel) > > diff --git a/sys/dev/sound/pcm/channel.c b/sys/dev/sound/pcm/channel.c > > index 1d192de54712..d56f5fb51dc9 100644 > > --- a/sys/dev/sound/pcm/channel.c > > +++ b/sys/dev/sound/pcm/channel.c > > @@ -38,7 +38,7 @@ > > > > #include "feeder_if.h" > > > > -SND_DECLARE_FILE("$FreeBSD$"); > > +SND_DECLARE_FILE(""); > > > > int report_soft_formats =3D 1; > > SYSCTL_INT(_hw_snd, OID_AUTO, report_soft_formats, CTLFLAG_RW, > > diff --git a/sys/dev/sound/pcm/dsp.c b/sys/dev/sound/pcm/dsp.c > > index bb435bc3925c..98d241e65a52 100644 > > --- a/sys/dev/sound/pcm/dsp.c > > +++ b/sys/dev/sound/pcm/dsp.c > > @@ -43,7 +43,7 @@ > > #include > > #include > > > > -SND_DECLARE_FILE("$FreeBSD$"); > > +SND_DECLARE_FILE(""); > > > > static int dsp_mmap_allow_prot_exec =3D 0; > > SYSCTL_INT(_hw_snd, OID_AUTO, compat_linux_mmap, CTLFLAG_RWTUN, > > diff --git a/sys/dev/sound/pcm/feeder.c b/sys/dev/sound/pcm/feeder.c > > index d379d06b8664..8fb377533907 100644 > > --- a/sys/dev/sound/pcm/feeder.c > > +++ b/sys/dev/sound/pcm/feeder.c > > @@ -35,7 +35,7 @@ > > > > #include "feeder_if.h" > > > > -SND_DECLARE_FILE("$FreeBSD$"); > > +SND_DECLARE_FILE(""); > > > > static MALLOC_DEFINE(M_FEEDER, "feeder", "pcm feeder"); > > > > diff --git a/sys/dev/sound/pcm/feeder_chain.c > b/sys/dev/sound/pcm/feeder_chain.c > > index 9c3baaf282b5..01def5f6e9cb 100644 > > --- a/sys/dev/sound/pcm/feeder_chain.c > > +++ b/sys/dev/sound/pcm/feeder_chain.c > > @@ -34,7 +34,7 @@ > > > > #include "feeder_if.h" > > > > -SND_DECLARE_FILE("$FreeBSD$"); > > +SND_DECLARE_FILE(""); > > > > /* chain state */ > > struct feeder_chain_state { > > diff --git a/sys/dev/sound/pcm/feeder_eq.c > b/sys/dev/sound/pcm/feeder_eq.c > > index bc39d33c03fb..70797a706367 100644 > > --- a/sys/dev/sound/pcm/feeder_eq.c > > +++ b/sys/dev/sound/pcm/feeder_eq.c > > @@ -46,7 +46,7 @@ > > #define SND_USE_FXDIV > > #include "snd_fxdiv_gen.h" > > > > -SND_DECLARE_FILE("$FreeBSD$"); > > +SND_DECLARE_FILE(""); > > #endif > > > > #include "feeder_eq_gen.h" > > diff --git a/sys/dev/sound/pcm/feeder_format.c > b/sys/dev/sound/pcm/feeder_format.c > > index 8a9054561b2b..3a741430e0ca 100644 > > --- a/sys/dev/sound/pcm/feeder_format.c > > +++ b/sys/dev/sound/pcm/feeder_format.c > > @@ -44,7 +44,7 @@ > > #define SND_USE_FXDIV > > #include "snd_fxdiv_gen.h" > > > > -SND_DECLARE_FILE("$FreeBSD$"); > > +SND_DECLARE_FILE(""); > > #endif > > > > #define FEEDFORMAT_RESERVOIR (SND_CHN_MAX * PCM_32_BPS) > > diff --git a/sys/dev/sound/pcm/feeder_matrix.c > b/sys/dev/sound/pcm/feeder_matrix.c > > index 33bf3ec11ee0..0afdb47c04d8 100644 > > --- a/sys/dev/sound/pcm/feeder_matrix.c > > +++ b/sys/dev/sound/pcm/feeder_matrix.c > > @@ -54,7 +54,7 @@ > > #define SND_USE_FXDIV > > #include "snd_fxdiv_gen.h" > > > > -SND_DECLARE_FILE("$FreeBSD$"); > > +SND_DECLARE_FILE(""); > > #endif > > > > #define FEEDMATRIX_RESERVOIR (SND_CHN_MAX * PCM_32_BPS) > > diff --git a/sys/dev/sound/pcm/feeder_mixer.c > b/sys/dev/sound/pcm/feeder_mixer.c > > index 13afceabf28e..42ebe89d7c09 100644 > > --- a/sys/dev/sound/pcm/feeder_mixer.c > > +++ b/sys/dev/sound/pcm/feeder_mixer.c > > @@ -38,7 +38,7 @@ > > #define SND_USE_FXDIV > > #include "snd_fxdiv_gen.h" > > > > -SND_DECLARE_FILE("$FreeBSD$"); > > +SND_DECLARE_FILE(""); > > #endif > > > > #undef SND_FEEDER_MULTIFORMAT > > diff --git a/sys/dev/sound/pcm/feeder_rate.c > b/sys/dev/sound/pcm/feeder_rate.c > > index 0784c477197a..b2afe0651bf5 100644 > > --- a/sys/dev/sound/pcm/feeder_rate.c > > +++ b/sys/dev/sound/pcm/feeder_rate.c > > @@ -61,7 +61,7 @@ > > #define SND_USE_FXDIV > > #include "snd_fxdiv_gen.h" > > > > -SND_DECLARE_FILE("$FreeBSD$"); > > +SND_DECLARE_FILE(""); > > #endif > > > > #include "feeder_rate_gen.h" > > diff --git a/sys/dev/sound/pcm/feeder_volume.c > b/sys/dev/sound/pcm/feeder_volume.c > > index 724d5a0922e8..fa11a089af76 100644 > > --- a/sys/dev/sound/pcm/feeder_volume.c > > +++ b/sys/dev/sound/pcm/feeder_volume.c > > @@ -39,7 +39,7 @@ > > #define SND_USE_FXDIV > > #include "snd_fxdiv_gen.h" > > > > -SND_DECLARE_FILE("$FreeBSD$"); > > +SND_DECLARE_FILE(""); > > #endif > > > > typedef void (*feed_volume_t)(int *, int *, uint32_t, uint8_t *, > uint32_t); > > diff --git a/sys/dev/sound/pcm/mixer.c b/sys/dev/sound/pcm/mixer.c > > index 080daeced12d..0c7576390b72 100644 > > --- a/sys/dev/sound/pcm/mixer.c > > +++ b/sys/dev/sound/pcm/mixer.c > > @@ -37,7 +37,7 @@ > > #include "feeder_if.h" > > #include "mixer_if.h" > > > > -SND_DECLARE_FILE("$FreeBSD$"); > > +SND_DECLARE_FILE(""); > > > > static MALLOC_DEFINE(M_MIXER, "mixer", "mixer"); > > > > diff --git a/sys/dev/sound/pcm/sndstat.c b/sys/dev/sound/pcm/sndstat.c > > index 64e0a1ca5d82..fc92bd783587 100644 > > --- a/sys/dev/sound/pcm/sndstat.c > > +++ b/sys/dev/sound/pcm/sndstat.c > > @@ -50,7 +50,7 @@ > > #include > > > > > > -SND_DECLARE_FILE("$FreeBSD$"); > > +SND_DECLARE_FILE(""); > > > > #define SS_TYPE_MODULE 0 > > #define SS_TYPE_PCM 1 > > diff --git a/sys/dev/sound/pcm/sound.c b/sys/dev/sound/pcm/sound.c > > index 1a7f8dc2fa68..17dc8d968b3c 100644 > > --- a/sys/dev/sound/pcm/sound.c > > +++ b/sys/dev/sound/pcm/sound.c > > @@ -44,7 +44,7 @@ > > > > #include "feeder_if.h" > > > > -SND_DECLARE_FILE("$FreeBSD$"); > > +SND_DECLARE_FILE(""); > > > > devclass_t pcm_devclass; > > > > diff --git a/sys/dev/sound/pcm/vchan.c b/sys/dev/sound/pcm/vchan.c > > index 0b0ddc224094..c84d8f14e075 100644 > > --- a/sys/dev/sound/pcm/vchan.c > > +++ b/sys/dev/sound/pcm/vchan.c > > @@ -36,7 +36,7 @@ > > #include > > #include > > > > -SND_DECLARE_FILE("$FreeBSD$"); > > +SND_DECLARE_FILE(""); > > > > /* > > * [ac3 , dts , linear , 0, linear, 0] > > > --000000000000ea271906030e8687 Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable


On Wed, Aug 16, 2023, 12:12 PM Kevin Bowling <kevin.bowling@kev009.com> wro= te:
On Wed, Aug 16, 2023 at 10:56= =E2=80=AFAM Warner Losh <imp@freebsd.org> wrote:
>
> The branch main has been updated by imp:
>
> URL: https://cgit.FreeBSD.org/src/commit/?id=3D82a265ad9bad315000a2d60b853c46= 69f1600cd0
>
> commit 82a265ad9bad315000a2d60b853c4669f1600cd0
> Author:=C2=A0 =C2=A0 =C2=A0Warner Losh <imp@FreeBSD.org>
> AuthorDate: 2023-08-16 17:53:59 +0000
> Commit:=C2=A0 =C2=A0 =C2=A0Warner Losh <imp@FreeBSD.org>
> CommitDate: 2023-08-16 17:53:59 +0000
>
>=C2=A0 =C2=A0 =C2=A0sys: Remove $FreeBSD$: sound driver version
>
>=C2=A0 =C2=A0 =C2=A0Remove /SND_DECLARE_FILE\("\$FreeBSD\$"\)= ;/

It seems like SND_DECLARE_FILE(""); should probably go away or th= e
string within shall be dropped.=C2=A0 Its idea of 'uniq' is a littl= e
concerning.

Likely. It actually adds the driver to a list, so I didn't j= ust remove it.

Warner

> ---
>=C2=A0 sys/arm/broadcom/bcm2835/bcm2835_audio.c | 2 +-
>=C2=A0 sys/dev/sound/pci/als4000.c=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0 =C2=A0 | 2 +-
>=C2=A0 sys/dev/sound/pci/atiixp.c=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0| 2 +-
>=C2=A0 sys/dev/sound/pci/cmi.c=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0= =C2=A0 =C2=A0 =C2=A0 | 2 +-
>=C2=A0 sys/dev/sound/pci/cs4281.c=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0| 2 +-
>=C2=A0 sys/dev/sound/pci/csa.c=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0= =C2=A0 =C2=A0 =C2=A0 | 2 +-
>=C2=A0 sys/dev/sound/pci/csamidi.c=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0 =C2=A0 | 2 +-
>=C2=A0 sys/dev/sound/pci/csapcm.c=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0| 2 +-
>=C2=A0 sys/dev/sound/pci/emu10k1.c=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0 =C2=A0 | 2 +-
>=C2=A0 sys/dev/sound/pci/envy24.c=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0| 2 +-
>=C2=A0 sys/dev/sound/pci/envy24ht.c=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0 =C2=A0| 2 +-
>=C2=A0 sys/dev/sound/pci/es137x.c=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0| 2 +-
>=C2=A0 sys/dev/sound/pci/fm801.c=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 | 2 +-
>=C2=A0 sys/dev/sound/pci/hda/hdaa.c=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0 =C2=A0| 2 +-
>=C2=A0 sys/dev/sound/pci/hda/hdaa_patches.c=C2=A0 =C2=A0 =C2=A0| 2 +- >=C2=A0 sys/dev/sound/pci/hda/hdac.c=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0 =C2=A0| 2 +-
>=C2=A0 sys/dev/sound/pci/hda/hdacc.c=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0 | 2 +-
>=C2=A0 sys/dev/sound/pci/hdspe-pcm.c=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0 | 2 +-
>=C2=A0 sys/dev/sound/pci/hdspe.c=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 | 2 +-
>=C2=A0 sys/dev/sound/pci/ich.c=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0= =C2=A0 =C2=A0 =C2=A0 | 2 +-
>=C2=A0 sys/dev/sound/pci/maestro3.c=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0 =C2=A0| 2 +-
>=C2=A0 sys/dev/sound/pci/neomagic.c=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0 =C2=A0| 2 +-
>=C2=A0 sys/dev/sound/pci/solo.c=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0| 2 +-
>=C2=A0 sys/dev/sound/pci/t4dwave.c=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0 =C2=A0 | 2 +-
>=C2=A0 sys/dev/sound/pci/via8233.c=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0 =C2=A0 | 2 +-
>=C2=A0 sys/dev/sound/pci/via82c686.c=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0 | 2 +-
>=C2=A0 sys/dev/sound/pci/vibes.c=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 | 2 +-
>=C2=A0 sys/dev/sound/pcm/ac97.c=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0| 2 +-
>=C2=A0 sys/dev/sound/pcm/ac97_patch.c=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0= =C2=A0| 2 +-
>=C2=A0 sys/dev/sound/pcm/buffer.c=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0| 2 +-
>=C2=A0 sys/dev/sound/pcm/channel.c=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0 =C2=A0 | 2 +-
>=C2=A0 sys/dev/sound/pcm/dsp.c=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0= =C2=A0 =C2=A0 =C2=A0 | 2 +-
>=C2=A0 sys/dev/sound/pcm/feeder.c=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0| 2 +-
>=C2=A0 sys/dev/sound/pcm/feeder_chain.c=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0| 2 +-
>=C2=A0 sys/dev/sound/pcm/feeder_eq.c=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0 | 2 +-
>=C2=A0 sys/dev/sound/pcm/feeder_format.c=C2=A0 =C2=A0 =C2=A0 =C2=A0 | 2= +-
>=C2=A0 sys/dev/sound/pcm/feeder_matrix.c=C2=A0 =C2=A0 =C2=A0 =C2=A0 | 2= +-
>=C2=A0 sys/dev/sound/pcm/feeder_mixer.c=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0| 2 +-
>=C2=A0 sys/dev/sound/pcm/feeder_rate.c=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 | 2 +-
>=C2=A0 sys/dev/sound/pcm/feeder_volume.c=C2=A0 =C2=A0 =C2=A0 =C2=A0 | 2= +-
>=C2=A0 sys/dev/sound/pcm/mixer.c=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 | 2 +-
>=C2=A0 sys/dev/sound/pcm/sndstat.c=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0 =C2=A0 | 2 +-
>=C2=A0 sys/dev/sound/pcm/sound.c=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 | 2 +-
>=C2=A0 sys/dev/sound/pcm/vchan.c=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 | 2 +-
>=C2=A0 44 files changed, 44 insertions(+), 44 deletions(-)
>
> diff --git a/sys/arm/broadcom/bcm2835/bcm2835_audio.c b/sys/arm/broadc= om/bcm2835/bcm2835_audio.c
> index 36b1dc86535b..0d430cf19df7 100644
> --- a/sys/arm/broadcom/bcm2835/bcm2835_audio.c
> +++ b/sys/arm/broadcom/bcm2835/bcm2835_audio.c
> @@ -38,7 +38,7 @@
>
>=C2=A0 #include "vc_vchi_audioserv_defs.h"
>
> -SND_DECLARE_FILE("$FreeBSD$");
> +SND_DECLARE_FILE("");
>
>=C2=A0 /* Audio destination */
>=C2=A0 #define=C2=A0 =C2=A0 =C2=A0 =C2=A0 DEST_AUTO=C2=A0 =C2=A0 =C2=A0= =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A00
> diff --git a/sys/dev/sound/pci/als4000.c b/sys/dev/sound/pci/als4000.c=
> index 71f6c4f909c7..89f7d6385493 100644
> --- a/sys/dev/sound/pci/als4000.c
> +++ b/sys/dev/sound/pci/als4000.c
> @@ -48,7 +48,7 @@
>
>=C2=A0 #include "mixer_if.h"
>
> -SND_DECLARE_FILE("$FreeBSD$");
> +SND_DECLARE_FILE("");
>
>=C2=A0 /* Debugging macro's */
>=C2=A0 #undef DEB
> diff --git a/sys/dev/sound/pci/atiixp.c b/sys/dev/sound/pci/atiixp.c > index 83eee21a333e..99468367c998 100644
> --- a/sys/dev/sound/pci/atiixp.c
> +++ b/sys/dev/sound/pci/atiixp.c
> @@ -69,7 +69,7 @@
>
>=C2=A0 #include <dev/sound/pci/atiixp.h>
>
> -SND_DECLARE_FILE("$FreeBSD$");
> +SND_DECLARE_FILE("");
>
>=C2=A0 #define ATI_IXP_DMA_RETRY_MAX=C2=A0 100
>
> diff --git a/sys/dev/sound/pci/cmi.c b/sys/dev/sound/pci/cmi.c
> index 6b4acbb4ddae..89a1eb24d878 100644
> --- a/sys/dev/sound/pci/cmi.c
> +++ b/sys/dev/sound/pci/cmi.c
> @@ -61,7 +61,7 @@
>=C2=A0 #include "mixer_if.h"
>=C2=A0 #include "mpufoi_if.h"
>
> -SND_DECLARE_FILE("$FreeBSD$");
> +SND_DECLARE_FILE("");
>
>=C2=A0 /* Supported chip ID's */
>=C2=A0 #define CMI8338A_PCI_ID=C2=A0 =C2=A00x010013f6
> diff --git a/sys/dev/sound/pci/cs4281.c b/sys/dev/sound/pci/cs4281.c > index b011f67e763e..fccbf807d965 100644
> --- a/sys/dev/sound/pci/cs4281.c
> +++ b/sys/dev/sound/pci/cs4281.c
> @@ -45,7 +45,7 @@
>
>=C2=A0 #include <dev/sound/pci/cs4281.h>
>
> -SND_DECLARE_FILE("$FreeBSD$");
> +SND_DECLARE_FILE("");
>
>=C2=A0 #define CS4281_DEFAULT_BUFSZ 16384
>
> diff --git a/sys/dev/sound/pci/csa.c b/sys/dev/sound/pci/csa.c
> index a03f319d85d5..68edfd9338c2 100644
> --- a/sys/dev/sound/pci/csa.c
> +++ b/sys/dev/sound/pci/csa.c
> @@ -54,7 +54,7 @@
>
>=C2=A0 #include <dev/sound/pci/cs461x_dsp.h>
>
> -SND_DECLARE_FILE("$FreeBSD$");
> +SND_DECLARE_FILE("");
>
>=C2=A0 /* This is the pci device id. */
>=C2=A0 #define CS4610_PCI_ID 0x60011013
> diff --git a/sys/dev/sound/pci/csamidi.c b/sys/dev/sound/pci/csamidi.c=
> index e9d6006544b3..cc4b41f86af9 100644
> --- a/sys/dev/sound/pci/csamidi.c
> +++ b/sys/dev/sound/pci/csamidi.c
> @@ -54,7 +54,7 @@
>
>=C2=A0 #include "mpufoi_if.h"
>
> -SND_DECLARE_FILE("$FreeBSD$");
> +SND_DECLARE_FILE("");
>
>=C2=A0 /* pulled from mpu401.c */
>=C2=A0 #define=C2=A0 =C2=A0 =C2=A0 =C2=A0 MPU_DATAPORT=C2=A0 =C2=A0 0 > diff --git a/sys/dev/sound/pci/csapcm.c b/sys/dev/sound/pci/csapcm.c > index d915a14a536f..14820a9c2216 100644
> --- a/sys/dev/sound/pci/csapcm.c
> +++ b/sys/dev/sound/pci/csapcm.c
> @@ -43,7 +43,7 @@
>=C2=A0 #include <dev/pci/pcireg.h>
>=C2=A0 #include <dev/pci/pcivar.h>
>
> -SND_DECLARE_FILE("$FreeBSD$");
> +SND_DECLARE_FILE("");
>
>=C2=A0 /* Buffer size on dma transfer. Fixed for CS416x. */
>=C2=A0 #define CS461x_BUFFSIZE=C2=A0 =C2=A0(4 * 1024)
> diff --git a/sys/dev/sound/pci/emu10k1.c b/sys/dev/sound/pci/emu10k1.c=
> index abb586e34525..d4624a549e42 100644
> --- a/sys/dev/sound/pci/emu10k1.c
> +++ b/sys/dev/sound/pci/emu10k1.c
> @@ -43,7 +43,7 @@
>=C2=A0 #include <dev/sound/midi/mpu401.h>
>=C2=A0 #include "mpufoi_if.h"
>
> -SND_DECLARE_FILE("$FreeBSD$");
> +SND_DECLARE_FILE("");
>
>=C2=A0 /* -------------------------------------------------------------= ------- */
>
> diff --git a/sys/dev/sound/pci/envy24.c b/sys/dev/sound/pci/envy24.c > index b95a3438ce79..8039d4e3186c 100644
> --- a/sys/dev/sound/pci/envy24.c
> +++ b/sys/dev/sound/pci/envy24.c
> @@ -41,7 +41,7 @@
>
>=C2=A0 #include "mixer_if.h"
>
> -SND_DECLARE_FILE("$FreeBSD$");
> +SND_DECLARE_FILE("");
>
>=C2=A0 static MALLOC_DEFINE(M_ENVY24, "envy24", "envy24 = audio");
>
> diff --git a/sys/dev/sound/pci/envy24ht.c b/sys/dev/sound/pci/envy24ht= .c
> index 4bfef99f600f..e9b6771e2162 100644
> --- a/sys/dev/sound/pci/envy24ht.c
> +++ b/sys/dev/sound/pci/envy24ht.c
> @@ -53,7 +53,7 @@
>
>=C2=A0 #include "mixer_if.h"
>
> -SND_DECLARE_FILE("$FreeBSD$");
> +SND_DECLARE_FILE("");
>
>=C2=A0 static MALLOC_DEFINE(M_ENVY24HT, "envy24ht", "env= y24ht audio");
>
> diff --git a/sys/dev/sound/pci/es137x.c b/sys/dev/sound/pci/es137x.c > index f1c94f16a123..a11a106fee2f 100644
> --- a/sys/dev/sound/pci/es137x.c
> +++ b/sys/dev/sound/pci/es137x.c
> @@ -90,7 +90,7 @@
>
>=C2=A0 #include "mixer_if.h"
>
> -SND_DECLARE_FILE("$FreeBSD$");
> +SND_DECLARE_FILE("");
>
>=C2=A0 #define MEM_MAP_REG 0x14
>
> diff --git a/sys/dev/sound/pci/fm801.c b/sys/dev/sound/pci/fm801.c
> index 2469fdba967f..34fb1f6f1bf6 100644
> --- a/sys/dev/sound/pci/fm801.c
> +++ b/sys/dev/sound/pci/fm801.c
> @@ -35,7 +35,7 @@
>=C2=A0 #include <dev/pci/pcireg.h>
>=C2=A0 #include <dev/pci/pcivar.h>
>
> -SND_DECLARE_FILE("$FreeBSD$");
> +SND_DECLARE_FILE("");
>
>=C2=A0 #define PCI_VENDOR_FORTEMEDIA=C2=A0 0x1319
>=C2=A0 #define PCI_DEVICE_FORTEMEDIA1 0x08011319=C2=A0 =C2=A0 =C2=A0 /*= Audio controller */
> diff --git a/sys/dev/sound/pci/hda/hdaa.c b/sys/dev/sound/pci/hda/hdaa= .c
> index c7706d2bd967..ef8f634ac8e8 100644
> --- a/sys/dev/sound/pci/hda/hdaa.c
> +++ b/sys/dev/sound/pci/hda/hdaa.c
> @@ -47,7 +47,7 @@
>
>=C2=A0 #include "mixer_if.h"
>
> -SND_DECLARE_FILE("$FreeBSD$");
> +SND_DECLARE_FILE("");
>
>=C2=A0 #define hdaa_lock(devinfo)=C2=A0 =C2=A0 =C2=A0snd_mtxlock((devin= fo)->lock)
>=C2=A0 #define hdaa_unlock(devinfo)=C2=A0 =C2=A0snd_mtxunlock((devinfo)= ->lock)
> diff --git a/sys/dev/sound/pci/hda/hdaa_patches.c b/sys/dev/sound/pci/= hda/hdaa_patches.c
> index bec8590745c5..8331312b69c9 100644
> --- a/sys/dev/sound/pci/hda/hdaa_patches.c
> +++ b/sys/dev/sound/pci/hda/hdaa_patches.c
> @@ -47,7 +47,7 @@
>=C2=A0 #include "pin_patch.h"
>=C2=A0 #include "pin_patch_realtek.h"
>
> -SND_DECLARE_FILE("$FreeBSD$");
> +SND_DECLARE_FILE("");
>
>=C2=A0 static const struct {
>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0uint32_t model;
> diff --git a/sys/dev/sound/pci/hda/hdac.c b/sys/dev/sound/pci/hda/hdac= .c
> index aca9bd7ac9ab..79ab71516cd9 100644
> --- a/sys/dev/sound/pci/hda/hdac.c
> +++ b/sys/dev/sound/pci/hda/hdac.c
> @@ -51,7 +51,7 @@
>
>=C2=A0 #define HDA_DRV_TEST_REV=C2=A0 =C2=A0 =C2=A0 =C2=A0"2012012= 6_0002"
>
> -SND_DECLARE_FILE("$FreeBSD$");
> +SND_DECLARE_FILE("");
>
>=C2=A0 #define hdac_lock(sc)=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 snd_mtxl= ock((sc)->lock)
>=C2=A0 #define hdac_unlock(sc)=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0= =C2=A0 =C2=A0 snd_mtxunlock((sc)->lock)
> diff --git a/sys/dev/sound/pci/hda/hdacc.c b/sys/dev/sound/pci/hda/hda= cc.c
> index 33eea6ef67c5..4616b3b23a48 100644
> --- a/sys/dev/sound/pci/hda/hdacc.c
> +++ b/sys/dev/sound/pci/hda/hdacc.c
> @@ -43,7 +43,7 @@
>=C2=A0 #include <dev/sound/pci/hda/hda_reg.h>
>=C2=A0 #include <dev/sound/pci/hda/hdac.h>
>
> -SND_DECLARE_FILE("$FreeBSD$");
> +SND_DECLARE_FILE("");
>
>=C2=A0 struct hdacc_fg {
>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0device_t=C2=A0 =C2=A0 =C2=A0 =C2=A0 d= ev;
> diff --git a/sys/dev/sound/pci/hdspe-pcm.c b/sys/dev/sound/pci/hdspe-p= cm.c
> index 6de5b353ab5b..b23304d32fc7 100644
> --- a/sys/dev/sound/pci/hdspe-pcm.c
> +++ b/sys/dev/sound/pci/hdspe-pcm.c
> @@ -40,7 +40,7 @@
>
>=C2=A0 #include <mixer_if.h>
>
> -SND_DECLARE_FILE("$FreeBSD$");
> +SND_DECLARE_FILE("");
>
>=C2=A0 struct hdspe_latency {
>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0uint32_t n;
> diff --git a/sys/dev/sound/pci/hdspe.c b/sys/dev/sound/pci/hdspe.c
> index 943c20bba4f1..ac253b28df3a 100644
> --- a/sys/dev/sound/pci/hdspe.c
> +++ b/sys/dev/sound/pci/hdspe.c
> @@ -40,7 +40,7 @@
>
>=C2=A0 #include <mixer_if.h>
>
> -SND_DECLARE_FILE("$FreeBSD$");
> +SND_DECLARE_FILE("");
>
>=C2=A0 static struct hdspe_channel chan_map_aio[] =3D {
>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0{=C2=A0 0,=C2=A0 1,=C2=A0 =C2=A0"= ;line", 1, 1 },
> diff --git a/sys/dev/sound/pci/ich.c b/sys/dev/sound/pci/ich.c
> index feb0175d2839..d5e8a48a186c 100644
> --- a/sys/dev/sound/pci/ich.c
> +++ b/sys/dev/sound/pci/ich.c
> @@ -38,7 +38,7 @@
>=C2=A0 #include <dev/pci/pcireg.h>
>=C2=A0 #include <dev/pci/pcivar.h>
>
> -SND_DECLARE_FILE("$FreeBSD$");
> +SND_DECLARE_FILE("");
>
>=C2=A0 /* -------------------------------------------------------------= ------- */
>
> diff --git a/sys/dev/sound/pci/maestro3.c b/sys/dev/sound/pci/maestro3= .c
> index f46b587daf7c..c60c69b6baf5 100644
> --- a/sys/dev/sound/pci/maestro3.c
> +++ b/sys/dev/sound/pci/maestro3.c
> @@ -69,7 +69,7 @@
>=C2=A0 #include <dev/sound/pci/allegro_reg.h>
>=C2=A0 #include <dev/sound/pci/allegro_code.h>
>
> -SND_DECLARE_FILE("$FreeBSD$");
> +SND_DECLARE_FILE("");
>
>=C2=A0 /* -------------------------------------------------------------= ------- */
>
> diff --git a/sys/dev/sound/pci/neomagic.c b/sys/dev/sound/pci/neomagic= .c
> index 5616223b7590..162d99b57c70 100644
> --- a/sys/dev/sound/pci/neomagic.c
> +++ b/sys/dev/sound/pci/neomagic.c
> @@ -40,7 +40,7 @@
>=C2=A0 #include <dev/pci/pcireg.h>
>=C2=A0 #include <dev/pci/pcivar.h>
>
> -SND_DECLARE_FILE("$FreeBSD$");
> +SND_DECLARE_FILE("");
>
>=C2=A0 /* -------------------------------------------------------------= ------- */
>
> diff --git a/sys/dev/sound/pci/solo.c b/sys/dev/sound/pci/solo.c
> index dc8351e9c117..1788929811ed 100644
> --- a/sys/dev/sound/pci/solo.c
> +++ b/sys/dev/sound/pci/solo.c
> @@ -39,7 +39,7 @@
>
>=C2=A0 #include "mixer_if.h"
>
> -SND_DECLARE_FILE("$FreeBSD$");
> +SND_DECLARE_FILE("");
>
>=C2=A0 #define SOLO_DEFAULT_BUFSZ 16384
>=C2=A0 #define ABS(x) (((x) < 0)? -(x) : (x))
> diff --git a/sys/dev/sound/pci/t4dwave.c b/sys/dev/sound/pci/t4dwave.c=
> index fc99a90b94e7..b7363402ba8b 100644
> --- a/sys/dev/sound/pci/t4dwave.c
> +++ b/sys/dev/sound/pci/t4dwave.c
> @@ -37,7 +37,7 @@
>=C2=A0 #include <dev/pci/pcireg.h>
>=C2=A0 #include <dev/pci/pcivar.h>
>
> -SND_DECLARE_FILE("$FreeBSD$");
> +SND_DECLARE_FILE("");
>
>=C2=A0 /* -------------------------------------------------------------= ------- */
>
> diff --git a/sys/dev/sound/pci/via8233.c b/sys/dev/sound/pci/via8233.c=
> index 9de5b18cd031..6656670c9e1c 100644
> --- a/sys/dev/sound/pci/via8233.c
> +++ b/sys/dev/sound/pci/via8233.c
> @@ -50,7 +50,7 @@
>
>=C2=A0 #include <dev/sound/pci/via8233.h>
>
> -SND_DECLARE_FILE("$FreeBSD$");
> +SND_DECLARE_FILE("");
>
>=C2=A0 #define VIA8233_PCI_ID 0x30591106
>
> diff --git a/sys/dev/sound/pci/via82c686.c b/sys/dev/sound/pci/via82c6= 86.c
> index 6bd604941cf8..076df8c81aa0 100644
> --- a/sys/dev/sound/pci/via82c686.c
> +++ b/sys/dev/sound/pci/via82c686.c
> @@ -39,7 +39,7 @@
>
>=C2=A0 #include <dev/sound/pci/via82c686.h>
>
> -SND_DECLARE_FILE("$FreeBSD$");
> +SND_DECLARE_FILE("");
>
>=C2=A0 #define VIA_PCI_ID 0x30581106
>=C2=A0 #define=C2=A0 =C2=A0 =C2=A0 =C2=A0 NSEGS=C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A04=C2=A0 =C2=A0 =C2=A0 =C2=A0/* Number of segments in SGD t= able */
> diff --git a/sys/dev/sound/pci/vibes.c b/sys/dev/sound/pci/vibes.c
> index 81401796d68c..1299f15dc814 100644
> --- a/sys/dev/sound/pci/vibes.c
> +++ b/sys/dev/sound/pci/vibes.c
> @@ -44,7 +44,7 @@
>
>=C2=A0 #include "mixer_if.h"
>
> -SND_DECLARE_FILE("$FreeBSD$");
> +SND_DECLARE_FILE("");
>
>=C2=A0 /* -------------------------------------------------------------= ------------ */
>=C2=A0 /* Constants */
> diff --git a/sys/dev/sound/pcm/ac97.c b/sys/dev/sound/pcm/ac97.c
> index 763188291009..d83e3f2fefa5 100644
> --- a/sys/dev/sound/pcm/ac97.c
> +++ b/sys/dev/sound/pcm/ac97.c
> @@ -38,7 +38,7 @@
>
>=C2=A0 #include "mixer_if.h"
>
> -SND_DECLARE_FILE("$FreeBSD$");
> +SND_DECLARE_FILE("");
>
>=C2=A0 static MALLOC_DEFINE(M_AC97, "ac97", "ac97 codec&= quot;);
>
> diff --git a/sys/dev/sound/pcm/ac97_patch.c b/sys/dev/sound/pcm/ac97_p= atch.c
> index f1a358b50958..aff8075fe96c 100644
> --- a/sys/dev/sound/pcm/ac97_patch.c
> +++ b/sys/dev/sound/pcm/ac97_patch.c
> @@ -34,7 +34,7 @@
>=C2=A0 #include <dev/sound/pcm/ac97.h>
>=C2=A0 #include <dev/sound/pcm/ac97_patch.h>
>
> -SND_DECLARE_FILE("$FreeBSD$");
> +SND_DECLARE_FILE("");
>
>=C2=A0 void ad1886_patch(struct ac97_info* codec)
>=C2=A0 {
> diff --git a/sys/dev/sound/pcm/buffer.c b/sys/dev/sound/pcm/buffer.c > index d75890eaddfb..d5a519362c5e 100644
> --- a/sys/dev/sound/pcm/buffer.c
> +++ b/sys/dev/sound/pcm/buffer.c
> @@ -40,7 +40,7 @@
>=C2=A0 #define=C2=A0 =C2=A0 =C2=A0 =C2=A0 SND_DECLARE_FXDIV
>=C2=A0 #include "snd_fxdiv_gen.h"
>
> -SND_DECLARE_FILE("$FreeBSD$");
> +SND_DECLARE_FILE("");
>
>=C2=A0 struct snd_dbuf *
>=C2=A0 sndbuf_create(device_t dev, char *drv, char *desc, struct pcm_ch= annel *channel)
> diff --git a/sys/dev/sound/pcm/channel.c b/sys/dev/sound/pcm/channel.c=
> index 1d192de54712..d56f5fb51dc9 100644
> --- a/sys/dev/sound/pcm/channel.c
> +++ b/sys/dev/sound/pcm/channel.c
> @@ -38,7 +38,7 @@
>
>=C2=A0 #include "feeder_if.h"
>
> -SND_DECLARE_FILE("$FreeBSD$");
> +SND_DECLARE_FILE("");
>
>=C2=A0 int report_soft_formats =3D 1;
>=C2=A0 SYSCTL_INT(_hw_snd, OID_AUTO, report_soft_formats, CTLFLAG_RW, > diff --git a/sys/dev/sound/pcm/dsp.c b/sys/dev/sound/pcm/dsp.c
> index bb435bc3925c..98d241e65a52 100644
> --- a/sys/dev/sound/pcm/dsp.c
> +++ b/sys/dev/sound/pcm/dsp.c
> @@ -43,7 +43,7 @@
>=C2=A0 #include <vm/vm_page.h>
>=C2=A0 #include <vm/vm_pager.h>
>
> -SND_DECLARE_FILE("$FreeBSD$");
> +SND_DECLARE_FILE("");
>
>=C2=A0 static int dsp_mmap_allow_prot_exec =3D 0;
>=C2=A0 SYSCTL_INT(_hw_snd, OID_AUTO, compat_linux_mmap, CTLFLAG_RWTUN,<= br> > diff --git a/sys/dev/sound/pcm/feeder.c b/sys/dev/sound/pcm/feeder.c > index d379d06b8664..8fb377533907 100644
> --- a/sys/dev/sound/pcm/feeder.c
> +++ b/sys/dev/sound/pcm/feeder.c
> @@ -35,7 +35,7 @@
>
>=C2=A0 #include "feeder_if.h"
>
> -SND_DECLARE_FILE("$FreeBSD$");
> +SND_DECLARE_FILE("");
>
>=C2=A0 static MALLOC_DEFINE(M_FEEDER, "feeder", "pcm fee= der");
>
> diff --git a/sys/dev/sound/pcm/feeder_chain.c b/sys/dev/sound/pcm/feed= er_chain.c
> index 9c3baaf282b5..01def5f6e9cb 100644
> --- a/sys/dev/sound/pcm/feeder_chain.c
> +++ b/sys/dev/sound/pcm/feeder_chain.c
> @@ -34,7 +34,7 @@
>
>=C2=A0 #include "feeder_if.h"
>
> -SND_DECLARE_FILE("$FreeBSD$");
> +SND_DECLARE_FILE("");
>
>=C2=A0 /* chain state */
>=C2=A0 struct feeder_chain_state {
> diff --git a/sys/dev/sound/pcm/feeder_eq.c b/sys/dev/sound/pcm/feeder_= eq.c
> index bc39d33c03fb..70797a706367 100644
> --- a/sys/dev/sound/pcm/feeder_eq.c
> +++ b/sys/dev/sound/pcm/feeder_eq.c
> @@ -46,7 +46,7 @@
>=C2=A0 #define SND_USE_FXDIV
>=C2=A0 #include "snd_fxdiv_gen.h"
>
> -SND_DECLARE_FILE("$FreeBSD$");
> +SND_DECLARE_FILE("");
>=C2=A0 #endif
>
>=C2=A0 #include "feeder_eq_gen.h"
> diff --git a/sys/dev/sound/pcm/feeder_format.c b/sys/dev/sound/pcm/fee= der_format.c
> index 8a9054561b2b..3a741430e0ca 100644
> --- a/sys/dev/sound/pcm/feeder_format.c
> +++ b/sys/dev/sound/pcm/feeder_format.c
> @@ -44,7 +44,7 @@
>=C2=A0 #define SND_USE_FXDIV
>=C2=A0 #include "snd_fxdiv_gen.h"
>
> -SND_DECLARE_FILE("$FreeBSD$");
> +SND_DECLARE_FILE("");
>=C2=A0 #endif
>
>=C2=A0 #define FEEDFORMAT_RESERVOIR=C2=A0 =C2=A0(SND_CHN_MAX * PCM_32_B= PS)
> diff --git a/sys/dev/sound/pcm/feeder_matrix.c b/sys/dev/sound/pcm/fee= der_matrix.c
> index 33bf3ec11ee0..0afdb47c04d8 100644
> --- a/sys/dev/sound/pcm/feeder_matrix.c
> +++ b/sys/dev/sound/pcm/feeder_matrix.c
> @@ -54,7 +54,7 @@
>=C2=A0 #define SND_USE_FXDIV
>=C2=A0 #include "snd_fxdiv_gen.h"
>
> -SND_DECLARE_FILE("$FreeBSD$");
> +SND_DECLARE_FILE("");
>=C2=A0 #endif
>
>=C2=A0 #define FEEDMATRIX_RESERVOIR=C2=A0 =C2=A0(SND_CHN_MAX * PCM_32_B= PS)
> diff --git a/sys/dev/sound/pcm/feeder_mixer.c b/sys/dev/sound/pcm/feed= er_mixer.c
> index 13afceabf28e..42ebe89d7c09 100644
> --- a/sys/dev/sound/pcm/feeder_mixer.c
> +++ b/sys/dev/sound/pcm/feeder_mixer.c
> @@ -38,7 +38,7 @@
>=C2=A0 #define SND_USE_FXDIV
>=C2=A0 #include "snd_fxdiv_gen.h"
>
> -SND_DECLARE_FILE("$FreeBSD$");
> +SND_DECLARE_FILE("");
>=C2=A0 #endif
>
>=C2=A0 #undef SND_FEEDER_MULTIFORMAT
> diff --git a/sys/dev/sound/pcm/feeder_rate.c b/sys/dev/sound/pcm/feede= r_rate.c
> index 0784c477197a..b2afe0651bf5 100644
> --- a/sys/dev/sound/pcm/feeder_rate.c
> +++ b/sys/dev/sound/pcm/feeder_rate.c
> @@ -61,7 +61,7 @@
>=C2=A0 #define SND_USE_FXDIV
>=C2=A0 #include "snd_fxdiv_gen.h"
>
> -SND_DECLARE_FILE("$FreeBSD$");
> +SND_DECLARE_FILE("");
>=C2=A0 #endif
>
>=C2=A0 #include "feeder_rate_gen.h"
> diff --git a/sys/dev/sound/pcm/feeder_volume.c b/sys/dev/sound/pcm/fee= der_volume.c
> index 724d5a0922e8..fa11a089af76 100644
> --- a/sys/dev/sound/pcm/feeder_volume.c
> +++ b/sys/dev/sound/pcm/feeder_volume.c
> @@ -39,7 +39,7 @@
>=C2=A0 #define SND_USE_FXDIV
>=C2=A0 #include "snd_fxdiv_gen.h"
>
> -SND_DECLARE_FILE("$FreeBSD$");
> +SND_DECLARE_FILE("");
>=C2=A0 #endif
>
>=C2=A0 typedef void (*feed_volume_t)(int *, int *, uint32_t, uint8_t *,= uint32_t);
> diff --git a/sys/dev/sound/pcm/mixer.c b/sys/dev/sound/pcm/mixer.c
> index 080daeced12d..0c7576390b72 100644
> --- a/sys/dev/sound/pcm/mixer.c
> +++ b/sys/dev/sound/pcm/mixer.c
> @@ -37,7 +37,7 @@
>=C2=A0 #include "feeder_if.h"
>=C2=A0 #include "mixer_if.h"
>
> -SND_DECLARE_FILE("$FreeBSD$");
> +SND_DECLARE_FILE("");
>
>=C2=A0 static MALLOC_DEFINE(M_MIXER, "mixer", "mixer&quo= t;);
>
> diff --git a/sys/dev/sound/pcm/sndstat.c b/sys/dev/sound/pcm/sndstat.c=
> index 64e0a1ca5d82..fc92bd783587 100644
> --- a/sys/dev/sound/pcm/sndstat.c
> +++ b/sys/dev/sound/pcm/sndstat.c
> @@ -50,7 +50,7 @@
>=C2=A0 #include <dev/sound/version.h>
>
>
> -SND_DECLARE_FILE("$FreeBSD$");
> +SND_DECLARE_FILE("");
>
>=C2=A0 #define=C2=A0 =C2=A0 =C2=A0 =C2=A0 SS_TYPE_MODULE=C2=A0 =C2=A0 = =C2=A0 =C2=A0 =C2=A0 0
>=C2=A0 #define=C2=A0 =C2=A0 =C2=A0 =C2=A0 SS_TYPE_PCM=C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A01
> diff --git a/sys/dev/sound/pcm/sound.c b/sys/dev/sound/pcm/sound.c
> index 1a7f8dc2fa68..17dc8d968b3c 100644
> --- a/sys/dev/sound/pcm/sound.c
> +++ b/sys/dev/sound/pcm/sound.c
> @@ -44,7 +44,7 @@
>
>=C2=A0 #include "feeder_if.h"
>
> -SND_DECLARE_FILE("$FreeBSD$");
> +SND_DECLARE_FILE("");
>
>=C2=A0 devclass_t pcm_devclass;
>
> diff --git a/sys/dev/sound/pcm/vchan.c b/sys/dev/sound/pcm/vchan.c
> index 0b0ddc224094..c84d8f14e075 100644
> --- a/sys/dev/sound/pcm/vchan.c
> +++ b/sys/dev/sound/pcm/vchan.c
> @@ -36,7 +36,7 @@
>=C2=A0 #include <dev/sound/pcm/sound.h>
>=C2=A0 #include <dev/sound/pcm/vchan.h>
>
> -SND_DECLARE_FILE("$FreeBSD$");
> +SND_DECLARE_FILE("");
>
>=C2=A0 /*
>=C2=A0 =C2=A0* [ac3 , dts , linear , 0, linear, 0]
>
--000000000000ea271906030e8687-- From nobody Wed Aug 16 20:18:18 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RQzwW3JxRz4Tpsc; Wed, 16 Aug 2023 20:18: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RQzwW0YGMz3cgy; Wed, 16 Aug 2023 20:18:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692217099; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=PWvL2pkbcp1daMykFFx9eMavhNE9zS95lCajphk1sXA=; b=EanSJcsXI2G2jL3hUz3KGO/p5d8h8HyyGFFMbHnABPqRvBZaMq272XwRlkoWtyXHxdqga6 UFx9puTw5V8i8o+SHpMqmcrWg0fISRSRAMmegjAWo49cRZhzNf1OJFcgcVpekXEIHwsp2j u66kRyK439n8q39PTcTni53Kgnq+3fHsEcVaEQUS0cU6mz/tr8fL99hocB6REI+SA/r3eN MsLHmqSxvJVQ/3+voOkochIICvlCjArAAEr5vRKyEVke+c9CddRVy0PgRamF4s0KyFaaJk vCJVMhhx5/EJNPayMLWDsz84ZOxPFPYan3XMGOAvj17urZovtN4Pn2C6vWbX8Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692217099; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=PWvL2pkbcp1daMykFFx9eMavhNE9zS95lCajphk1sXA=; b=J+yvdgameOqh48UQxHcHMMg4eKuq3PivJjT4++hl6npGbvBvhP9iudlKbrVZ7WjvJ2UHu5 1nfNa/5aPSy/02gha51HywWEIKub7Udv1hByvACB/gKqMrj2qJNiny4CmWn/y8T/ETTo9W bGNbqVux480INFZ7pRMNk6tt4xw/tYj97keYqjd+S/IB7mk2NbwAsEnqPWVuvg9QtcoVYd YcM0FK4nG78+s3ghEUUStnlOHnNRyuucqZDC8pGbI4UOXk8lf7i+9AGa7qLGihBNabeytf yEnGngmJYkTu19JcbTGiumxcjmtAOHc3barWfzwi2O4nHAm3ISttzv9+5l2V4w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692217099; a=rsa-sha256; cv=none; b=Nk1stNrFXQIkc8Dt0pfU8kIrujFtav5q0F6XLUZdVzUyTPk1GidUSGAuQ8sTeYhZ10MSm/ UGXPvWBVWCfZp6A/AKnNlf880bbf+rC5qXwtP8DRJiRjPwgqtC18PC2tco5M11mtTiIJI3 L6vaf9Gkiz9ogVV+WDSta0+CP1irjLoEPlq2slSzdwmmIT3hY9W5mpr5Y3jb1RLvVhMTmx LaPXEtsgxUDRLlR/zJlUtbTcS2AYMtfFixTH9Ojukqs4OM0a6wOdpEzQrCDO1FwlEkgl7v x7cL0i21pvhcES5OSXpQEcEDsYj+ZHVQJp9Z0jflMz2cra4Cg5VE490wQwdwpw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RQzwV6l0xz158j; Wed, 16 Aug 2023 20:18:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37GKIIw3013569; Wed, 16 Aug 2023 20:18:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37GKIIHo013566; Wed, 16 Aug 2023 20:18:18 GMT (envelope-from git) Date: Wed, 16 Aug 2023 20:18:18 GMT Message-Id: <202308162018.37GKIIHo013566@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: ddb5480ec67a - main - Fix partially removed comment by removing the rest List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ddb5480ec67a44a28316724397fd6609354c4558 Auto-Submitted: auto-generated The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=ddb5480ec67a44a28316724397fd6609354c4558 commit ddb5480ec67a44a28316724397fd6609354c4558 Author: Warner Losh AuthorDate: 2023-08-16 20:17:33 +0000 Commit: Warner Losh CommitDate: 2023-08-16 20:17:33 +0000 Fix partially removed comment by removing the rest Fixes: 2a63c3be1582 --- libexec/bootpd/bptypes.h | 2 -- 1 file changed, 2 deletions(-) diff --git a/libexec/bootpd/bptypes.h b/libexec/bootpd/bptypes.h index 13882d03eb29..3e5deaec8bd5 100644 --- a/libexec/bootpd/bptypes.h +++ b/libexec/bootpd/bptypes.h @@ -1,5 +1,3 @@ - */ - #ifndef BPTYPES_H #define BPTYPES_H From nobody Wed Aug 16 20:25:23 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RR04g54tcz4Tq0N; Wed, 16 Aug 2023 20:25: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RR04g4TGpz3dXh; Wed, 16 Aug 2023 20:25:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692217523; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XgL0OF4+Eab/22aBa5p/fAqa96V+LaYnhZDRmY4R7PY=; b=bQyvdslX2l4Zuwi/wLBVCVais/sDSFV2Ep6+vwlSj7DIhrUt1JnHMxd2qMAdvnBbboyE5G rhbAW8ZzUHCmx6AbSp1p8mfVUOICpi6q4oIBsNjhUIk8HobpX64jbX3wV6jbliZZvIQKqO QuW1rL8MggcCG2IFx2urPfwt39Kj1oSkZtwjWg2UXn+JrTfLWTo15lqNwIaYXi84qTrSuk wdNhFsOzSp0KZ1+ymUjcsuPVsOgeoLDDabrGexDwI1Hsvfo/c9mdIoGZDA2YbWEzF1zkJM krxrXwiGwKPefzjNqrPNRcM9Le5Gb/pv5s4RlByG8moI7ZEXcXYRaJ77eM/mOA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692217523; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XgL0OF4+Eab/22aBa5p/fAqa96V+LaYnhZDRmY4R7PY=; b=cMdE9y0OhG2gS7cglNl4n1kNlwk39oxxp/op262IaQwf0JNXD06kizJow4blHyoOKAKC5+ cIqACR/EakwpubepYKxiYh5jwryzG07Eg+lug4ystqCN3rPa69MoLrWUGeMyuMgoFjVShB PbsBhmx4wVyUcSU6/CjRCZjIx72fpUCKeKrczAC7E/eK4S+W33kxVpp4S/coDtP4Ee3bzy A1fA3AhwYV0fuP6I+gm3pv+OSU4Xob2TF1NDSbms+p+80z1ILEnUQQ4JK0jh76oZRAQlYO kXRdcsvCZIpFn1mjtvl1SBE3qnmM7L1cA4tDPX51n0xySsouVCrZXv3fSTdgNA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692217523; a=rsa-sha256; cv=none; b=resZB8lguFFzCJT0O2MhsrGdhc3zo5SgPGvi0b23vY3jT8tyPcCwKBlNFfvgl7BstxuiNz c7plKFK9+dWeyK60KZ43JgXa/TeflUDtgjkAMTVLEXpd27R7Z2vvx/PQrcQvaVhamvZmc2 CzS+GF0RLo1aWxPM4zVL5gk0+B5/NJ6kgLgLD7nO79uflYK03EZ5J/8ZoA39pe3Ga+7ArH qEnZUraBgn0z3pye6RQWvkU7Xb3uc5aWLHmHo4xyFOceXlYGwwGT785HntT6Yd6SnXrceV HinEbreeo70zE+Phobve2q0Ic3dZYzxRxEV1c5xOV6NMLBAF8DnPAxl6eFgASg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RR04g3Sq7z15D0; Wed, 16 Aug 2023 20:25:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37GKPNPQ029787; Wed, 16 Aug 2023 20:25:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37GKPNrw029784; Wed, 16 Aug 2023 20:25:23 GMT (envelope-from git) Date: Wed, 16 Aug 2023 20:25:23 GMT Message-Id: <202308162025.37GKPNrw029784@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: 90aad5d3e44d - main - makefs: clean up some leftovers after $FreeBSD$ tag removal List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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/main X-Git-Reftype: branch X-Git-Commit: 90aad5d3e44d137ce80d2ec257de07c7c1367bd3 Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=90aad5d3e44d137ce80d2ec257de07c7c1367bd3 commit 90aad5d3e44d137ce80d2ec257de07c7c1367bd3 Author: Ed Maste AuthorDate: 2023-03-30 14:02:02 +0000 Commit: Ed Maste CommitDate: 2023-08-16 20:24:37 +0000 makefs: clean up some leftovers after $FreeBSD$ tag removal Fixes: 2a63c3be1582 --- usr.sbin/makefs/cd9660/Makefile.inc | 2 -- usr.sbin/makefs/ffs/Makefile.inc | 2 -- usr.sbin/makefs/msdos.c | 3 --- usr.sbin/makefs/msdos/Makefile.inc | 2 -- usr.sbin/makefs/tests/makefs_cd9660_tests.sh | 2 -- usr.sbin/makefs/tests/makefs_ffs_tests.sh | 2 -- usr.sbin/makefs/tests/makefs_tests_common.sh | 2 -- 7 files changed, 15 deletions(-) diff --git a/usr.sbin/makefs/cd9660/Makefile.inc b/usr.sbin/makefs/cd9660/Makefile.inc index be08e8e34cd9..e596309a6243 100644 --- a/usr.sbin/makefs/cd9660/Makefile.inc +++ b/usr.sbin/makefs/cd9660/Makefile.inc @@ -1,5 +1,3 @@ -# - .PATH: ${SRCDIR}/cd9660 CFLAGS+=-I${SRCTOP}/sys/fs/cd9660/ diff --git a/usr.sbin/makefs/ffs/Makefile.inc b/usr.sbin/makefs/ffs/Makefile.inc index bf62ac8bf926..0db1750ab282 100644 --- a/usr.sbin/makefs/ffs/Makefile.inc +++ b/usr.sbin/makefs/ffs/Makefile.inc @@ -1,5 +1,3 @@ -# - .PATH: ${SRCDIR}/ffs ${SRCTOP}/sys/ufs/ffs SRCS+= ffs_alloc.c ffs_balloc.c ffs_bswap.c ffs_subr.c ufs_bmap.c SRCS+= buf.c mkfs.c diff --git a/usr.sbin/makefs/msdos.c b/usr.sbin/makefs/msdos.c index 75aad6949203..8353f06315ac 100644 --- a/usr.sbin/makefs/msdos.c +++ b/usr.sbin/makefs/msdos.c @@ -33,9 +33,6 @@ #endif #include -#if defined(__RCSID) && !defined(__lint) -#endif /* !__lint */ - #include #if !HAVE_NBTOOL_CONFIG_H diff --git a/usr.sbin/makefs/msdos/Makefile.inc b/usr.sbin/makefs/msdos/Makefile.inc index 3fb55c5394fc..78ddc7804b31 100644 --- a/usr.sbin/makefs/msdos/Makefile.inc +++ b/usr.sbin/makefs/msdos/Makefile.inc @@ -1,5 +1,3 @@ -# - MSDOS= ${SRCTOP}/sys/fs/msdosfs MSDOS_NEWFS= ${SRCTOP}/sbin/newfs_msdos diff --git a/usr.sbin/makefs/tests/makefs_cd9660_tests.sh b/usr.sbin/makefs/tests/makefs_cd9660_tests.sh index 3f9b37abee4c..2fdf47f76a4c 100644 --- a/usr.sbin/makefs/tests/makefs_cd9660_tests.sh +++ b/usr.sbin/makefs/tests/makefs_cd9660_tests.sh @@ -23,8 +23,6 @@ # THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -# -# # A note on specs: # - A copy of the ISO-9660 spec can be found here: diff --git a/usr.sbin/makefs/tests/makefs_ffs_tests.sh b/usr.sbin/makefs/tests/makefs_ffs_tests.sh index fafec4c885fb..2505b2e24d72 100644 --- a/usr.sbin/makefs/tests/makefs_ffs_tests.sh +++ b/usr.sbin/makefs/tests/makefs_ffs_tests.sh @@ -23,8 +23,6 @@ # THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -# -# MAKEFS="makefs -t ffs" MOUNT="mount" diff --git a/usr.sbin/makefs/tests/makefs_tests_common.sh b/usr.sbin/makefs/tests/makefs_tests_common.sh index 08f687fa44a4..12c7c7c84fb7 100644 --- a/usr.sbin/makefs/tests/makefs_tests_common.sh +++ b/usr.sbin/makefs/tests/makefs_tests_common.sh @@ -23,8 +23,6 @@ # THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -# -# KB=1024 : ${TMPDIR=/tmp} From nobody Wed Aug 16 20:26:40 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RR06P3Gvjz4TqMK for ; Wed, 16 Aug 2023 20:26:53 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-ed1-x52d.google.com (mail-ed1-x52d.google.com [IPv6:2a00:1450:4864:20::52d]) (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 "GTS CA 1D4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RR06P0wgRz3ddM for ; Wed, 16 Aug 2023 20:26:53 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-ed1-x52d.google.com with SMTP id 4fb4d7f45d1cf-522dd6b6438so8726898a12.0 for ; Wed, 16 Aug 2023 13:26:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20221208.gappssmtp.com; s=20221208; t=1692217612; x=1692822412; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:from:to:cc:subject:date:message-id:reply-to; bh=pkFYtNYQpSltj4B2SSYr9NqhhaeVTaIRarknFW3be4Q=; b=ofttfl1VHXFtIdeocuqS8bMfZAgzEqHtbR34HDXFBPwirBjCNZnJuqPkaf4bDmBrJU YI1qoIv5t4xFK4I80ogWQpuwt1PRviLbuBs5JaSCLITeOw3jsH9D3014htav3BDFzR7F FNxYfHaKKH3sObsHsno4Nd5h1U7BAHmfwu5OljrdBP3YulzolT1+auyn6RcLWQy6WP0L bGfjf5LOK9XBF4clGjg99uO00yxp0rKKUkFIM2zRQi9ImXp0OZ+U+sN8E7b560H6lgsW H3O4scBMsOFbLJsWsJBCx+hpzyLLfpY/Z5oUcFmlmOiNqCGLhTrPrLEMyvdfariKryN6 Xdbg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1692217612; x=1692822412; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=pkFYtNYQpSltj4B2SSYr9NqhhaeVTaIRarknFW3be4Q=; b=kkyrvsbW3jbQFJkq/ZGaCn2ePftAvHiexURflJIlrM8UflSth4N0J2F4pzpi+wsj6e rWBMHnZKUjM+TIfHCn8NEP6g2/COLLLZGsabHrDeTJdGmOEWdF9MJKXk8h41yEU+etqd 23G2oeJ8vbsjfnT6LfffqhZhK1UkQmS/aYU/ELLFN3YFI+H/FSQ6GhA4ztvCX0wSwweR V6swjnD5WxMsEWM/lF2Zl0Iw9ufG1hTOnyz4bCzthEBcy+1iaIPMMQ1s0b/I/SM6yxpP cxPJrq8ZnmMsDN8GPyXV9gTL8Idx7CTWVUN3nqbBc2RGa9kY+s+XUtKaKyt0gXwdvBsW uZ8A== X-Gm-Message-State: AOJu0YznBkMQ2ZNWJeh33Kp6FmKSwD0wsHzUhQCbhFHCBd1BzG56Q507 kcjEHhbyYUotUrwlljsPjBo1XpMUh35pQajwT3uugA== X-Google-Smtp-Source: AGHT+IHxoi+uoOYqcfMa3Q9rbUjPIeYKCwEM10p5Gp2xCdbDzbMq1POXyNNcURniCjXoSzZGAMJ5L21sIwN6tIwfG0k= X-Received: by 2002:a05:6402:164e:b0:525:d95b:cd46 with SMTP id s14-20020a056402164e00b00525d95bcd46mr486838edx.2.1692217611667; Wed, 16 Aug 2023 13:26:51 -0700 (PDT) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 References: <202308162025.37GKPNrw029784@gitrepo.freebsd.org> In-Reply-To: <202308162025.37GKPNrw029784@gitrepo.freebsd.org> From: Warner Losh Date: Wed, 16 Aug 2023 14:26:40 -0600 Message-ID: Subject: Re: git: 90aad5d3e44d - main - makefs: clean up some leftovers after $FreeBSD$ tag removal To: Ed Maste Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Content-Type: multipart/alternative; boundary="000000000000a060400603101d8a" X-Rspamd-Queue-Id: 4RR06P0wgRz3ddM X-Spamd-Bar: ---- 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:2a00:1450::/32, country:US] --000000000000a060400603101d8a Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable On Wed, Aug 16, 2023 at 2:25=E2=80=AFPM Ed Maste wrote= : > The branch main has been updated by emaste: > > URL: > https://cgit.FreeBSD.org/src/commit/?id=3D90aad5d3e44d137ce80d2ec257de07c= 7c1367bd3 > > commit 90aad5d3e44d137ce80d2ec257de07c7c1367bd3 > Author: Ed Maste > AuthorDate: 2023-03-30 14:02:02 +0000 > Commit: Ed Maste > CommitDate: 2023-08-16 20:24:37 +0000 > > makefs: clean up some leftovers after $FreeBSD$ tag removal > > Fixes: 2a63c3be1582 > --- > usr.sbin/makefs/cd9660/Makefile.inc | 2 -- > usr.sbin/makefs/ffs/Makefile.inc | 2 -- > usr.sbin/makefs/msdos.c | 3 --- > usr.sbin/makefs/msdos/Makefile.inc | 2 -- > usr.sbin/makefs/tests/makefs_cd9660_tests.sh | 2 -- > usr.sbin/makefs/tests/makefs_ffs_tests.sh | 2 -- > usr.sbin/makefs/tests/makefs_tests_common.sh | 2 -- > 7 files changed, 15 deletions(-) > > diff --git a/usr.sbin/makefs/cd9660/Makefile.inc > b/usr.sbin/makefs/cd9660/Makefile.inc > index be08e8e34cd9..e596309a6243 100644 > --- a/usr.sbin/makefs/cd9660/Makefile.inc > +++ b/usr.sbin/makefs/cd9660/Makefile.inc > @@ -1,5 +1,3 @@ > -# > - > .PATH: ${SRCDIR}/cd9660 > > CFLAGS+=3D-I${SRCTOP}/sys/fs/cd9660/ > diff --git a/usr.sbin/makefs/ffs/Makefile.inc > b/usr.sbin/makefs/ffs/Makefile.inc > index bf62ac8bf926..0db1750ab282 100644 > --- a/usr.sbin/makefs/ffs/Makefile.inc > +++ b/usr.sbin/makefs/ffs/Makefile.inc > @@ -1,5 +1,3 @@ > -# > - > .PATH: ${SRCDIR}/ffs ${SRCTOP}/sys/ufs/ffs > SRCS+=3D ffs_alloc.c ffs_balloc.c ffs_bswap.c ffs_subr.c ufs_bmap.c > SRCS+=3D buf.c mkfs.c > diff --git a/usr.sbin/makefs/msdos.c b/usr.sbin/makefs/msdos.c > index 75aad6949203..8353f06315ac 100644 > --- a/usr.sbin/makefs/msdos.c > +++ b/usr.sbin/makefs/msdos.c > @@ -33,9 +33,6 @@ > #endif > > #include > This should have likely been deleted as well... I'll add it to the fix for the other minor issues people are coming in with. Warner > -#if defined(__RCSID) && !defined(__lint) > -#endif /* !__lint */ > - > #include > > #if !HAVE_NBTOOL_CONFIG_H > diff --git a/usr.sbin/makefs/msdos/Makefile.inc > b/usr.sbin/makefs/msdos/Makefile.inc > index 3fb55c5394fc..78ddc7804b31 100644 > --- a/usr.sbin/makefs/msdos/Makefile.inc > +++ b/usr.sbin/makefs/msdos/Makefile.inc > @@ -1,5 +1,3 @@ > -# > - > MSDOS=3D ${SRCTOP}/sys/fs/msdosfs > MSDOS_NEWFS=3D ${SRCTOP}/sbin/newfs_msdos > > diff --git a/usr.sbin/makefs/tests/makefs_cd9660_tests.sh > b/usr.sbin/makefs/tests/makefs_cd9660_tests.sh > index 3f9b37abee4c..2fdf47f76a4c 100644 > --- a/usr.sbin/makefs/tests/makefs_cd9660_tests.sh > +++ b/usr.sbin/makefs/tests/makefs_cd9660_tests.sh > @@ -23,8 +23,6 @@ > # THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT > # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE > # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. > -# > -# > > # A note on specs: > # - A copy of the ISO-9660 spec can be found here: > diff --git a/usr.sbin/makefs/tests/makefs_ffs_tests.sh > b/usr.sbin/makefs/tests/makefs_ffs_tests.sh > index fafec4c885fb..2505b2e24d72 100644 > --- a/usr.sbin/makefs/tests/makefs_ffs_tests.sh > +++ b/usr.sbin/makefs/tests/makefs_ffs_tests.sh > @@ -23,8 +23,6 @@ > # THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT > # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE > # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. > -# > -# > > MAKEFS=3D"makefs -t ffs" > MOUNT=3D"mount" > diff --git a/usr.sbin/makefs/tests/makefs_tests_common.sh > b/usr.sbin/makefs/tests/makefs_tests_common.sh > index 08f687fa44a4..12c7c7c84fb7 100644 > --- a/usr.sbin/makefs/tests/makefs_tests_common.sh > +++ b/usr.sbin/makefs/tests/makefs_tests_common.sh > @@ -23,8 +23,6 @@ > # THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT > # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE > # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. > -# > -# > > KB=3D1024 > : ${TMPDIR=3D/tmp} > --000000000000a060400603101d8a Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable


=
On Wed, Aug 16, 2023 at 2:25=E2=80=AF= PM Ed Maste <emaste@freebsd.org> wrote:
The= branch main has been updated by emaste:

URL: https://cgit.= FreeBSD.org/src/commit/?id=3D90aad5d3e44d137ce80d2ec257de07c7c1367bd3
commit 90aad5d3e44d137ce80d2ec257de07c7c1367bd3
Author:=C2=A0 =C2=A0 =C2=A0Ed Maste <emaste@FreeBSD.org>
AuthorDate: 2023-03-30 14:02:02 +0000
Commit:=C2=A0 =C2=A0 =C2=A0Ed Maste <emaste@FreeBSD.org>
CommitDate: 2023-08-16 20:24:37 +0000

=C2=A0 =C2=A0 makefs: clean up some leftovers after $FreeBSD$ tag removal
=C2=A0 =C2=A0 Fixes: 2a63c3be1582
---
=C2=A0usr.sbin/makefs/cd9660/Makefile.inc=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0= | 2 --
=C2=A0usr.sbin/makefs/ffs/Makefile.inc=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0 =C2=A0| 2 --
=C2=A0usr.sbin/makefs/msdos.c=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 | 3 ---
=C2=A0usr.sbin/makefs/msdos/Makefile.inc=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0| 2 --
=C2=A0usr.sbin/makefs/tests/makefs_cd9660_tests.sh | 2 --
=C2=A0usr.sbin/makefs/tests/makefs_ffs_tests.sh=C2=A0 =C2=A0 | 2 --
=C2=A0usr.sbin/makefs/tests/makefs_tests_common.sh | 2 --
=C2=A07 files changed, 15 deletions(-)

diff --git a/usr.sbin/makefs/cd9660/Makefile.inc b/usr.sbin/makefs/cd9660/M= akefile.inc
index be08e8e34cd9..e596309a6243 100644
--- a/usr.sbin/makefs/cd9660/Makefile.inc
+++ b/usr.sbin/makefs/cd9660/Makefile.inc
@@ -1,5 +1,3 @@
-#
-
=C2=A0.PATH: ${SRCDIR}/cd9660

=C2=A0CFLAGS+=3D-I${SRCTOP}/sys/fs/cd9660/
diff --git a/usr.sbin/makefs/ffs/Makefile.inc b/usr.sbin/makefs/ffs/Makefil= e.inc
index bf62ac8bf926..0db1750ab282 100644
--- a/usr.sbin/makefs/ffs/Makefile.inc
+++ b/usr.sbin/makefs/ffs/Makefile.inc
@@ -1,5 +1,3 @@
-#
-
=C2=A0.PATH: ${SRCDIR}/ffs ${SRCTOP}/sys/ufs/ffs
=C2=A0SRCS+=3D ffs_alloc.c ffs_balloc.c ffs_bswap.c ffs_subr.c ufs_bmap.c =C2=A0SRCS+=3D buf.c mkfs.c
diff --git a/usr.sbin/makefs/msdos.c b/usr.sbin/makefs/msdos.c
index 75aad6949203..8353f06315ac 100644
--- a/usr.sbin/makefs/msdos.c
+++ b/usr.sbin/makefs/msdos.c
@@ -33,9 +33,6 @@
=C2=A0#endif

=C2=A0#include <sys/cdefs.h>

This= should have likely been deleted as well... I'll add it to the fix for = the other minor issues people are coming in with.

= Warner
=C2=A0
-#if defined(__RCSID) && !defined(__lint)
-#endif /* !__lint */
-
=C2=A0#include <sys/param.h>

=C2=A0#if !HAVE_NBTOOL_CONFIG_H
diff --git a/usr.sbin/makefs/msdos/Makefile.inc b/usr.sbin/makefs/msdos/Mak= efile.inc
index 3fb55c5394fc..78ddc7804b31 100644
--- a/usr.sbin/makefs/msdos/Makefile.inc
+++ b/usr.sbin/makefs/msdos/Makefile.inc
@@ -1,5 +1,3 @@
-#
-
=C2=A0MSDOS=3D=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0${SRCTOP}/sys/fs/msdosfs =C2=A0MSDOS_NEWFS=3D=C2=A0 =C2=A0${SRCTOP}/sbin/newfs_msdos

diff --git a/usr.sbin/makefs/tests/makefs_cd9660_tests.sh b/usr.sbin/makefs= /tests/makefs_cd9660_tests.sh
index 3f9b37abee4c..2fdf47f76a4c 100644
--- a/usr.sbin/makefs/tests/makefs_cd9660_tests.sh
+++ b/usr.sbin/makefs/tests/makefs_cd9660_tests.sh
@@ -23,8 +23,6 @@
=C2=A0# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT=
=C2=A0# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE U= SE
=C2=A0# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE= .
-#
-#

=C2=A0# A note on specs:
=C2=A0# - A copy of the ISO-9660 spec can be found here:
diff --git a/usr.sbin/makefs/tests/makefs_ffs_tests.sh b/usr.sbin/makefs/te= sts/makefs_ffs_tests.sh
index fafec4c885fb..2505b2e24d72 100644
--- a/usr.sbin/makefs/tests/makefs_ffs_tests.sh
+++ b/usr.sbin/makefs/tests/makefs_ffs_tests.sh
@@ -23,8 +23,6 @@
=C2=A0# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT=
=C2=A0# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE U= SE
=C2=A0# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE= .
-#
-#

=C2=A0MAKEFS=3D"makefs -t ffs"
=C2=A0MOUNT=3D"mount"
diff --git a/usr.sbin/makefs/tests/makefs_tests_common.sh b/usr.sbin/makefs= /tests/makefs_tests_common.sh
index 08f687fa44a4..12c7c7c84fb7 100644
--- a/usr.sbin/makefs/tests/makefs_tests_common.sh
+++ b/usr.sbin/makefs/tests/makefs_tests_common.sh
@@ -23,8 +23,6 @@
=C2=A0# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT=
=C2=A0# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE U= SE
=C2=A0# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE= .
-#
-#

=C2=A0KB=3D1024
=C2=A0: ${TMPDIR=3D/tmp}
--000000000000a060400603101d8a-- From nobody Wed Aug 16 20:45:53 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RR0XK5ZpHz4TrHb; Wed, 16 Aug 2023 20:45: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RR0XK4Qgjz3fpt; Wed, 16 Aug 2023 20:45:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692218753; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9phwAORDW8dAGBGlnEx2mz0EAo60NM6Z+xQ1EJpftFs=; b=vDlhIRFxNmpkLB8fX4UAWcEARLKKKsq9zCPa7oI4MXw6V9p3AR0D5sB/xxABL4J8xd5Eth 4b8C0aUbmkj+S0Q03FgPPZRmEogh9dCHKnFu/EeE3HmUO2n4m1X842nMipdkQ88hts3Kc9 Oosk4h/Dz4zcGIUiulV/lbhJ7E4qE4Aw1FnD3t0FWBcm6ca3YiL0Q8KnSX9Z2gnGzjo3VO j351eG3Qe9Bs3ePZLhUisVObZhbW5zNwgUWswspoprLy9oSetfdLdGMe9e00+DkQ7pW8Vs Zzhab4+QFV8zIf0OiIj67tralDSU1hU2fgvH+sjywGTEOjqEkjen+RcOnScswA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692218753; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=9phwAORDW8dAGBGlnEx2mz0EAo60NM6Z+xQ1EJpftFs=; b=kJM7ziONefywNEjhBSg28BUY6d2LDz6ydWxnzligWashzSEEnVnRIL/Uf66UUHfs7dMScm lOXpSj6/+AKzJ7FsnMHRrtQGG2NA384jt6z2FKCLQ5J4mdoa/D+G/WbZmfdAStHbiKnbdO 12JrFMY+sCqcRLEpUZnJS0mu5OTjIBo5yvYY55z2MdbXh27amU4OOQRrkUtwMtdnQXIdQd BJaJKm0cH2b+ta+7bpT/p0lFXjMl0BlwK2cnSOq8t2WtFN5GpsuOgs7PlpDxX0RIQSgbtR /dLxOsNJ1w4bNFMry2VLa2UGvdNEEQXJgCJUb0td9RXc5e9/AXOr+SD3zqiT7w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692218753; a=rsa-sha256; cv=none; b=LZRq2+DAiKct2Opv7lZ4yId3kbYPQFcEwVG6nOkNjEopwWx2qsC30I7gmjfqY1O3eU6Rsx fhKDO0S+4KR4iS+EShadZvgnpiOIvXwJl4BKzpyRo3DA2qvL2QqctCJN1IiX4Esb11jcm9 palsd20vowLco/WLEUKVFCdMd4BvehCYxvY1GAXhoc6IZy2XsePsOq72q/MvtIiqYk740b Qm0fxAwbtFRLDKlNg7u3tntlEfBvIXXRRxUVnvKzAYKKOJimUbQ+R1XCUf5B4ZlwquhwDj AT5Uq0BhIcyUlMaxLaY8GzFpwyx7j5ONGxgkXEOFctOYcUB7+NfKZaeIg9Vihg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RR0XK3MXTz15p3; Wed, 16 Aug 2023 20:45:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37GKjr30062412; Wed, 16 Aug 2023 20:45:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37GKjrm5062409; Wed, 16 Aug 2023 20:45:53 GMT (envelope-from git) Date: Wed, 16 Aug 2023 20:45:53 GMT Message-Id: <202308162045.37GKjrm5062409@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: 0ed2e7e88984 - main - Cirrus-CI: temporarily disable amd64-gcc12 build/test on main List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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/main X-Git-Reftype: branch X-Git-Commit: 0ed2e7e88984aa4ad01a41e9350c5870b271c0c3 Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=0ed2e7e88984aa4ad01a41e9350c5870b271c0c3 commit 0ed2e7e88984aa4ad01a41e9350c5870b271c0c3 Author: Ed Maste AuthorDate: 2023-08-16 20:26:49 +0000 Commit: Ed Maste CommitDate: 2023-08-16 20:45:23 +0000 Cirrus-CI: temporarily disable amd64-gcc12 build/test on main The amd64-gcc12 job is failing at present. Unfortunately Cirrus-CI appears to have a 100MB log limit and we exceed this before the error is reported. Disable the job for now until we can address the log length issue. See also https://github.com/cirruslabs/cirrus-ci-docs/issues/1176. Sponsored by: The FreeBSD Foundation --- .cirrus.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.cirrus.yml b/.cirrus.yml index b5c2770d4887..5b033160b23b 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -62,6 +62,7 @@ task: TOOLCHAIN_PKG: ${TOOLCHAIN} - name: amd64-gcc12 World and kernel build and boot smoke test (FreeBSD repo) only_if: $CIRRUS_REPO_FULL_NAME == 'freebsd/freebsd-src' + trigger_type: manual env: TARGET: amd64 TARGET_ARCH: amd64 From nobody Wed Aug 16 20:54:10 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RR0k91wLqz4TrfV for ; Wed, 16 Aug 2023 20:54:25 +0000 (UTC) (envelope-from kevin.bowling@kev009.com) Received: from mail-pf1-x429.google.com (mail-pf1-x429.google.com [IPv6:2607:f8b0:4864:20::429]) (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 "GTS CA 1D4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RR0k751p2z3gRW for ; Wed, 16 Aug 2023 20:54:23 +0000 (UTC) (envelope-from kevin.bowling@kev009.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-pf1-x429.google.com with SMTP id d2e1a72fcca58-68891000f34so788258b3a.0 for ; Wed, 16 Aug 2023 13:54:23 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kev009.com; s=google; t=1692219262; x=1692824062; h=content-transfer-encoding:cc:to:subject:message-id:date:from :in-reply-to:references:mime-version:from:to:cc:subject:date :message-id:reply-to; bh=CacgfeLkS+UoNJUw6Wtr+qHC7llOM1hzw5n6VGg+ML8=; b=YFqczkkFZCtNrMZG1GlkGRi1JVSzvnQ3Um1RDv8S9pbYhh+Ab5VCRAmWGrFuBwcXzF WzVEctTuj/Yhx4shVG5QNJdUx399TYguNoZH2O1LX44ERz1FhX1EiTXIz2u6FQmRUB6o +An0wn22RWxNwnOjLinsPdxg7kp0xPDkPiUR4= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1692219262; x=1692824062; h=content-transfer-encoding:cc:to:subject:message-id:date:from :in-reply-to:references:mime-version:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=CacgfeLkS+UoNJUw6Wtr+qHC7llOM1hzw5n6VGg+ML8=; b=OiCvdqJxG7VhgN2vm62xrJhG0Ke+Fx9pL2+bfFfv5qBX+jNVJUN83vcdf7FUNFuGlX 9fXamsjRknBELBuzaPrBUyD7KpxFcDHoBzOQcA7Ca7JqC3+uVshjhK6f9poNvEMKhjHS lbV7nTl0wdWPmQOmhBkTUyJBRbQckytmb/XaBfSEQ2jw4bPEpa2zSp8eRs4u+j3dlnYo xgRX3rZVR/nEaHZftbgFM/qFFLMXLGiZnZCOfyb9InNFGR3vlzdereVsFnNDf3NpWUh/ 74IuYKkqP2W9Zbw4BG202LhZMUE/U6ZPl0pcn/aNILQUBYtxDMaO+j4D+kj0Estmn4TE 7nvg== X-Gm-Message-State: AOJu0YyoHUUnu+Sg5vMK1ddo9P7YDJZyrvm4zZsJN7aDIQMZcDgRLqh/ 8Hu544NcjxaOqeD87HuVbst+T/mgd4fqNZiKPR23rQ== X-Google-Smtp-Source: AGHT+IHl4r70YdXpr8+gTCmeTzwyoFPJPaewEaLg6Qm1CrpgGjnx9gxiqKdarOpnb5XuxPJofoYST9kgIDfJGceCSSk= X-Received: by 2002:a05:6a00:3902:b0:687:2fa9:532d with SMTP id fh2-20020a056a00390200b006872fa9532dmr2604866pfb.17.1692219261902; Wed, 16 Aug 2023 13:54:21 -0700 (PDT) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 References: <202308161756.37GHufPp058798@gitrepo.freebsd.org> In-Reply-To: From: Kevin Bowling Date: Wed, 16 Aug 2023 13:54:10 -0700 Message-ID: Subject: Re: git: 82a265ad9bad - main - sys: Remove $FreeBSD$: sound driver version To: Warner Losh Cc: Warner Losh , src-committers , "" , "" Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-Rspamd-Queue-Id: 4RR0k751p2z3gRW X-Spamd-Bar: ---- 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] On Wed, Aug 16, 2023 at 11:33=E2=80=AFAM Warner Losh wrote= : > > > > On Wed, Aug 16, 2023, 12:12 PM Kevin Bowling w= rote: >> >> On Wed, Aug 16, 2023 at 10:56=E2=80=AFAM Warner Losh w= rote: >> > >> > The branch main has been updated by imp: >> > >> > URL: https://cgit.FreeBSD.org/src/commit/?id=3D82a265ad9bad315000a2d60= b853c4669f1600cd0 >> > >> > commit 82a265ad9bad315000a2d60b853c4669f1600cd0 >> > Author: Warner Losh >> > AuthorDate: 2023-08-16 17:53:59 +0000 >> > Commit: Warner Losh >> > CommitDate: 2023-08-16 17:53:59 +0000 >> > >> > sys: Remove $FreeBSD$: sound driver version >> > >> > Remove /SND_DECLARE_FILE\("\$FreeBSD\$"\);/ >> >> It seems like SND_DECLARE_FILE(""); should probably go away or the >> string within shall be dropped. Its idea of 'uniq' is a little >> concerning. > > > Likely. It actually adds the driver to a list, so I didn't just remove it= . https://reviews.freebsd.org/D41484 > Warner > >> > --- >> > sys/arm/broadcom/bcm2835/bcm2835_audio.c | 2 +- >> > sys/dev/sound/pci/als4000.c | 2 +- >> > sys/dev/sound/pci/atiixp.c | 2 +- >> > sys/dev/sound/pci/cmi.c | 2 +- >> > sys/dev/sound/pci/cs4281.c | 2 +- >> > sys/dev/sound/pci/csa.c | 2 +- >> > sys/dev/sound/pci/csamidi.c | 2 +- >> > sys/dev/sound/pci/csapcm.c | 2 +- >> > sys/dev/sound/pci/emu10k1.c | 2 +- >> > sys/dev/sound/pci/envy24.c | 2 +- >> > sys/dev/sound/pci/envy24ht.c | 2 +- >> > sys/dev/sound/pci/es137x.c | 2 +- >> > sys/dev/sound/pci/fm801.c | 2 +- >> > sys/dev/sound/pci/hda/hdaa.c | 2 +- >> > sys/dev/sound/pci/hda/hdaa_patches.c | 2 +- >> > sys/dev/sound/pci/hda/hdac.c | 2 +- >> > sys/dev/sound/pci/hda/hdacc.c | 2 +- >> > sys/dev/sound/pci/hdspe-pcm.c | 2 +- >> > sys/dev/sound/pci/hdspe.c | 2 +- >> > sys/dev/sound/pci/ich.c | 2 +- >> > sys/dev/sound/pci/maestro3.c | 2 +- >> > sys/dev/sound/pci/neomagic.c | 2 +- >> > sys/dev/sound/pci/solo.c | 2 +- >> > sys/dev/sound/pci/t4dwave.c | 2 +- >> > sys/dev/sound/pci/via8233.c | 2 +- >> > sys/dev/sound/pci/via82c686.c | 2 +- >> > sys/dev/sound/pci/vibes.c | 2 +- >> > sys/dev/sound/pcm/ac97.c | 2 +- >> > sys/dev/sound/pcm/ac97_patch.c | 2 +- >> > sys/dev/sound/pcm/buffer.c | 2 +- >> > sys/dev/sound/pcm/channel.c | 2 +- >> > sys/dev/sound/pcm/dsp.c | 2 +- >> > sys/dev/sound/pcm/feeder.c | 2 +- >> > sys/dev/sound/pcm/feeder_chain.c | 2 +- >> > sys/dev/sound/pcm/feeder_eq.c | 2 +- >> > sys/dev/sound/pcm/feeder_format.c | 2 +- >> > sys/dev/sound/pcm/feeder_matrix.c | 2 +- >> > sys/dev/sound/pcm/feeder_mixer.c | 2 +- >> > sys/dev/sound/pcm/feeder_rate.c | 2 +- >> > sys/dev/sound/pcm/feeder_volume.c | 2 +- >> > sys/dev/sound/pcm/mixer.c | 2 +- >> > sys/dev/sound/pcm/sndstat.c | 2 +- >> > sys/dev/sound/pcm/sound.c | 2 +- >> > sys/dev/sound/pcm/vchan.c | 2 +- >> > 44 files changed, 44 insertions(+), 44 deletions(-) >> > >> > diff --git a/sys/arm/broadcom/bcm2835/bcm2835_audio.c b/sys/arm/broadc= om/bcm2835/bcm2835_audio.c >> > index 36b1dc86535b..0d430cf19df7 100644 >> > --- a/sys/arm/broadcom/bcm2835/bcm2835_audio.c >> > +++ b/sys/arm/broadcom/bcm2835/bcm2835_audio.c >> > @@ -38,7 +38,7 @@ >> > >> > #include "vc_vchi_audioserv_defs.h" >> > >> > -SND_DECLARE_FILE("$FreeBSD$"); >> > +SND_DECLARE_FILE(""); >> > >> > /* Audio destination */ >> > #define DEST_AUTO 0 >> > diff --git a/sys/dev/sound/pci/als4000.c b/sys/dev/sound/pci/als4000.c >> > index 71f6c4f909c7..89f7d6385493 100644 >> > --- a/sys/dev/sound/pci/als4000.c >> > +++ b/sys/dev/sound/pci/als4000.c >> > @@ -48,7 +48,7 @@ >> > >> > #include "mixer_if.h" >> > >> > -SND_DECLARE_FILE("$FreeBSD$"); >> > +SND_DECLARE_FILE(""); >> > >> > /* Debugging macro's */ >> > #undef DEB >> > diff --git a/sys/dev/sound/pci/atiixp.c b/sys/dev/sound/pci/atiixp.c >> > index 83eee21a333e..99468367c998 100644 >> > --- a/sys/dev/sound/pci/atiixp.c >> > +++ b/sys/dev/sound/pci/atiixp.c >> > @@ -69,7 +69,7 @@ >> > >> > #include >> > >> > -SND_DECLARE_FILE("$FreeBSD$"); >> > +SND_DECLARE_FILE(""); >> > >> > #define ATI_IXP_DMA_RETRY_MAX 100 >> > >> > diff --git a/sys/dev/sound/pci/cmi.c b/sys/dev/sound/pci/cmi.c >> > index 6b4acbb4ddae..89a1eb24d878 100644 >> > --- a/sys/dev/sound/pci/cmi.c >> > +++ b/sys/dev/sound/pci/cmi.c >> > @@ -61,7 +61,7 @@ >> > #include "mixer_if.h" >> > #include "mpufoi_if.h" >> > >> > -SND_DECLARE_FILE("$FreeBSD$"); >> > +SND_DECLARE_FILE(""); >> > >> > /* Supported chip ID's */ >> > #define CMI8338A_PCI_ID 0x010013f6 >> > diff --git a/sys/dev/sound/pci/cs4281.c b/sys/dev/sound/pci/cs4281.c >> > index b011f67e763e..fccbf807d965 100644 >> > --- a/sys/dev/sound/pci/cs4281.c >> > +++ b/sys/dev/sound/pci/cs4281.c >> > @@ -45,7 +45,7 @@ >> > >> > #include >> > >> > -SND_DECLARE_FILE("$FreeBSD$"); >> > +SND_DECLARE_FILE(""); >> > >> > #define CS4281_DEFAULT_BUFSZ 16384 >> > >> > diff --git a/sys/dev/sound/pci/csa.c b/sys/dev/sound/pci/csa.c >> > index a03f319d85d5..68edfd9338c2 100644 >> > --- a/sys/dev/sound/pci/csa.c >> > +++ b/sys/dev/sound/pci/csa.c >> > @@ -54,7 +54,7 @@ >> > >> > #include >> > >> > -SND_DECLARE_FILE("$FreeBSD$"); >> > +SND_DECLARE_FILE(""); >> > >> > /* This is the pci device id. */ >> > #define CS4610_PCI_ID 0x60011013 >> > diff --git a/sys/dev/sound/pci/csamidi.c b/sys/dev/sound/pci/csamidi.c >> > index e9d6006544b3..cc4b41f86af9 100644 >> > --- a/sys/dev/sound/pci/csamidi.c >> > +++ b/sys/dev/sound/pci/csamidi.c >> > @@ -54,7 +54,7 @@ >> > >> > #include "mpufoi_if.h" >> > >> > -SND_DECLARE_FILE("$FreeBSD$"); >> > +SND_DECLARE_FILE(""); >> > >> > /* pulled from mpu401.c */ >> > #define MPU_DATAPORT 0 >> > diff --git a/sys/dev/sound/pci/csapcm.c b/sys/dev/sound/pci/csapcm.c >> > index d915a14a536f..14820a9c2216 100644 >> > --- a/sys/dev/sound/pci/csapcm.c >> > +++ b/sys/dev/sound/pci/csapcm.c >> > @@ -43,7 +43,7 @@ >> > #include >> > #include >> > >> > -SND_DECLARE_FILE("$FreeBSD$"); >> > +SND_DECLARE_FILE(""); >> > >> > /* Buffer size on dma transfer. Fixed for CS416x. */ >> > #define CS461x_BUFFSIZE (4 * 1024) >> > diff --git a/sys/dev/sound/pci/emu10k1.c b/sys/dev/sound/pci/emu10k1.c >> > index abb586e34525..d4624a549e42 100644 >> > --- a/sys/dev/sound/pci/emu10k1.c >> > +++ b/sys/dev/sound/pci/emu10k1.c >> > @@ -43,7 +43,7 @@ >> > #include >> > #include "mpufoi_if.h" >> > >> > -SND_DECLARE_FILE("$FreeBSD$"); >> > +SND_DECLARE_FILE(""); >> > >> > /* ------------------------------------------------------------------= -- */ >> > >> > diff --git a/sys/dev/sound/pci/envy24.c b/sys/dev/sound/pci/envy24.c >> > index b95a3438ce79..8039d4e3186c 100644 >> > --- a/sys/dev/sound/pci/envy24.c >> > +++ b/sys/dev/sound/pci/envy24.c >> > @@ -41,7 +41,7 @@ >> > >> > #include "mixer_if.h" >> > >> > -SND_DECLARE_FILE("$FreeBSD$"); >> > +SND_DECLARE_FILE(""); >> > >> > static MALLOC_DEFINE(M_ENVY24, "envy24", "envy24 audio"); >> > >> > diff --git a/sys/dev/sound/pci/envy24ht.c b/sys/dev/sound/pci/envy24ht= .c >> > index 4bfef99f600f..e9b6771e2162 100644 >> > --- a/sys/dev/sound/pci/envy24ht.c >> > +++ b/sys/dev/sound/pci/envy24ht.c >> > @@ -53,7 +53,7 @@ >> > >> > #include "mixer_if.h" >> > >> > -SND_DECLARE_FILE("$FreeBSD$"); >> > +SND_DECLARE_FILE(""); >> > >> > static MALLOC_DEFINE(M_ENVY24HT, "envy24ht", "envy24ht audio"); >> > >> > diff --git a/sys/dev/sound/pci/es137x.c b/sys/dev/sound/pci/es137x.c >> > index f1c94f16a123..a11a106fee2f 100644 >> > --- a/sys/dev/sound/pci/es137x.c >> > +++ b/sys/dev/sound/pci/es137x.c >> > @@ -90,7 +90,7 @@ >> > >> > #include "mixer_if.h" >> > >> > -SND_DECLARE_FILE("$FreeBSD$"); >> > +SND_DECLARE_FILE(""); >> > >> > #define MEM_MAP_REG 0x14 >> > >> > diff --git a/sys/dev/sound/pci/fm801.c b/sys/dev/sound/pci/fm801.c >> > index 2469fdba967f..34fb1f6f1bf6 100644 >> > --- a/sys/dev/sound/pci/fm801.c >> > +++ b/sys/dev/sound/pci/fm801.c >> > @@ -35,7 +35,7 @@ >> > #include >> > #include >> > >> > -SND_DECLARE_FILE("$FreeBSD$"); >> > +SND_DECLARE_FILE(""); >> > >> > #define PCI_VENDOR_FORTEMEDIA 0x1319 >> > #define PCI_DEVICE_FORTEMEDIA1 0x08011319 /* Audio controller */ >> > diff --git a/sys/dev/sound/pci/hda/hdaa.c b/sys/dev/sound/pci/hda/hdaa= .c >> > index c7706d2bd967..ef8f634ac8e8 100644 >> > --- a/sys/dev/sound/pci/hda/hdaa.c >> > +++ b/sys/dev/sound/pci/hda/hdaa.c >> > @@ -47,7 +47,7 @@ >> > >> > #include "mixer_if.h" >> > >> > -SND_DECLARE_FILE("$FreeBSD$"); >> > +SND_DECLARE_FILE(""); >> > >> > #define hdaa_lock(devinfo) snd_mtxlock((devinfo)->lock) >> > #define hdaa_unlock(devinfo) snd_mtxunlock((devinfo)->lock) >> > diff --git a/sys/dev/sound/pci/hda/hdaa_patches.c b/sys/dev/sound/pci/= hda/hdaa_patches.c >> > index bec8590745c5..8331312b69c9 100644 >> > --- a/sys/dev/sound/pci/hda/hdaa_patches.c >> > +++ b/sys/dev/sound/pci/hda/hdaa_patches.c >> > @@ -47,7 +47,7 @@ >> > #include "pin_patch.h" >> > #include "pin_patch_realtek.h" >> > >> > -SND_DECLARE_FILE("$FreeBSD$"); >> > +SND_DECLARE_FILE(""); >> > >> > static const struct { >> > uint32_t model; >> > diff --git a/sys/dev/sound/pci/hda/hdac.c b/sys/dev/sound/pci/hda/hdac= .c >> > index aca9bd7ac9ab..79ab71516cd9 100644 >> > --- a/sys/dev/sound/pci/hda/hdac.c >> > +++ b/sys/dev/sound/pci/hda/hdac.c >> > @@ -51,7 +51,7 @@ >> > >> > #define HDA_DRV_TEST_REV "20120126_0002" >> > >> > -SND_DECLARE_FILE("$FreeBSD$"); >> > +SND_DECLARE_FILE(""); >> > >> > #define hdac_lock(sc) snd_mtxlock((sc)->lock) >> > #define hdac_unlock(sc) snd_mtxunlock((sc)->lock) >> > diff --git a/sys/dev/sound/pci/hda/hdacc.c b/sys/dev/sound/pci/hda/hda= cc.c >> > index 33eea6ef67c5..4616b3b23a48 100644 >> > --- a/sys/dev/sound/pci/hda/hdacc.c >> > +++ b/sys/dev/sound/pci/hda/hdacc.c >> > @@ -43,7 +43,7 @@ >> > #include >> > #include >> > >> > -SND_DECLARE_FILE("$FreeBSD$"); >> > +SND_DECLARE_FILE(""); >> > >> > struct hdacc_fg { >> > device_t dev; >> > diff --git a/sys/dev/sound/pci/hdspe-pcm.c b/sys/dev/sound/pci/hdspe-p= cm.c >> > index 6de5b353ab5b..b23304d32fc7 100644 >> > --- a/sys/dev/sound/pci/hdspe-pcm.c >> > +++ b/sys/dev/sound/pci/hdspe-pcm.c >> > @@ -40,7 +40,7 @@ >> > >> > #include >> > >> > -SND_DECLARE_FILE("$FreeBSD$"); >> > +SND_DECLARE_FILE(""); >> > >> > struct hdspe_latency { >> > uint32_t n; >> > diff --git a/sys/dev/sound/pci/hdspe.c b/sys/dev/sound/pci/hdspe.c >> > index 943c20bba4f1..ac253b28df3a 100644 >> > --- a/sys/dev/sound/pci/hdspe.c >> > +++ b/sys/dev/sound/pci/hdspe.c >> > @@ -40,7 +40,7 @@ >> > >> > #include >> > >> > -SND_DECLARE_FILE("$FreeBSD$"); >> > +SND_DECLARE_FILE(""); >> > >> > static struct hdspe_channel chan_map_aio[] =3D { >> > { 0, 1, "line", 1, 1 }, >> > diff --git a/sys/dev/sound/pci/ich.c b/sys/dev/sound/pci/ich.c >> > index feb0175d2839..d5e8a48a186c 100644 >> > --- a/sys/dev/sound/pci/ich.c >> > +++ b/sys/dev/sound/pci/ich.c >> > @@ -38,7 +38,7 @@ >> > #include >> > #include >> > >> > -SND_DECLARE_FILE("$FreeBSD$"); >> > +SND_DECLARE_FILE(""); >> > >> > /* ------------------------------------------------------------------= -- */ >> > >> > diff --git a/sys/dev/sound/pci/maestro3.c b/sys/dev/sound/pci/maestro3= .c >> > index f46b587daf7c..c60c69b6baf5 100644 >> > --- a/sys/dev/sound/pci/maestro3.c >> > +++ b/sys/dev/sound/pci/maestro3.c >> > @@ -69,7 +69,7 @@ >> > #include >> > #include >> > >> > -SND_DECLARE_FILE("$FreeBSD$"); >> > +SND_DECLARE_FILE(""); >> > >> > /* ------------------------------------------------------------------= -- */ >> > >> > diff --git a/sys/dev/sound/pci/neomagic.c b/sys/dev/sound/pci/neomagic= .c >> > index 5616223b7590..162d99b57c70 100644 >> > --- a/sys/dev/sound/pci/neomagic.c >> > +++ b/sys/dev/sound/pci/neomagic.c >> > @@ -40,7 +40,7 @@ >> > #include >> > #include >> > >> > -SND_DECLARE_FILE("$FreeBSD$"); >> > +SND_DECLARE_FILE(""); >> > >> > /* ------------------------------------------------------------------= -- */ >> > >> > diff --git a/sys/dev/sound/pci/solo.c b/sys/dev/sound/pci/solo.c >> > index dc8351e9c117..1788929811ed 100644 >> > --- a/sys/dev/sound/pci/solo.c >> > +++ b/sys/dev/sound/pci/solo.c >> > @@ -39,7 +39,7 @@ >> > >> > #include "mixer_if.h" >> > >> > -SND_DECLARE_FILE("$FreeBSD$"); >> > +SND_DECLARE_FILE(""); >> > >> > #define SOLO_DEFAULT_BUFSZ 16384 >> > #define ABS(x) (((x) < 0)? -(x) : (x)) >> > diff --git a/sys/dev/sound/pci/t4dwave.c b/sys/dev/sound/pci/t4dwave.c >> > index fc99a90b94e7..b7363402ba8b 100644 >> > --- a/sys/dev/sound/pci/t4dwave.c >> > +++ b/sys/dev/sound/pci/t4dwave.c >> > @@ -37,7 +37,7 @@ >> > #include >> > #include >> > >> > -SND_DECLARE_FILE("$FreeBSD$"); >> > +SND_DECLARE_FILE(""); >> > >> > /* ------------------------------------------------------------------= -- */ >> > >> > diff --git a/sys/dev/sound/pci/via8233.c b/sys/dev/sound/pci/via8233.c >> > index 9de5b18cd031..6656670c9e1c 100644 >> > --- a/sys/dev/sound/pci/via8233.c >> > +++ b/sys/dev/sound/pci/via8233.c >> > @@ -50,7 +50,7 @@ >> > >> > #include >> > >> > -SND_DECLARE_FILE("$FreeBSD$"); >> > +SND_DECLARE_FILE(""); >> > >> > #define VIA8233_PCI_ID 0x30591106 >> > >> > diff --git a/sys/dev/sound/pci/via82c686.c b/sys/dev/sound/pci/via82c6= 86.c >> > index 6bd604941cf8..076df8c81aa0 100644 >> > --- a/sys/dev/sound/pci/via82c686.c >> > +++ b/sys/dev/sound/pci/via82c686.c >> > @@ -39,7 +39,7 @@ >> > >> > #include >> > >> > -SND_DECLARE_FILE("$FreeBSD$"); >> > +SND_DECLARE_FILE(""); >> > >> > #define VIA_PCI_ID 0x30581106 >> > #define NSEGS 4 /* Number of segments in SGD t= able */ >> > diff --git a/sys/dev/sound/pci/vibes.c b/sys/dev/sound/pci/vibes.c >> > index 81401796d68c..1299f15dc814 100644 >> > --- a/sys/dev/sound/pci/vibes.c >> > +++ b/sys/dev/sound/pci/vibes.c >> > @@ -44,7 +44,7 @@ >> > >> > #include "mixer_if.h" >> > >> > -SND_DECLARE_FILE("$FreeBSD$"); >> > +SND_DECLARE_FILE(""); >> > >> > /* ------------------------------------------------------------------= ------- */ >> > /* Constants */ >> > diff --git a/sys/dev/sound/pcm/ac97.c b/sys/dev/sound/pcm/ac97.c >> > index 763188291009..d83e3f2fefa5 100644 >> > --- a/sys/dev/sound/pcm/ac97.c >> > +++ b/sys/dev/sound/pcm/ac97.c >> > @@ -38,7 +38,7 @@ >> > >> > #include "mixer_if.h" >> > >> > -SND_DECLARE_FILE("$FreeBSD$"); >> > +SND_DECLARE_FILE(""); >> > >> > static MALLOC_DEFINE(M_AC97, "ac97", "ac97 codec"); >> > >> > diff --git a/sys/dev/sound/pcm/ac97_patch.c b/sys/dev/sound/pcm/ac97_p= atch.c >> > index f1a358b50958..aff8075fe96c 100644 >> > --- a/sys/dev/sound/pcm/ac97_patch.c >> > +++ b/sys/dev/sound/pcm/ac97_patch.c >> > @@ -34,7 +34,7 @@ >> > #include >> > #include >> > >> > -SND_DECLARE_FILE("$FreeBSD$"); >> > +SND_DECLARE_FILE(""); >> > >> > void ad1886_patch(struct ac97_info* codec) >> > { >> > diff --git a/sys/dev/sound/pcm/buffer.c b/sys/dev/sound/pcm/buffer.c >> > index d75890eaddfb..d5a519362c5e 100644 >> > --- a/sys/dev/sound/pcm/buffer.c >> > +++ b/sys/dev/sound/pcm/buffer.c >> > @@ -40,7 +40,7 @@ >> > #define SND_DECLARE_FXDIV >> > #include "snd_fxdiv_gen.h" >> > >> > -SND_DECLARE_FILE("$FreeBSD$"); >> > +SND_DECLARE_FILE(""); >> > >> > struct snd_dbuf * >> > sndbuf_create(device_t dev, char *drv, char *desc, struct pcm_channel= *channel) >> > diff --git a/sys/dev/sound/pcm/channel.c b/sys/dev/sound/pcm/channel.c >> > index 1d192de54712..d56f5fb51dc9 100644 >> > --- a/sys/dev/sound/pcm/channel.c >> > +++ b/sys/dev/sound/pcm/channel.c >> > @@ -38,7 +38,7 @@ >> > >> > #include "feeder_if.h" >> > >> > -SND_DECLARE_FILE("$FreeBSD$"); >> > +SND_DECLARE_FILE(""); >> > >> > int report_soft_formats =3D 1; >> > SYSCTL_INT(_hw_snd, OID_AUTO, report_soft_formats, CTLFLAG_RW, >> > diff --git a/sys/dev/sound/pcm/dsp.c b/sys/dev/sound/pcm/dsp.c >> > index bb435bc3925c..98d241e65a52 100644 >> > --- a/sys/dev/sound/pcm/dsp.c >> > +++ b/sys/dev/sound/pcm/dsp.c >> > @@ -43,7 +43,7 @@ >> > #include >> > #include >> > >> > -SND_DECLARE_FILE("$FreeBSD$"); >> > +SND_DECLARE_FILE(""); >> > >> > static int dsp_mmap_allow_prot_exec =3D 0; >> > SYSCTL_INT(_hw_snd, OID_AUTO, compat_linux_mmap, CTLFLAG_RWTUN, >> > diff --git a/sys/dev/sound/pcm/feeder.c b/sys/dev/sound/pcm/feeder.c >> > index d379d06b8664..8fb377533907 100644 >> > --- a/sys/dev/sound/pcm/feeder.c >> > +++ b/sys/dev/sound/pcm/feeder.c >> > @@ -35,7 +35,7 @@ >> > >> > #include "feeder_if.h" >> > >> > -SND_DECLARE_FILE("$FreeBSD$"); >> > +SND_DECLARE_FILE(""); >> > >> > static MALLOC_DEFINE(M_FEEDER, "feeder", "pcm feeder"); >> > >> > diff --git a/sys/dev/sound/pcm/feeder_chain.c b/sys/dev/sound/pcm/feed= er_chain.c >> > index 9c3baaf282b5..01def5f6e9cb 100644 >> > --- a/sys/dev/sound/pcm/feeder_chain.c >> > +++ b/sys/dev/sound/pcm/feeder_chain.c >> > @@ -34,7 +34,7 @@ >> > >> > #include "feeder_if.h" >> > >> > -SND_DECLARE_FILE("$FreeBSD$"); >> > +SND_DECLARE_FILE(""); >> > >> > /* chain state */ >> > struct feeder_chain_state { >> > diff --git a/sys/dev/sound/pcm/feeder_eq.c b/sys/dev/sound/pcm/feeder_= eq.c >> > index bc39d33c03fb..70797a706367 100644 >> > --- a/sys/dev/sound/pcm/feeder_eq.c >> > +++ b/sys/dev/sound/pcm/feeder_eq.c >> > @@ -46,7 +46,7 @@ >> > #define SND_USE_FXDIV >> > #include "snd_fxdiv_gen.h" >> > >> > -SND_DECLARE_FILE("$FreeBSD$"); >> > +SND_DECLARE_FILE(""); >> > #endif >> > >> > #include "feeder_eq_gen.h" >> > diff --git a/sys/dev/sound/pcm/feeder_format.c b/sys/dev/sound/pcm/fee= der_format.c >> > index 8a9054561b2b..3a741430e0ca 100644 >> > --- a/sys/dev/sound/pcm/feeder_format.c >> > +++ b/sys/dev/sound/pcm/feeder_format.c >> > @@ -44,7 +44,7 @@ >> > #define SND_USE_FXDIV >> > #include "snd_fxdiv_gen.h" >> > >> > -SND_DECLARE_FILE("$FreeBSD$"); >> > +SND_DECLARE_FILE(""); >> > #endif >> > >> > #define FEEDFORMAT_RESERVOIR (SND_CHN_MAX * PCM_32_BPS) >> > diff --git a/sys/dev/sound/pcm/feeder_matrix.c b/sys/dev/sound/pcm/fee= der_matrix.c >> > index 33bf3ec11ee0..0afdb47c04d8 100644 >> > --- a/sys/dev/sound/pcm/feeder_matrix.c >> > +++ b/sys/dev/sound/pcm/feeder_matrix.c >> > @@ -54,7 +54,7 @@ >> > #define SND_USE_FXDIV >> > #include "snd_fxdiv_gen.h" >> > >> > -SND_DECLARE_FILE("$FreeBSD$"); >> > +SND_DECLARE_FILE(""); >> > #endif >> > >> > #define FEEDMATRIX_RESERVOIR (SND_CHN_MAX * PCM_32_BPS) >> > diff --git a/sys/dev/sound/pcm/feeder_mixer.c b/sys/dev/sound/pcm/feed= er_mixer.c >> > index 13afceabf28e..42ebe89d7c09 100644 >> > --- a/sys/dev/sound/pcm/feeder_mixer.c >> > +++ b/sys/dev/sound/pcm/feeder_mixer.c >> > @@ -38,7 +38,7 @@ >> > #define SND_USE_FXDIV >> > #include "snd_fxdiv_gen.h" >> > >> > -SND_DECLARE_FILE("$FreeBSD$"); >> > +SND_DECLARE_FILE(""); >> > #endif >> > >> > #undef SND_FEEDER_MULTIFORMAT >> > diff --git a/sys/dev/sound/pcm/feeder_rate.c b/sys/dev/sound/pcm/feede= r_rate.c >> > index 0784c477197a..b2afe0651bf5 100644 >> > --- a/sys/dev/sound/pcm/feeder_rate.c >> > +++ b/sys/dev/sound/pcm/feeder_rate.c >> > @@ -61,7 +61,7 @@ >> > #define SND_USE_FXDIV >> > #include "snd_fxdiv_gen.h" >> > >> > -SND_DECLARE_FILE("$FreeBSD$"); >> > +SND_DECLARE_FILE(""); >> > #endif >> > >> > #include "feeder_rate_gen.h" >> > diff --git a/sys/dev/sound/pcm/feeder_volume.c b/sys/dev/sound/pcm/fee= der_volume.c >> > index 724d5a0922e8..fa11a089af76 100644 >> > --- a/sys/dev/sound/pcm/feeder_volume.c >> > +++ b/sys/dev/sound/pcm/feeder_volume.c >> > @@ -39,7 +39,7 @@ >> > #define SND_USE_FXDIV >> > #include "snd_fxdiv_gen.h" >> > >> > -SND_DECLARE_FILE("$FreeBSD$"); >> > +SND_DECLARE_FILE(""); >> > #endif >> > >> > typedef void (*feed_volume_t)(int *, int *, uint32_t, uint8_t *, uint= 32_t); >> > diff --git a/sys/dev/sound/pcm/mixer.c b/sys/dev/sound/pcm/mixer.c >> > index 080daeced12d..0c7576390b72 100644 >> > --- a/sys/dev/sound/pcm/mixer.c >> > +++ b/sys/dev/sound/pcm/mixer.c >> > @@ -37,7 +37,7 @@ >> > #include "feeder_if.h" >> > #include "mixer_if.h" >> > >> > -SND_DECLARE_FILE("$FreeBSD$"); >> > +SND_DECLARE_FILE(""); >> > >> > static MALLOC_DEFINE(M_MIXER, "mixer", "mixer"); >> > >> > diff --git a/sys/dev/sound/pcm/sndstat.c b/sys/dev/sound/pcm/sndstat.c >> > index 64e0a1ca5d82..fc92bd783587 100644 >> > --- a/sys/dev/sound/pcm/sndstat.c >> > +++ b/sys/dev/sound/pcm/sndstat.c >> > @@ -50,7 +50,7 @@ >> > #include >> > >> > >> > -SND_DECLARE_FILE("$FreeBSD$"); >> > +SND_DECLARE_FILE(""); >> > >> > #define SS_TYPE_MODULE 0 >> > #define SS_TYPE_PCM 1 >> > diff --git a/sys/dev/sound/pcm/sound.c b/sys/dev/sound/pcm/sound.c >> > index 1a7f8dc2fa68..17dc8d968b3c 100644 >> > --- a/sys/dev/sound/pcm/sound.c >> > +++ b/sys/dev/sound/pcm/sound.c >> > @@ -44,7 +44,7 @@ >> > >> > #include "feeder_if.h" >> > >> > -SND_DECLARE_FILE("$FreeBSD$"); >> > +SND_DECLARE_FILE(""); >> > >> > devclass_t pcm_devclass; >> > >> > diff --git a/sys/dev/sound/pcm/vchan.c b/sys/dev/sound/pcm/vchan.c >> > index 0b0ddc224094..c84d8f14e075 100644 >> > --- a/sys/dev/sound/pcm/vchan.c >> > +++ b/sys/dev/sound/pcm/vchan.c >> > @@ -36,7 +36,7 @@ >> > #include >> > #include >> > >> > -SND_DECLARE_FILE("$FreeBSD$"); >> > +SND_DECLARE_FILE(""); >> > >> > /* >> > * [ac3 , dts , linear , 0, linear, 0] >> > From nobody Wed Aug 16 20:59:53 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RR0rW39B8z4Ts52; Wed, 16 Aug 2023 20:59:55 +0000 (UTC) (envelope-from jhb@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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RR0rW2Bk1z4CXR; Wed, 16 Aug 2023 20:59:55 +0000 (UTC) (envelope-from jhb@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692219595; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=QgkL2IPy9RnZj4Le4gS3IM4g+SDb3BGt4zAhQqS6z6w=; b=rb9thepLc+HOiwMJu+EMRIGcvw6gcDI7lnRtXmJRxMIarepiIbRc82UuZ2W9cwolueOsDt iVuFIQ7Nvu2SCVyq998ogXBoCntYwpM6/9C1Pzu7Horwd4Z/MQGM6QIKdz5JMQNVun2dvs +lMcjBshQcAF2RzZRS/PlGVP6aJUo9YiQVDpIRY+ULYC3A6froFcORQTWY+fCRj/GNpM9y aCprb0J8CCNlYh7fPk07QGQDGY4M7y3K5igtv+NnMJ9VNd7//SaGilISw0a6ivT1jEi6uu ATMaoCU+1UBrb8qWh+3zt1sevcqOE+nYW28em7h8mf1o56CD6kQYcAX3/9tFNQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692219595; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=QgkL2IPy9RnZj4Le4gS3IM4g+SDb3BGt4zAhQqS6z6w=; b=Muj9ZmtIUebH0aOfPbaLqKVwv6E0/7zUPX/+YhlRxwCZXxEaoZPhKfrj3LYKbvK4re/uV6 79R7K9sTsM098RjOPnu71mSHr+YAMy1sJe2FGbQyowVYiAjGVrzdYzD8i8fRtZyQM8dX7U 6hTDdzI3DCS54MHHHONMPkgu7ugENEC6sq8V9gsyX83DEnbg5ShLGOs91S2IzDx/sIk0H5 ugD3luPAQ/2FaEAoqGA1D2qLJAgB2FVE+jwz0MkjwYYzebJovX22O16EcqJuF3cIRLPERS FJdWnidZ6nHdLARB5gU4rlF6Z3VdtcyxP8dt+W+RV/ozjaiYSNYad+KqeMRz8g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692219595; a=rsa-sha256; cv=none; b=jTs/0uo2+CNPYy6Z+yvtDXA2Rb3Phf2waP0H9EIWvRFJcDR/9hyhA/Pqs6LcijOpvgOiah 3XB3KMQgE+eJ5hzwgC+WajPM7x2KMqVnaIEeRpvN6EwyT2Xfc9t7S9bkF4bE1qg81rcLpm MLKXLU9RzEjP1wrfE6K2z6qDExG5O5rAVxmPGBupIqv8y7QkH5UI8ZYvHcdxy+6xk9rNMT zCQtFYSEKXgwJHUy68CFxhfqMpGYKy0ki0g+K8L/Srv4LhSWvNyN/hAZxIROF8tjtOt3Dx eyDARRkXpGQ7eGSmo7RWMB3+SlChcJL7GQBtIqGiGfdRmjiO7Y7OVvvdDCkm3A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from [IPV6:2601:648:8683:a9e0:7075:181:17d9:4b81] (unknown [IPv6:2601:648:8683:a9e0:7075:181:17d9:4b81]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) (Authenticated sender: jhb) by smtp.freebsd.org (Postfix) with ESMTPSA id 4RR0rV5JCDz1RKf; Wed, 16 Aug 2023 20:59:54 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Message-ID: <74ec860a-e963-d746-4b6b-55ab6e6ef68a@FreeBSD.org> Date: Wed, 16 Aug 2023 13:59:53 -0700 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.15; rv:102.0) Gecko/20100101 Thunderbird/102.14.0 Subject: Re: git: da51a1211dc7 - main - RELNOTES: Note the deprecation of 32-bit platforms for 15.0. Content-Language: en-US To: Mike Karels Cc: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org References: <202308161653.37GGrXLu058051@gitrepo.freebsd.org> <137aaabe-cba6-e88d-05d6-7fd214c9a594@FreeBSD.org> From: John Baldwin In-Reply-To: Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit On 8/16/23 10:10 AM, Mike Karels wrote: > On 16 Aug 2023, at 11:55, John Baldwin wrote: > >> On 8/16/23 9:53 AM, John Baldwin wrote: >>> The branch main has been updated by jhb: >>> >>> URL: https://cgit.FreeBSD.org/src/commit/?id=da51a1211dc799fa123f5d7f041eaf83c36f976b >>> >>> commit da51a1211dc799fa123f5d7f041eaf83c36f976b >>> Author: John Baldwin >>> AuthorDate: 2023-08-16 16:49:17 +0000 >>> Commit: John Baldwin >>> CommitDate: 2023-08-16 16:52:16 +0000 >>> >>> RELNOTES: Note the deprecation of 32-bit platforms for 15.0. >>> This draws a line in the sand of removing support for 32-bit worlds >>> and kernels aside from COMPAT_FREEBSD32 and lib32 support. The >>> project may choose to alter this approach when 15.0 is released by >>> extending some level of 32-bit support in 15.0 or later. >>> In particular, at present there is a fair bit of interest in retaining >>> armv7 support in 15.0 at least. >> >> This language probably needs further tweaking before 14.0 ships, but it's a >> start at least, and we need to get the associated warning into 14.0 to give >> users lots of heads up before 15.0 ships. > > From the RELNOTES entry: > > + FreeBSD 15.0 will not include support for 32-bit platforms. > > That sounds quite definite, although it is softened in the last paragraph. > Maybe "is not planned to include" or something like that? Yeah, I'm not sure exactly how we want to word it. We want to get people's attention so they know to give feedback and/or adjust future plans while also reserving the right to relax our stance. "is not planned" might still work well enough for the former though. -- John Baldwin From nobody Wed Aug 16 21:42:22 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RR1nV5PtBz4Tvgg; Wed, 16 Aug 2023 21:42:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RR1nV4VZKz4GpS; Wed, 16 Aug 2023 21:42:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692222142; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=nIh3UAEVnuSzJu9QwLTzLjjmhhIiUFfjcF3ryNaRzrs=; b=Uo6hLO5HWy9AwfAGRHNziacK9EbRdKOEXe/F5A/9nUKi7F8MZ5rRGjwMGF58haHls0vNpi z1xd/2YEYLd82/hy1lH2LmCx4GgOoTSMiBq2KDdClTI0G2E8ceLNhQ05ZLBxoKlk7CRW8a Tg6YHKs1r/L0Bv2/9mO+S4kNy7lHQdllyPv8NktXLORRoy7kufkmdu6rlsxjTq0RUoQ20G 82Up3Cgo5SaA7S0aFO9e1CpE/D9zr9NPxtdtTfqIrGyO5oqioB7leHRmEngvWuqurSUHKU gyZdgEB5V8O9Tq76yzYRe2QiZxLp3jPdSbiqStV4jezyUQXlw7NaxRUsCEVM9g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692222142; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=nIh3UAEVnuSzJu9QwLTzLjjmhhIiUFfjcF3ryNaRzrs=; b=BJQ9Vjz2UizSVn9CD7bTNzIZFtr0w/0Li8iTAqW9/2spAfy0s3qcvv38vV2/dLgoaucFn8 tmYpITjuCoWaum74UP0+VHvDCWHBlwVnhUuaQsVrtCcfR5zFwbogXfdJJ3YwtIoZVmKcEp g8G3O2uhy/LxgGUsXNEU0aHBIZmN103JA13gjeWsbYxgMoIJ4mQKbERvlR+Iq80h8Zw1zg lG2D7+fsdUHXybG7RdZt51Cqb0ZxKqBaCfAXHHyA+gIWDHGzKJtAlepnw3lHb/aKQ2PRuV whXdSIvsUf9E4EVXdSu4ETxTkkmJO5bcrC4fOo53+khNQIECH4gg9agz5AFZig== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692222142; a=rsa-sha256; cv=none; b=mafBG0IHsD41JRm6fFNWsplB2Qjtlb1eXcHx5LMp73KMJ/0APHaiESW7E107i+dwHRwq2L 4LLqUW1u/1cFWhu8daIVMZ9cVvcTqOnixjpcIjEkprCxz9lKlm8AQQHKxF4M3iczxukfhI Xh+ccnOcDGFjC/3bX+1i5/biv3OWhvYvq8UR41iEJ6SuQnziz1K81M0WqFpP5J+2TwC9lQ cZbV+/6T05EVAQMKoAAhsazEHg5i1Xy7MknvtAHLReW75BVT1AiQkOC09utHlHdrP8Uyot ZNl42CM4bUm6Mv4di5mNMADoDqNU2x4Y29yXpxNUTu2nkXkyw5rFfaFz0TeXUA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RR1nV3Y1rz16tW; Wed, 16 Aug 2023 21:42:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37GLgMvX062255; Wed, 16 Aug 2023 21:42:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37GLgMUl062252; Wed, 16 Aug 2023 21:42:22 GMT (envelope-from git) Date: Wed, 16 Aug 2023 21:42:22 GMT Message-Id: <202308162142.37GLgMUl062252@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: d1d7a273707a - main - share/examples/tests: fix comments after $FreeBSD$ removal List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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/main X-Git-Reftype: branch X-Git-Commit: d1d7a273707a50d4ad1691b2c4dbf645dfa253ea Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=d1d7a273707a50d4ad1691b2c4dbf645dfa253ea commit d1d7a273707a50d4ad1691b2c4dbf645dfa253ea Author: Ed Maste AuthorDate: 2023-08-16 21:37:21 +0000 Commit: Ed Maste CommitDate: 2023-08-16 21:42:10 +0000 share/examples/tests: fix comments after $FreeBSD$ removal Fixes: 2a63c3be1582 ("Remove $FreeBSD$: one-line .c comment pattern") --- share/examples/tests/tests/atf/printf_test.c | 2 +- share/examples/tests/tests/tap/printf_test.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/share/examples/tests/tests/atf/printf_test.c b/share/examples/tests/tests/atf/printf_test.c index 90fe32b23a3a..d837c6b7686f 100644 --- a/share/examples/tests/tests/atf/printf_test.c +++ b/share/examples/tests/tests/atf/printf_test.c @@ -1,4 +1,4 @@ - * +/* * SPDX-License-Identifier: BSD-3-Clause * * Copyright 2013 Google Inc. diff --git a/share/examples/tests/tests/tap/printf_test.c b/share/examples/tests/tests/tap/printf_test.c index b3dd90fca3eb..62ab64722f8b 100644 --- a/share/examples/tests/tests/tap/printf_test.c +++ b/share/examples/tests/tests/tap/printf_test.c @@ -1,4 +1,4 @@ - * +/* * Copyright 2013 Google Inc. * All rights reserved. * From nobody Thu Aug 17 00:30:57 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RR5X12lH7z4mQl9; Thu, 17 Aug 2023 00:30: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RR5X12J7Wz4TlK; Thu, 17 Aug 2023 00:30:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692232257; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7UzBDUvOOZ/3JY8Ww7qvNRmDO36NXUZtZJ9OUjdtWAw=; b=t0ApJ0r+LOtDzGIOEO+ag6DLXJvuZjmwrVBlDjUjKWfDTAIdDdGh3Q777EusdhHw10wFwW dTIxv6INNcZ2ePwzGsS8jBDQyBqTTN7M2kVAK6MdPBvw3tzIFU8Xnebgbgsjo8zJKPy43t sUZ4FED4lux/SwbxVQjABBcC5uoMqn6pzPhE+PcBTS/u0Qk/PsDC6W1ZGFP/BD89LFNvFZ 9xr1s41b/iLgbBOZF1Bdkq03u5fnkUxo571K/2ZRvFi8Jz5zOmmmKLGRSqpqMMzOvuduSs 4eREIj3boLqhIU4H9CNNIR3naglvFBp1RN8GdsUnC2fBTCkX0kSIBdHiwCnbrA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692232257; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7UzBDUvOOZ/3JY8Ww7qvNRmDO36NXUZtZJ9OUjdtWAw=; b=vSMEJE0oZmwgEjQ/RAxLDSHfnZ2bitAZdowb7XzrBWozet4cOu044ZKrao4mgyJ+OEewQY bhHOPYpe+niWTa/sp+Esyt75XUwaLSLsR+apDpSg/kg9qFeT7AqLb5koV2Sy9Ge8Hq0jRn 7EviIDkRPGoy3bLxuKaPXReVSeg0aYLcUX0ry37yZbRXkXCTtkfoLwGacI95f16zjt1v6q 45iIFi9tQMNEM50mx2OGgawssDpX8s6v/4HkPJ7mW89RH3BZTv+pufoZJ0dGuFyjhqUPXC YQkRVLdAWgnAfBMwRUgY2xJp9vTw84L51WE34J11jf1EUxgaCohz3W0AeefHyA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692232257; a=rsa-sha256; cv=none; b=rcuaTdERzHkb85wC2kWikNhOe5W0DTFMysMggf1dadi4MYqib9xHBejpVPypRDjGHEMmGh +MPEcP9+JQpl0KVADYpEZI7PhjAN5WVFDUj3ZifJqC9f9G0khFBKGPE8yIqLifainXFxjh Xsh3m6nvZwaftv0mwa5XE6BH2SFtN4wJ2hW1GVHao9zvtT8WongBjxRZouAwLonsQSLn5Y AnTeqsCEg0Q5i1We2V7Ntv22A/E5CPLe4Ykl/8MzV99l09b99KPra1hqhr/Zg3j7h2Gba4 KeECQcFsvWgGFwzEyc7tajDBoi2QNA07dpJ8ajqXSyqa20W8aovo1x8u3kJdXg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RR5X11LwVz1ByJ; Thu, 17 Aug 2023 00:30:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37H0Uvm9037277; Thu, 17 Aug 2023 00:30:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37H0UvCG037274; Thu, 17 Aug 2023 00:30:57 GMT (envelope-from git) Date: Thu, 17 Aug 2023 00:30:57 GMT Message-Id: <202308170030.37H0UvCG037274@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kevin Bowling Subject: git: a1c25461c6d1 - stable/13 - ixgbe: Add support for 82599 LS List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kbowling X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: a1c25461c6d16987b0e1eee60a8a1a0b0618574f Auto-Submitted: auto-generated The branch stable/13 has been updated by kbowling: URL: https://cgit.FreeBSD.org/src/commit/?id=a1c25461c6d16987b0e1eee60a8a1a0b0618574f commit a1c25461c6d16987b0e1eee60a8a1a0b0618574f Author: Kevin Bowling AuthorDate: 2023-08-10 01:30:15 +0000 Commit: Kevin Bowling CommitDate: 2023-08-17 00:30:19 +0000 ixgbe: Add support for 82599 LS Obtained from: DPDK 549ccd3dc01539e060597b503f2b65b272de3347 (cherry picked from commit 9228ac3a69c4c7401a743e6465e118101a2beeb0) --- sys/dev/ixgbe/if_ix.c | 1 + sys/dev/ixgbe/ixgbe_82599.c | 3 +++ sys/dev/ixgbe/ixgbe_type.h | 2 ++ 3 files changed, 6 insertions(+) diff --git a/sys/dev/ixgbe/if_ix.c b/sys/dev/ixgbe/if_ix.c index 54bc16e73763..150fdff03d05 100644 --- a/sys/dev/ixgbe/if_ix.c +++ b/sys/dev/ixgbe/if_ix.c @@ -76,6 +76,7 @@ static pci_vendor_info_t ixgbe_vendor_info_array[] = PVID(IXGBE_INTEL_VENDOR_ID, IXGBE_DEV_ID_82599_XAUI_LOM, "Intel(R) X520 82599 (XAUI/BX4)"), PVID(IXGBE_INTEL_VENDOR_ID, IXGBE_DEV_ID_82599_CX4, "Intel(R) X520 82599 (Dual CX4)"), PVID(IXGBE_INTEL_VENDOR_ID, IXGBE_DEV_ID_82599_T3_LOM, "Intel(R) X520-T 82599 LOM"), + PVID(IXGBE_INTEL_VENDOR_ID, IXGBE_DEV_ID_82599_LS, "Intel(R) X520 82599 LS"), PVID(IXGBE_INTEL_VENDOR_ID, IXGBE_DEV_ID_82599_COMBO_BACKPLANE, "Intel(R) X520 82599 (Combined Backplane)"), PVID(IXGBE_INTEL_VENDOR_ID, IXGBE_DEV_ID_82599_BACKPLANE_FCOE, "Intel(R) X520 82599 (Backplane w/FCoE)"), PVID(IXGBE_INTEL_VENDOR_ID, IXGBE_DEV_ID_82599_SFP_SF2, "Intel(R) X520 82599 (Dual SFP+)"), diff --git a/sys/dev/ixgbe/ixgbe_82599.c b/sys/dev/ixgbe/ixgbe_82599.c index 698602080592..7afb440b556d 100644 --- a/sys/dev/ixgbe/ixgbe_82599.c +++ b/sys/dev/ixgbe/ixgbe_82599.c @@ -568,6 +568,9 @@ enum ixgbe_media_type ixgbe_get_media_type_82599(struct ixgbe_hw *hw) case IXGBE_DEV_ID_82599_T3_LOM: media_type = ixgbe_media_type_copper; break; + case IXGBE_DEV_ID_82599_LS: + media_type = ixgbe_media_type_fiber_lco; + break; case IXGBE_DEV_ID_82599_QSFP_SF_QP: media_type = ixgbe_media_type_fiber_qsfp; break; diff --git a/sys/dev/ixgbe/ixgbe_type.h b/sys/dev/ixgbe/ixgbe_type.h index 9fb800560e43..7d39e391855a 100644 --- a/sys/dev/ixgbe/ixgbe_type.h +++ b/sys/dev/ixgbe/ixgbe_type.h @@ -100,6 +100,7 @@ #define IXGBE_DEV_ID_82599_KR 0x1517 #define IXGBE_DEV_ID_82599_COMBO_BACKPLANE 0x10F8 #define IXGBE_SUBDEV_ID_82599_KX4_KR_MEZZ 0x000C +#define IXGBE_DEV_ID_82599_LS 0x154F #define IXGBE_DEV_ID_82599_CX4 0x10F9 #define IXGBE_DEV_ID_82599_SFP 0x10FB #define IXGBE_SUBDEV_ID_82599_SFP 0x11A9 @@ -3758,6 +3759,7 @@ enum ixgbe_media_type { ixgbe_media_type_fiber, ixgbe_media_type_fiber_fixed, ixgbe_media_type_fiber_qsfp, + ixgbe_media_type_fiber_lco, ixgbe_media_type_copper, ixgbe_media_type_backplane, ixgbe_media_type_cx4, From nobody Thu Aug 17 00:30:58 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RR5X24DJYz4mQnb; Thu, 17 Aug 2023 00:30: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RR5X23GgXz4Tdb; Thu, 17 Aug 2023 00:30:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692232258; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=TzEtOTz0ziNnCjzIdpzcT7xWQ6gm7+jX0X2owgWTuTg=; b=mYAdw6vAhwSGFJ4R+709wMIm+6cQDZO/aiogSIJuCeWbFAr8WGeG1me4wWJUy1xn3Nm1mo O8oozzo7iMmHlqby47zRbwBlDiiu2kxIGODDJCzNC6N6HyL1EUUJ88YEfKMXgb6NFsxpMZ 1I//dWNJt5nxVvFwmhSb3UOoolo/9VqZGT9ieHTKS8hhGHh49sb7JnCDIBLc4X6IQTvwyP LrHNUcJ5A3eJ1aNgZ1XvTjMBI5L8mSabPV2xLPj39i1VfTPNctDBhHi6Xpx1AaqpsncRgd ZRxEizMsnzgtvuK0tCQ/8mgcKIE6Vkj1HJZ+eg/pUVEmW0vz+ja/MHK9XJELag== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692232258; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=TzEtOTz0ziNnCjzIdpzcT7xWQ6gm7+jX0X2owgWTuTg=; b=HnuHX0IrmnHJ4vMWaXCTfHya/sy2BIQKOIZhtYEAos7HNhrF5lole4tF7xzAiZcv+m32LX 8zbi8F85DZpkAH3+dDiTHq3VKefxmzZcs5hho6FKsmqrWwJH+kdNYunxTSGsavsYmJc12k t5HS/lBcJLB3E6SWsMzFIjkzAxvKv6ztOP63NQ8ZM0hbSieqTXwzeHv1cU0sEwyxkLyrGr egbqh11BfcTk7OsKN1zWFWwHf26QExVOjXMaVwRRkWyYtZ6OxeWv0QU/x9AWmKPE5yj6TQ XTexVxGOX4NxhwT6o7vBMioM3vKi9AjvmdRYHEmf5uKWvNgeTzezMhGXth9Dug== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692232258; a=rsa-sha256; cv=none; b=I5sbvZgdpDepOt6yPdK2XtGbl4slFmRyySuegf6T5O2GeckwCAjqsAJwxbPz5dqUm/DFud 3+Twd0JffzS185Ih0e+U7Hu+c+RVYZU0twyl3ZaFqrrqnNKeh+6bnsFI7PWR0fUdd/UvHP N/V8bPiWxhwqxFhEFi3smJ6c07PK6ERpQPAIUc6NIo9Rg95EkX2P8kKf804p6rSaxPVIpG 10VkyoiFiwpu5hw36qlceIvaXy6Mr/2hI/GUnO2bqoH4nqyHLxyqUfiGbMc5u8c4ChQEUl YYGyP5oWs2To/OmrVtKbwvrfYAA+JNcW5gSuOlBRyHmi5IcBfWYJELbwZ9tDpw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RR5X22LyVz1CNS; Thu, 17 Aug 2023 00:30:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37H0Uw4v037327; Thu, 17 Aug 2023 00:30:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37H0UwD0037324; Thu, 17 Aug 2023 00:30:58 GMT (envelope-from git) Date: Thu, 17 Aug 2023 00:30:58 GMT Message-Id: <202308170030.37H0UwD0037324@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kevin Bowling Subject: git: f09f2763b67f - stable/13 - igc: sync srrctl buffer sizing with e1000 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kbowling X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: f09f2763b67fcbf65d7cac5b114eab72308cde60 Auto-Submitted: auto-generated The branch stable/13 has been updated by kbowling: URL: https://cgit.FreeBSD.org/src/commit/?id=f09f2763b67fcbf65d7cac5b114eab72308cde60 commit f09f2763b67fcbf65d7cac5b114eab72308cde60 Author: Kevin Bowling AuthorDate: 2023-08-10 14:41:21 +0000 Commit: Kevin Bowling CommitDate: 2023-08-17 00:30:32 +0000 igc: sync srrctl buffer sizing with e1000 Approved by: grehan Differential Revision: https://reviews.freebsd.org/D31493 (cherry picked from commit 0eb8cd1de26849cbaefaf3bc59aa9612fa0dfa52) --- sys/dev/igc/if_igc.c | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/sys/dev/igc/if_igc.c b/sys/dev/igc/if_igc.c index 826a35e7e15e..49d4755d057c 100644 --- a/sys/dev/igc/if_igc.c +++ b/sys/dev/igc/if_igc.c @@ -1986,6 +1986,7 @@ igc_initialize_transmit_unit(if_ctx_t ctx) * Enable receive unit. * **********************************************************************/ +#define BSIZEPKT_ROUNDUP ((1< ETHERMTU) { - /* Set maximum packet len */ - if (adapter->rx_mbuf_sz <= 4096) { - srrctl |= 4096 >> IGC_SRRCTL_BSIZEPKT_SHIFT; - rctl |= IGC_RCTL_SZ_4096 | IGC_RCTL_BSEX; - } else if (adapter->rx_mbuf_sz > 4096) { - srrctl |= 8192 >> IGC_SRRCTL_BSIZEPKT_SHIFT; - rctl |= IGC_RCTL_SZ_8192 | IGC_RCTL_BSEX; - } psize = scctx->isc_max_frame_size; /* are we on a vlan? */ if (ifp->if_vlantrunk != NULL) psize += VLAN_TAG_SIZE; IGC_WRITE_REG(&adapter->hw, IGC_RLPML, psize); - } else { - srrctl |= 2048 >> IGC_SRRCTL_BSIZEPKT_SHIFT; - rctl |= IGC_RCTL_SZ_2048; } + /* Set maximum packet buffer len */ + srrctl |= (adapter->rx_mbuf_sz + BSIZEPKT_ROUNDUP) >> + IGC_SRRCTL_BSIZEPKT_SHIFT; + /* srrctl above overrides this but set the register to a sane value */ + rctl |= IGC_RCTL_SZ_2048; + /* * If TX flow control is disabled and there's >1 queue defined, * enable DROP. From nobody Thu Aug 17 00:30:59 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RR5X40hnzz4mQsX; Thu, 17 Aug 2023 00:31: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RR5X34r8bz4Tf8; Thu, 17 Aug 2023 00:30:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692232259; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Oh+1pS38PdRpd/YXNx6y5ObiHeDcXmky12EUL3+wTGg=; b=YrqM3tOIgpc9nROkAOxU4oVxhx9oV/FdEbMXbKcEMCsuLB94E2lpTop+45pUANgIuQPv5+ e+J4cvxJMbMy5W5+DBWMKZPiUbmoFbvrtO49v1AgT3IDO6/WvxCYO0rasG+u9a5VLQE6vp Fcj+Fe2g+Cs26LeJvxPJw6cQnpGYsC6Iwkk5ncu8VF7ZMBHOUZXd2W3czZ9qf67zxHNZjn Ehd/k0zY4UoJZjtwreiIuqE+gX/73BMjEVuSmF7MGVW6mCSvScnXucI7HsfKWAYU2Y0L1s k1GnW/F5itNePIw2zcFyYHMYd0HQnMS6OBRMHUNK93wrmTMSR+9rvESQLMP9Gg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692232259; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Oh+1pS38PdRpd/YXNx6y5ObiHeDcXmky12EUL3+wTGg=; b=ZtRq7YiWurLVVXOHVMAi+Jh1zSe1TTHUfzYYrEQphFQZg1cP7pldxuJYrSqZd3zjmq+VSO WtbmIt8HdJydJOr5LoxCGDakflgzESF43hCcPGcx0LS1OC/jUJ/dov2usKbgFA14tFSytW PQkrcTR6qgAJEjZDVDxkc42Xxh5TWDsG9kqUg8qhBQ2eYDS8oyeOb2k5arh1eNj/urnZ5J JZDaT286el5FWPrPoXsWZa6j6KNiBBn25NBEeHpZZIqFkooHS01ZqnHcqxL1HEwCwnaDlG v80ryjvFDCdI5nXhmRNKtyQz7WOEMAzYm/sF9FaLRsEzWrZOTl4eU2ITrfay4g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692232259; a=rsa-sha256; cv=none; b=jKEDU0P5K0XGGDK8w2Rn9/22vc0c9jp1+RTrVX5o/wwb3e/lmv2mRvEbdIkT+OkPxNMGs4 I3U6IuulF01vhU1kwQYR2WCLLRw6ZAkWHXBWRzUefql1RW8ZvZsjaCQBQz2kbBBCUGriex YVvqABQ+F8pv/k7xKSOobH3gAbeOzRiNI66z4KxHh3XD10XjEnDpQll4ZFuwg7frHwDQH0 OPsYC4NDh5icfFxw+Ll7SD7aY9z/ez3aK/zluBgDXI9p4B8z23JkoivBNW++pWo4zjZx36 +UU8WOVXodXCd2JWXgzM7nqxQaNin5NXGUankqnepwmEI1uTO0E3fS7JrfPTzQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RR5X33KRXz1C9R; Thu, 17 Aug 2023 00:30:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37H0UxlJ037375; Thu, 17 Aug 2023 00:30:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37H0Ux5U037371; Thu, 17 Aug 2023 00:30:59 GMT (envelope-from git) Date: Thu, 17 Aug 2023 00:30:59 GMT Message-Id: <202308170030.37H0Ux5U037371@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kevin Bowling Subject: git: a6b804a4f6f4 - stable/13 - ixgbe: Check for fw_recovery List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kbowling X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: a6b804a4f6f499a63f428f73fba67ea8ccacb07a Auto-Submitted: auto-generated The branch stable/13 has been updated by kbowling: URL: https://cgit.FreeBSD.org/src/commit/?id=a6b804a4f6f499a63f428f73fba67ea8ccacb07a commit a6b804a4f6f499a63f428f73fba67ea8ccacb07a Author: Kevin Bowling AuthorDate: 2023-08-10 00:31:49 +0000 Commit: Kevin Bowling CommitDate: 2023-08-17 00:30:47 +0000 ixgbe: Check for fw_recovery The x550 uses an upgradable flash code. Check for recovery condition like other flashable intel cards do in case of fw errors. Differential Revision: https://reviews.freebsd.org/D31869 (cherry picked from commit 8b4a3fbdd57215cffde530e2fa3098c272a985fe) --- sys/dev/ixgbe/if_ix.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/sys/dev/ixgbe/if_ix.c b/sys/dev/ixgbe/if_ix.c index 150fdff03d05..4245f4f08eb7 100644 --- a/sys/dev/ixgbe/if_ix.c +++ b/sys/dev/ixgbe/if_ix.c @@ -921,6 +921,15 @@ ixgbe_if_attach_pre(if_ctx_t ctx) goto err_pci; } + if (hw->mac.ops.fw_recovery_mode && hw->mac.ops.fw_recovery_mode(hw)) { + device_printf(dev, "Firmware recovery mode detected. Limiting " + "functionality.\nRefer to the Intel(R) Ethernet Adapters " + "and Devices User Guide for details on firmware recovery " + "mode."); + error = ENOSYS; + goto err_pci; + } + if (hw->mbx.ops.init_params) hw->mbx.ops.init_params(hw); From nobody Thu Aug 17 01:31:08 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RR6sm06l7z4mVLM; Thu, 17 Aug 2023 01:31:24 +0000 (UTC) (envelope-from carpeddiem@gmail.com) Received: from mail-lj1-f169.google.com (mail-lj1-f169.google.com [209.85.208.169]) (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 "GTS CA 1D4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RR6sk4Nntz4Z2v; Thu, 17 Aug 2023 01:31:22 +0000 (UTC) (envelope-from carpeddiem@gmail.com) Authentication-Results: mx1.freebsd.org; dkim=none; spf=pass (mx1.freebsd.org: domain of carpeddiem@gmail.com designates 209.85.208.169 as permitted sender) smtp.mailfrom=carpeddiem@gmail.com; dmarc=none Received: by mail-lj1-f169.google.com with SMTP id 38308e7fff4ca-2b962535808so109413461fa.0; Wed, 16 Aug 2023 18:31:22 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1692235880; x=1692840680; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=lfMNnAW6MO2yh9lhbaGutKFUwhYRYa6y2a6iNrMR2kY=; b=FqgIoo9uLUP2pTsA8VmWxsbclp+aHtR7xBO9KrUijU4OZ87aSQuQKh5n0F5l29TrYn FwB2V7ZG3IRFtL1tIkqkATFKEisdCEFKr9bgOjDJO/JqpZ5d6+tPBtkZGg6nkOFShiq3 SH5ZAQAHmBtbUGQQKfCx0DYsFDQINy1ThHPCjbe7kNpg/zaelmdCn58kuy2NJxsVNbR9 foMCWGQWx763PfhIvpUw1Y+Q2AeVAXRG5hSrS/QVzXPuxmA2hY5Na/KgCWwJx5FlBk7g KJRt6O1A09q92+ELHhYka2NLI2RYsThq5tjXdschuhahzGTDNbmBaaS5yDE6kEvge4EK /KMw== X-Gm-Message-State: AOJu0YxcD2XT6+vj/nDYuIXAjcMIIWnEMF/dttOQGpmC13xPYngEM6iE zhXY1JIv+NLZ9pDSF1LwWpMI2qS3abxmMo2cQtIPP/5cHgk= X-Google-Smtp-Source: AGHT+IF31C0t0s3xZED+LcKKBPA17g6pBIFY7v6xdLu4rXlVcEQsCLFVz01lu6EpopO24eZK6abE3t+XR6PNI6/0l/4= X-Received: by 2002:a05:651c:1031:b0:2b6:df6b:84c0 with SMTP id w17-20020a05651c103100b002b6df6b84c0mr2820255ljm.25.1692235879629; Wed, 16 Aug 2023 18:31:19 -0700 (PDT) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 References: <202308100232.37A2Wdaw040438@gitrepo.freebsd.org> In-Reply-To: <202308100232.37A2Wdaw040438@gitrepo.freebsd.org> From: Ed Maste Date: Wed, 16 Aug 2023 21:31:08 -0400 Message-ID: Subject: Re: git: 28f6c2f29280 - main - Import GoogleTest 1.14.0 To: Enji Cooper Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Content-Type: text/plain; charset="UTF-8" X-Spamd-Result: default: False [-2.99 / 15.00]; NEURAL_HAM_LONG(-1.00)[-1.000]; NEURAL_HAM_MEDIUM(-1.00)[-1.000]; NEURAL_HAM_SHORT(-0.99)[-0.986]; FORGED_SENDER(0.30)[emaste@freebsd.org,carpeddiem@gmail.com]; R_SPF_ALLOW(-0.20)[+ip4:209.85.128.0/17]; MIME_GOOD(-0.10)[text/plain]; FREEMAIL_ENVFROM(0.00)[gmail.com]; MLMMJ_DEST(0.00)[dev-commits-src-all@freebsd.org,dev-commits-src-main@freebsd.org]; MIME_TRACE(0.00)[0:+]; RCVD_IN_DNSWL_NONE(0.00)[209.85.208.169:from]; R_DKIM_NA(0.00)[]; RWL_MAILSPIKE_POSSIBLE(0.00)[209.85.208.169:from]; RCVD_COUNT_ONE(0.00)[1]; RCVD_TLS_LAST(0.00)[]; ASN(0.00)[asn:15169, ipnet:209.85.128.0/17, country:US]; FROM_HAS_DN(0.00)[]; FREEFALL_USER(0.00)[carpeddiem]; ARC_NA(0.00)[]; BLOCKLISTDE_FAIL(0.00)[209.85.208.169:server fail]; RCPT_COUNT_THREE(0.00)[4]; TO_MATCH_ENVRCPT_ALL(0.00)[]; TO_DN_SOME(0.00)[]; DMARC_NA(0.00)[freebsd.org]; FROM_NEQ_ENVFROM(0.00)[emaste@freebsd.org,carpeddiem@gmail.com] X-Spamd-Bar: -- X-Rspamd-Queue-Id: 4RR6sk4Nntz4Z2v On Wed, 9 Aug 2023 at 22:32, Enji Cooper wrote: > > The branch main has been updated by ngie: > > URL: https://cgit.FreeBSD.org/src/commit/?id=28f6c2f292806bf31230a959bc4b19d7081669a7 > > commit 28f6c2f292806bf31230a959bc4b19d7081669a7 > Author: Enji Cooper > AuthorDate: 2023-08-08 06:17:32 +0000 > Commit: Enji Cooper > CommitDate: 2023-08-10 09:32:33 +0000 > > Import GoogleTest 1.14.0 the amd64-gcc12 job is currently broken, with: /usr/obj/tmp/cirrus-ci-build/amd64.amd64/tmp/usr/include/private/gmock/gmock-actions.h:1637:9: recursively required from 'testing::internal::DoAllAction::operator testing::Action() const [with R = int; Args = {int*, int*, char*, char*, char*, char*, char*, char*, char*}; typename std::__1::enable_if::value, Args, const Args&>::type ...)> >, std::__1::is_convertible&, testing::Action > >::value, int>::type = 0; InitialAction = testing::internal::SetArgumentPointeeAction<1, int, void>; OtherActions = {testing::internal::SetArgumentPointeeAction<2, char, void>, testing::internal::SetArgumentPointeeAction<3, char, void>, testing::internal::SetArgumentPointeeAction<4, char, void>, testing::internal::SetArgumentPointeeAction<5, char, void>, testing::internal::SetArgumentPointeeAction<6, char, void>, testing::internal::SetArgumentPointeeAction<7, char, void>, testing::internal::SetArgumentPointeeAction<8, char, void>, testing::internal::ReturnAction}]' /usr/obj/tmp/cirrus-ci-build/amd64.amd64/tmp/usr/include/private/gmock/gmock-actions.h:1637:9: required from 'testing::internal::DoAllAction::operator testing::Action() const [with R = int; Args = {int*, int*, char*, char*, char*, char*, char*, char*, char*}; typename std::__1::enable_if::value, Args, const Args&>::type ...)> >, std::__1::is_convertible&, testing::Action > >::value, int>::type = 0; InitialAction = testing::internal::SetArgumentPointeeAction<0, int, void>; OtherActions = {testing::internal::SetArgumentPointeeAction<1, int, void>, testing::internal::SetArgumentPointeeAction<2, char, void>, testing::internal::SetArgumentPointeeAction<3, char, void>, testing::internal::SetArgumentPointeeAction<4, char, void>, testing::internal::SetArgumentPointeeAction<5, char, void>, testing::internal::SetArgumentPointeeAction<6, char, void>, testing::internal::SetArgumentPointeeAction<7, char, void>, testing::internal::SetArgumentPointeeAction<8, char, void>, testing::internal::ReturnAction}]' /tmp/cirrus-ci-build/contrib/googletest/googlemock/test/gmock-more-actions_test.cc:939:72: required from here /usr/obj/tmp/cirrus-ci-build/amd64.amd64/tmp/usr/include/c++/v1/__functional/function.h:417:28: error: placement new constructing an object of type '_Fun' and size '112' in a region of type 'std::__1::aligned_storage<24>::type' and size '32' [-Werror=placement-new=] 417 | ::new ((void*)&__buf_) _Fun(_VSTD::move(__f), _Alloc(__af)); | ^~~~~~~~~~~~~~ /usr/obj/tmp/cirrus-ci-build/amd64.amd64/tmp/usr/include/c++/v1/__functional/function.h:386:55: note: 'std::__1::__function::__value_func::__buf_' declared here 386 | typename aligned_storage<3 * sizeof(void*)>::type __buf_; | ^~~~~~ https://cirrus-ci.com/task/6420590324613120?logs=build_world#L5388 From nobody Thu Aug 17 02:59:22 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RR8qG5t80z4q4Qd; Thu, 17 Aug 2023 02:59:22 +0000 (UTC) (envelope-from danfe@freebsd.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2610:1c1:1:6074::16:84]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "freefall.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RR8qG5Jqlz3CyB; Thu, 17 Aug 2023 02:59:22 +0000 (UTC) (envelope-from danfe@freebsd.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692241162; 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=9OGSOoakrzcgWgvH4d1ssIYSyBRs2HIWdPsmsDY8HNg=; b=oDYEQp1Usjes1WNjrXHtlYvxPuM12/VyLfPSFUy35p3tOe4qaoBevNyuhj23RkgHTeNI3K H5/JMPgTnvZ6UFRe0Bd5O4+N/8znhquQLCZfsELlR9DtC0VNRbmqgei/ffbR+DAXxT9s1L ZSuBfGA1kV4/7Y/Ly2QMH3/9Pwft1x3a45SYw4eon6gWKkkK+MTBDlZgtWdussySQsVPL7 5kAkOcTUD00+8/BNjq89lzsuuyNIt8uzHmq4nmINEf2flEiLQhGO5ROiRrful5zhykOYuc Y5u6ANEQREFRaSoBVg6XamFRCibogKmT81V7WWyYInzKsU1UoVQoJc6orVGLjw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692241162; 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=9OGSOoakrzcgWgvH4d1ssIYSyBRs2HIWdPsmsDY8HNg=; b=NT+1/D+3q6shrmQNEwR/B42/kHsbtDRhNMENI8HvTnpf0ifgng+I+wMLBRoKJPln9urmJZ hbGK0i8dJ31Mftrl/qPRFNv4mwlsegdfbGPOStLAcVFigChqWoWsAPqFgVmS678pe7noF8 WBkGEr1JPfe2vro5hXBbO0Uv6NLZLmlOFpDQga4jkiLE8DwTLgvUBzqTuOCTDsrFAS7KnD 9UhTIpBRR5VeW/Q/lhqMeVy/53jLJCNJ0+Y97pspR+x8uQKIbGMv5hzLlNZCBjFbhFjqEj o8rlGqWe8WueiQvTnn/DeIU5rJ6QFHkhAAki2Emh46A+HPzwHEzeSGaafcPENA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692241162; a=rsa-sha256; cv=none; b=LbzkkvZXwkmrKNqPEHT4MntnlIjworJePH9NXInA9TypFnyLseGsBNKcPJnJnOC1siebcz qE+PmFRZ2mJ67Aokaa9Emyo2BAaaPLv/POFDHFcum8LWUMb22KeAUZH9SVr2ofH/zJdxGx gEcRk9uXypNTsoGZQnMXriJGLhmcO7xZoejrqoAyAtUWEYJEtH5OyasV9oH55+5ZL0DWbp r3TETXlzyi/4IJ15RPA2dLxKromLYMcM8Ng/q+fgfvNYKOBijmUKqZtG5q6fNEmjt2k8ay yjTqktDBqYwsvypk7eOHhB4G5mGZAd22p2CoEHRnlbZ5Dh2jnfrMyHG27Wc0Fg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: by freefall.freebsd.org (Postfix, from userid 1033) id 95A69B4B8; Thu, 17 Aug 2023 02:59:22 +0000 (UTC) Date: Thu, 17 Aug 2023 02:59:22 +0000 From: Alexey Dokuchaev To: Warner Losh Cc: Jessica Clarke , Warner Losh , src-committers , "" , "" Subject: Re: git: da5432eda807 - main - Remove $FreeBSD$: alt two-line .c pattern Message-ID: References: <202308161757.37GHv2ca059368@gitrepo.freebsd.org> <83CE52EE-11ED-4650-A515-F4CE19345BB9@freebsd.org> List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: On Wed, Aug 16, 2023 at 12:30:58PM -0600, Warner Losh wrote: > On Wed, Aug 16, 2023, 12:15 PM Jessica Clarke wrote: > > On 16 Aug 2023, at 18:57, Warner Losh wrote: > > > commit da5432eda807c4b7232d030d5157d5b417ea4f52 > > > > > > Remove $FreeBSD$: alt two-line .c pattern > > > > > > Remove /^\s*__RCSID\("\$FreeBSD\$"\);\n\n/ > > > ... > > > diff --git a/sbin/routed/if.c b/sbin/routed/if.c > > > index 83d8fe503893..72894942fe05 100644 > > > --- a/sbin/routed/if.c > > > +++ b/sbin/routed/if.c > > > @@ -33,9 +33,6 @@ > > > > > > #include "defs.h" > > > #include "pathnames.h" > > > - > > > -__RCSID("$FreeBSD$"); > > > - > > > struct ifhead ifnet = LIST_HEAD_INITIALIZER(ifnet); /* all interfaces */ > > > > Alas these diffs aren't style(9)-compliant. > > Fixes welcome. I'm sure there's a hundred errors in the 32k changes > I made. I tried to catch as many as I could... I think I've also noticed some triple \n\n\n as well, when #include ...__RCSID() were following top comment. On a related note, can we expect to see $FreeBSD$ back one day, when Git will be replaced with something which does support keywords properly? ./danfe From nobody Thu Aug 17 03:14:25 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RR98v4VV1z4q5dk for ; Thu, 17 Aug 2023 03:14:39 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-ed1-x529.google.com (mail-ed1-x529.google.com [IPv6:2a00:1450:4864:20::529]) (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 "GTS CA 1D4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RR98v2mbPz3G4t for ; Thu, 17 Aug 2023 03:14:39 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-ed1-x529.google.com with SMTP id 4fb4d7f45d1cf-52557cc5e7bso5575403a12.0 for ; Wed, 16 Aug 2023 20:14:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20221208.gappssmtp.com; s=20221208; t=1692242076; x=1692846876; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:from:to:cc:subject:date:message-id:reply-to; bh=03MpvTcZY9GLmxTfCWZFBxei4CSBU87Klr/XNS6lWmY=; b=SHl9Hi613z8YQQfKi/xN0+CQzBM00VOfUGbA2W3WeKeI9b69eC7JQfORxS42wsLSHL QDqGlo2WXcjg6tiYa0O+7XOA0QNnBr4O1O8eLX/hM0lUh7MPg8mHWT7XC63kd3K+/57J xq5iOq4SC+mn3sMNBkwiQcReNyZRjVh1b3XVHtaRdoHJEu2dFOvHdbcd4KlM6nTUR/F9 WC7+eFQ6utBU6eEB9t+FI4pEASQJkGUwbvKc3qftBRRRc1qk0d+vIWkb4drbchMcPaIS vO5nOqkqvn4c0pVxr7+5TsQDSIrJZbvDpiYETaG7ef0BtXuKe9ZTajCwm7mUUzahKMYM tq1A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1692242076; x=1692846876; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=03MpvTcZY9GLmxTfCWZFBxei4CSBU87Klr/XNS6lWmY=; b=kT6SKVpSOFzUnrfFpRUREFEqyGnAWnVDWjuRS7Of37MDlJmigXB+pmu3tDb84pnJKb A4W2D2UY20BnumEw0ksn5adGcawu+TN8N8vpC5h4uwhzVLxGJolFRXF0H/6YJquovSfY /Nh1tpkGV4KTPiBgpUeOmWip1jQHncTvAdbYN1GZMIh/d1i2U6Bip2pSDzq4s9AvPIR8 qc82XB6EO264BuoKGyo5VBDp3Gr7J4eyytpHR87vM6+zZxZQjtPkXRzNGI2wc7fpPj4c M+E0XHdUwwtfUYfnkU/uTzazCj2tlYVjr8Xom0t4UqfnCYmPGk00kNOkv8xg3II3qDVz dudg== X-Gm-Message-State: AOJu0Yxh+2G6rVetwwX3rkleOvxG2mVHfd9h4FWufNP1Tkd9JPYVnTLa dJVhfIIZ5jKZZhn0twSeyVSge17eiSTqx797YvNq1Qa6oT+y76kn X-Google-Smtp-Source: AGHT+IGrx3iXimew99aUZopQSDOXBSA9aVWZLE4Fut2eX95lW5zOJiDzlGMGNZrUNf4bxLr6+3vHuXGi0mEnGVAE8JI= X-Received: by 2002:a05:6402:1858:b0:523:3e77:7eb5 with SMTP id v24-20020a056402185800b005233e777eb5mr2887460edy.2.1692242076482; Wed, 16 Aug 2023 20:14:36 -0700 (PDT) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 References: <202308161757.37GHv2ca059368@gitrepo.freebsd.org> <83CE52EE-11ED-4650-A515-F4CE19345BB9@freebsd.org> In-Reply-To: From: Warner Losh Date: Wed, 16 Aug 2023 21:14:25 -0600 Message-ID: Subject: Re: git: da5432eda807 - main - Remove $FreeBSD$: alt two-line .c pattern To: Alexey Dokuchaev Cc: Jessica Clarke , Warner Losh , src-committers , "" , "" Content-Type: multipart/alternative; boundary="000000000000d7d92a060315cf2d" X-Rspamd-Queue-Id: 4RR98v2mbPz3G4t X-Spamd-Bar: ---- 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:2a00:1450::/32, country:US] --000000000000d7d92a060315cf2d Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable On Wed, Aug 16, 2023 at 8:59=E2=80=AFPM Alexey Dokuchaev wrote: > On Wed, Aug 16, 2023 at 12:30:58PM -0600, Warner Losh wrote: > > On Wed, Aug 16, 2023, 12:15 PM Jessica Clarke wrote: > > > On 16 Aug 2023, at 18:57, Warner Losh wrote: > > > > commit da5432eda807c4b7232d030d5157d5b417ea4f52 > > > > > > > > Remove $FreeBSD$: alt two-line .c pattern > > > > > > > > Remove /^\s*__RCSID\("\$FreeBSD\$"\);\n\n/ > > > > ... > > > > diff --git a/sbin/routed/if.c b/sbin/routed/if.c > > > > index 83d8fe503893..72894942fe05 100644 > > > > --- a/sbin/routed/if.c > > > > +++ b/sbin/routed/if.c > > > > @@ -33,9 +33,6 @@ > > > > > > > > #include "defs.h" > > > > #include "pathnames.h" > > > > - > > > > -__RCSID("$FreeBSD$"); > > > > - > > > > struct ifhead ifnet =3D LIST_HEAD_INITIALIZER(ifnet); /* all > interfaces */ > > > > > > Alas these diffs aren't style(9)-compliant. > > > > Fixes welcome. I'm sure there's a hundred errors in the 32k changes > > I made. I tried to catch as many as I could... > > I think I've also noticed some triple \n\n\n as well, when #include > ...__RCSID() were following top comment. Yea, I'm slowly gathering up the 'problem' patterns that I'll need to do a followup commits with. But so for they seem to be relatively small. I should have had more patterns for __RCSID. And we know about the hard-coded static char rcsid[] stuff. And the blank lines at the start of Makefiles (and a few others). There's so much variation that it's hard to capture it all (my 18 patterns weren't enough to capture all the nuance)= . > On a related note, > can we expect to see $FreeBSD$ back one day, when Git will be replaced > with something which does support keywords properly? > I highly doubt it. Nobody is going to put something like that back into the source tree with 32k files. We've removed them, and the current thinking is they are never coming back. But who knows what will happen in 10 or 20 years when we replace git with the next thing, so it may be unwise to say never, but I'd be greatly surprised if keywords came back into vogue. Warner --000000000000d7d92a060315cf2d Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable


=
On Wed, Aug 16, 2023 at 8:59=E2=80=AF= PM Alexey Dokuchaev <danfe@freebsd.= org> wrote:
On Wed, Aug 16, 2023 at 12:30:58PM -0600, Warner Losh wrote:
> On Wed, Aug 16, 2023, 12:15 PM Jessica Clarke wrote:
> > On 16 Aug 2023, at 18:57, Warner Losh wrote:
> > > commit da5432eda807c4b7232d030d5157d5b417ea4f52
> > >
> > >=C2=A0 =C2=A0 Remove $FreeBSD$: alt two-line .c pattern
> > >
> > >=C2=A0 =C2=A0 Remove /^\s*__RCSID\("\$FreeBSD\$"\);= \n\n/
> > > ...
> > > diff --git a/sbin/routed/if.c b/sbin/routed/if.c
> > > index 83d8fe503893..72894942fe05 100644
> > > --- a/sbin/routed/if.c
> > > +++ b/sbin/routed/if.c
> > > @@ -33,9 +33,6 @@
> > >
> > > #include "defs.h"
> > > #include "pathnames.h"
> > > -
> > > -__RCSID("$FreeBSD$");
> > > -
> > > struct ifhead ifnet =3D LIST_HEAD_INITIALIZER(ifnet); /* all= interfaces */
> >
> > Alas these diffs aren't style(9)-compliant.
>
> Fixes welcome. I'm sure there's a hundred errors in the 32k ch= anges
> I made. I tried to catch as many as I could...

I think I've also noticed some triple \n\n\n as well, when #include
<cdefs.h>...__RCSID() were following top comment.
<= br>
Yea, I'm slowly gathering up the 'problem' patter= ns that I'll need to
do a followup commits with. But so for t= hey seem to be relatively small.
I should have had more patterns = for __RCSID. And we know about
the hard-coded static char rcsid[]= stuff. And the blank lines at the start
of Makefiles (and a few = others). There's so much variation that it's hard
to capt= ure it all (my 18 patterns weren't enough to capture all the nuance).
=C2=A0
On a= related note,
can we expect to see $FreeBSD$ back one day, when Git will be replaced
with something which does support keywords properly?
<= br>
I highly doubt it. Nobody is going to put something like that= back into the
source tree with 32k files. We've removed them= , and the current thinking
is they are never coming back. But who= knows what will happen in 10 or 20
years when we replace git wit= h the next thing, so it may be unwise to say
never, but I'd b= e greatly surprised if keywords came back into vogue.

Warner

--000000000000d7d92a060315cf2d-- From nobody Thu Aug 17 07:08:54 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RRGMC0vQjz4qKS7; Thu, 17 Aug 2023 07:08: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RRGMC0D01z3dg7; Thu, 17 Aug 2023 07:08:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692256135; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=OWIQAP1KhUAxnFEc1r0jfkbeGFVKfehwQnvHYwnlEr8=; b=W+YkEJv87Jt/IwEvrXM66HKZbvpQkd1HM+5XF3BNPBHqfaG2Wn5I1F8fre6yvd2ricyDg/ qrahlQAYzNUcioRJBZ+icEgETUw5m85m1lZXVrgvjVQ+D9ydPoSyUqI2YkKlEazJl+mXu9 ZTonK2sXMA8rNKWuK2bJHdakIKtAzt1X1bxN90vEUNgCze0dZ7e7jgbxxkxjwT0Sr+Mc50 5YT5feRdM7LENx80ZGxz8ll5d+9SYhOdB2FkMASEjNVjh7LkU1cRM4i8GDiPor53Pb6C9i mgct1XQ0tpOHux1etacdKCLR3Y3Yt4lrUv1lJ+jdRplXX1kV4UsHmuTEQCV2jw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692256135; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=OWIQAP1KhUAxnFEc1r0jfkbeGFVKfehwQnvHYwnlEr8=; b=htKgWH5Y5dCGxEuofGWYzhWYMt+mlWqE/BEIEopAimMNkDhQ9S9PUi17hNfnQdmP5+Ju3l yL39YHUu43615DLKPdGtv+5z8rAHCFi8+Xsln/2yOavucisw00lvN/Mf8ecaHoiVIOf6ld B36262G6hczmcN3Qs871FEtzIgU8ieNJYp+1jt/NeJDYR3BX334tnj6D4dRBi9ftB/tnR7 oUT4+CiIsM00uDE+Tmyo+PUAA6GMsxF7mb8VrLA6S6S/djjadIOPSqN3i7p62sJZ26cw/6 1GgLgnosRa6lT2X3M2sah6Q0+WnSccN28yBawHPF1+hZyp/etHy63fnwkPxFtw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692256135; a=rsa-sha256; cv=none; b=LDQs6wADixTHivdrMwFXP5yO8K/I2jyoMB+PSz89ika4eHSP2JCLgRVObhAPcZZvaXV2eH QIYz73R7K60wuKeyHZh4WuK7ZP0hqKLpGGbAgyS5mKaY64+0E5egJNsbPeKOtARDtruJ7B 68A0O+tJ8FDNgs6gW8rkSTVRWz688tsQa73on6BhE5v0PI7LEY8VAWIalup2eR5QJ4k7dJ 4+IfthMWqRG7oD6dolG8yBghkNTEDAaJslwyYEaJYoMUvnMxk+ErTAlblzZMNqU0DpDNVx zWdolSv7gZMkZJZnwKxvB4FZJ3IGtNhRx2gHlgJpAZdjqoVa3KEkoNWFoJY8lw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RRGMB6Gvhz8dC; Thu, 17 Aug 2023 07:08:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37H78sQX097434; Thu, 17 Aug 2023 07:08:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37H78s4a097431; Thu, 17 Aug 2023 07:08:54 GMT (envelope-from git) Date: Thu, 17 Aug 2023 07:08:54 GMT Message-Id: <202308170708.37H78s4a097431@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Corvin =?utf-8?Q?K=C3=B6hne?= Subject: git: 67c26eb2a57c - main - bhyve: add cmdline option for TPM emulation List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: corvink X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 67c26eb2a57cd1f103d77db3b894a25f4bc10402 Auto-Submitted: auto-generated The branch main has been updated by corvink: URL: https://cgit.FreeBSD.org/src/commit/?id=67c26eb2a57cd1f103d77db3b894a25f4bc10402 commit 67c26eb2a57cd1f103d77db3b894a25f4bc10402 Author: Corvin Köhne AuthorDate: 2021-10-07 14:20:37 +0000 Commit: Corvin Köhne CommitDate: 2023-08-17 06:17:59 +0000 bhyve: add cmdline option for TPM emulation At the moment, only a TPM passthru is supported. The cmdline looks like: -l tpm,passthru,/dev/tpm0 Reviewed by: markj MFC after: 1 week Sponsored by: Beckhoff Automation GmbH & Co. KG Differential Revision: https://reviews.freebsd.org/D32961 --- usr.sbin/bhyve/bhyve.8 | 39 +++++++++++++++++++++++++++++++++++++++ usr.sbin/bhyve/bhyve_config.5 | 9 +++++++++ usr.sbin/bhyve/bhyverun.c | 5 +++++ usr.sbin/bhyve/pci_lpc.c | 25 ++++++++++++++++++++++++- usr.sbin/bhyve/tpm_device.c | 22 ++++++++++++++++++++++ usr.sbin/bhyve/tpm_device.h | 2 ++ 6 files changed, 101 insertions(+), 1 deletion(-) diff --git a/usr.sbin/bhyve/bhyve.8 b/usr.sbin/bhyve/bhyve.8 index 2979f90d34cf..7eddeec4647a 100644 --- a/usr.sbin/bhyve/bhyve.8 +++ b/usr.sbin/bhyve/bhyve.8 @@ -215,6 +215,8 @@ The only supported devices are the TTY-class devices .Cm com1 , com2 , com3 , and .Cm com4 , +the TPM module +.Cm tpm , the boot ROM device .Cm bootrom , the @@ -538,6 +540,23 @@ process. Use the host TTY device for serial port I/O. .El .Pp +TPM device backends: +.Bl -tag -width 10n +.It Ar type Ns \&, Ns Ar path Ns Op Cm \&, Ns Ar tpm-device-options +Emulate a TPM device. +.El +.Pp +The +.Ar tpm-device-options +are: +.Bl -tag -width 10n +.It Cm version= Ns Ar version +Version of the TPM device according to the TCG specification. +Defaults to +.Cm 2.0 +.El +.El +.Pp Boot ROM device backends: .Bl -tag -width 10n .It Ar romfile Ns Op Cm \&, Ns Ar varfile @@ -623,6 +642,26 @@ The host device must have been reserved at boot-time using the loader variable as described in .Xr vmm 4 . .Pp +TPM devices: +.Bl -tag -width 10n +.It Ns Ar type +Specifies the type of the TPM device. +.Pp +Supported types: +.Bl -tag -width 10n +.It Cm passthru +.El +.It Cm version= Ns Ar version +The +.Ar version +of the emulated TPM device according to the TCG specification. +.Pp +Supported versions: +.Bl -tag -width 10n +.It Cm 2.0 +.El +.El +.Pp Virtio console device backends: .Bl -bullet .Sm off diff --git a/usr.sbin/bhyve/bhyve_config.5 b/usr.sbin/bhyve/bhyve_config.5 index 8063df763689..d074d4503894 100644 --- a/usr.sbin/bhyve/bhyve_config.5 +++ b/usr.sbin/bhyve/bhyve_config.5 @@ -139,6 +139,15 @@ Specify the keyboard layout name with the file name in This value only works when loaded with UEFI mode for VNC, and used a VNC client that don't support QEMU Extended Key Event Message (e.g. TightVNC). +.It Va tpm.path Ta string Ta Ta +Path to the host TPM device. +This is typically /dev/tpm0. +.It Va tpm.type Ta string Ta Ta +Type of the TPM device passed to the guest. +Currently, only "passthru" is supported. +.It Va tpm.version Ta string Ta 2.0 Ta +Version of the TPM device according to the TCG specification. +Currently, only version 2.0 is supported. .It Va rtc.use_localtime Ta bool Ta true Ta The real time clock uses the local time of the host. If this is set to false, the real time clock uses UTC. diff --git a/usr.sbin/bhyve/bhyverun.c b/usr.sbin/bhyve/bhyverun.c index 384c469f9ce7..3d32bfd35408 100644 --- a/usr.sbin/bhyve/bhyverun.c +++ b/usr.sbin/bhyve/bhyverun.c @@ -103,6 +103,7 @@ #ifdef BHYVE_SNAPSHOT #include "snapshot.h" #endif +#include "tpm_device.h" #include "xmsr.h" #include "spinup_ap.h" #include "rtc.h" @@ -1474,6 +1475,10 @@ main(int argc, char *argv[]) perror("device emulation initialization error"); exit(4); } + if (init_tpm(ctx) != 0) { + fprintf(stderr, "Failed to init TPM device"); + exit(4); + } /* * Initialize after PCI, to allow a bootrom file to reserve the high diff --git a/usr.sbin/bhyve/pci_lpc.c b/usr.sbin/bhyve/pci_lpc.c index ebda61aaea60..2ff9bbc27774 100644 --- a/usr.sbin/bhyve/pci_lpc.c +++ b/usr.sbin/bhyve/pci_lpc.c @@ -49,6 +49,7 @@ #include "pci_lpc.h" #include "pci_passthru.h" #include "pctestdev.h" +#include "tpm_device.h" #include "uart_emul.h" #define IO_ICU1 0x20 @@ -93,7 +94,7 @@ lpc_device_parse(const char *opts) { int unit, error; char *str, *cpy, *lpcdev, *node_name; - const char *romfile, *varfile; + const char *romfile, *varfile, *tpm_type, *tpm_path; error = -1; str = cpy = strdup(opts); @@ -124,6 +125,27 @@ lpc_device_parse(const char *opts) error = 0; goto done; } + if (strcasecmp(lpcdev, "tpm") == 0) { + nvlist_t *nvl = create_config_node("tpm"); + + tpm_type = strsep(&str, ","); + if (tpm_type == NULL) { + errx(4, "invalid tpm type \"%s\"", opts); + } + set_config_value_node(nvl, "type", tpm_type); + + tpm_path = strsep(&str, ","); + if (tpm_path == NULL) { + errx(4, "invalid tpm path \"%s\"", opts); + } + set_config_value_node(nvl, "path", tpm_path); + + pci_parse_legacy_config(find_config_node("tpm"), str); + + set_config_value_node_if_unset(nvl, "version", "2.0"); + error = 0; + goto done; + } for (unit = 0; unit < LPC_UART_NUM; unit++) { if (strcasecmp(lpcdev, lpc_uart_names[unit]) == 0) { asprintf(&node_name, "lpc.%s.path", @@ -157,6 +179,7 @@ lpc_print_supported_devices(void) printf("bootrom\n"); for (i = 0; i < LPC_UART_NUM; i++) printf("%s\n", lpc_uart_names[i]); + printf("tpm\n"); printf("%s\n", pctestdev_getname()); } diff --git a/usr.sbin/bhyve/tpm_device.c b/usr.sbin/bhyve/tpm_device.c index 4c40db419380..3a4a8c577345 100644 --- a/usr.sbin/bhyve/tpm_device.c +++ b/usr.sbin/bhyve/tpm_device.c @@ -232,3 +232,25 @@ err_out: return (error); } + +static struct tpm_device *lpc_tpm; + +int +init_tpm(struct vmctx *ctx) +{ + nvlist_t *nvl; + int error; + + nvl = find_config_node("tpm"); + if (nvl == NULL) + return (0); + + error = tpm_device_create(&lpc_tpm, ctx, nvl); + if (error) { + warnx("%s: unable to create a TPM device (%d)", + __func__, error); + return (error); + } + + return (0); +} diff --git a/usr.sbin/bhyve/tpm_device.h b/usr.sbin/bhyve/tpm_device.h index a17c85c2ed47..0dd4c27999df 100644 --- a/usr.sbin/bhyve/tpm_device.h +++ b/usr.sbin/bhyve/tpm_device.h @@ -16,3 +16,5 @@ struct tpm_device; int tpm_device_create(struct tpm_device **new_dev, struct vmctx *vm_ctx, nvlist_t *nvl); void tpm_device_destroy(struct tpm_device *dev); + +int init_tpm(struct vmctx *ctx); From nobody Thu Aug 17 11:27:12 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RRN5D41Jmz4qYgd; Thu, 17 Aug 2023 11:27:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RRN5D3rL6z4XjY; Thu, 17 Aug 2023 11:27:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692271632; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Lrp87yhfsxZz7WFUjQvwYvv5+ebqmODmYdACx+Srizc=; b=la6Z5PMxsfMS9Q+Wp5T36QBzyB/un7hXuVzfDyfgP5t1ijk8WMTBUYfYW5twWaslFpLE3c oSRYlhaDzcsXi4KnAgsSK7FnsifyuEm/VHS0Yr57qE2c6v1L83d2MhDl+KeL7yC68ccs4E jpyN4AIByrqsuyEHVk4xX3D5qnaB9BqdhQw053L4RiN6oTn2g66W5+Eu0aYLRDZZ98BfX5 kGv6hpEYKXKbU5lRoY2/a+LDJ10jMbvaZ5T4DaQuZBAHmQCqYM7aXhoXiWHqPM1EBQBGKA JLOhyZGozBUCk8DiyThU8EhrTI5RS84BvsYB2maXed5WwGEbDWNnbIJKtnkuww== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692271632; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Lrp87yhfsxZz7WFUjQvwYvv5+ebqmODmYdACx+Srizc=; b=HidHyx5PBa9NfzCgj8O/FaoxhEQVK+sZsAGAOfh4bmNHUbMbk8cQziyFz/2ToWl5qXoL8C 6JD1Z9WLL/cN41VNMPTZLKNYvTt6ZPx1LSP+xicpz4h6Vx+21VhhroA3FIUvaE3t13AMCa i50qhaKF45cW+fxXFmrTPoIydTko0H7fxGulTPKs0RjTYwXgGpcFmXzXLyJJg5tKz+PFp+ 8GkDr4JRRadh3WSlOoXrm+CvS2gakiznWPnVGDVIEpVKmOr3kzXO3ifzykXjNdjiNbQ96B EVYWm0Rh/8NaTQOARNYnimd3sKOBpdx59g0BSsaLEBa/MOWGZNepoK3IFzFDiA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692271632; a=rsa-sha256; cv=none; b=tUFGNa2oFglSpS8qjjjprwINrMu0p2uGSw/7w32h58N9lmllB62dTS8cWDBUsPljKXAbAw FbV5yENqTVeJ17MTJVobVyAHluwQtTWIxKpjeHm0s5yc9CqN95f7+P4Rmq0zWgAIwQnjg4 G3HbC20Hb2mIh2zuRB3zY+jMUoq5V9zaCl35ZQEG91/L6JhWjT0kPEXIyjpnIi0iehg72w AA1OU91Zhc3R0kJcqT6xCT75d3ZF8PaPFKUq4+Vb0uuCe9m5JyY75kAXwxzRfWrab50gbY yJQTME82QdlNX7YFLZpP3hMGjh+OdP6+n66MBksQkBCgx90cjDkH8Cz7dTZyAw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RRN5D2trSzXyn; Thu, 17 Aug 2023 11:27:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37HBRC4Q030238; Thu, 17 Aug 2023 11:27:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37HBRCPk030235; Thu, 17 Aug 2023 11:27:12 GMT (envelope-from git) Date: Thu, 17 Aug 2023 11:27:12 GMT Message-Id: <202308171127.37HBRCPk030235@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Andrew Turner Subject: git: 02f2706606e1 - main - Add a virtio-gpu 2D driver List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: andrew X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 02f2706606e1a4364d10a313dade29a9d4cfffe1 Auto-Submitted: auto-generated The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=02f2706606e1a4364d10a313dade29a9d4cfffe1 commit 02f2706606e1a4364d10a313dade29a9d4cfffe1 Author: Andrew Turner AuthorDate: 2023-08-17 11:26:57 +0000 Commit: Andrew Turner CommitDate: 2023-08-17 11:26:57 +0000 Add a virtio-gpu 2D driver Add a driver to connect vt to the VirtIO GPU device in 2D mode. This provides a output on the display when a qemu virtio gpu device is added, e.g. with -device virtio-gpu-pci. Tested on qemu using UTM, and a Hetzner arm64 VM instance. Reviewed by: bryanv (earlier version) Sponsored by: Arm Ltd Differential Revision: https://reviews.freebsd.org/D40094 --- share/man/man4/Makefile | 1 + share/man/man4/virtio.4 | 5 + share/man/man4/virtio_gpu.4 | 54 ++++ sys/arm64/conf/std.virt | 1 + sys/conf/files | 1 + sys/dev/virtio/gpu/virtio_gpu.c | 697 ++++++++++++++++++++++++++++++++++++++++ sys/dev/virtio/gpu/virtio_gpu.h | 454 ++++++++++++++++++++++++++ 7 files changed, 1213 insertions(+) diff --git a/share/man/man4/Makefile b/share/man/man4/Makefile index 327e1fa9a90c..a5faad3e66ec 100644 --- a/share/man/man4/Makefile +++ b/share/man/man4/Makefile @@ -570,6 +570,7 @@ MAN= aac.4 \ virtio_balloon.4 \ virtio_blk.4 \ virtio_console.4 \ + virtio_gpu.4 \ virtio_random.4 \ virtio_scsi.4 \ ${_vmci.4} \ diff --git a/share/man/man4/virtio.4 b/share/man/man4/virtio.4 index 5d7319682084..1e5ea0e4a7da 100644 --- a/share/man/man4/virtio.4 +++ b/share/man/man4/virtio.4 @@ -83,6 +83,10 @@ A pseudo-device to allow the VM to release memory back to the hypervisor is provided by the .Xr virtio_balloon 4 device driver. +.It Sy GPU +Graphics support is provided by the +.Xr virtio_gpu 4 +device driver. .It Sy SCSI An emulated SCSI HBA is provided by the .Xr virtio_scsi 4 @@ -92,6 +96,7 @@ device driver. .Xr virtio_balloon 4 , .Xr virtio_blk 4 , .Xr virtio_console 4 , +.Xr virtio_gpu 4 , .Xr virtio_random 4 , .Xr virtio_scsi 4 , .Xr vtnet 4 diff --git a/share/man/man4/virtio_gpu.4 b/share/man/man4/virtio_gpu.4 new file mode 100644 index 000000000000..bb34ec419df6 --- /dev/null +++ b/share/man/man4/virtio_gpu.4 @@ -0,0 +1,54 @@ +.\"- +.\" SPDX-License-Identifier: BSD-2-Clause +.\" +.\" Copyright (c) 2014 Bryan Venteicher +.\" All rights reserved. +.\" Copyright (c) 2023 Arm Ltd +.\" +.\" Redistribution and use in source and binary forms, with or without +.\" modification, are permitted provided that the following conditions +.\" are met: +.\" 1. Redistributions of source code must retain the above copyright +.\" notice, this list of conditions and the following disclaimer. +.\" 2. Redistributions in binary form must reproduce the above copyright +.\" notice, this list of conditions and the following disclaimer in the +.\" documentation and/or other materials provided with the distribution. +.\" +.\" THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND +.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +.\" ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE +.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS +.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) +.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY +.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF +.\" SUCH DAMAGE. +.\" +.Dd August 14, 2023 +.Dt VIRTIO_GPU 4 +.Os +.Sh NAME +.Nm virtio_gpu +.Nd VirtIO GPU driver +.Sh SYNOPSIS +To compile this driver into the kernel, +place the following lines in your +kernel configuration file: +.Bd -ragged -offset indent +.Cd "device virtio_gpu" +.Ed +.Sh DESCRIPTION +The +.Nm +device driver provides support for VirtIO gpu devices to create a +.Xr vt 4 +console. +.Sh SEE ALSO +.Xr virtio 4 +.Xr vt 4 +.Sh HISTORY +The +.Nm +driver first appeared in FreeBSD 14.0. diff --git a/sys/arm64/conf/std.virt b/sys/arm64/conf/std.virt index 1b7d7ad8ab0a..5047aabac42c 100644 --- a/sys/arm64/conf/std.virt +++ b/sys/arm64/conf/std.virt @@ -19,6 +19,7 @@ device virtio # Generic VirtIO bus (required) device virtio_pci # VirtIO PCI device device virtio_mmio # VirtIO Memory Mapped IO device device virtio_blk # VirtIO Block device +device virtio_gpu # VirtIO GPU device device virtio_scsi # VirtIO SCSI device device vtnet # VirtIO Ethernet device diff --git a/sys/conf/files b/sys/conf/files index bd4964d3dd64..0db5887e6a75 100644 --- a/sys/conf/files +++ b/sys/conf/files @@ -3399,6 +3399,7 @@ dev/virtio/mmio/virtio_mmio_if.m optional virtio_mmio dev/virtio/network/if_vtnet.c optional vtnet dev/virtio/block/virtio_blk.c optional virtio_blk dev/virtio/balloon/virtio_balloon.c optional virtio_balloon +dev/virtio/gpu/virtio_gpu.c optional virtio_gpu dev/virtio/scsi/virtio_scsi.c optional virtio_scsi dev/virtio/random/virtio_random.c optional virtio_random dev/virtio/console/virtio_console.c optional virtio_console diff --git a/sys/dev/virtio/gpu/virtio_gpu.c b/sys/dev/virtio/gpu/virtio_gpu.c new file mode 100644 index 000000000000..0472bc98b3ba --- /dev/null +++ b/sys/dev/virtio/gpu/virtio_gpu.c @@ -0,0 +1,697 @@ +/*- + * SPDX-License-Identifier: BSD-2-Clause + * + * Copyright (c) 2013, Bryan Venteicher + * All rights reserved. + * Copyright (c) 2023, Arm Ltd + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice unmodified, this list of conditions, and the following + * disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR + * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. + * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, + * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY + * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF + * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +/* Driver for VirtIO GPU device. */ + +#include +#include +#include +#include +#include +#include +#include +#include +#include + +#include +#include +#include + +#include +#include + +#include +#include +#include + +#include +#include +#include + +#include "fb_if.h" + +#define VTGPU_FEATURES 0 + +/* The guest can allocate resource IDs, we only need one */ +#define VTGPU_RESOURCE_ID 1 + +struct vtgpu_softc { + /* Must be first so we can cast from info -> softc */ + struct fb_info vtgpu_fb_info; + struct virtio_gpu_config vtgpu_gpucfg; + + device_t vtgpu_dev; + uint64_t vtgpu_features; + + struct virtqueue *vtgpu_ctrl_vq; + + uint64_t vtgpu_next_fence; + + bool vtgpu_have_fb_info; +}; + +static int vtgpu_modevent(module_t, int, void *); + +static int vtgpu_probe(device_t); +static int vtgpu_attach(device_t); +static int vtgpu_detach(device_t); + +static int vtgpu_negotiate_features(struct vtgpu_softc *); +static int vtgpu_setup_features(struct vtgpu_softc *); +static void vtgpu_read_config(struct vtgpu_softc *, + struct virtio_gpu_config *); +static int vtgpu_alloc_virtqueue(struct vtgpu_softc *); +static int vtgpu_get_display_info(struct vtgpu_softc *); +static int vtgpu_create_2d(struct vtgpu_softc *); +static int vtgpu_attach_backing(struct vtgpu_softc *); +static int vtgpu_set_scanout(struct vtgpu_softc *, uint32_t, uint32_t, + uint32_t, uint32_t); +static int vtgpu_transfer_to_host_2d(struct vtgpu_softc *, uint32_t, + uint32_t, uint32_t, uint32_t); +static int vtgpu_resource_flush(struct vtgpu_softc *, uint32_t, uint32_t, + uint32_t, uint32_t); + +static vd_blank_t vtgpu_fb_blank; +static vd_bitblt_text_t vtgpu_fb_bitblt_text; +static vd_bitblt_bmp_t vtgpu_fb_bitblt_bitmap; +static vd_drawrect_t vtgpu_fb_drawrect; +static vd_setpixel_t vtgpu_fb_setpixel; + +static struct vt_driver vtgpu_fb_driver = { + .vd_name = "virtio_gpu", + .vd_init = vt_fb_init, + .vd_fini = vt_fb_fini, + .vd_blank = vtgpu_fb_blank, + .vd_bitblt_text = vtgpu_fb_bitblt_text, + .vd_invalidate_text = vt_fb_invalidate_text, + .vd_bitblt_bmp = vtgpu_fb_bitblt_bitmap, + .vd_drawrect = vtgpu_fb_drawrect, + .vd_setpixel = vtgpu_fb_setpixel, + .vd_postswitch = vt_fb_postswitch, + .vd_priority = VD_PRIORITY_GENERIC+10, + .vd_fb_ioctl = vt_fb_ioctl, + .vd_fb_mmap = NULL, /* No mmap as we need to signal the host */ + .vd_suspend = vt_fb_suspend, + .vd_resume = vt_fb_resume, +}; + +VT_DRIVER_DECLARE(vt_vtgpu, vtgpu_fb_driver); + +static void +vtgpu_fb_blank(struct vt_device *vd, term_color_t color) +{ + struct vtgpu_softc *sc; + struct fb_info *info; + + info = vd->vd_softc; + sc = (struct vtgpu_softc *)info; + + vt_fb_blank(vd, color); + + vtgpu_transfer_to_host_2d(sc, 0, 0, sc->vtgpu_fb_info.fb_width, + sc->vtgpu_fb_info.fb_height); + vtgpu_resource_flush(sc, 0, 0, sc->vtgpu_fb_info.fb_width, + sc->vtgpu_fb_info.fb_height); +} + +static void +vtgpu_fb_bitblt_text(struct vt_device *vd, const struct vt_window *vw, + const term_rect_t *area) +{ + struct vtgpu_softc *sc; + struct fb_info *info; + int x, y, width, height; + + info = vd->vd_softc; + sc = (struct vtgpu_softc *)info; + + vt_fb_bitblt_text(vd, vw, area); + + x = area->tr_begin.tp_col * vw->vw_font->vf_width + vw->vw_draw_area.tr_begin.tp_col; + y = area->tr_begin.tp_row * vw->vw_font->vf_height + vw->vw_draw_area.tr_begin.tp_row; + width = area->tr_end.tp_col * vw->vw_font->vf_width + vw->vw_draw_area.tr_begin.tp_col - x; + height = area->tr_end.tp_row * vw->vw_font->vf_height + vw->vw_draw_area.tr_begin.tp_row - y; + + vtgpu_transfer_to_host_2d(sc, x, y, width, height); + vtgpu_resource_flush(sc, x, y, width, height); +} + +static void +vtgpu_fb_bitblt_bitmap(struct vt_device *vd, const struct vt_window *vw, + const uint8_t *pattern, const uint8_t *mask, + unsigned int width, unsigned int height, + unsigned int x, unsigned int y, term_color_t fg, term_color_t bg) +{ + struct vtgpu_softc *sc; + struct fb_info *info; + + info = vd->vd_softc; + sc = (struct vtgpu_softc *)info; + + vt_fb_bitblt_bitmap(vd, vw, pattern, mask, width, height, x, y, fg, bg); + + vtgpu_transfer_to_host_2d(sc, x, y, width, height); + vtgpu_resource_flush(sc, x, y, width, height); +} + +static void +vtgpu_fb_drawrect(struct vt_device *vd, int x1, int y1, int x2, int y2, + int fill, term_color_t color) +{ + struct vtgpu_softc *sc; + struct fb_info *info; + int width, height; + + info = vd->vd_softc; + sc = (struct vtgpu_softc *)info; + + vt_fb_drawrect(vd, x1, y1, x2, y2, fill, color); + + width = x2 - x1 + 1; + height = y2 - y1 + 1; + vtgpu_transfer_to_host_2d(sc, x1, y1, width, height); + vtgpu_resource_flush(sc, x1, y1, width, height); +} + +static void +vtgpu_fb_setpixel(struct vt_device *vd, int x, int y, term_color_t color) +{ + struct vtgpu_softc *sc; + struct fb_info *info; + + info = vd->vd_softc; + sc = (struct vtgpu_softc *)info; + + vt_fb_setpixel(vd, x, y, color); + + vtgpu_transfer_to_host_2d(sc, x, y, 1, 1); + vtgpu_resource_flush(sc, x, y, 1, 1); +} + +static struct virtio_feature_desc vtgpu_feature_desc[] = { + { VIRTIO_GPU_F_VIRGL, "VirGL" }, + { VIRTIO_GPU_F_EDID, "EDID" }, + { VIRTIO_GPU_F_RESOURCE_UUID, "ResUUID" }, + { VIRTIO_GPU_F_RESOURCE_BLOB, "ResBlob" }, + { VIRTIO_GPU_F_CONTEXT_INIT, "ContextInit" }, + { 0, NULL } +}; + +static device_method_t vtgpu_methods[] = { + /* Device methods. */ + DEVMETHOD(device_probe, vtgpu_probe), + DEVMETHOD(device_attach, vtgpu_attach), + DEVMETHOD(device_detach, vtgpu_detach), + + DEVMETHOD_END +}; + +static driver_t vtgpu_driver = { + "vtgpu", + vtgpu_methods, + sizeof(struct vtgpu_softc) +}; + +VIRTIO_DRIVER_MODULE(virtio_gpu, vtgpu_driver, vtgpu_modevent, NULL); +MODULE_VERSION(virtio_gpu, 1); +MODULE_DEPEND(virtio_gpu, virtio, 1, 1, 1); + +VIRTIO_SIMPLE_PNPINFO(virtio_gpu, VIRTIO_ID_GPU, + "VirtIO GPU"); + +static int +vtgpu_modevent(module_t mod, int type, void *unused) +{ + int error; + + switch (type) { + case MOD_LOAD: + case MOD_QUIESCE: + case MOD_UNLOAD: + case MOD_SHUTDOWN: + error = 0; + break; + default: + error = EOPNOTSUPP; + break; + } + + return (error); +} + +static int +vtgpu_probe(device_t dev) +{ + return (VIRTIO_SIMPLE_PROBE(dev, virtio_gpu)); +} + +static int +vtgpu_attach(device_t dev) +{ + struct vtgpu_softc *sc; + int error; + + sc = device_get_softc(dev); + sc->vtgpu_have_fb_info = false; + sc->vtgpu_dev = dev; + sc->vtgpu_next_fence = 1; + virtio_set_feature_desc(dev, vtgpu_feature_desc); + + error = vtgpu_setup_features(sc); + if (error != 0) { + device_printf(dev, "cannot setup features\n"); + goto fail; + } + + vtgpu_read_config(sc, &sc->vtgpu_gpucfg); + + error = vtgpu_alloc_virtqueue(sc); + if (error != 0) { + device_printf(dev, "cannot allocate virtqueue\n"); + goto fail; + } + + virtio_setup_intr(dev, INTR_TYPE_TTY); + + /* Read the device info to get the display size */ + error = vtgpu_get_display_info(sc); + if (error != 0) { + goto fail; + } + + /* + * TODO: This doesn't need to be contigmalloc as we + * can use scatter-gather lists. + */ + sc->vtgpu_fb_info.fb_vbase = (vm_offset_t)contigmalloc( + sc->vtgpu_fb_info.fb_size, M_DEVBUF, M_WAITOK|M_ZERO, 0, ~0, 4, 0); + sc->vtgpu_fb_info.fb_pbase = pmap_kextract(sc->vtgpu_fb_info.fb_vbase); + + /* Create the 2d resource */ + error = vtgpu_create_2d(sc); + if (error != 0) { + goto fail; + } + + /* Attach the backing memory */ + error = vtgpu_attach_backing(sc); + if (error != 0) { + goto fail; + } + + /* Set the scanout to link the framebuffer to the display scanout */ + error = vtgpu_set_scanout(sc, 0, 0, sc->vtgpu_fb_info.fb_width, + sc->vtgpu_fb_info.fb_height); + if (error != 0) { + goto fail; + } + + vt_allocate(&vtgpu_fb_driver, &sc->vtgpu_fb_info); + sc->vtgpu_have_fb_info = true; + + error = vtgpu_transfer_to_host_2d(sc, 0, 0, sc->vtgpu_fb_info.fb_width, + sc->vtgpu_fb_info.fb_height); + if (error != 0) + goto fail; + error = vtgpu_resource_flush(sc, 0, 0, sc->vtgpu_fb_info.fb_width, + sc->vtgpu_fb_info.fb_height); + +fail: + if (error != 0) + vtgpu_detach(dev); + + return (error); +} + +static int +vtgpu_detach(device_t dev) +{ + struct vtgpu_softc *sc; + + sc = device_get_softc(dev); + if (sc->vtgpu_have_fb_info) + vt_deallocate(&vtgpu_fb_driver, &sc->vtgpu_fb_info); + if (sc->vtgpu_fb_info.fb_vbase != 0) { + MPASS(sc->vtgpu_fb_info.fb_size != 0); + contigfree((void *)sc->vtgpu_fb_info.fb_vbase, + sc->vtgpu_fb_info.fb_size, M_DEVBUF); + } + + /* TODO: Tell the host we are detaching */ + + return (0); +} + +static int +vtgpu_negotiate_features(struct vtgpu_softc *sc) +{ + device_t dev; + uint64_t features; + + dev = sc->vtgpu_dev; + features = VTGPU_FEATURES; + + sc->vtgpu_features = virtio_negotiate_features(dev, features); + return (virtio_finalize_features(dev)); +} + +static int +vtgpu_setup_features(struct vtgpu_softc *sc) +{ + int error; + + error = vtgpu_negotiate_features(sc); + if (error != 0) + return (error); + + return (0); +} + +static void +vtgpu_read_config(struct vtgpu_softc *sc, + struct virtio_gpu_config *gpucfg) +{ + device_t dev; + + dev = sc->vtgpu_dev; + + bzero(gpucfg, sizeof(struct virtio_gpu_config)); + +#define VTGPU_GET_CONFIG(_dev, _field, _cfg) \ + virtio_read_device_config(_dev, \ + offsetof(struct virtio_gpu_config, _field), \ + &(_cfg)->_field, sizeof((_cfg)->_field)) \ + + VTGPU_GET_CONFIG(dev, events_read, gpucfg); + VTGPU_GET_CONFIG(dev, events_clear, gpucfg); + VTGPU_GET_CONFIG(dev, num_scanouts, gpucfg); + VTGPU_GET_CONFIG(dev, num_capsets, gpucfg); + +#undef VTGPU_GET_CONFIG +} + +static int +vtgpu_alloc_virtqueue(struct vtgpu_softc *sc) +{ + device_t dev; + struct vq_alloc_info vq_info[2]; + int nvqs; + + dev = sc->vtgpu_dev; + nvqs = 1; + + VQ_ALLOC_INFO_INIT(&vq_info[0], 0, NULL, sc, &sc->vtgpu_ctrl_vq, + "%s control", device_get_nameunit(dev)); + + return (virtio_alloc_virtqueues(dev, 0, nvqs, vq_info)); +} + +static int +vtgpu_req_resp(struct vtgpu_softc *sc, void *req, size_t reqlen, + void *resp, size_t resplen) +{ + struct sglist sg; + struct sglist_seg segs[2]; + int error; + + sglist_init(&sg, 2, segs); + + error = sglist_append(&sg, req, reqlen); + if (error != 0) { + device_printf(sc->vtgpu_dev, + "Unable to append the request to the sglist: %d\n", error); + return (error); + } + error = sglist_append(&sg, resp, resplen); + if (error != 0) { + device_printf(sc->vtgpu_dev, + "Unable to append the response buffer to the sglist: %d\n", + error); + return (error); + } + error = virtqueue_enqueue(sc->vtgpu_ctrl_vq, resp, &sg, 1, 1); + if (error != 0) { + device_printf(sc->vtgpu_dev, "Enqueue failed: %d\n", error); + return (error); + } + + virtqueue_notify(sc->vtgpu_ctrl_vq); + virtqueue_poll(sc->vtgpu_ctrl_vq, NULL); + + return (0); +} + +static int +vtgpu_get_display_info(struct vtgpu_softc *sc) +{ + struct { + struct virtio_gpu_ctrl_hdr req; + char pad; + struct virtio_gpu_resp_display_info resp; + } s = { 0 }; + int error; + + s.req.type = htole32(VIRTIO_GPU_CMD_GET_DISPLAY_INFO); + s.req.flags = htole32(VIRTIO_GPU_FLAG_FENCE); + s.req.fence_id = htole64(atomic_fetchadd_64(&sc->vtgpu_next_fence, 1)); + + error = vtgpu_req_resp(sc, &s.req, sizeof(s.req), &s.resp, + sizeof(s.resp)); + if (error != 0) + return (error); + + for (int i = 0; i < sc->vtgpu_gpucfg.num_scanouts; i++) { + if (s.resp.pmodes[i].enabled != 0) + MPASS(i == 0); + sc->vtgpu_fb_info.fb_name = + device_get_nameunit(sc->vtgpu_dev); + + sc->vtgpu_fb_info.fb_width = + le32toh(s.resp.pmodes[i].r.width); + sc->vtgpu_fb_info.fb_height = + le32toh(s.resp.pmodes[i].r.height); + /* 32 bits per pixel */ + sc->vtgpu_fb_info.fb_bpp = 32; + sc->vtgpu_fb_info.fb_depth = 32; + sc->vtgpu_fb_info.fb_size = sc->vtgpu_fb_info.fb_width * + sc->vtgpu_fb_info.fb_height * 4; + sc->vtgpu_fb_info.fb_stride = + sc->vtgpu_fb_info.fb_width * 4; + return (0); + } + + return (ENXIO); +} + +static int +vtgpu_create_2d(struct vtgpu_softc *sc) +{ + struct { + struct virtio_gpu_resource_create_2d req; + char pad; + struct virtio_gpu_ctrl_hdr resp; + } s = { 0 }; + int error; + + s.req.hdr.type = htole32(VIRTIO_GPU_CMD_RESOURCE_CREATE_2D); + s.req.hdr.flags = htole32(VIRTIO_GPU_FLAG_FENCE); + s.req.hdr.fence_id = htole64( + atomic_fetchadd_64(&sc->vtgpu_next_fence, 1)); + + s.req.resource_id = htole32(VTGPU_RESOURCE_ID); + s.req.format = htole32(VIRTIO_GPU_FORMAT_B8G8R8X8_UNORM); + s.req.width = htole32(sc->vtgpu_fb_info.fb_width); + s.req.height = htole32(sc->vtgpu_fb_info.fb_height); + + error = vtgpu_req_resp(sc, &s.req, sizeof(s.req), &s.resp, + sizeof(s.resp)); + if (error != 0) + return (error); + + if (s.resp.type != htole32(VIRTIO_GPU_RESP_OK_NODATA)) { + device_printf(sc->vtgpu_dev, "Invalid reponse type %x\n", + le32toh(s.resp.type)); + return (EINVAL); + } + + return (0); +} + +static int +vtgpu_attach_backing(struct vtgpu_softc *sc) +{ + struct { + struct { + struct virtio_gpu_resource_attach_backing backing; + struct virtio_gpu_mem_entry mem[1]; + } req; + char pad; + struct virtio_gpu_ctrl_hdr resp; + } s = { 0 }; + int error; + + s.req.backing.hdr.type = + htole32(VIRTIO_GPU_CMD_RESOURCE_ATTACH_BACKING); + s.req.backing.hdr.flags = htole32(VIRTIO_GPU_FLAG_FENCE); + s.req.backing.hdr.fence_id = htole64( + atomic_fetchadd_64(&sc->vtgpu_next_fence, 1)); + + s.req.backing.resource_id = htole32(VTGPU_RESOURCE_ID); + s.req.backing.nr_entries = htole32(1); + + s.req.mem[0].addr = htole32(sc->vtgpu_fb_info.fb_pbase); + s.req.mem[0].length = htole32(sc->vtgpu_fb_info.fb_size); + + error = vtgpu_req_resp(sc, &s.req, sizeof(s.req), &s.resp, + sizeof(s.resp)); + if (error != 0) + return (error); + + if (s.resp.type != htole32(VIRTIO_GPU_RESP_OK_NODATA)) { + device_printf(sc->vtgpu_dev, "Invalid reponse type %x\n", + le32toh(s.resp.type)); + return (EINVAL); + } + + return (0); +} + +static int +vtgpu_set_scanout(struct vtgpu_softc *sc, uint32_t x, uint32_t y, + uint32_t width, uint32_t height) +{ + struct { + struct virtio_gpu_set_scanout req; + char pad; + struct virtio_gpu_ctrl_hdr resp; + } s = { 0 }; + int error; + + s.req.hdr.type = htole32(VIRTIO_GPU_CMD_SET_SCANOUT); + s.req.hdr.flags = htole32(VIRTIO_GPU_FLAG_FENCE); + s.req.hdr.fence_id = htole64( + atomic_fetchadd_64(&sc->vtgpu_next_fence, 1)); + + s.req.r.x = htole32(x); + s.req.r.y = htole32(y); + s.req.r.width = htole32(width); + s.req.r.height = htole32(height); + + s.req.scanout_id = 0; + s.req.resource_id = htole32(VTGPU_RESOURCE_ID); + + error = vtgpu_req_resp(sc, &s.req, sizeof(s.req), &s.resp, + sizeof(s.resp)); + if (error != 0) + return (error); + + if (s.resp.type != htole32(VIRTIO_GPU_RESP_OK_NODATA)) { + device_printf(sc->vtgpu_dev, "Invalid reponse type %x\n", + le32toh(s.resp.type)); + return (EINVAL); + } + + return (0); +} + +static int +vtgpu_transfer_to_host_2d(struct vtgpu_softc *sc, uint32_t x, uint32_t y, + uint32_t width, uint32_t height) +{ + struct { + struct virtio_gpu_transfer_to_host_2d req; + char pad; + struct virtio_gpu_ctrl_hdr resp; + } s = { 0 }; + int error; + + s.req.hdr.type = htole32(VIRTIO_GPU_CMD_TRANSFER_TO_HOST_2D); + s.req.hdr.flags = htole32(VIRTIO_GPU_FLAG_FENCE); + s.req.hdr.fence_id = htole64( + atomic_fetchadd_64(&sc->vtgpu_next_fence, 1)); + + s.req.r.x = htole32(x); + s.req.r.y = htole32(y); + s.req.r.width = htole32(width); + s.req.r.height = htole32(height); + + s.req.offset = htole64((y * sc->vtgpu_fb_info.fb_width + x) + * (sc->vtgpu_fb_info.fb_bpp / 8)); + s.req.resource_id = htole32(VTGPU_RESOURCE_ID); + + error = vtgpu_req_resp(sc, &s.req, sizeof(s.req), &s.resp, + sizeof(s.resp)); + if (error != 0) + return (error); + + if (s.resp.type != htole32(VIRTIO_GPU_RESP_OK_NODATA)) { + device_printf(sc->vtgpu_dev, "Invalid reponse type %x\n", + le32toh(s.resp.type)); + return (EINVAL); + } + + return (0); +} + +static int +vtgpu_resource_flush(struct vtgpu_softc *sc, uint32_t x, uint32_t y, + uint32_t width, uint32_t height) +{ + struct { + struct virtio_gpu_resource_flush req; + char pad; + struct virtio_gpu_ctrl_hdr resp; + } s = { 0 }; + int error; + + s.req.hdr.type = htole32(VIRTIO_GPU_CMD_RESOURCE_FLUSH); + s.req.hdr.flags = htole32(VIRTIO_GPU_FLAG_FENCE); + s.req.hdr.fence_id = htole64( + atomic_fetchadd_64(&sc->vtgpu_next_fence, 1)); + + s.req.r.x = htole32(x); + s.req.r.y = htole32(y); + s.req.r.width = htole32(width); + s.req.r.height = htole32(height); + + s.req.resource_id = htole32(VTGPU_RESOURCE_ID); + + error = vtgpu_req_resp(sc, &s.req, sizeof(s.req), &s.resp, + sizeof(s.resp)); + if (error != 0) + return (error); + + if (s.resp.type != htole32(VIRTIO_GPU_RESP_OK_NODATA)) { + device_printf(sc->vtgpu_dev, "Invalid reponse type %x\n", + le32toh(s.resp.type)); + return (EINVAL); + } + + return (0); +} diff --git a/sys/dev/virtio/gpu/virtio_gpu.h b/sys/dev/virtio/gpu/virtio_gpu.h new file mode 100644 index 000000000000..edb3041edb62 --- /dev/null +++ b/sys/dev/virtio/gpu/virtio_gpu.h @@ -0,0 +1,454 @@ +/* + * Virtio GPU Device + * + * Copyright Red Hat, Inc. 2013-2014 + * + * Authors: + * Dave Airlie + * Gerd Hoffmann + * + * This header is BSD licensed so anyone can use the definitions + * to implement compatible drivers/servers: + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. Neither the name of IBM nor the names of its contributors + * may be used to endorse or promote products derived from this software + * without specific prior written permission. + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL IBM OR + * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT + * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF + * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND + * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, + * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT + * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + */ + +#ifndef VIRTIO_GPU_HW_H +#define VIRTIO_GPU_HW_H + +/* + * VIRTIO_GPU_CMD_CTX_* + * VIRTIO_GPU_CMD_*_3D + */ +#define VIRTIO_GPU_F_VIRGL 0 + +/* + * VIRTIO_GPU_CMD_GET_EDID + */ +#define VIRTIO_GPU_F_EDID 1 +/* + * VIRTIO_GPU_CMD_RESOURCE_ASSIGN_UUID + */ +#define VIRTIO_GPU_F_RESOURCE_UUID 2 + +/* + * VIRTIO_GPU_CMD_RESOURCE_CREATE_BLOB + */ +#define VIRTIO_GPU_F_RESOURCE_BLOB 3 +/* + * VIRTIO_GPU_CMD_CREATE_CONTEXT with + * context_init and multiple timelines + */ +#define VIRTIO_GPU_F_CONTEXT_INIT 4 + +enum virtio_gpu_ctrl_type { + VIRTIO_GPU_UNDEFINED = 0, + + /* 2d commands */ + VIRTIO_GPU_CMD_GET_DISPLAY_INFO = 0x0100, + VIRTIO_GPU_CMD_RESOURCE_CREATE_2D, + VIRTIO_GPU_CMD_RESOURCE_UNREF, + VIRTIO_GPU_CMD_SET_SCANOUT, + VIRTIO_GPU_CMD_RESOURCE_FLUSH, + VIRTIO_GPU_CMD_TRANSFER_TO_HOST_2D, + VIRTIO_GPU_CMD_RESOURCE_ATTACH_BACKING, + VIRTIO_GPU_CMD_RESOURCE_DETACH_BACKING, + VIRTIO_GPU_CMD_GET_CAPSET_INFO, + VIRTIO_GPU_CMD_GET_CAPSET, + VIRTIO_GPU_CMD_GET_EDID, + VIRTIO_GPU_CMD_RESOURCE_ASSIGN_UUID, + VIRTIO_GPU_CMD_RESOURCE_CREATE_BLOB, + VIRTIO_GPU_CMD_SET_SCANOUT_BLOB, + + /* 3d commands */ + VIRTIO_GPU_CMD_CTX_CREATE = 0x0200, + VIRTIO_GPU_CMD_CTX_DESTROY, + VIRTIO_GPU_CMD_CTX_ATTACH_RESOURCE, + VIRTIO_GPU_CMD_CTX_DETACH_RESOURCE, + VIRTIO_GPU_CMD_RESOURCE_CREATE_3D, + VIRTIO_GPU_CMD_TRANSFER_TO_HOST_3D, + VIRTIO_GPU_CMD_TRANSFER_FROM_HOST_3D, + VIRTIO_GPU_CMD_SUBMIT_3D, + VIRTIO_GPU_CMD_RESOURCE_MAP_BLOB, + VIRTIO_GPU_CMD_RESOURCE_UNMAP_BLOB, + + /* cursor commands */ + VIRTIO_GPU_CMD_UPDATE_CURSOR = 0x0300, + VIRTIO_GPU_CMD_MOVE_CURSOR, + + /* success responses */ + VIRTIO_GPU_RESP_OK_NODATA = 0x1100, + VIRTIO_GPU_RESP_OK_DISPLAY_INFO, + VIRTIO_GPU_RESP_OK_CAPSET_INFO, + VIRTIO_GPU_RESP_OK_CAPSET, + VIRTIO_GPU_RESP_OK_EDID, + VIRTIO_GPU_RESP_OK_RESOURCE_UUID, + VIRTIO_GPU_RESP_OK_MAP_INFO, + + /* error responses */ + VIRTIO_GPU_RESP_ERR_UNSPEC = 0x1200, + VIRTIO_GPU_RESP_ERR_OUT_OF_MEMORY, + VIRTIO_GPU_RESP_ERR_INVALID_SCANOUT_ID, + VIRTIO_GPU_RESP_ERR_INVALID_RESOURCE_ID, + VIRTIO_GPU_RESP_ERR_INVALID_CONTEXT_ID, + VIRTIO_GPU_RESP_ERR_INVALID_PARAMETER, +}; + +enum virtio_gpu_shm_id { + VIRTIO_GPU_SHM_ID_UNDEFINED = 0, + /* + * VIRTIO_GPU_CMD_RESOURCE_MAP_BLOB + * VIRTIO_GPU_CMD_RESOURCE_UNMAP_BLOB + */ + VIRTIO_GPU_SHM_ID_HOST_VISIBLE = 1 +}; + +#define VIRTIO_GPU_FLAG_FENCE (1 << 0) *** 326 LINES SKIPPED *** From nobody Thu Aug 17 11:47:06 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RRNXB6XmKz4qZrr; Thu, 17 Aug 2023 11:47: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RRNXB5zkmz4YZ0; Thu, 17 Aug 2023 11:47:06 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692272826; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kRjtE6tAgop6NvAGE44/fRAMU44Ia3/eeW4XOy6vKFY=; b=Fkpwwoq9K6KwKlx7TX/DHLemTEvqbYfQ7P85A5hxIoYNKuceoMFcMw4SZlMI7LMbuE3x9k IK/haWdLca7Iu4jfwJOqYWV3xvEpA/MEbPiXbYBvJSpvU79L/5cmzDJGp//+y0Rizs8q4r qwd0Nj8mIzdtBxbg7NXBnq+GtR6A4iiy3BHYUKJ0RdFIaxGBJLakiXqnMqEXtXWfh8KGSV X9WgqWYScVjtq9m900XXA4+i4f+9WBm2bOXzKpRi5D6aDVTsCnGcFCkgc1R8Frb5E42/oX MNIPugX2V2PUQaGz/sYkcliRqILsM23ZOgkcbcfQxoWIb1A50oZ+a/W0OgSXgQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692272826; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kRjtE6tAgop6NvAGE44/fRAMU44Ia3/eeW4XOy6vKFY=; b=kwSJt9WFSbjyZjdcOvePYDYixytx9bFlqlnwI57ZJvS1fEzcca5ve+ITP+Y4YnE8Y1UJpF sNU34QV8NVvfakL4B37JS7TNY5S94J44h2kjwBx+brWmFZKKByRXHyMbd3YqsYya4YKQzc /Ouo+N0kkC+oMmD33XtCJKMuYVF3EZ71ZL2UAjq7hgrvMUm+n+hESwYF9/aA2CeFF6jTnY mXtSinTtuHuBkJHF4UG8JBRphmv1Q64Byb+IE+ywpkpq8E0E1c73H5VvBnZZ3QbAStNvt8 ZASmnqIa8Hrt5RuzV5WzBzERtrKgT/Bl15xpucAHkEntHOPSJGTIwQxI4pb3dQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692272826; a=rsa-sha256; cv=none; b=vSUh42V6GAVcw5BReMjSaEihp861P0uIyG8Nvne6KXFzQ7/dGtwdU/2dwQmjp32vXqPAUx lm4AS+0mYBUaWZnmBRXma8bC44QG8Gdw9mGuY9pFEq+6tAc8snRB/Tv87xqkvKEx2eTrZq si+cUEi7zOKV2MMXC5o/VRuHMTjnCpGB9u3a8qeZHTvX9jsn4c9y5zQG95slflzJYdh3tw B/Kefq7TI3F7IMxfbO1HazrArW9Abp+lQbzl9CMyXOr/3NWnapQXSXNhbN0iTfakN8dN+Z l8SaH0tTbTEMQM0Q1ZtSz0w/+C77nYHHiPNAyp0hZCmECvMb6D3/Yp4pZqkYBw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RRNXB4vyyzY37; Thu, 17 Aug 2023 11:47:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37HBl6xl063022; Thu, 17 Aug 2023 11:47:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37HBl6mb063019; Thu, 17 Aug 2023 11:47:06 GMT (envelope-from git) Date: Thu, 17 Aug 2023 11:47:06 GMT Message-Id: <202308171147.37HBl6mb063019@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Piotr Kubaj Subject: git: 89e73359424a - main - ixl: fix multicast filters handling List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: pkubaj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 89e73359424a338a7900a4854ad7439f5848ebb8 Auto-Submitted: auto-generated The branch main has been updated by pkubaj: URL: https://cgit.FreeBSD.org/src/commit/?id=89e73359424a338a7900a4854ad7439f5848ebb8 commit 89e73359424a338a7900a4854ad7439f5848ebb8 Author: Mateusz Pacuszka AuthorDate: 2023-08-17 11:30:54 +0000 Commit: Piotr Kubaj CommitDate: 2023-08-17 11:46:48 +0000 ixl: fix multicast filters handling Summary: Hardware supports up to 128 entries of multicast filters. If there is more, filters should be removed and multicast promiscuous enabled. In case user deletes the multicast address and overall count is less than 128, multicast promiscuous mode should be disabled and all the filters reapplied into the HW. Currently driver only enables multicast promiscuous mode and deletes the entries without any information to the user and it's not capable of reapplying the filters once count is less than 128. Address that by: 1. Add logging 2. Add logic in case multicast promiscuous is enabled and user lowers the number of multicast entries to <128. 3. Fix a bug where driver removes different MAC entries along with the one that's being deleted by the user. Reviewers: #intel_networking, erj Reviewed By: #intel_networking, erj Subscribers: imp, ae Differential Revision: https://reviews.freebsd.org/D40860 --- sys/dev/ixl/ixl_pf_main.c | 97 ++++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 87 insertions(+), 10 deletions(-) diff --git a/sys/dev/ixl/ixl_pf_main.c b/sys/dev/ixl/ixl_pf_main.c index 4f384e7191af..af253faeac7a 100644 --- a/sys/dev/ixl/ixl_pf_main.c +++ b/sys/dev/ixl/ixl_pf_main.c @@ -592,6 +592,15 @@ ixl_add_maddr(void *arg, struct sockaddr_dl *sdl, u_int cnt) * Routines for multicast and vlan filter management. * *********************************************************************/ + +/** + * ixl_add_multi - Add multicast filters to the hardware + * @vsi: The VSI structure + * + * In case number of multicast filters in the IFP exceeds 127 entries, + * multicast promiscuous mode will be enabled and the filters will be removed + * from the hardware + */ void ixl_add_multi(struct ixl_vsi *vsi) { @@ -599,14 +608,20 @@ ixl_add_multi(struct ixl_vsi *vsi) struct i40e_hw *hw = vsi->hw; int mcnt = 0; struct ixl_add_maddr_arg cb_arg; + enum i40e_status_code status; IOCTL_DEBUGOUT("ixl_add_multi: begin"); mcnt = if_llmaddr_count(ifp); if (__predict_false(mcnt >= MAX_MULTICAST_ADDR)) { - i40e_aq_set_vsi_multicast_promiscuous(hw, - vsi->seid, TRUE, NULL); - /* delete all existing MC filters */ + status = i40e_aq_set_vsi_multicast_promiscuous(hw, vsi->seid, + TRUE, NULL); + if (status != I40E_SUCCESS) + if_printf(ifp, "Failed to enable multicast promiscuous " + "mode, status: %s\n", i40e_stat_str(hw, status)); + else + if_printf(ifp, "Enabled multicast promiscuous mode\n"); + /* Delete all existing MC filters */ ixl_del_multi(vsi, true); return; } @@ -632,30 +647,92 @@ ixl_match_maddr(void *arg, struct sockaddr_dl *sdl, u_int cnt) return (0); } +/** + * ixl_dis_multi_promisc - Disable multicast promiscuous mode + * @vsi: The VSI structure + * @vsi_mcnt: Number of multicast filters in the VSI + * + * Disable multicast promiscuous mode based on number of entries in the IFP + * and the VSI, then re-add multicast filters. + * + */ +static void +ixl_dis_multi_promisc(struct ixl_vsi *vsi, int vsi_mcnt) +{ + struct ifnet *ifp = vsi->ifp; + struct i40e_hw *hw = vsi->hw; + int ifp_mcnt = 0; + enum i40e_status_code status; + + ifp_mcnt = if_llmaddr_count(ifp); + /* + * Equal lists or empty ifp list mean the list has not been changed + * and in such case avoid disabling multicast promiscuous mode as it + * was not previously enabled. Case where multicast promiscuous mode has + * been enabled is when vsi_mcnt == 0 && ifp_mcnt > 0. + */ + if (ifp_mcnt == vsi_mcnt || ifp_mcnt == 0 || + ifp_mcnt >= MAX_MULTICAST_ADDR) + return; + + status = i40e_aq_set_vsi_multicast_promiscuous(hw, vsi->seid, + FALSE, NULL); + if (status != I40E_SUCCESS) { + if_printf(ifp, "Failed to disable multicast promiscuous " + "mode, status: %s\n", i40e_stat_str(hw, status)); + + return; + } + + if_printf(ifp, "Disabled multicast promiscuous mode\n"); + + ixl_add_multi(vsi); +} + +/** + * ixl_del_multi - Delete multicast filters from the hardware + * @vsi: The VSI structure + * @all: Bool to determine if all the multicast filters should be removed + * + * In case number of multicast filters in the IFP drops to 127 entries, + * multicast promiscuous mode will be disabled and the filters will be reapplied + * to the hardware. + */ void ixl_del_multi(struct ixl_vsi *vsi, bool all) { - struct ixl_ftl_head to_del; + int to_del_cnt = 0, vsi_mcnt = 0; if_t ifp = vsi->ifp; struct ixl_mac_filter *f, *fn; - int mcnt = 0; + struct ixl_ftl_head to_del; IOCTL_DEBUGOUT("ixl_del_multi: begin"); LIST_INIT(&to_del); /* Search for removed multicast addresses */ LIST_FOREACH_SAFE(f, &vsi->ftl, ftle, fn) { - if ((f->flags & IXL_FILTER_MC) == 0 || - (!all && (if_foreach_llmaddr(ifp, ixl_match_maddr, f) == 0))) + if ((f->flags & IXL_FILTER_MC) == 0) + continue; + + /* Count all the multicast filters in the VSI for comparison */ + vsi_mcnt++; + + if (!all && if_foreach_llmaddr(ifp, ixl_match_maddr, f) != 0) continue; LIST_REMOVE(f, ftle); LIST_INSERT_HEAD(&to_del, f, ftle); - mcnt++; + to_del_cnt++; } - if (mcnt > 0) - ixl_del_hw_filters(vsi, &to_del, mcnt); + if (to_del_cnt > 0) { + ixl_del_hw_filters(vsi, &to_del, to_del_cnt); + return; + } + + ixl_dis_multi_promisc(vsi, vsi_mcnt); + + IOCTL_DEBUGOUT("ixl_del_multi: end"); } void From nobody Thu Aug 17 13:02:59 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RRQCm0Nj4z4qdt1; Thu, 17 Aug 2023 13:03: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RRQCl6cnbz4h0V; Thu, 17 Aug 2023 13:02:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692277379; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=sSpH0zC/SGVq0m6HXHBfb6NXg/wSH4BmDMJf9TUgYc8=; b=cPgklM5rCjtvrEOUzzhr8CTqifPRK1CYlbLjg5LsNEzrpnGCVNK4qLCexSOPdzt5C4p/7l DfvFsTaYwJ4Nj1rPyC2hDmcY5Jp2Z7wLQs+Hlk9Ax6ojovmD6Iq2owrFbhDiWSX6hjrDTZ tEJ+5gCX0eF1BjTc3JXWi++NF5eYe7jR2a6VRswKy0J68JFokavW2CIuLwycOEDkjQ7/g/ /cYJSflWGWFF9D5PLK6KUFEnZ2mp2uDqcZMt2RQogI2bQDoW7EkCiscnGEaXwoITsfhIbk IpMGyg1BOeNUNfvDnGMstRxu+F1bA0ipp/0+FMueqSq8TsvbfptZRR5hgVO1zg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692277379; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=sSpH0zC/SGVq0m6HXHBfb6NXg/wSH4BmDMJf9TUgYc8=; b=FvJzoDwCGXXma8ihlbqmneovpG1Fhz3xPNLAco9c41tG+70voI9B8ZrRaU4yqpfrcq3dO5 e/VuwQuw8uOoXQ7+6LTK5RrZZwpxiEk1DZkgZBHp3YE/Bu7RRfEinzqZ7ML6YK/j5aS6EQ WkACIDTG89uc4cgq+sVhd2PGB58fG8ELGR7LQCuZHMvsR6WWlq/X+YmyVG8I8V8E7wOibv dpSELvFLU/UCO5eNec2Nwh0zOTBDLSYmutS71O8Hf1BQtazUOklkE84fEAg3a5TihWQxwL kxyeymegOn5Y7Oz/+sO+6ZvLCsjJk7DXqFeB4A0jx7jHHzsQSqHF3U+igF/EYg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692277379; a=rsa-sha256; cv=none; b=JMxtfYtGZ0Lb43lYIFlPAs34scy0okOGRfp6CLO8iR2oPGm0aiApFNr4nkmVCtaYmaegF6 JKHzOSlpqgm+f/Gzr9JlMXvvNFhzy+B9/ft8z9AgLpyoNhT5QhKXk+q1MfkOCNDV0VrBVi q25tsMTKI0+L3CfmWAYj1HwYlHF3H4x6TdhEVt0C9wI+VfqYZSg/zEBERcUFjinh6Bab07 eVAIVMoG78z8F1y1i0t8DwmkrBdEjQYExng9DYYEZYXJyDSgjxfTVii1+5WlRigTmG/AKJ rQP+hCW8lDHtxZDR0DNIZ0d11RdO5HfFsvPtZozVl0iz52JM+7SZAdRiJBvEfA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RRQCl5dThzZgH; Thu, 17 Aug 2023 13:02:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37HD2xPD096711; Thu, 17 Aug 2023 13:02:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37HD2xe7096708; Thu, 17 Aug 2023 13:02:59 GMT (envelope-from git) Date: Thu, 17 Aug 2023 13:02:59 GMT Message-Id: <202308171302.37HD2xe7096708@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Corvin =?utf-8?Q?K=C3=B6hne?= Subject: git: 3152cbdd1657 - stable/13 - bhyve: don't panic if e820 finds no available memory List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: corvink X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 3152cbdd16572e0580588b349165c680ce8bc87b Auto-Submitted: auto-generated The branch stable/13 has been updated by corvink: URL: https://cgit.FreeBSD.org/src/commit/?id=3152cbdd16572e0580588b349165c680ce8bc87b commit 3152cbdd16572e0580588b349165c680ce8bc87b Author: Corvin Köhne AuthorDate: 2023-05-09 12:32:33 +0000 Commit: Corvin Köhne CommitDate: 2023-08-17 12:58:04 +0000 bhyve: don't panic if e820 finds no available memory The GVT-d emulation tries to allocate some specific memory. It could happen that this address doesn't exist. In that case, GVT-d will fall back to allocate any address. Nevertheless, this only works if the e820 fails with an error instead of exiting on an assertion. Reviewed by: markj MFC after: 1 week Sponsored by: Beckhoff Automation GmbH & Co. KG Differential Revision: https://reviews.freebsd.org/D40034 (cherry picked from commit 99aeb28b2f7e28c516dd6434db63a9bc1c1f3218) --- usr.sbin/bhyve/e820.c | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/usr.sbin/bhyve/e820.c b/usr.sbin/bhyve/e820.c index 6c43e6eda3a5..99a66645f70f 100644 --- a/usr.sbin/bhyve/e820.c +++ b/usr.sbin/bhyve/e820.c @@ -197,11 +197,17 @@ e820_add_entry(const uint64_t base, const uint64_t end, return (0); } - assert(element != NULL); - /* Non system memory should be allocated inside system memory. */ - assert(element->type == E820_TYPE_MEMORY); - /* New element should fit into existing system memory element. */ - assert(base >= element->base && end <= element->end); + /* + * If some one tries to allocate a specific address, it could happen, that + * this address is not allocatable. Therefore, do some checks. If the + * address is not allocatable, don't panic. The user may have a fallback and + * tries to allocate another address. This is true for the GVT-d emulation + * which tries to reuse the host address of the graphics stolen memory and + * falls back to allocating the highest address below 4 GB. + */ + if (element == NULL || element->type != E820_TYPE_MEMORY || + (base < element->base || end > element->end)) + return (ENOMEM); if (base == element->base) { /* From nobody Thu Aug 17 13:09:07 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RRQLr1hKzz4qfRS; Thu, 17 Aug 2023 13:09:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RRQLr1808z4hCP; Thu, 17 Aug 2023 13:09:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692277748; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=aisgxmVvMJJWAlnYtQVU+5zFnSCw0u1V1wMMsyeApEg=; b=pDddEJHka1A8Aam1xKf2QVufHiDRFSaS46dRi2cIEF5E6MyoLRJf0kZ4bm5ALHH50EfvxV ebbDEgqXjIdM/hUYndwBAVGv/MfUrKzT9xwNY5bPNbwmYlij72YJn1gcoxhE66fTu5nUVM k1Ott5a/19KP/nfYJs00D5pJfskplrm4V3tSga/jdsFg8trhnLFGW2G+a1swCfDx9xQnaa mhwtghxeXCwyiH3gBdoRTLYkbpeENXUlL95wqv6rQ9xVFwoJG5dQvM7qzv+aajOmAows6B 6IrmAeDCB45ACTQbGu1O4oExjwO6R7E7Ml3dO99NKA8boVijV7TnCudcUoXLgg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692277748; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=aisgxmVvMJJWAlnYtQVU+5zFnSCw0u1V1wMMsyeApEg=; b=eKsklpBGGPY7X6ONqqsgsf0RdUbqMDaoFbbuqC9v1H5O1kyYbJNA7KaRogDAH2/szGSJu9 7TCr4T0NF9gCDfsjhgTGFalwSsG0Lx+ZY9o53qX1K9sAWDeTacCDGwYyur8VhLg/wyp22u iJ4xT9XaKzx60HjBkffJUI5qBc73rCxtLos8IbVU1M2VhxFkcR9aiPwMlqN79uCf4xZpST xLBul7qW5UOEl9Ih7IkGAnE3cpbd1/xYIb3ofqYEgodBzY9J6bW46cxcmx2c0rrrvx2xQJ GEPqZGpCUwBim/qoFSWJf8N0WriPiAhVlFT7Nad0IPN7dcACNYB1Jb1mcnCVNQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692277748; a=rsa-sha256; cv=none; b=nYpyR2CYblrIL92fj+3R1eXTKeJtIGHxxukIHW8Q9+vUUrGQsrK9NPThX0D2U0gwel30Io iVXza1DHCFsQzKNC+twN0AgYzn3bniSQNPMKo1EIsNn2i/Zphnu2BY9M04Enc53nQQ/rB4 BvImQf1UFnFWeM57A/EBbPcRTDw6Whs6wGf5HOJDlUyzEBKZMKy4y/RxHx5q5fvu0mLWwV AsWQrV0ObtHqRd/L/a9yS9yAIF6E8dmQsfFP3LZ3ks1IsoPU/Bjoei8RtNTixa5TTtWN/p JCrWFKsEFeNCRRuBhvzrHv5TxCMf5YhYNBFR3Bk0Ho7mGz8J4t++N7v3EvHvEQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RRQLr0Bn4zZxj; Thu, 17 Aug 2023 13:09:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37HD97bZ097678; Thu, 17 Aug 2023 13:09:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37HD97Tb097675; Thu, 17 Aug 2023 13:09:07 GMT (envelope-from git) Date: Thu, 17 Aug 2023 13:09:07 GMT Message-Id: <202308171309.37HD97Tb097675@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= Subject: git: e738085b9463 - main - Remove my middle name. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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/main X-Git-Reftype: branch X-Git-Commit: e738085b94631f90e21a49852538ac95974baf44 Auto-Submitted: auto-generated The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=e738085b94631f90e21a49852538ac95974baf44 commit e738085b94631f90e21a49852538ac95974baf44 Author: Dag-Erling Smørgrav AuthorDate: 2023-08-17 13:08:11 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2023-08-17 13:08:30 +0000 Remove my middle name. --- contrib/openbsm/compat/flopen.h | 2 +- lib/libutil/flopen.3 | 2 +- lib/libutil/flopen.c | 2 +- lib/libutil/kld.3 | 2 +- lib/libutil/kld.c | 2 +- lib/libutil/quotafile.3 | 2 +- lib/libutil/quotafile.c | 2 +- lib/libutil/tests/flopen_test.c | 2 +- lib/libutil/tests/pidfile_test.c | 2 +- share/man/man4/aio.4 | 2 +- share/man/man4/coretemp.4 | 2 +- share/man/man4/ichwd.4 | 2 +- share/man/man4/ucycom.4 | 2 +- share/man/man9/LOCK_PROFILING.9 | 2 +- share/man/man9/pseudofs.9 | 2 +- share/man/man9/sbuf.9 | 2 +- share/man/man9/zone.9 | 2 +- sys/compat/linprocfs/linprocfs.c | 2 +- sys/dev/fb/splash_pcx.c | 2 +- sys/dev/syscons/logo/logo_saver.c | 2 +- sys/dev/syscons/rain/rain_saver.c | 2 +- sys/dev/syscons/warp/warp_saver.c | 2 +- sys/dev/usb/serial/ucycom.c | 2 +- sys/fs/pseudofs/pseudofs.c | 2 +- sys/fs/pseudofs/pseudofs.h | 2 +- sys/fs/pseudofs/pseudofs_fileno.c | 2 +- sys/fs/pseudofs/pseudofs_internal.h | 2 +- sys/fs/pseudofs/pseudofs_vncache.c | 2 +- sys/fs/pseudofs/pseudofs_vnops.c | 2 +- sys/kern/subr_sbuf.c | 2 +- sys/sys/sbuf.h | 2 +- tools/regression/pthread/mutex_isowned_np/mutex_isowned_np.c | 2 +- tools/tools/ansify/ansify.pl | 2 +- tools/tools/genericize/genericize.pl | 2 +- tools/tools/hcomp/hcomp.pl | 2 +- tools/tools/mtxstat/mtxstat.pl | 2 +- tools/tools/track/track.sh | 2 +- usr.bin/grep/file.c | 2 +- usr.bin/grep/grep.c | 2 +- usr.bin/grep/grep.h | 2 +- usr.bin/grep/queue.c | 2 +- usr.bin/grep/util.c | 2 +- usr.bin/logins/logins.1 | 2 +- usr.bin/logins/logins.c | 2 +- usr.bin/sockstat/sockstat.1 | 2 +- usr.bin/sockstat/sockstat.c | 2 +- usr.sbin/acpi/acpiconf/acpiconf.8 | 2 +- usr.sbin/chkgrp/chkgrp.8 | 2 +- usr.sbin/chkgrp/chkgrp.c | 2 +- usr.sbin/kldxref/kldxref.8 | 2 +- 50 files changed, 50 insertions(+), 50 deletions(-) diff --git a/contrib/openbsm/compat/flopen.h b/contrib/openbsm/compat/flopen.h index 7871b13c183f..be9114ab4f44 100644 --- a/contrib/openbsm/compat/flopen.h +++ b/contrib/openbsm/compat/flopen.h @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2007 Dag-Erling Coïdan Smørgrav + * Copyright (c) 2007 Dag-Erling Smørgrav * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/lib/libutil/flopen.3 b/lib/libutil/flopen.3 index 61c26231cc59..259bbe16e9f7 100644 --- a/lib/libutil/flopen.3 +++ b/lib/libutil/flopen.3 @@ -1,5 +1,5 @@ .\"- -.\" Copyright (c) 2007 Dag-Erling Coïdan Smørgrav +.\" Copyright (c) 2007 Dag-Erling Smørgrav .\" All rights reserved. .\" .\" Redistribution and use in source and binary forms, with or without diff --git a/lib/libutil/flopen.c b/lib/libutil/flopen.c index b1961894c11f..9fb3ec8aeae0 100644 --- a/lib/libutil/flopen.c +++ b/lib/libutil/flopen.c @@ -1,7 +1,7 @@ /*- * SPDX-License-Identifier: BSD-2-Clause * - * Copyright (c) 2007-2009 Dag-Erling Coïdan Smørgrav + * Copyright (c) 2007-2009 Dag-Erling Smørgrav * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/lib/libutil/kld.3 b/lib/libutil/kld.3 index 0f751e5ee194..6bcf62508aea 100644 --- a/lib/libutil/kld.3 +++ b/lib/libutil/kld.3 @@ -1,5 +1,5 @@ .\"- -.\" Copyright (c) 2006 Dag-Erling Coïdan Smørgrav +.\" Copyright (c) 2006 Dag-Erling Smørgrav .\" All rights reserved. .\" .\" Redistribution and use in source and binary forms, with or without diff --git a/lib/libutil/kld.c b/lib/libutil/kld.c index 2a79c9302f0f..374a1992bc55 100644 --- a/lib/libutil/kld.c +++ b/lib/libutil/kld.c @@ -1,7 +1,7 @@ /*- * SPDX-License-Identifier: BSD-2-Clause * - * Copyright (c) 2006 Dag-Erling Coïdan Smørgrav + * Copyright (c) 2006 Dag-Erling Smørgrav * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/lib/libutil/quotafile.3 b/lib/libutil/quotafile.3 index 9654d14cf669..5d2bff56baba 100644 --- a/lib/libutil/quotafile.3 +++ b/lib/libutil/quotafile.3 @@ -1,5 +1,5 @@ .\"- -.\" Copyright (c) 2009 Dag-Erling Coïdan Smørgrav and +.\" Copyright (c) 2009 Dag-Erling Smørgrav and .\" Marshall Kirk McKusick. All rights reserved. .\" .\" Redistribution and use in source and binary forms, with or without diff --git a/lib/libutil/quotafile.c b/lib/libutil/quotafile.c index 047a2a0e6c2f..1f02813dee92 100644 --- a/lib/libutil/quotafile.c +++ b/lib/libutil/quotafile.c @@ -1,7 +1,7 @@ /*- * SPDX-License-Identifier: BSD-2-Clause * - * Copyright (c) 2008 Dag-Erling Coïdan Smørgrav + * Copyright (c) 2008 Dag-Erling Smørgrav * Copyright (c) 2008 Marshall Kirk McKusick * All rights reserved. * diff --git a/lib/libutil/tests/flopen_test.c b/lib/libutil/tests/flopen_test.c index b86dd123eb9b..94129ebfac46 100644 --- a/lib/libutil/tests/flopen_test.c +++ b/lib/libutil/tests/flopen_test.c @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2007-2009 Dag-Erling Coïdan Smørgrav + * Copyright (c) 2007-2009 Dag-Erling Smørgrav * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/lib/libutil/tests/pidfile_test.c b/lib/libutil/tests/pidfile_test.c index 0463b7b29c87..bb11d6a19b79 100644 --- a/lib/libutil/tests/pidfile_test.c +++ b/lib/libutil/tests/pidfile_test.c @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2007-2009 Dag-Erling Coïdan Smørgrav + * Copyright (c) 2007-2009 Dag-Erling Smørgrav * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/share/man/man4/aio.4 b/share/man/man4/aio.4 index e7b04544ba5e..21332a3b1037 100644 --- a/share/man/man4/aio.4 +++ b/share/man/man4/aio.4 @@ -1,5 +1,5 @@ .\"- -.\" Copyright (c) 2002 Dag-Erling Coïdan Smørgrav +.\" Copyright (c) 2002 Dag-Erling Smørgrav .\" All rights reserved. .\" .\" Redistribution and use in source and binary forms, with or without diff --git a/share/man/man4/coretemp.4 b/share/man/man4/coretemp.4 index 54948c2da13a..210b9d0fae62 100644 --- a/share/man/man4/coretemp.4 +++ b/share/man/man4/coretemp.4 @@ -1,5 +1,5 @@ .\"- -.\" Copyright (c) 2007 Dag-Erling Coïdan Smørgrav +.\" Copyright (c) 2007 Dag-Erling Smørgrav .\" All rights reserved. .\" .\" Redistribution and use in source and binary forms, with or without diff --git a/share/man/man4/ichwd.4 b/share/man/man4/ichwd.4 index f2a931405456..cc6924f7f866 100644 --- a/share/man/man4/ichwd.4 +++ b/share/man/man4/ichwd.4 @@ -1,5 +1,5 @@ .\"- -.\" Copyright (c) 2007 Dag-Erling Coïdan Smørgrav +.\" Copyright (c) 2007 Dag-Erling Smørgrav .\" All rights reserved. .\" .\" Redistribution and use in source and binary forms, with or without diff --git a/share/man/man4/ucycom.4 b/share/man/man4/ucycom.4 index 056b220f6d02..4f4790f51c03 100644 --- a/share/man/man4/ucycom.4 +++ b/share/man/man4/ucycom.4 @@ -1,5 +1,5 @@ .\"- -.\" Copyright (c) 2004 Dag-Erling Coïdan Smørgrav +.\" Copyright (c) 2004 Dag-Erling Smørgrav .\" All rights reserved. .\" .\" Redistribution and use in source and binary forms, with or without diff --git a/share/man/man9/LOCK_PROFILING.9 b/share/man/man9/LOCK_PROFILING.9 index 94f9596a63e9..e2b42cadb08b 100644 --- a/share/man/man9/LOCK_PROFILING.9 +++ b/share/man/man9/LOCK_PROFILING.9 @@ -1,5 +1,5 @@ .\"- -.\" Copyright (c) 2004 Dag-Erling Coïdan Smørgrav +.\" Copyright (c) 2004 Dag-Erling Smørgrav .\" Copyright (c) 2005 Robert N. M. Watson .\" Copyright (c) 2006 Kip Macy .\" All rights reserved. diff --git a/share/man/man9/pseudofs.9 b/share/man/man9/pseudofs.9 index 54b80b5b95e5..e076c398c711 100644 --- a/share/man/man9/pseudofs.9 +++ b/share/man/man9/pseudofs.9 @@ -1,5 +1,5 @@ .\"- -.\" Copyright (c) 2001 Dag-Erling Coïdan Smørgrav +.\" Copyright (c) 2001 Dag-Erling Smørgrav .\" All rights reserved. .\" .\" Redistribution and use in source and binary forms, with or without diff --git a/share/man/man9/sbuf.9 b/share/man/man9/sbuf.9 index 499b9b194d35..5ab045118f51 100644 --- a/share/man/man9/sbuf.9 +++ b/share/man/man9/sbuf.9 @@ -1,5 +1,5 @@ .\"- -.\" Copyright (c) 2000 Poul-Henning Kamp and Dag-Erling Coïdan Smørgrav +.\" Copyright (c) 2000 Poul-Henning Kamp and Dag-Erling Smørgrav .\" All rights reserved. .\" .\" Redistribution and use in source and binary forms, with or without diff --git a/share/man/man9/zone.9 b/share/man/man9/zone.9 index 24cd2b4cb2d8..a6b8d2dfedbe 100644 --- a/share/man/man9/zone.9 +++ b/share/man/man9/zone.9 @@ -1,5 +1,5 @@ .\"- -.\" Copyright (c) 2001 Dag-Erling Coïdan Smørgrav +.\" Copyright (c) 2001 Dag-Erling Smørgrav .\" All rights reserved. .\" .\" Redistribution and use in source and binary forms, with or without diff --git a/sys/compat/linprocfs/linprocfs.c b/sys/compat/linprocfs/linprocfs.c index 5c812353f989..856e5aca07d6 100644 --- a/sys/compat/linprocfs/linprocfs.c +++ b/sys/compat/linprocfs/linprocfs.c @@ -1,7 +1,7 @@ /*- * SPDX-License-Identifier: BSD-4-Clause * - * Copyright (c) 2000 Dag-Erling Coïdan Smørgrav + * Copyright (c) 2000 Dag-Erling Smørgrav * Copyright (c) 1999 Pierre Beyssac * Copyright (c) 1993 Jan-Simon Pendry * Copyright (c) 1993 diff --git a/sys/dev/fb/splash_pcx.c b/sys/dev/fb/splash_pcx.c index e7fade552d04..d2b0b7719426 100644 --- a/sys/dev/fb/splash_pcx.c +++ b/sys/dev/fb/splash_pcx.c @@ -3,7 +3,7 @@ * * Copyright (c) 1999 Michael Smith * Copyright (c) 1999 Kazutaka YOKOTA - * Copyright (c) 1999 Dag-Erling Coïdan Smørgrav + * Copyright (c) 1999 Dag-Erling Smørgrav * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/sys/dev/syscons/logo/logo_saver.c b/sys/dev/syscons/logo/logo_saver.c index c209dc4032db..513d68be98e3 100644 --- a/sys/dev/syscons/logo/logo_saver.c +++ b/sys/dev/syscons/logo/logo_saver.c @@ -1,7 +1,7 @@ /*- * SPDX-License-Identifier: BSD-3-Clause * - * Copyright (c) 1998 Dag-Erling Coïdan Smørgrav + * Copyright (c) 1998 Dag-Erling Smørgrav * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/sys/dev/syscons/rain/rain_saver.c b/sys/dev/syscons/rain/rain_saver.c index 06d26b6fe02d..7fce014bdbe4 100644 --- a/sys/dev/syscons/rain/rain_saver.c +++ b/sys/dev/syscons/rain/rain_saver.c @@ -1,7 +1,7 @@ /*- * SPDX-License-Identifier: BSD-3-Clause * - * Copyright (c) 1998 Dag-Erling Coïdan Smørgrav + * Copyright (c) 1998 Dag-Erling Smørgrav * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/sys/dev/syscons/warp/warp_saver.c b/sys/dev/syscons/warp/warp_saver.c index d1c79ea82d10..54f9fd4f1749 100644 --- a/sys/dev/syscons/warp/warp_saver.c +++ b/sys/dev/syscons/warp/warp_saver.c @@ -1,7 +1,7 @@ /*- * SPDX-License-Identifier: BSD-3-Clause * - * Copyright (c) 1998 Dag-Erling Coïdan Smørgrav + * Copyright (c) 1998 Dag-Erling Smørgrav * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/sys/dev/usb/serial/ucycom.c b/sys/dev/usb/serial/ucycom.c index d1e975516c90..664cb7f05263 100644 --- a/sys/dev/usb/serial/ucycom.c +++ b/sys/dev/usb/serial/ucycom.c @@ -2,7 +2,7 @@ /*- * SPDX-License-Identifier: BSD-2-Clause * - * Copyright (c) 2004 Dag-Erling Coïdan Smørgrav + * Copyright (c) 2004 Dag-Erling Smørgrav * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/sys/fs/pseudofs/pseudofs.c b/sys/fs/pseudofs/pseudofs.c index 47a812262fad..eb4ca8a82456 100644 --- a/sys/fs/pseudofs/pseudofs.c +++ b/sys/fs/pseudofs/pseudofs.c @@ -1,7 +1,7 @@ /*- * SPDX-License-Identifier: BSD-3-Clause * - * Copyright (c) 2001 Dag-Erling Coïdan Smørgrav + * Copyright (c) 2001 Dag-Erling Smørgrav * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/sys/fs/pseudofs/pseudofs.h b/sys/fs/pseudofs/pseudofs.h index c28d7cbb8078..c60dd7b339d1 100644 --- a/sys/fs/pseudofs/pseudofs.h +++ b/sys/fs/pseudofs/pseudofs.h @@ -1,7 +1,7 @@ /*- * SPDX-License-Identifier: BSD-3-Clause * - * Copyright (c) 2001 Dag-Erling Coïdan Smørgrav + * Copyright (c) 2001 Dag-Erling Smørgrav * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/sys/fs/pseudofs/pseudofs_fileno.c b/sys/fs/pseudofs/pseudofs_fileno.c index 8d526994e299..3c1b18bdda1e 100644 --- a/sys/fs/pseudofs/pseudofs_fileno.c +++ b/sys/fs/pseudofs/pseudofs_fileno.c @@ -1,7 +1,7 @@ /*- * SPDX-License-Identifier: BSD-3-Clause * - * Copyright (c) 2001 Dag-Erling Coïdan Smørgrav + * Copyright (c) 2001 Dag-Erling Smørgrav * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/sys/fs/pseudofs/pseudofs_internal.h b/sys/fs/pseudofs/pseudofs_internal.h index bb2187aa1ce9..cefeba8d0326 100644 --- a/sys/fs/pseudofs/pseudofs_internal.h +++ b/sys/fs/pseudofs/pseudofs_internal.h @@ -1,7 +1,7 @@ /*- * SPDX-License-Identifier: BSD-3-Clause * - * Copyright (c) 2001 Dag-Erling Coïdan Smørgrav + * Copyright (c) 2001 Dag-Erling Smørgrav * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/sys/fs/pseudofs/pseudofs_vncache.c b/sys/fs/pseudofs/pseudofs_vncache.c index 2120398f5b2e..33023dd0d08f 100644 --- a/sys/fs/pseudofs/pseudofs_vncache.c +++ b/sys/fs/pseudofs/pseudofs_vncache.c @@ -1,7 +1,7 @@ /*- * SPDX-License-Identifier: BSD-3-Clause * - * Copyright (c) 2001 Dag-Erling Coïdan Smørgrav + * Copyright (c) 2001 Dag-Erling Smørgrav * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/sys/fs/pseudofs/pseudofs_vnops.c b/sys/fs/pseudofs/pseudofs_vnops.c index 48adbfdb4c47..0bdfedffafcb 100644 --- a/sys/fs/pseudofs/pseudofs_vnops.c +++ b/sys/fs/pseudofs/pseudofs_vnops.c @@ -1,7 +1,7 @@ /*- * SPDX-License-Identifier: BSD-3-Clause * - * Copyright (c) 2001 Dag-Erling Coïdan Smørgrav + * Copyright (c) 2001 Dag-Erling Smørgrav * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/sys/kern/subr_sbuf.c b/sys/kern/subr_sbuf.c index 1d361dcc1391..0ce2427f6dbb 100644 --- a/sys/kern/subr_sbuf.c +++ b/sys/kern/subr_sbuf.c @@ -2,7 +2,7 @@ * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 2000-2008 Poul-Henning Kamp - * Copyright (c) 2000-2008 Dag-Erling Coïdan Smørgrav + * Copyright (c) 2000-2008 Dag-Erling Smørgrav * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/sys/sys/sbuf.h b/sys/sys/sbuf.h index 201c90229732..60dcda53a461 100644 --- a/sys/sys/sbuf.h +++ b/sys/sys/sbuf.h @@ -2,7 +2,7 @@ * SPDX-License-Identifier: BSD-2-Clause * * Copyright (c) 2000-2008 Poul-Henning Kamp - * Copyright (c) 2000-2008 Dag-Erling Coïdan Smørgrav + * Copyright (c) 2000-2008 Dag-Erling Smørgrav * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/tools/regression/pthread/mutex_isowned_np/mutex_isowned_np.c b/tools/regression/pthread/mutex_isowned_np/mutex_isowned_np.c index c1dd5159dc8a..9032c7dd3968 100644 --- a/tools/regression/pthread/mutex_isowned_np/mutex_isowned_np.c +++ b/tools/regression/pthread/mutex_isowned_np/mutex_isowned_np.c @@ -1,5 +1,5 @@ /*- - * Copyright (c) 2008 Dag-Erling Coïdan Smørgrav + * Copyright (c) 2008 Dag-Erling Smørgrav * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/tools/tools/ansify/ansify.pl b/tools/tools/ansify/ansify.pl index 76538b8b0f7e..3664c7fcb484 100644 --- a/tools/tools/ansify/ansify.pl +++ b/tools/tools/ansify/ansify.pl @@ -1,6 +1,6 @@ #!/usr/bin/perl -w #- -# Copyright (c) 2005 Dag-Erling Coïdan Smørgrav +# Copyright (c) 2005 Dag-Erling Smørgrav # All rights reserved. # # Redistribution and use in source and binary forms, with or without diff --git a/tools/tools/genericize/genericize.pl b/tools/tools/genericize/genericize.pl index 5eaf1ab2e830..6ed2d1d60e85 100755 --- a/tools/tools/genericize/genericize.pl +++ b/tools/tools/genericize/genericize.pl @@ -1,6 +1,6 @@ #!/usr/bin/perl -w #- -# Copyright (c) 2004 Dag-Erling Coïdan Smørgrav +# Copyright (c) 2004 Dag-Erling Smørgrav # All rights reserved. # # Redistribution and use in source and binary forms, with or without diff --git a/tools/tools/hcomp/hcomp.pl b/tools/tools/hcomp/hcomp.pl index 280b5360d200..6d15eef08542 100644 --- a/tools/tools/hcomp/hcomp.pl +++ b/tools/tools/hcomp/hcomp.pl @@ -1,6 +1,6 @@ #!/usr/bin/perl -w #- -# Copyright (c) 2003 Dag-Erling Coïdan Smørgrav +# Copyright (c) 2003 Dag-Erling Smørgrav # All rights reserved. # # Redistribution and use in source and binary forms, with or without diff --git a/tools/tools/mtxstat/mtxstat.pl b/tools/tools/mtxstat/mtxstat.pl index c755bbb5288a..eaf95cf1df54 100644 --- a/tools/tools/mtxstat/mtxstat.pl +++ b/tools/tools/mtxstat/mtxstat.pl @@ -1,6 +1,6 @@ #!/usr/bin/perl -Tw #- -# Copyright (c) 2002 Dag-Erling Coïdan Smørgrav +# Copyright (c) 2002 Dag-Erling Smørgrav # All rights reserved. # # Redistribution and use in source and binary forms, with or without diff --git a/tools/tools/track/track.sh b/tools/tools/track/track.sh index 9050c9f1b183..31e93166cef2 100644 --- a/tools/tools/track/track.sh +++ b/tools/tools/track/track.sh @@ -1,6 +1,6 @@ #!/bin/sh #- -# Copyright (c) 2008 Dag-Erling Coïdan Smørgrav +# Copyright (c) 2008 Dag-Erling Smørgrav # All rights reserved. # # Redistribution and use in source and binary forms, with or without diff --git a/usr.bin/grep/file.c b/usr.bin/grep/file.c index 2845f0ec225d..cd2764811776 100644 --- a/usr.bin/grep/file.c +++ b/usr.bin/grep/file.c @@ -4,7 +4,7 @@ /*- * SPDX-License-Identifier: BSD-2-Clause * - * Copyright (c) 1999 James Howard and Dag-Erling Coïdan Smørgrav + * Copyright (c) 1999 James Howard and Dag-Erling Smørgrav * Copyright (C) 2008-2010 Gabor Kovesdan * Copyright (C) 2010 Dimitry Andric * All rights reserved. diff --git a/usr.bin/grep/grep.c b/usr.bin/grep/grep.c index cbf52a4df820..9f960f74dbb6 100644 --- a/usr.bin/grep/grep.c +++ b/usr.bin/grep/grep.c @@ -4,7 +4,7 @@ /*- * SPDX-License-Identifier: BSD-2-Clause * - * Copyright (c) 1999 James Howard and Dag-Erling Coïdan Smørgrav + * Copyright (c) 1999 James Howard and Dag-Erling Smørgrav * Copyright (C) 2008-2009 Gabor Kovesdan * All rights reserved. * diff --git a/usr.bin/grep/grep.h b/usr.bin/grep/grep.h index 02f612aecf1f..211fe1ae75c8 100644 --- a/usr.bin/grep/grep.h +++ b/usr.bin/grep/grep.h @@ -4,7 +4,7 @@ /*- * SPDX-License-Identifier: BSD-2-Clause * - * Copyright (c) 1999 James Howard and Dag-Erling Coïdan Smørgrav + * Copyright (c) 1999 James Howard and Dag-Erling Smørgrav * Copyright (c) 2008-2009 Gabor Kovesdan * All rights reserved. * diff --git a/usr.bin/grep/queue.c b/usr.bin/grep/queue.c index 3ef8a640b37d..6c4815992d0f 100644 --- a/usr.bin/grep/queue.c +++ b/usr.bin/grep/queue.c @@ -3,7 +3,7 @@ /*- * SPDX-License-Identifier: BSD-2-Clause * - * Copyright (c) 1999 James Howard and Dag-Erling Coïdan Smørgrav + * Copyright (c) 1999 James Howard and Dag-Erling Smørgrav * All rights reserved. * Copyright (c) 2020 Kyle Evans * diff --git a/usr.bin/grep/util.c b/usr.bin/grep/util.c index 68bfd504279e..1805cc74bfc6 100644 --- a/usr.bin/grep/util.c +++ b/usr.bin/grep/util.c @@ -4,7 +4,7 @@ /*- * SPDX-License-Identifier: BSD-2-Clause * - * Copyright (c) 1999 James Howard and Dag-Erling Coïdan Smørgrav + * Copyright (c) 1999 James Howard and Dag-Erling Smørgrav * Copyright (C) 2008-2010 Gabor Kovesdan * Copyright (C) 2017 Kyle Evans * All rights reserved. diff --git a/usr.bin/logins/logins.1 b/usr.bin/logins/logins.1 index bdd00ed96a03..2b6f27d71f1d 100644 --- a/usr.bin/logins/logins.1 +++ b/usr.bin/logins/logins.1 @@ -1,5 +1,5 @@ .\"- -.\" Copyright (c) 2004 Dag-Erling Coïdan Smørgrav +.\" Copyright (c) 2004 Dag-Erling Smørgrav .\" All rights reserved. .\" .\" Redistribution and use in source and binary forms, with or without diff --git a/usr.bin/logins/logins.c b/usr.bin/logins/logins.c index aef7eb7aba5b..683abf321547 100644 --- a/usr.bin/logins/logins.c +++ b/usr.bin/logins/logins.c @@ -1,7 +1,7 @@ /*- * SPDX-License-Identifier: BSD-3-Clause * - * Copyright (c) 2004 Dag-Erling Coïdan Smørgrav + * Copyright (c) 2004 Dag-Erling Smørgrav * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/usr.bin/sockstat/sockstat.1 b/usr.bin/sockstat/sockstat.1 index e6eb67c2e5a2..2e1b06688afa 100644 --- a/usr.bin/sockstat/sockstat.1 +++ b/usr.bin/sockstat/sockstat.1 @@ -1,5 +1,5 @@ .\"- -.\" Copyright (c) 1999 Dag-Erling Coïdan Smørgrav +.\" Copyright (c) 1999 Dag-Erling Smørgrav .\" All rights reserved. .\" .\" Redistribution and use in source and binary forms, with or without diff --git a/usr.bin/sockstat/sockstat.c b/usr.bin/sockstat/sockstat.c index 378fbbf0fef5..52c494f03045 100644 --- a/usr.bin/sockstat/sockstat.c +++ b/usr.bin/sockstat/sockstat.c @@ -1,7 +1,7 @@ /*- * SPDX-License-Identifier: BSD-2-Clause * - * Copyright (c) 2002 Dag-Erling Coïdan Smørgrav + * Copyright (c) 2002 Dag-Erling Smørgrav * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/usr.sbin/acpi/acpiconf/acpiconf.8 b/usr.sbin/acpi/acpiconf/acpiconf.8 index e337de5ad27c..24af8b5c8719 100644 --- a/usr.sbin/acpi/acpiconf/acpiconf.8 +++ b/usr.sbin/acpi/acpiconf/acpiconf.8 @@ -1,5 +1,5 @@ .\"- -.\" Copyright (c) 2000 Dag-Erling Coïdan Smørgrav +.\" Copyright (c) 2000 Dag-Erling Smørgrav .\" All rights reserved. .\" .\" Redistribution and use in source and binary forms, with or without diff --git a/usr.sbin/chkgrp/chkgrp.8 b/usr.sbin/chkgrp/chkgrp.8 index 20d4ee9a0349..3837e5fe6803 100644 --- a/usr.sbin/chkgrp/chkgrp.8 +++ b/usr.sbin/chkgrp/chkgrp.8 @@ -1,4 +1,4 @@ -.\" Copyright (c) 1998 Dag-Erling Coïdan Smørgrav +.\" Copyright (c) 1998 Dag-Erling Smørgrav .\" All rights reserved. .\" .\" Redistribution and use in source and binary forms, with or without diff --git a/usr.sbin/chkgrp/chkgrp.c b/usr.sbin/chkgrp/chkgrp.c index 650448d9e40b..69eff6e7574d 100644 --- a/usr.sbin/chkgrp/chkgrp.c +++ b/usr.sbin/chkgrp/chkgrp.c @@ -1,7 +1,7 @@ /*- * SPDX-License-Identifier: BSD-3-Clause * - * Copyright (c) 1998 Dag-Erling Coïdan Smørgrav + * Copyright (c) 1998 Dag-Erling Smørgrav * All rights reserved. * * Redistribution and use in source and binary forms, with or without diff --git a/usr.sbin/kldxref/kldxref.8 b/usr.sbin/kldxref/kldxref.8 index 4a06e62e7feb..0b141bb18a1c 100644 --- a/usr.sbin/kldxref/kldxref.8 +++ b/usr.sbin/kldxref/kldxref.8 @@ -1,6 +1,6 @@ .\"- .\" Copyright (c) 2001 Boris Popov -.\" Copyright (c) 2001 Dag-Erling Coïdan Smørgrav +.\" Copyright (c) 2001 Dag-Erling Smørgrav .\" All rights reserved. .\" .\" Redistribution and use in source and binary forms, with or without From nobody Thu Aug 17 13:29:31 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RRQpN1ZjGz4qgHv; Thu, 17 Aug 2023 13:29: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RRQpN0zs2z4jYG; Thu, 17 Aug 2023 13:29:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692278972; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=m7ePx43WafxkO2Zaizyxktaba5T/5g3cpsw33bJRaZg=; b=rZa5W0LD13DBoI44hSWxvoSmqHYd51Dk5/aVgHz80zr4Js0XzgZPBzlz/IMGfpuoVLBjp4 M7X0dpwPxoLVAjPTy0pHPBgKEFmNevXdOdcZ8qngzY3e2adaKiFd4zs+DPFR8gYrlPbW2G AN5Dyov6nnBbBX5n3tDvbXdnJgFmmRSmNj3VVxQprIsjro7uLcbJB3EBZ89nm9i5EQDszl wTMpnvbIyyto8dgQmFy0WPg0oSXkgaAPpzbO3USWbMDjK2NXTMMGpEhCk7IRBHiYmcWpE1 IiY7A8/uitl5O29pdpzQ4ooNfQ99xdTPtOGARofrJN4TTVq7IEdwasZ62+jiPA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692278972; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=m7ePx43WafxkO2Zaizyxktaba5T/5g3cpsw33bJRaZg=; b=MwqFmYqlHaYhT1WYvXmV1dBZStjbekHmMwgDpspB1w31M3x/k1El3DM+TxeiM/sBp2/mSa C1vU8wOTA/oEKFmuPfXFhPRGhd1iOC58MkQvkjfyEEz80nJO9H7MbfQ48wl8oQOo3eUTiq rp4/OPf80iX+971iAyjoGCmQI5Wpv3vU/dDy7r42VLGJuF57b8Y1VPmrmJ6XRYvB+pABqs 4wfoY5I9ffOVRKKq5TEGomI41ku5WrW+k4pbD/PoBd7ItF7QqSvLEUnfSInfkrAGzDmSIK XyKcfEIWo/7IAiHZ8qBMZJYnhNZ5TMkv0U2s+50Kyc7qx3xl9QbrSQKPuslKDg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692278972; a=rsa-sha256; cv=none; b=NZ1v1F0ZuYMTZur7tYNItf4nlmasHlaXebsqoAaSv4PaNbpfVpx5q0xTKBS4K+ShXVGS5v ZTmFeRhjUW2QVmuCvpaaWL6YPauBadsWhnLmavXT3+rvPYbCnZGEoBWdtrTSYuveG4KigU 25GYmd24U3/4GXa3qlIazJGDtQNtkg/gIzy02DlUmQ5F5sS7L30YSY6cQmr9Styy/JOa7c VNGueMCy0xdlNJQ9Af8fb+3iu6SAeaIqcGXqhCkBSd6fEHz9KG4UGFwwPW9moa5FJ2XOpq kJsGqIjypGr1VIRqlCc2nwkMkHLekao3Hw3cwVjrb+2VpCu8B5RTHFHw8/FqxA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RRQpN00fSzbk7; Thu, 17 Aug 2023 13:29:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37HDTVsX030652; Thu, 17 Aug 2023 13:29:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37HDTVsp030649; Thu, 17 Aug 2023 13:29:31 GMT (envelope-from git) Date: Thu, 17 Aug 2023 13:29:31 GMT Message-Id: <202308171329.37HDTVsp030649@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Corvin =?utf-8?Q?K=C3=B6hne?= Subject: git: 82eece443ee3 - stable/13 - bhyve: fix vCPU single-stepping on VMX List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: corvink X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 82eece443ee3eed9a04481e7127271985734ddff Auto-Submitted: auto-generated The branch stable/13 has been updated by corvink: URL: https://cgit.FreeBSD.org/src/commit/?id=82eece443ee3eed9a04481e7127271985734ddff commit 82eece443ee3eed9a04481e7127271985734ddff Author: Bojan Novković AuthorDate: 2023-05-09 07:02:04 +0000 Commit: Corvin Köhne CommitDate: 2023-08-17 13:06:29 +0000 bhyve: fix vCPU single-stepping on VMX This patch fixes virtual machine single stepping on VMX hosts. Currently, when using bhyve's gdb stub, each attempt at single-stepping a vCPU lands in a timer interrupt. The current single-stepping mechanism uses the Monitor Trap Flag feature to cause VMEXIT after a single instruction is executed. Unfortunately, the SDM states that MTF causes VMEXITs for the next instruction that gets executed, which is often not what the person using the debugger expects. [1] This patch adds a new VM capability that masks interrupts on a vCPU by blocking interrupt injection and modifies the gdb stub to use the newly added capability while single-stepping a vCPU. [1] Intel SDM 26.5.2 Vol. 3C Reviewed by: corvink, jbh MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D39949 (cherry picked from commit fefac543590db4e1461235b7c936f46026d0f318) --- sys/amd64/include/vmm.h | 1 + sys/amd64/vmm/intel/vmx.c | 7 +++++++ usr.sbin/bhyve/gdb.c | 5 +++++ 3 files changed, 13 insertions(+) diff --git a/sys/amd64/include/vmm.h b/sys/amd64/include/vmm.h index 29797ad04e0d..84b689dd7391 100644 --- a/sys/amd64/include/vmm.h +++ b/sys/amd64/include/vmm.h @@ -500,6 +500,7 @@ enum vm_cap_type { VM_CAP_RDPID, VM_CAP_RDTSCP, VM_CAP_IPI_EXIT, + VM_CAP_MASK_HWINTR, VM_CAP_MAX }; diff --git a/sys/amd64/vmm/intel/vmx.c b/sys/amd64/vmm/intel/vmx.c index 3a0693a29e80..9c2672c9ae23 100644 --- a/sys/amd64/vmm/intel/vmx.c +++ b/sys/amd64/vmm/intel/vmx.c @@ -1439,6 +1439,10 @@ vmx_inject_interrupts(struct vmx_vcpu *vcpu, struct vlapic *vlapic, uint64_t rflags, entryinfo; uint32_t gi, info; + if (vcpu->cap.set & (1 << VM_CAP_MASK_HWINTR)) { + return; + } + if (vcpu->state.nextrip != guestrip) { gi = vmcs_read(VMCS_GUEST_INTERRUPTIBILITY); if (gi & HWINTR_BLOCKING) { @@ -3634,6 +3638,9 @@ vmx_setcap(void *vcpui, int type, int val) vlapic = vm_lapic(vcpu->vcpu); vlapic->ipi_exit = val; break; + case VM_CAP_MASK_HWINTR: + retval = 0; + break; default: break; } diff --git a/usr.sbin/bhyve/gdb.c b/usr.sbin/bhyve/gdb.c index 6c1315a8371d..03f684e002ce 100644 --- a/usr.sbin/bhyve/gdb.c +++ b/usr.sbin/bhyve/gdb.c @@ -795,6 +795,9 @@ gdb_cpu_resume(int vcpu) if (vs->stepping) { error = vm_set_capability(ctx, vcpu, VM_CAP_MTRAP_EXIT, 1); assert(error == 0); + + error = vm_set_capability(ctx, vcpu, VM_CAP_MASK_HWINTR, 1); + assert(error == 0); } } @@ -845,6 +848,8 @@ gdb_cpu_mtrap(int vcpu) vs->stepping = false; vs->stepped = true; vm_set_capability(ctx, vcpu, VM_CAP_MTRAP_EXIT, 0); + vm_set_capability(ctx, vcpu, VM_CAP_MASK_HWINTR, 0); + while (vs->stepped) { if (stopped_vcpu == -1) { debug("$vCPU %d reporting step\n", vcpu); From nobody Thu Aug 17 13:29:33 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RRQpP2fwJz4qgHx; Thu, 17 Aug 2023 13:29: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RRQpP20Qvz4jYW; Thu, 17 Aug 2023 13:29:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692278973; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=eW4keyDRKKjDpuvBQrnfYv0dJsUgLOsS18lyN37WS/4=; b=Fw3jocyS5zVMhYbLI94ZZKLHEpBWJPiIZBQDEaPXAHSx66yHFGwQCwaZtK1m47V447NKhy 8L61nqQGtGOQMI1iWVFdchNe97Rty76VZJpqvmc5rTLY571BkQRPE5sKUHS5VqLJVPWVja 3NZGxENQ5hlboCZs247m5IFe92TzOqU5gcwvcJvThSMOXjTy2lU0ZJGoTZ/bqJxO/X3Z9R HZcreNiKlYK7KGtiJzREm6JXDeT3xZX6DwgFHY72BtUAxGh7sQrTe16IwBRDxUf1+xJuSa zLRyzP7JX/pPofYHOwiLFEMYldpyh2/9YdRCFzZXAgm0hR12//rZ2QDuaPAFlA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692278973; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=eW4keyDRKKjDpuvBQrnfYv0dJsUgLOsS18lyN37WS/4=; b=O80N2d7h+LyBGVyHhMjsjqDgfMcLKhVjI6nqH8D/nyElpn+zMsN3jw09pS8xHBOc9WQGgJ X/9AnXgrRgRvbYAbYlFWdVEDFzgjN4wTVBGOxRdvOIlddKGpjqcKAlU3VDSsjB9MazIR/y dTN8qhq4Nie5105F2gy/mxnulZo69C7MkzGfFj0FEVhgVHM/9Cs3hDPM9j4E7+f1k7QBRs zLZH3qRjeKuiuRi6CSNh8QUVn00RsrQPnqCNt67pkT9nOh0atObTSdZaQPBZuVDX41OvaE y69n2xdCkpfq2lEnvSHYXKRKOAajEWeGM3YJKD+LMEVzxC7nyplbkiRFKleP9g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692278973; a=rsa-sha256; cv=none; b=k7zKSAshjkqXJYJOuBbqyooorphdF/iB6JMb0ycSUoBZBbGlP5PQw/5gevOBt4p1i5gUWr LJFCM8YMqN2zV/PdvoBvSc92Cgl6fY/+9+00+Dm9KCHoEJ3sqF2aJysOtmKT29pPWg3lIG 3jYvN7oGz5vjw3QLbXmwzN7EFmk8QPtd954fzTmdmXwE5clcXLNuQbtGMfUjM+d4irvto9 qsn7TmxOsn9eLdrVVDmahekVbcpbrE3hfdeD7GcxxfLGNKFxZBX6kEIM5JKwWD7kMKXVhm nDi/BG3Ih4C31vvDWzAMhwnA7x9959BYeJRddeRp74HneAFcXV23KeqN9z0AMg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RRQpP0ylyzZyh; Thu, 17 Aug 2023 13:29:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37HDTXl8030713; Thu, 17 Aug 2023 13:29:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37HDTXQJ030710; Thu, 17 Aug 2023 13:29:33 GMT (envelope-from git) Date: Thu, 17 Aug 2023 13:29:33 GMT Message-Id: <202308171329.37HDTXQJ030710@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Corvin =?utf-8?Q?K=C3=B6hne?= Subject: git: 320ce3c3c56b - stable/13 - bhyve: Remove vestigial support for setting max vCPUs. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: corvink X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 320ce3c3c56bb0b52236d67c995a9d669e7a5bd2 Auto-Submitted: auto-generated The branch stable/13 has been updated by corvink: URL: https://cgit.FreeBSD.org/src/commit/?id=320ce3c3c56bb0b52236d67c995a9d669e7a5bd2 commit 320ce3c3c56bb0b52236d67c995a9d669e7a5bd2 Author: John Baldwin AuthorDate: 2023-06-12 10:47:35 +0000 Commit: Corvin Köhne CommitDate: 2023-08-17 13:06:51 +0000 bhyve: Remove vestigial support for setting max vCPUs. The kernel part of the hypervisor is not going to support per-VM maxcpu limits. The topology is only used to control the values returned by CPUID leaves for which max vCPUs is not relevant. Reviewed by: corvink, markj MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D37176 (cherry picked from commit bb1770105022e7d65bef0f32988c08ee9676b68e) --- usr.sbin/bhyve/bhyverun.c | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/usr.sbin/bhyve/bhyverun.c b/usr.sbin/bhyve/bhyverun.c index 14a4eb9cabec..63ca9439d6e6 100644 --- a/usr.sbin/bhyve/bhyverun.c +++ b/usr.sbin/bhyve/bhyverun.c @@ -293,10 +293,6 @@ topology_parse(const char *opt) set_config_value("cores", cp + strlen("cores=")); else if (strncmp(cp, "threads=", strlen("threads=")) == 0) set_config_value("threads", cp + strlen("threads=")); -#ifdef notyet /* Do not expose this until vmm.ko implements it */ - else if (strncmp(cp, "maxcpus=", strlen("maxcpus=")) == 0) - set_config_value("maxcpus", cp + strlen("maxcpus=")); -#endif else if (strchr(cp, '=') != NULL) goto out; else @@ -1136,8 +1132,7 @@ do_open(const char *vmname) exit(4); } } - error = vm_set_topology(ctx, cpu_sockets, cpu_cores, cpu_threads, - 0 /* maxcpus, unimplemented */); + error = vm_set_topology(ctx, cpu_sockets, cpu_cores, cpu_threads, 0); if (error) errx(EX_OSERR, "vm_set_topology"); return (ctx); From nobody Thu Aug 17 13:29:34 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RRQpQ3ZNPz4qgFQ; Thu, 17 Aug 2023 13:29:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RRQpQ2tFHz4jvT; Thu, 17 Aug 2023 13:29:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692278974; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=D4l6eSc8+JPUi5CGDCCUqk1n1j+sFkqULVc9IrLLBQI=; b=ks02CuX9Dh00fynGCwlA+whHEMRl9uFYeOKzwO5rm3+xEGa7GJbQB2goOS+gn9f5U2OEu3 Qlg/iKH9NxvLvgnGWFCakbgoXxyA2BQ1s+YSj8QZJkd7HGWWWIFjygmZ8qmNNRALdSLknz g4qAYiq0gpduCXaZD03pUju3rbYi0drJ0x2jUHgkMts9asb2hT1gLO6GtXLUCRPpjt4QD/ b2PbtnNsA7GhxC5zOOP92dbFYs/exMsJesMEjqBhu/XPuWt8MQebqLfUBD0xgwo3knop8t 5G5BuvCdTykSj4plxFCw1vskMB8YGCY8WrZQ2I7/7NGZfUtOLReda7TaNKlybQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692278974; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=D4l6eSc8+JPUi5CGDCCUqk1n1j+sFkqULVc9IrLLBQI=; b=tgpvyZmqFu9ClvkPMdI8F3zWlMH7l9mg+TXZwymKY4M38TsRQ0UD8paMkMbCIX/f9tw14N sbPdBvZJ0KS5Jb2exkJ2HAuYkRms60VdsNcMcBugPYvlNIdoHJK0yFiyj9H923PAKQL4LA Uaz7SuG8G2WBxg/TJJ1ccuGMjssDHxwZQR7Tvme/juFyxgXV8/xgxqTUbbV8XkHvFn6KVY KGrbXeUYDZ37k5Ay1zVfRiyvN3c+pcPBB5/C3el/oUwyP0fg2p+zIpKC/5YctGeaywG7zO 1yGy1gJm+bUYcPiJSzRiDSnrAOkMdfqpspZV44Ss6oCE3epbOuFudI1q28mf7g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692278974; a=rsa-sha256; cv=none; b=oquY3yGSaVJPMrAzTkI9OtlNF5vaz29GWsl3i/a6YIEphBG5GlkvsVNX6Z9RMZ8tdUMPA6 cOjjBWoaNapnkLzPT9dRdzfhHsqW4FkSq4PGQzoaBN00VFza8JdRnAgvZmsjsUSnz/7+8p x2n2hY54GKyGi6C5cfhR0GMF51aU1LiSlXdJOEITjjkSTV8muETXQyfeWHPkW9YeIztoYj u1pJw4bvvOx8WEklIyXiVbEr2Za7hVaVvUa/uhHni5U9h7ji7i1SBUkeuPrBvK4pXM7j+H Q6ogv/Hfj7zfCWVRiKurX+SsbUIkuY1IOphPebkKLQXcRxAuYOgFm4ySQUNeZw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RRQpQ1yfnzbsQ; Thu, 17 Aug 2023 13:29:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37HDTYKN030754; Thu, 17 Aug 2023 13:29:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37HDTYAI030751; Thu, 17 Aug 2023 13:29:34 GMT (envelope-from git) Date: Thu, 17 Aug 2023 13:29:34 GMT Message-Id: <202308171329.37HDTYAI030751@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Corvin =?utf-8?Q?K=C3=B6hne?= Subject: git: 1fb7c59981bc - stable/13 - linuxkpi: advance platform_device List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: corvink X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 1fb7c59981bc5d4c522521df067caaaa85c42cdb Auto-Submitted: auto-generated The branch stable/13 has been updated by corvink: URL: https://cgit.FreeBSD.org/src/commit/?id=1fb7c59981bc5d4c522521df067caaaa85c42cdb commit 1fb7c59981bc5d4c522521df067caaaa85c42cdb Author: Corvin Köhne AuthorDate: 2023-01-31 08:18:38 +0000 Commit: Corvin Köhne CommitDate: 2023-08-17 13:06:53 +0000 linuxkpi: advance platform_device These are required by some linux driver like: https://github.com/beckhoff/bbapi Reviewed by: manu MFC after: 1 week Sponsored by: Beckhoff Automation GmbH & Co. KG Differential Revision: https://reviews.freebsd.org/D39554 (cherry picked from commit 740d76544ad8a59f1be53584a0aa5bbbe00833ee) --- sys/compat/linuxkpi/common/include/linux/platform_device.h | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/sys/compat/linuxkpi/common/include/linux/platform_device.h b/sys/compat/linuxkpi/common/include/linux/platform_device.h index f45cdce829c4..0d7aebfa4037 100644 --- a/sys/compat/linuxkpi/common/include/linux/platform_device.h +++ b/sys/compat/linuxkpi/common/include/linux/platform_device.h @@ -34,6 +34,9 @@ #include struct platform_device { + const char *name; + int id; + bool id_auto; struct device dev; }; @@ -78,6 +81,13 @@ platform_driver_unregister(struct platform_driver *pdrv) return; } +static __inline int +platform_device_register(struct platform_device *pdev) +{ + pr_debug("%s: TODO\n", __func__); + return (0); +} + static __inline void platform_device_unregister(struct platform_device *pdev) { From nobody Thu Aug 17 13:49:10 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RRRF24br6z4qhH1; Thu, 17 Aug 2023 13:49: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RRRF23swMz4lN6; Thu, 17 Aug 2023 13:49:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692280150; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rqKx0S6wZU8L/mUTx+xjKKnAr1nj2sZg066hre6/lEA=; b=MrKBlCA4jjBH4UJWsp4vI7qHLw5ose72QCZ8QFStAwsVYng9fh2s6lkBPRQFHU+a0ClwLQ EWaBuMnrgt4N/sFDvpicqh36lm8QgFLJhvS9m1S4XBcYLhFRbngQbi62VYuSVe2PS/IAV8 D4NHbKgilmKNji+KY5ImGRpBtaPBXZdMpz0+4dWxSzcbph97UVg9/+E39Nr8wkwSaViQau dj7J3gXlcoAU7DmGGgHgna9Zuy6XwNWdkEztH/T5XuSYBLI5OTPuJ0wc09wPphMiYatdLq HkYRQsE82oQpr8LwPnlo17eKTB0ffN2syqNYLy7ki3b13RWGTtS0fO79hY/+kw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692280150; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=rqKx0S6wZU8L/mUTx+xjKKnAr1nj2sZg066hre6/lEA=; b=Yo3hyl4Mw74z1UHB/RyN4mPZNDS4F47tTVKCM1jPu+JVnA0cBu/rxd3x/MFNkxYNWgy9DX OTBJme9K6DU5zJzuQ5VO3dDzoE3SaH3rWMuJRLg/wMjvll0EHX34jpL4QViClKlcDGv5pd whDaGx4w2FwomlRC3PRIPLd7IS/I0M0RhedmDS+ciA0OEALmGUSCQqSjOI4j5Q4snD1V9P 9oNkX+PELFcRoKExARX4isk+Ft4v8B5K8RCzIimaQ2b7tCvTpB9mXqsq5aq6z5Xy5odugV 5kEMCg7/2rZIWEEWFx7/YIuqwerdkky3qJohxF5yzamZ8iLyU9dvH4qMozCqJA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692280150; a=rsa-sha256; cv=none; b=KQOnidhlu62HFE9Lmy2ApFkIRscuO8+BzlmmLDLva5RAfaeTJlRsyPLb+SDWjtTE+Bn5+R 8Xne6pyK6abDr+sUkokDpU1BFQtlZc0l62OOz6GQGNDx9ImQk6FzxEYhHTJvYVv0Ru53z7 ailouzT+Y/OuKY3lW/IcDbgPfylG8r9IwydvWb9sUBOlkxgOd5qf2V/ZkU7hbMW64hZBis 6wCd9nBih5nvywbQg2RXcIlWEL3Kl4trMD8N1MMYuZWkaAk82J9sQUEsYALKvHltQiK7Kg rh/C0EpsssPOLxBFmqLCzmAGW0CQsR1oWWNS4LfuFeuzy7j5XPUVEnORr3yn+w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RRRF22dq4zblm; Thu, 17 Aug 2023 13:49:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37HDnAKB063887; Thu, 17 Aug 2023 13:49:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37HDnAq7063884; Thu, 17 Aug 2023 13:49:10 GMT (envelope-from git) Date: Thu, 17 Aug 2023 13:49:10 GMT Message-Id: <202308171349.37HDnAq7063884@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= Subject: git: a4aaee2120ce - main - forkpty: Avoid fd leak if fork() fails. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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/main X-Git-Reftype: branch X-Git-Commit: a4aaee2120ce0a121f86e39e214c2fabe82f2762 Auto-Submitted: auto-generated The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=a4aaee2120ce0a121f86e39e214c2fabe82f2762 commit a4aaee2120ce0a121f86e39e214c2fabe82f2762 Author: Dag-Erling Smørgrav AuthorDate: 2023-08-17 13:48:42 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2023-08-17 13:48:42 +0000 forkpty: Avoid fd leak if fork() fails. MFC after: 1 week Sponsored by: Klara, Inc. Reviewed by: allanjude Differential Revision: https://reviews.freebsd.org/D41491 --- lib/libutil/pty.c | 1 + lib/libutil/tests/Makefile | 1 + lib/libutil/tests/forkpty_test.c | 58 ++++++++++++++++++++++++++++++++++++++++ 3 files changed, 60 insertions(+) diff --git a/lib/libutil/pty.c b/lib/libutil/pty.c index f52407608e9a..e5b42a666c7f 100644 --- a/lib/libutil/pty.c +++ b/lib/libutil/pty.c @@ -95,6 +95,7 @@ forkpty(int *amaster, char *name, struct termios *termp, struct winsize *winp) return (-1); switch (pid = fork()) { case -1: + (void)close(master); (void)close(slave); return (-1); case 0: diff --git a/lib/libutil/tests/Makefile b/lib/libutil/tests/Makefile index 0c67747aeb3f..d29045d78a10 100644 --- a/lib/libutil/tests/Makefile +++ b/lib/libutil/tests/Makefile @@ -7,6 +7,7 @@ TAP_TESTS_C+= trimdomain_test TAP_TESTS_C+= trimdomain-nodomain_test ATF_TESTS_C+= cpuset_test ATF_TESTS_C+= expand_number_test +ATF_TESTS_C+= forkpty_test WARNS?= 2 LIBADD+= util diff --git a/lib/libutil/tests/forkpty_test.c b/lib/libutil/tests/forkpty_test.c new file mode 100644 index 000000000000..3e54cf310150 --- /dev/null +++ b/lib/libutil/tests/forkpty_test.c @@ -0,0 +1,58 @@ +/*- + * Copyright (c) 2023 Klara, Inc. + * + * SPDX-License-Identifier: BSD-2-Clause + */ + +#include +#include + +#include +#include +#include + +#include + +ATF_TC(forkfail); +ATF_TC_HEAD(forkfail, tc) +{ + atf_tc_set_md_var(tc, "descr", "Check for fd leak when fork() fails"); + atf_tc_set_md_var(tc, "require.user", "unprivileged"); +} + +ATF_TC_BODY(forkfail, tc) +{ + struct rlimit orl, nrl; + pid_t pid; + int prevfd, fd, pty; + + /* set process limit to 1 so fork() will fail */ + ATF_REQUIRE_EQ(0, getrlimit(RLIMIT_NPROC, &orl)); + nrl = orl; + nrl.rlim_cur = 1; + ATF_REQUIRE_EQ(0, setrlimit(RLIMIT_NPROC, &nrl)); + /* check first free fd */ + ATF_REQUIRE((fd = dup(0)) > 0); + ATF_REQUIRE_EQ(0, close(fd)); + /* attempt forkpty() */ + pid = forkpty(&pty, NULL, NULL, NULL); + if (pid == 0) { + /* child - fork() unexpectedly succeeded */ + _exit(0); + } + ATF_CHECK_ERRNO(EAGAIN, pid < 0); + if (pid > 0) { + /* parent - fork() unexpectedly succeeded */ + (void)waitpid(pid, NULL, 0); + } + /* check that first free fd hasn't changed */ + prevfd = fd; + ATF_REQUIRE((fd = dup(0)) > 0); + ATF_CHECK_EQ(prevfd, fd); +} + +ATF_TP_ADD_TCS(tp) +{ + ATF_TP_ADD_TC(tp, forkfail); + return (atf_no_error()); +} From nobody Thu Aug 17 14:07:30 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RRRfB4mhtz4qhy6; Thu, 17 Aug 2023 14:07: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RRRfB4GJJz4mj8; Thu, 17 Aug 2023 14:07:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692281250; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qXp4KN7qg6duBg5nf+VSqN14PHHq3MNkjfbwPLZUnXk=; b=HSqokwdMzdHLPKir5lSPV+/LyUCXX9clO8KTzEAWClHiys92KHVDo6NFUInC5lE3Ayi0o2 mh/qPZDKSFgidn7EkMVwnkN5oeW/jj05DIlRvNwrzGPRsTNO1gGRQ5+3v7zqk6/4OaT7IN YTmr/NqdsiwEbEp0xa5l6Pn6gtfYRnuy8mPgYXtTy8igXdoHkX2gZ/kU3NnjMg1uVMnfS9 bsm1u/oX41ypn6QWdx681pWczCk54qRDq5qJdqc/keFWc4DxglRG5M5/5WFcTBBEI4T4OC JDypnEYjGw3mQy5DEZHsWbRk+j9n3n9cAjAH+l76LgsJrzcwLN7n33r7bIlfqw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692281250; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=qXp4KN7qg6duBg5nf+VSqN14PHHq3MNkjfbwPLZUnXk=; b=IUYjhIAX9iFY01J2n1kud5LdMwRlg56uPhto036VzAiQOFJKSzZRK/jlZY2nQzYFXR9B1K P5FfVcQQ2kOped95ugDcTNO5nYsDIDa58XVbSMJ1AA2JKd4hRwbQ7zKWWmKSo32b3DLq0T J4wqB4FUu1f4h0wR2gLPwVTBDyg9oWg6m3uW05sPBrIcVHpvzWQjiBf4mNZG14Xn3zwkGV DkZ1HM9zZiISHSN9JzYh3f1JsYx7fPdLrOzbYbnVGoDqz0Vk7SqKx4tgHPGc/HqybqMWjo R3SbAAj+myBDITiM7YEbYZYVTZeS6UndJ/LcIfhYaPkMgpINLAidQQwlS1bnQw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692281250; a=rsa-sha256; cv=none; b=pXD+RqAWpX78a+L/VESY20lKFWcfvWaUQB596qrb1p4iZOAO8PFV38znYP862g+HfXG3EE d0HIpTg7Rzp6UAAojPKadJO0XX9hWwSSX/u6F6EOKFCfNBvjVPra0ww0qM0zb6eJxildSz Gf4NmgHXcAV16y2b5W56ZHc9gbeIaj12kJKUuTZAzETlhiwIRm5VxDQxv66eGp4G/Wyra5 5fFJrTxb21nH7or4rf+5Oh9+r8XcPweoL2MGjN/iwV2eh+H1+qCyav3jO/K/8kV3Ko8CvH 1ShpHuVmNnv4fcrFPNlbvu0cdL53421UBgVfdO2D2P8MhbYcAEGddKR6xK6vaw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RRRfB3K4Vzclw; Thu, 17 Aug 2023 14:07:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37HE7U98097159; Thu, 17 Aug 2023 14:07:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37HE7Uil097156; Thu, 17 Aug 2023 14:07:30 GMT (envelope-from git) Date: Thu, 17 Aug 2023 14:07:30 GMT Message-Id: <202308171407.37HE7Uil097156@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: 044dfb356bb6 - stable/13 - msi: report error for attempt to use APIC ID > 255 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 044dfb356bb6481af4de4ed0f7ef04c3b638bf71 Auto-Submitted: auto-generated The branch stable/13 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=044dfb356bb6481af4de4ed0f7ef04c3b638bf71 commit 044dfb356bb6481af4de4ed0f7ef04c3b638bf71 Author: Ed Maste AuthorDate: 2023-08-08 23:42:09 +0000 Commit: Ed Maste CommitDate: 2023-08-17 14:06:39 +0000 msi: report error for attempt to use APIC ID > 255 The MSI/MSI-X address includes 8 bits to encode the Destination ID. Previously IDs over 255 overlapped with the fixed portion of the address, resulting in an invalid value (and a nonfunctional interrupt). Instead, print an error message and return EINVAL. The interrupt will still not work, but the user will have a clue as to why. PR: 273022 Reviewed by: jhb Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D41395 (cherry picked from commit cbf845052f1c2862a64e66dbaf38e887a7592474) --- sys/x86/x86/msi.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/sys/x86/x86/msi.c b/sys/x86/x86/msi.c index f85d4a5161e5..de8f42c0fa68 100644 --- a/sys/x86/x86/msi.c +++ b/sys/x86/x86/msi.c @@ -620,6 +620,11 @@ msi_map(int irq, uint64_t *addr, uint32_t *data) mtx_unlock(&msi_lock); error = EOPNOTSUPP; #endif + if (error == EOPNOTSUPP && msi->msi_cpu > 0xff) { + printf("%s: unsupported destination APIC ID %u\n", __func__, + msi->msi_cpu); + error = EINVAL; + } if (error == EOPNOTSUPP) { *addr = INTEL_ADDR(msi); *data = INTEL_DATA(msi); From nobody Thu Aug 17 17:32:54 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RRXCB2yTJz4mS9b; Thu, 17 Aug 2023 17:32: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RRXCB2LkGz3HvM; Thu, 17 Aug 2023 17:32:54 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692293574; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=01RXmHUGwRhS6HmbSYRlGv7e6U3p3TojwGSgqyBsLrs=; b=bFM8ugx0dqj6kt4xM80/v1zE7dsIBfy8S1JUX4TK3fVaU55IUJA1QN8iAszavMVbRYY784 oszs8K4/V8IXo67OGbtKzTseOaMwTvJWGMGXAz2FjO/O10YfFSA8vT/odCDu4xECa4KpkL Mjg0pi/67fEhRcr7VDSIkFJ8gyYF+lvX5UaO8+jwD6ubHjInHvJ7RMHXYA8spzYSK3m3ft ZK36TGw8YgltjMqa6MFTa+lbGb6pXZkfajhOZ+RXVzsA8T4ENrrneiaS2F0UKwmCR98bxQ 4rmNKsApBBQbMi4GeSNdbh2Wm5De2n8JvAFQQfWfI04rOqoAoWayvn2h59lgNQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692293574; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=01RXmHUGwRhS6HmbSYRlGv7e6U3p3TojwGSgqyBsLrs=; b=B+T9GZ4GxpTtyq1YXMsbEMjBo8Fuo2eBVB+wGhm/3Z09oiOSvNmsOz6c4L9xmvIF9KWz7z mdkye6sp3nHVNmfY6uOdM5BaGTKY+R6ALVPf+uZDc8bpILK0maZSMqGW8DjkP5KPoOyrx2 RxKnKfp9B+PCXDudgYdyTeZePO4QiymX07ut/Hu1Sul5GTaf6m2r7NynNWQ+5feLgoyLgX i3s8s5SLo2MDY+wK/3GM8J+zDEWCzruvk9yt/lm68fGjVmrkDw5BBqV20k+R0vJ36t9vYl bfr8ae2pknqtdjbkFN9NdGSx/pxSGDZcn7IbLFavmKodCMxikkVpc22HbKJLNQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692293574; a=rsa-sha256; cv=none; b=XCTOxstW+46IctAPzYEVcOuc7Cag/HtYsQ+3SfEPHkiLscTRhW0N+LM/N/O5MKE5q0pOiR itw9WLmRHe6hQxvMWaFFTg677AbOD8YCaIRvgoXzLsKDePy4fbbaUUK/P4ATtk83NDTsL3 Nfx9Is0WKEOW6PZk8SeVG4X7FNtxRbzCQsGd7YOnN0iYMDsNd96AWhEQtkcNpkF+sNKseU lck4mdbRg4hAN/w5Hfl7hsCPJe9rLWvuDc029eNBt3VVLL7+yeAbzQ+2ACHRzlHO3xtZm7 adNKbSNfB75KJfwszRoqyjK9wya0dREpZMos/X7e03+LuDXChbxxOgGXoKdPGQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RRXCB1Nm9zjXy; Thu, 17 Aug 2023 17:32:54 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37HHWsbl045592; Thu, 17 Aug 2023 17:32:54 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37HHWsO9045590; Thu, 17 Aug 2023 17:32:54 GMT (envelope-from git) Date: Thu, 17 Aug 2023 17:32:54 GMT Message-Id: <202308171732.37HHWsO9045590@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: 5f72ceb2c50d - main - Cirrus-CI: for *-gcc12, build world with make -s List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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/main X-Git-Reftype: branch X-Git-Commit: 5f72ceb2c50d4fa316d26c51849baa200a38c1d8 Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=5f72ceb2c50d4fa316d26c51849baa200a38c1d8 commit 5f72ceb2c50d4fa316d26c51849baa200a38c1d8 Author: Ed Maste AuthorDate: 2023-08-16 23:34:24 +0000 Commit: Ed Maste CommitDate: 2023-08-17 17:23:15 +0000 Cirrus-CI: for *-gcc12, build world with make -s Cirrus-CI appears to have a 100MB limit for log output. Use `make -s` to attempt to reduce the amount of output. Sponsored by: The FreeBSD Foundation --- .cirrus.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.cirrus.yml b/.cirrus.yml index 5b033160b23b..40ee22425884 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -52,6 +52,7 @@ task: TARGET_ARCH: amd64 TOOLCHAIN: amd64-gcc12 TOOLCHAIN_PKG: ${TOOLCHAIN} + EXTRA_MAKE_FLAGS: -s - name: aarch64-gcc12 World and kernel build and boot smoke test (manual) only_if: $CIRRUS_REPO_FULL_NAME != 'freebsd/freebsd-src' trigger_type: manual @@ -60,6 +61,7 @@ task: TARGET_ARCH: aarch64 TOOLCHAIN: aarch64-gcc12 TOOLCHAIN_PKG: ${TOOLCHAIN} + EXTRA_MAKE_FLAGS: -s - name: amd64-gcc12 World and kernel build and boot smoke test (FreeBSD repo) only_if: $CIRRUS_REPO_FULL_NAME == 'freebsd/freebsd-src' trigger_type: manual @@ -68,6 +70,7 @@ task: TARGET_ARCH: amd64 TOOLCHAIN: amd64-gcc12 TOOLCHAIN_PKG: ${TOOLCHAIN} + EXTRA_MAKE_FLAGS: -s timeout_in: 120m install_script: - sh .cirrus-ci/pkg-install.sh ${TOOLCHAIN_PKG} git-lite @@ -82,7 +85,7 @@ task: - chown user:user /usr/obj/$(pwd -P) build_world_script: - - su user -c "make -j$(sysctl -n hw.ncpu) CROSS_TOOLCHAIN=${TOOLCHAIN} WITHOUT_TOOLCHAIN=yes buildworld" + - su user -c "make -j$(sysctl -n hw.ncpu) ${EXTRA_MAKE_FLAGS} CROSS_TOOLCHAIN=${TOOLCHAIN} WITHOUT_TOOLCHAIN=yes buildworld" build_kernel_script: - su user -c "make -j$(sysctl -n hw.ncpu) CROSS_TOOLCHAIN=${TOOLCHAIN} WITHOUT_TOOLCHAIN=yes buildkernel" From nobody Thu Aug 17 17:35:39 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RRXGN240Vz4mS9r; Thu, 17 Aug 2023 17:35:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RRXGN11jrz3JZc; Thu, 17 Aug 2023 17:35:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692293740; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MpCrGXcIRLXkT2/mW/k7NGVM7YcCLVNhNWhJq0sCDIU=; b=sTJAeCZKOFDR7pllb+ptNHWnS6VebQ/c3+iMCECPIARcSm5TQ1+gY13FG5MLLrHu6/J9WV hPnJ0kiKi0ry7z7PJN/28zcRDyzavmcTVvL3Yu9vYoY6GEGmorp85iwDOx86tT1kKR/95I ymPMh3tX1D6U0+dVNiAq409SHsSia/MUD33b+OzzAIDDbrla1IhyLTgQE3BXIrRDu9JyM1 ebKfR7MIyMMLdqETVD4mXO+bvUOg0Xo5puIwo0LaRAkeM0MUVlEkmK749aF5e+TIYdr4H6 UxxcsnYKrWrG3kZBM0hmCHkxQcjuuAiiuBLUzgCJGfBwLdFy8put9mDIoLwhMQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692293740; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MpCrGXcIRLXkT2/mW/k7NGVM7YcCLVNhNWhJq0sCDIU=; b=VktYWoMTSnianoGEvyMH0UDykwyxagKJAw2PutTJlrCrzEBsI0PzA1K27zyEDPYt0CYVJC 7q3XguKrTmC7hbbb76RfkRhp9M4HkZjOESeOJuyiRVC9iZW0Ip73ZV2ppuH9Ap0SeXDmpm VWR/lp8a/Xi1P+M5fti/vbGCMRGVjBPNKV/DSQ1YkhSocJt+tF2vzd6jLZcb8iFZGJVjqd jt37gxImayZpr2LJUbt2BH+W9zXrsuu9LAtqppWmrEWZffzhEdM7rf/twvdImsRlvs7RHO r9hq2ns0Cf6Vz8g7slRol2L+j0+jXxlePy7SWJoC6RBBwiI4y/Br7GC67DZgGg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692293740; a=rsa-sha256; cv=none; b=XC9al57qSS8ByGtHsSZa/9n0yAQByuiLqxDt+8j6sWeJ7Gc/P+AJgxb7BtCj8sAg8xUKbb TDVB1i7cWhzEVGcVvMlFWTreUWJG+PIcFN1pMVqDRCOufa6T/LHWNEN8ITllamM2DV02MR TlrfATrVgxnLJyi8juLVQYO0AdGIiAVlUsnDKGVyOEjKa+ql3ynWo427hdoRUGR40fYcr4 JhDEm6jKQdA8sU9dBH6oyoNEIr+S88byQxLkvQ7MXKDzFegXefMyTmXiOFpQmx6AAU3rU5 l7m6a5UOYYSSmiik85H7u2O0KXK/5nliHtLPb+NoyfaWKXUmRCo23CTB+KgQlQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RRXGN05hnzjMm; Thu, 17 Aug 2023 17:35:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37HHZdG8046156; Thu, 17 Aug 2023 17:35:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37HHZdbH046154; Thu, 17 Aug 2023 17:35:39 GMT (envelope-from git) Date: Thu, 17 Aug 2023 17:35:39 GMT Message-Id: <202308171735.37HHZdbH046154@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: 4722ceb7d53e - main - Use 115200 bps by default for serial communication List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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/main X-Git-Reftype: branch X-Git-Commit: 4722ceb7d53e76507c76e053caab6b6f7b24ecef Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=4722ceb7d53e76507c76e053caab6b6f7b24ecef commit 4722ceb7d53e76507c76e053caab6b6f7b24ecef Author: Ed Maste AuthorDate: 2023-08-17 17:14:52 +0000 Commit: Ed Maste CommitDate: 2023-08-17 17:31:38 +0000 Use 115200 bps by default for serial communication 9600 was a standard baud rate decades ago, but 115200 is now more common so choose defaults that are useful to the largest number of users. Note that boot0sio does not support rates above 9600 so it remains unchanged. Reviewed by: bz, imp, manu Relnotes: Yes Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D36295 --- UPDATING | 12 ++++++++++++ libexec/rc/rc.d/serial | 6 +++--- sbin/init/ttys | 4 ++-- sbin/reboot/boot_i386.8 | 2 +- share/examples/etc/make.conf | 5 ++--- share/man/man4/dcons.4 | 2 +- share/man/man5/remote.5 | 2 +- stand/defaults/loader.conf | 2 +- stand/defaults/loader.conf.5 | 2 +- stand/i386/boot2/Makefile | 2 +- stand/i386/btx/btx/Makefile | 2 +- stand/i386/gptboot/Makefile | 2 +- stand/i386/gptzfsboot/Makefile | 2 +- stand/i386/isoboot/Makefile | 2 +- stand/i386/libi386/Makefile | 2 +- stand/i386/libi386/comconsole.c | 2 +- stand/i386/zfsboot/Makefile | 2 +- stand/man/loader_simp.8 | 2 +- sys/dev/usb/serial/usb_serial.c | 2 +- tools/tools/nanobsd/rescue/Files/etc/ttys | 8 ++++---- 20 files changed, 38 insertions(+), 27 deletions(-) diff --git a/UPDATING b/UPDATING index c05670e14f7c..705ca6431a32 100644 --- a/UPDATING +++ b/UPDATING @@ -27,6 +27,18 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 14.x IS SLOW: world, or to merely disable the most expensive debugging functionality at runtime, run "ln -s 'abort:false,junk:false' /etc/malloc.conf".) +20230817: + Serial communication (in boot loaders, kernel, and userland) has + been changed to default to 115200 bps, in line with common industry + practice and typcial firmware serial console redirection + configuration. + + Note that the early x86 BIOS bootloader (i.e., boot0sio) does not + support rates above 9600 bps and is not chagned. boot0sio users may + set BOOT_COMCONSOLE_SPEED=9600 to use 9600 for all of the boot + components, or use the standard boot0 and have the boot2 stage start + with the serial port at 115200. + 20230807: Following the general removal of MIPS support, the ath(4) AHB bus- frontend has been removed, too, and building of the PCI support is diff --git a/libexec/rc/rc.d/serial b/libexec/rc/rc.d/serial index 43162452b4e1..ea60c8aa77da 100755 --- a/libexec/rc/rc.d/serial +++ b/libexec/rc/rc.d/serial @@ -35,7 +35,7 @@ # dtrwait 300 drainwait `sysctl -n kern.drainwait` # initial cflag from = cread cs8 hupcl # initial iflag, lflag and oflag all 0 -# speed 9600 +# speed 115200 # special chars from # nothing locked # except for serial consoles the initial iflag, lflag and oflag are from @@ -50,9 +50,9 @@ default() { for i in $* do comcontrol /dev/tty${dc}${i} dtrwait 300 drainwait $drainwait - stty < /dev/tty${dc}${i}.init -clocal crtscts hupcl 9600 reprint ^R + stty < /dev/tty${dc}${i}.init -clocal crtscts hupcl 115200 reprint ^R stty < /dev/tty${dc}${i}.lock -clocal -crtscts -hupcl 0 - stty < /dev/cua${dc}${i}.init -clocal crtscts hupcl 9600 reprint ^R + stty < /dev/cua${dc}${i}.init -clocal crtscts hupcl 115200 reprint ^R stty < /dev/cua${dc}${i}.lock -clocal -crtscts -hupcl 0 done } diff --git a/sbin/init/ttys b/sbin/init/ttys index 508b584abb87..f5cfe4118da6 100644 --- a/sbin/init/ttys +++ b/sbin/init/ttys @@ -45,8 +45,8 @@ ttyu1 "/usr/libexec/getty 3wire" vt100 onifconsole secure ttyu2 "/usr/libexec/getty 3wire" vt100 onifconsole secure ttyu3 "/usr/libexec/getty 3wire" vt100 onifconsole secure # Dumb console -dcons "/usr/libexec/getty std.9600" vt100 off secure +dcons "/usr/libexec/getty std.115200" vt100 off secure # Xen Virtual console xc0 "/usr/libexec/getty Pc" xterm onifconsole secure # RISC-V HTIF console -rcons "/usr/libexec/getty std.9600" vt100 onifconsole secure +rcons "/usr/libexec/getty std.115200" vt100 onifconsole secure diff --git a/sbin/reboot/boot_i386.8 b/sbin/reboot/boot_i386.8 index 67f76a4ec4e3..da8fc2e430ac 100644 --- a/sbin/reboot/boot_i386.8 +++ b/sbin/reboot/boot_i386.8 @@ -244,7 +244,7 @@ the root password must be entered. .It Fl S Ns Ar speed set the speed of the serial console to .Ar speed . -The default is 9600 unless it has been overridden by setting +The default is 115200 unless it has been overridden by setting .Va BOOT_COMCONSOLE_SPEED in .Xr make.conf 5 diff --git a/share/examples/etc/make.conf b/share/examples/etc/make.conf index e3b4845aa2ad..56332932e359 100644 --- a/share/examples/etc/make.conf +++ b/share/examples/etc/make.conf @@ -167,10 +167,9 @@ # #BOOT_COMCONSOLE_PORT= 0x3F8 # -# The default serial console speed is 9600. Set the speed to a larger value -# for better interactive response. +# The default serial console speed is 115200. # -#BOOT_COMCONSOLE_SPEED= 115200 +#BOOT_COMCONSOLE_SPEED= 9600 # # By default the 'pxeboot' loader retrieves the kernel via NFS. Defining # this and recompiling /usr/src/stand will cause it to retrieve the kernel diff --git a/share/man/man4/dcons.4 b/share/man/man4/dcons.4 index b9b78d8f70ac..6ef58ea00757 100644 --- a/share/man/man4/dcons.4 +++ b/share/man/man4/dcons.4 @@ -82,7 +82,7 @@ signal to using .Xr kill 1 . .Bd -literal -offset indent -dcons "/usr/libexec/getty std.9600" vt100 on secure +dcons "/usr/libexec/getty std.115200" vt100 on secure .Ed .Pp Once the diff --git a/share/man/man5/remote.5 b/share/man/man5/remote.5 index 43cbd463e9c3..677c413eec26 100644 --- a/share/man/man5/remote.5 +++ b/share/man/man5/remote.5 @@ -91,7 +91,7 @@ serial port. When a modem is used, the data rate used to communicate with the remote modem may be different than this rate. This is a decimal number. -The default rate is 9600 bits per second. +The default rate is 115200 bits per second. .It Cm \&cm (str) An initial connection message to be sent to the remote host. diff --git a/stand/defaults/loader.conf b/stand/defaults/loader.conf index 3c7dab540c9c..08406aa43bc8 100644 --- a/stand/defaults/loader.conf +++ b/stand/defaults/loader.conf @@ -100,7 +100,7 @@ efi_max_resolution="1x1" # Set the max resolution for EFI loader to use: #kernels="kernel kernel.old" # Kernels to display in the boot menu kernels_autodetect="YES" # Auto-detect kernel directories in /boot #loader_logo="orbbw" # Desired logo: orbbw, orb, fbsdbw, beastiebw, beastie, none -#comconsole_speed="9600" # Set the current serial console speed +#comconsole_speed="115200" # Set the current serial console speed #console="vidconsole" # A comma separated list of console(s) #currdev="disk1s1a" # Set the current device module_path="/boot/modules;/boot/dtb;/boot/dtb/overlays" # Set the module search path diff --git a/stand/defaults/loader.conf.5 b/stand/defaults/loader.conf.5 index 8aaaee948b35..195b34e75fdd 100644 --- a/stand/defaults/loader.conf.5 +++ b/stand/defaults/loader.conf.5 @@ -252,7 +252,7 @@ a bitmap will be loaded to be displayed on screen while booting. Name of the bitmap to be loaded. Any other name can be used. .It Va comconsole_speed -.Dq ( 9600 +.Dq ( 115200 or the value of the .Va BOOT_COMCONSOLE_SPEED variable when diff --git a/stand/i386/boot2/Makefile b/stand/i386/boot2/Makefile index 34d7c6e05627..6d6a05cf228f 100644 --- a/stand/i386/boot2/Makefile +++ b/stand/i386/boot2/Makefile @@ -7,7 +7,7 @@ FILES= boot boot1 boot2 BOOT_BOOT1_FLAGS?= 0x80 BOOT_COMCONSOLE_PORT?= 0x3f8 -BOOT_COMCONSOLE_SPEED?= 9600 +BOOT_COMCONSOLE_SPEED?= 115200 B2SIOFMT?= 0x3 REL1= 0x700 diff --git a/stand/i386/btx/btx/Makefile b/stand/i386/btx/btx/Makefile index 29161f466c77..bfb9edcd1d31 100644 --- a/stand/i386/btx/btx/Makefile +++ b/stand/i386/btx/btx/Makefile @@ -16,7 +16,7 @@ CFLAGS+=-I${BOOTSRC}/i386/common .if defined(BTX_SERIAL) BOOT_COMCONSOLE_PORT?= 0x3f8 -BOOT_COMCONSOLE_SPEED?= 9600 +BOOT_COMCONSOLE_SPEED?= 115200 B2SIOFMT?= 0x3 CFLAGS+=-DBTX_SERIAL -DSIOPRT=${BOOT_COMCONSOLE_PORT} \ diff --git a/stand/i386/gptboot/Makefile b/stand/i386/gptboot/Makefile index f657f69625fb..cce5e2e88d5d 100644 --- a/stand/i386/gptboot/Makefile +++ b/stand/i386/gptboot/Makefile @@ -7,7 +7,7 @@ FILES= gptboot MAN= gptboot.8 BOOT_COMCONSOLE_PORT?= 0x3f8 -BOOT_COMCONSOLE_SPEED?= 9600 +BOOT_COMCONSOLE_SPEED?= 115200 B2SIOFMT?= 0x3 REL1= 0x700 diff --git a/stand/i386/gptzfsboot/Makefile b/stand/i386/gptzfsboot/Makefile index 619a0a6e0cb4..03f891912886 100644 --- a/stand/i386/gptzfsboot/Makefile +++ b/stand/i386/gptzfsboot/Makefile @@ -9,7 +9,7 @@ FILES= gptzfsboot MAN= gptzfsboot.8 BOOT_COMCONSOLE_PORT?= 0x3f8 -BOOT_COMCONSOLE_SPEED?= 9600 +BOOT_COMCONSOLE_SPEED?= 115200 B2SIOFMT?= 0x3 REL1= 0x700 diff --git a/stand/i386/isoboot/Makefile b/stand/i386/isoboot/Makefile index 7a909808e168..12be31b52bc4 100644 --- a/stand/i386/isoboot/Makefile +++ b/stand/i386/isoboot/Makefile @@ -8,7 +8,7 @@ FILES= isoboot MAN= isoboot.8 BOOT_COMCONSOLE_PORT?= 0x3f8 -BOOT_COMCONSOLE_SPEED?= 9600 +BOOT_COMCONSOLE_SPEED?= 115200 B2SIOFMT?= 0x3 REL1= 0x700 diff --git a/stand/i386/libi386/Makefile b/stand/i386/libi386/Makefile index 24e30b2e944f..0bc0efd35f22 100644 --- a/stand/i386/libi386/Makefile +++ b/stand/i386/libi386/Makefile @@ -18,7 +18,7 @@ SRCS+= teken.c BOOT_COMCONSOLE_PORT?= 0x3f8 CFLAGS+= -DCOMPORT=${BOOT_COMCONSOLE_PORT} -BOOT_COMCONSOLE_SPEED?= 9600 +BOOT_COMCONSOLE_SPEED?= 115200 CFLAGS+= -DCOMSPEED=${BOOT_COMCONSOLE_SPEED} .ifdef(BOOT_BIOSDISK_DEBUG) diff --git a/stand/i386/libi386/comconsole.c b/stand/i386/libi386/comconsole.c index 8a8373cf144b..6fff811bd34c 100644 --- a/stand/i386/libi386/comconsole.c +++ b/stand/i386/libi386/comconsole.c @@ -40,7 +40,7 @@ #define COMPORT 0x3f8 #endif #ifndef COMSPEED -#define COMSPEED 9600 +#define COMSPEED 115200 #endif static void comc_probe(struct console *cp); diff --git a/stand/i386/zfsboot/Makefile b/stand/i386/zfsboot/Makefile index 0e4e8ee4dc16..dcfac140231a 100644 --- a/stand/i386/zfsboot/Makefile +++ b/stand/i386/zfsboot/Makefile @@ -7,7 +7,7 @@ FILES= zfsboot MAN= zfsboot.8 BOOT_COMCONSOLE_PORT?= 0x3f8 -BOOT_COMCONSOLE_SPEED?= 9600 +BOOT_COMCONSOLE_SPEED?= 115200 B2SIOFMT?= 0x3 REL1= 0x700 diff --git a/stand/man/loader_simp.8 b/stand/man/loader_simp.8 index c43729f43aca..6eac6bf6a102 100644 --- a/stand/man/loader_simp.8 +++ b/stand/man/loader_simp.8 @@ -358,7 +358,7 @@ Defines the speed of the serial console (i386 and amd64 only). If the previous boot stage indicated that a serial console is in use then this variable is initialized to the current speed of the console serial port. -Otherwise it is set to 9600 unless this was overridden using the +Otherwise it is set to 115200 unless this was overridden using the .Va BOOT_COMCONSOLE_SPEED variable when .Nm diff --git a/sys/dev/usb/serial/usb_serial.c b/sys/dev/usb/serial/usb_serial.c index 3a9b198b9ed8..300438010c05 100644 --- a/sys/dev/usb/serial/usb_serial.c +++ b/sys/dev/usb/serial/usb_serial.c @@ -130,7 +130,7 @@ static unsigned ucom_cons_tx_high = 0; static int ucom_cons_unit = -1; static int ucom_cons_subunit = 0; -static int ucom_cons_baud = 9600; +static int ucom_cons_baud = 115200; static struct ucom_softc *ucom_cons_softc = NULL; SYSCTL_INT(_hw_usb_ucom, OID_AUTO, cons_unit, CTLFLAG_RWTUN, diff --git a/tools/tools/nanobsd/rescue/Files/etc/ttys b/tools/tools/nanobsd/rescue/Files/etc/ttys index bdf7db4f0809..151ea5446d76 100644 --- a/tools/tools/nanobsd/rescue/Files/etc/ttys +++ b/tools/tools/nanobsd/rescue/Files/etc/ttys @@ -44,8 +44,8 @@ ttyv8 "/usr/local/bin/xdm -nodaemon" xterm off secure # Serial terminals # The 'dialup' keyword identifies dialin lines to login, fingerd etc. ttyu0 "/usr/libexec/getty std.115200" xterm-color on secure -ttyu1 "/usr/libexec/getty std.9600" dialup off secure -ttyu2 "/usr/libexec/getty std.9600" dialup off secure -ttyu3 "/usr/libexec/getty std.9600" dialup off secure +ttyu1 "/usr/libexec/getty std.115200" dialup off secure +ttyu2 "/usr/libexec/getty std.115200" dialup off secure +ttyu3 "/usr/libexec/getty std.115200" dialup off secure # Dumb console -dcons "/usr/libexec/getty std.9600" vt100 off secure +dcons "/usr/libexec/getty std.115200" vt100 off secure From nobody Thu Aug 17 17:47:07 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RRXWc1dNMz4mTDx; Thu, 17 Aug 2023 17:47:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RRXWb6S0sz3KLK; Thu, 17 Aug 2023 17:47:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692294427; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=INcUkpufx0UhLHIzdan3tC8yQdgnTK8w7UYWgVd79sk=; b=B5JynBmPbTnqCIo+oC9Z1bhFVW8XiV8rOf0iQuE6VvnvoK/1xtUKMJ/pN/9C7+lPhruCSW x7fst0rneBQ4JV9Uh/APthbHGvxsXoJYE0sifDhCexL+yzd4JreSVnRg3/dNLIvvz+qt8L YARpwybexoI962/nS+H/OodT+A0illc+qDdOGCdaiWCI2nhC7UWBNRNzK2V5aKMCqFCj/P wXZ+6o0GHv3MRyuD8V96877Y9neDCTKYAt71w+o6ow/6iQyraF9A30E8ZIK1jYhbPJMYcB cvZhmm1NuP2i2OhL8Ix6wR3tIZvt5oa0neJHy6sEu8efCV2519z+UJbXTjByAg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692294427; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=INcUkpufx0UhLHIzdan3tC8yQdgnTK8w7UYWgVd79sk=; b=KpWgKGrJVKKMLgMuDcALn/b9RYUmKOuKiS+xOjqTs1Wub26LvUx84Omhi5pdl6w+WL/SLh TUsyTbfyz8zHcxcbYY/viKBA6LKPNNtfn8lSFa7T2Qs0YI0pqiCHukpgZ31vMrqy+rQJEI +E82p2J/SxCQrs1ILGRRdGIPBjBPi4MekoHeHGXhPg/tUyN1g6PLhgfAUA9oIEjqGe5eKc M5x/1PhGLMC+4hTtW6zbaiA+G7+dxfP5EJMJe26KVumIQBZ+yiGmNnvvZuIkHTp9CDiSdI 0fBP4zQiZXzrrv8miRqI023lSZkb1IE/7QhdeVRsBKC2GmbjBMtu1UXtJ6+NSA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692294427; a=rsa-sha256; cv=none; b=dZ9x8rWSxPwsdhDsB2ADQ4sYUfuxGPlln/E/GEoJqZ73tDVNXct2n6lZegaR0ENs9YS9/h LT2w+tXC5CpHx5ndqKOh7q19J81GiQ+I3Y1pnrP6oZB6rhLZl/EP890Ef+1UibcBwt+O5R ndImiFEcjOkRtI2LbwHGHt7b8Z1C2eSuDNY4+6EddYt50yGW4UGNCCCwOrJc+g0cpSB10u 2hCEkwVsG+JtUa4MscszeeHfkJUnfVc+zrem0qVmUHZ9EXk2x+KsoaxZJmUdEaGbFfcWIB A4+KYmy0QEUP+BANckqKb+OfnAsHGBdcw/fRuFv7f7EZZL0t/ixf+qj4xggX6w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RRXWb5XGPzk7D; Thu, 17 Aug 2023 17:47:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37HHl7VU062519; Thu, 17 Aug 2023 17:47:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37HHl7FD062516; Thu, 17 Aug 2023 17:47:07 GMT (envelope-from git) Date: Thu, 17 Aug 2023 17:47:07 GMT Message-Id: <202308171747.37HHl7FD062516@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: 3ff06779936a - main - share/examples: clarify BOOT_COMCONSOLE_SPEED List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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/main X-Git-Reftype: branch X-Git-Commit: 3ff06779936adc4931696688e3bd5997841d5e39 Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=3ff06779936adc4931696688e3bd5997841d5e39 commit 3ff06779936adc4931696688e3bd5997841d5e39 Author: Ed Maste AuthorDate: 2023-08-17 17:43:39 +0000 Commit: Ed Maste CommitDate: 2023-08-17 17:46:42 +0000 share/examples: clarify BOOT_COMCONSOLE_SPEED Give an example of why one may want to override BOOT_COMCONSOLE_SPEED so that it's clear why the default (in a comment) and the commented-out example setting have different values. Reported by: otis Fixes: 4722ceb7d53e ("Use 115200 bps by default for serial communication") --- share/examples/etc/make.conf | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/share/examples/etc/make.conf b/share/examples/etc/make.conf index 56332932e359..e450ea04eb14 100644 --- a/share/examples/etc/make.conf +++ b/share/examples/etc/make.conf @@ -167,7 +167,8 @@ # #BOOT_COMCONSOLE_PORT= 0x3F8 # -# The default serial console speed is 115200. +# The default serial console speed is 115200. It can be set to a different +# rate, if desired in your environment. # #BOOT_COMCONSOLE_SPEED= 9600 # From nobody Thu Aug 17 18:19:18 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RRYDm4FSGz4mVtX; Thu, 17 Aug 2023 18:19:20 +0000 (UTC) (envelope-from jhb@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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RRYDm23VVz3Q5q; Thu, 17 Aug 2023 18:19:20 +0000 (UTC) (envelope-from jhb@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692296360; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=LTFT+xlo43QnK1QvgitD2O1avtq76LWAq667GrUtOW8=; b=Rx9i4vRb7WUeSKaULAvGlCTc91BN03NJV/ocX62s9/lPOuzRrBG5AY525lVzNUxEshfsHt rTz4WnJtff+PtBlmEciD0bqPNumqhh4+bKtxf2HszrAdGOV1ICG37vm5lG+cKDGQTo8pHa FPxgcGMfyrxWigN4Pro2E6fFCQZm2UW11L1VhsB2aXvdHuCIN04hv88erEbt7ByfpmouL7 hCYm5M9HA2uKVpb+aDhTaSQYrYj6ukh/AkW7ThTMnAoxLHTDlGAKTbXnioaYOGuyc5ISUI svGVvRaf/gLNMPOaPJpccCDLOUQ2g+ST03C/4ha2P3of21L9j1wKtysoTHMF+A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692296360; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=LTFT+xlo43QnK1QvgitD2O1avtq76LWAq667GrUtOW8=; b=My54rw8HahrOaQiygfwGul4iI5lpOn/bW9A/zG0zPpFx5kYF2VaE/gEXDN9wnZgEI9xLT4 aE2Wm8i1HP65L4IG5eRFp8a/fSDZYCFHpnUvc9LlckdEUAFn8/M8C7J+8iY0EJ8oDuOsVI Etq02VKiW+xVzRiDZttuYamk1dnnsrA+DwuJnf0AYRlEJNKDvnW7ZjC9pRwSii+neEN9JN 9W1/yM7ZtkBdTPHes20c1BWb/PAMEEp9RYs7HMm/cSc5ojQvDdAJJPY7tS9vplJVq1vi+r Wsgp7h27yg/EoDDvPsfYe/jVLlim9LQiaq4AiZH4XDvdjCgpPjJYkacmVtNaNQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692296360; a=rsa-sha256; cv=none; b=u9G2QbyN+EVR78I+vYQfE7fmIjyC7z/ET4pXNm1c1R33PJ+9b8Pdh6a1ITnFteSlg5FVbV KDnqbnnxHVFB82zcogspTo1l+4EpD3dAdK7yR8+bRa4d+dW9+zWuPxinF1B6DLfvpsLyue G7vV9sitsMGuvlwXfjQMLTcVmbTkYxxBm7dFXswg6/X5T07VEpTdmNxleAvYrTwHeMBjjC yeJc2WK9wQCjhdlK6ASy/E3QFJf/gnALGOPh/yWCl019fOJqvdAjccv1lsxLI3Ci4bp8Kr rQCmqBTM7HbhmF5co48/u3avLmFUgVBlO5UcAW4LvabHuBwsOSmM+KeuPRFEnw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from [IPV6:2601:648:8683:a9e0:7075:181:17d9:4b81] (unknown [IPv6:2601:648:8683:a9e0:7075:181:17d9:4b81]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) (Authenticated sender: jhb) by smtp.freebsd.org (Postfix) with ESMTPSA id 4RRYDl59hNzrCY; Thu, 17 Aug 2023 18:19:19 +0000 (UTC) (envelope-from jhb@FreeBSD.org) Message-ID: <88a3318f-37bd-f60e-fe6a-5ee58584fcbf@FreeBSD.org> Date: Thu, 17 Aug 2023 11:19:18 -0700 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.15; rv:102.0) Gecko/20100101 Thunderbird/102.14.0 Subject: Re: git: 4722ceb7d53e - main - Use 115200 bps by default for serial communication Content-Language: en-US To: Ed Maste , src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org References: <202308171735.37HHZdbH046154@gitrepo.freebsd.org> From: John Baldwin In-Reply-To: <202308171735.37HHZdbH046154@gitrepo.freebsd.org> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit On 8/17/23 10:35 AM, Ed Maste wrote: > The branch main has been updated by emaste: > > URL: https://cgit.FreeBSD.org/src/commit/?id=4722ceb7d53e76507c76e053caab6b6f7b24ecef > > commit 4722ceb7d53e76507c76e053caab6b6f7b24ecef > Author: Ed Maste > AuthorDate: 2023-08-17 17:14:52 +0000 > Commit: Ed Maste > CommitDate: 2023-08-17 17:31:38 +0000 > > Use 115200 bps by default for serial communication > > 9600 was a standard baud rate decades ago, but 115200 is now more common > so choose defaults that are useful to the largest number of users. > > Note that boot0sio does not support rates above 9600 so it remains > unchanged. > > Reviewed by: bz, imp, manu > Relnotes: Yes > Sponsored by: The FreeBSD Foundation > Differential Revision: https://reviews.freebsd.org/D36295 > --- > UPDATING | 12 ++++++++++++ > libexec/rc/rc.d/serial | 6 +++--- > sbin/init/ttys | 4 ++-- > sbin/reboot/boot_i386.8 | 2 +- > share/examples/etc/make.conf | 5 ++--- > share/man/man4/dcons.4 | 2 +- > share/man/man5/remote.5 | 2 +- > stand/defaults/loader.conf | 2 +- > stand/defaults/loader.conf.5 | 2 +- > stand/i386/boot2/Makefile | 2 +- > stand/i386/btx/btx/Makefile | 2 +- > stand/i386/gptboot/Makefile | 2 +- > stand/i386/gptzfsboot/Makefile | 2 +- > stand/i386/isoboot/Makefile | 2 +- > stand/i386/libi386/Makefile | 2 +- > stand/i386/libi386/comconsole.c | 2 +- > stand/i386/zfsboot/Makefile | 2 +- > stand/man/loader_simp.8 | 2 +- > sys/dev/usb/serial/usb_serial.c | 2 +- > tools/tools/nanobsd/rescue/Files/etc/ttys | 8 ++++---- > 20 files changed, 38 insertions(+), 27 deletions(-) > > diff --git a/UPDATING b/UPDATING > index c05670e14f7c..705ca6431a32 100644 > --- a/UPDATING > +++ b/UPDATING > @@ -27,6 +27,18 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 14.x IS SLOW: > world, or to merely disable the most expensive debugging functionality > at runtime, run "ln -s 'abort:false,junk:false' /etc/malloc.conf".) > > +20230817: > + Serial communication (in boot loaders, kernel, and userland) has > + been changed to default to 115200 bps, in line with common industry > + practice and typcial firmware serial console redirection > + configuration. > + > + Note that the early x86 BIOS bootloader (i.e., boot0sio) does not > + support rates above 9600 bps and is not chagned. boot0sio users may s/chagned/changed/ > + set BOOT_COMCONSOLE_SPEED=9600 to use 9600 for all of the boot > + components, or use the standard boot0 and have the boot2 stage start > + with the serial port at 115200. Actually, many of these tools permit leaving the speed unchanged to use any settings set by the BIOS. For example, there's a comment about this in boot0's Makefile: # Comm settings for boot0sio. # # boot0sio uses BIOS INT $0x14 for serial ports, we can only support these # baudrates due to INT14's limited interface. In addition, if # BOOT_BOOT0_COMCONSOLE_SPEED=0, then the baud rate and frame format will remain # unchanged. Some BIOSes initialize the serial ports to 115200, and this may # allow boot0sio access at that rate if so. Arguably we should default to that as most people who are going to bother using this are also setting up console redirection in their BIOS. Granted, all of this is for non-UEFI booting anyway so is a bit long in the tooth regardless. Do we bother setting the speed at all for UEFI or do we just trust the firmware to do it I hope? -- John Baldwin From nobody Thu Aug 17 18:21:39 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RRYHj1zTNz4mVXr for ; Thu, 17 Aug 2023 18:21:53 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Received: from mail-ej1-x629.google.com (mail-ej1-x629.google.com [IPv6:2a00:1450:4864:20::629]) (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 "GTS CA 1D4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RRYHj081Wz3QLr for ; Thu, 17 Aug 2023 18:21:53 +0000 (UTC) (envelope-from wlosh@bsdimp.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-ej1-x629.google.com with SMTP id a640c23a62f3a-99c93638322so22987266b.1 for ; Thu, 17 Aug 2023 11:21:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bsdimp-com.20221208.gappssmtp.com; s=20221208; t=1692296511; x=1692901311; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:from:to:cc:subject:date:message-id:reply-to; bh=j+j5FBaU6P5CkkXQNo+wZ1sDVrYMqPbLI+N1+k8yBS4=; b=NEmLFD4EyUoECFqjfidAi4zFip9CRK4A/XfiDxXoqSPNS/ChW+jCc8QKInNBvFbcHo ZHTIkPh2fChRpnc9ZAazzANxXwQ+Vv6jDRKYiCtBHFk1hee+kw61Zn4WUDrCZNoaggdI xrwjeV+wQZLbVgTiJg0E14CAFfpyuV9WvyRfLrAGwayzKVtCVmaSALs0vSKqyWjg3mlv JQaCbmY/1/oYA+Ez2aaVddS1U+PfVw26mSzLA2pxGWdslkCnS3iP6XPkd5KJf5MtHgZP VJysAOZNn00N/KNX8cwcckddR78hOmnl91qkLMCe11EBXyWurXQ1CbOYvUM/9WNFv/jo V7Zg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1692296511; x=1692901311; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=j+j5FBaU6P5CkkXQNo+wZ1sDVrYMqPbLI+N1+k8yBS4=; b=Exi2/LzAp4pvMiwMdLyNJEhbs99DnP3wxRBmviwLU2RJeFCEL6vyskzd91AqfowfGX 9qjpiM5Qgun2TjQFiyNvRaWPiGa//OCTlm6kYfuMhQzbj36LvvZOSNZoK0MukAfLA+Tb FAo71lnAnlGp3e/j0e+KngajWIuS0/AlpU52EjK9zb6s2Vx8QocksyBIExCOk8izcIxy RY+MayvDfMWPpfgvzzZVRAdfXEeCXhPTdoQZUep2OW0Tvt95rpv8Vj32Y+TnliHQnsh+ xGzUqyHTCov8WBayLAI9iAaOoX6BplXrLX6CJwN8OWEurpHLo5D+OOfRpuF+103hUXbC zemQ== X-Gm-Message-State: AOJu0YyZ/QI/MYnlbHJ8UzeZnmXc51RqrL8E5eRplB5jZRJUQ1JPExCt fPjFQHCV6LTOxTvOxNWBZsISMt/j/tyXxdY1L/FEJPnZu3sjLbVO X-Google-Smtp-Source: AGHT+IF7dfmePFm6U+1nHVRSUsw4qyaxB55t7CWjzI+18eOBLVEhmjCvSGThTegdmMxOjx/bFV0BN+jz5N9Ks5jrW34= X-Received: by 2002:a17:907:7b88:b0:98e:3dac:6260 with SMTP id ne8-20020a1709077b8800b0098e3dac6260mr4727753ejc.13.1692296510860; Thu, 17 Aug 2023 11:21:50 -0700 (PDT) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 References: <202308171735.37HHZdbH046154@gitrepo.freebsd.org> <88a3318f-37bd-f60e-fe6a-5ee58584fcbf@FreeBSD.org> In-Reply-To: <88a3318f-37bd-f60e-fe6a-5ee58584fcbf@FreeBSD.org> From: Warner Losh Date: Thu, 17 Aug 2023 12:21:39 -0600 Message-ID: Subject: Re: git: 4722ceb7d53e - main - Use 115200 bps by default for serial communication To: John Baldwin Cc: Ed Maste , src-committers , "" , "" Content-Type: multipart/alternative; boundary="00000000000062814e0603227c29" X-Rspamd-Queue-Id: 4RRYHj081Wz3QLr X-Spamd-Bar: ---- 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:2a00:1450::/32, country:US] --00000000000062814e0603227c29 Content-Type: text/plain; charset="UTF-8" On Thu, Aug 17, 2023, 12:19 PM John Baldwin wrote: > On 8/17/23 10:35 AM, Ed Maste wrote: > > The branch main has been updated by emaste: > > > > URL: > https://cgit.FreeBSD.org/src/commit/?id=4722ceb7d53e76507c76e053caab6b6f7b24ecef > > > > commit 4722ceb7d53e76507c76e053caab6b6f7b24ecef > > Author: Ed Maste > > AuthorDate: 2023-08-17 17:14:52 +0000 > > Commit: Ed Maste > > CommitDate: 2023-08-17 17:31:38 +0000 > > > > Use 115200 bps by default for serial communication > > > > 9600 was a standard baud rate decades ago, but 115200 is now more > common > > so choose defaults that are useful to the largest number of users. > > > > Note that boot0sio does not support rates above 9600 so it remains > > unchanged. > > > > Reviewed by: bz, imp, manu > > Relnotes: Yes > > Sponsored by: The FreeBSD Foundation > > Differential Revision: https://reviews.freebsd.org/D36295 > > --- > > UPDATING | 12 ++++++++++++ > > libexec/rc/rc.d/serial | 6 +++--- > > sbin/init/ttys | 4 ++-- > > sbin/reboot/boot_i386.8 | 2 +- > > share/examples/etc/make.conf | 5 ++--- > > share/man/man4/dcons.4 | 2 +- > > share/man/man5/remote.5 | 2 +- > > stand/defaults/loader.conf | 2 +- > > stand/defaults/loader.conf.5 | 2 +- > > stand/i386/boot2/Makefile | 2 +- > > stand/i386/btx/btx/Makefile | 2 +- > > stand/i386/gptboot/Makefile | 2 +- > > stand/i386/gptzfsboot/Makefile | 2 +- > > stand/i386/isoboot/Makefile | 2 +- > > stand/i386/libi386/Makefile | 2 +- > > stand/i386/libi386/comconsole.c | 2 +- > > stand/i386/zfsboot/Makefile | 2 +- > > stand/man/loader_simp.8 | 2 +- > > sys/dev/usb/serial/usb_serial.c | 2 +- > > tools/tools/nanobsd/rescue/Files/etc/ttys | 8 ++++---- > > 20 files changed, 38 insertions(+), 27 deletions(-) > > > > diff --git a/UPDATING b/UPDATING > > index c05670e14f7c..705ca6431a32 100644 > > --- a/UPDATING > > +++ b/UPDATING > > @@ -27,6 +27,18 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 14.x IS SLOW: > > world, or to merely disable the most expensive debugging > functionality > > at runtime, run "ln -s 'abort:false,junk:false' /etc/malloc.conf".) > > > > +20230817: > > + Serial communication (in boot loaders, kernel, and userland) has > > + been changed to default to 115200 bps, in line with common industry > > + practice and typcial firmware serial console redirection > > + configuration. > > + > > + Note that the early x86 BIOS bootloader (i.e., boot0sio) does not > > + support rates above 9600 bps and is not chagned. boot0sio users > may > > s/chagned/changed/ > > > + set BOOT_COMCONSOLE_SPEED=9600 to use 9600 for all of the boot > > + components, or use the standard boot0 and have the boot2 stage > start > > + with the serial port at 115200. > > Actually, many of these tools permit leaving the speed unchanged to use any > settings set by the BIOS. For example, there's a comment about this in > boot0's Makefile: > > # Comm settings for boot0sio. > # > # boot0sio uses BIOS INT $0x14 for serial ports, we can only support these > # baudrates due to INT14's limited interface. In addition, if > # BOOT_BOOT0_COMCONSOLE_SPEED=0, then the baud rate and frame format will > remain > # unchanged. Some BIOSes initialize the serial ports to 115200, and this > may > # allow boot0sio access at that rate if so. > > Arguably we should default to that as most people who are going to bother > using this are also setting up console redirection in their BIOS. Granted, > all of this is for non-UEFI booting anyway so is a bit long in the tooth > regardless. Do we bother setting the speed at all for UEFI or do we just > trust the firmware to do it I hope? > Trust the firmware to tell us what the speed is, but we do have some super hacky overrides. Warner -- > John Baldwin > > --00000000000062814e0603227c29 Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable


On Thu, Aug 17, 2023, 12:19 PM John Baldwin <jhb@freebsd.org> wrote:
On 8/17/23 10:35 AM, Ed Maste wrote:
> The branch main has been updated by emaste:
>
> URL: https://cgit.FreeBSD.org/src/commit/?id=3D4722ceb7d53e76507c76e053caab6b= 6f7b24ecef
>
> commit 4722ceb7d53e76507c76e053caab6b6f7b24ecef
> Author:=C2=A0 =C2=A0 =C2=A0Ed Maste <emaste@FreeBSD.org>
> AuthorDate: 2023-08-17 17:14:52 +0000
> Commit:=C2=A0 =C2=A0 =C2=A0Ed Maste <emaste@FreeBSD.org>
> CommitDate: 2023-08-17 17:31:38 +0000
>
>=C2=A0 =C2=A0 =C2=A0 Use 115200 bps by default for serial communication=
>=C2=A0 =C2=A0 =C2=A0
>=C2=A0 =C2=A0 =C2=A0 9600 was a standard baud rate decades ago, but 115= 200 is now more common
>=C2=A0 =C2=A0 =C2=A0 so choose defaults that are useful to the largest = number of users.
>=C2=A0 =C2=A0 =C2=A0
>=C2=A0 =C2=A0 =C2=A0 Note that boot0sio does not support rates above 96= 00 so it remains
>=C2=A0 =C2=A0 =C2=A0 unchanged.
>=C2=A0 =C2=A0 =C2=A0
>=C2=A0 =C2=A0 =C2=A0 Reviewed by:=C2=A0 =C2=A0 bz, imp, manu
>=C2=A0 =C2=A0 =C2=A0 Relnotes:=C2=A0 =C2=A0 =C2=A0 =C2=A0Yes
>=C2=A0 =C2=A0 =C2=A0 Sponsored by:=C2=A0 =C2=A0The FreeBSD Foundation >=C2=A0 =C2=A0 =C2=A0 Differential Revision: https:/= /reviews.freebsd.org/D36295
> ---
>=C2=A0 =C2=A0UPDATING=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 | 12 = ++++++++++++
>=C2=A0 =C2=A0libexec/rc/rc.d/serial=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 |=C2=A0 6 +++---
>=C2=A0 =C2=A0sbin/init/ttys=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 |=C2=A0 4 ++--
>=C2=A0 =C2=A0sbin/reboot/boot_i386.8=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0|=C2=A0 2 +-
>=C2=A0 =C2=A0share/examples/etc/make.conf=C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0 =C2=A0 =C2=A0 |=C2=A0 5 ++---
>=C2=A0 =C2=A0share/man/man4/dcons.4=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 |=C2=A0 2 +-
>=C2=A0 =C2=A0share/man/man5/remote.5=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0|=C2=A0 2 +-
>=C2=A0 =C2=A0stand/defaults/loader.conf=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 |=C2=A0 2 +-
>=C2=A0 =C2=A0stand/defaults/loader.conf.5=C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0 =C2=A0 =C2=A0 |=C2=A0 2 +-
>=C2=A0 =C2=A0stand/i386/boot2/Makefile=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0|=C2=A0 2 +-
>=C2=A0 =C2=A0stand/i386/btx/btx/Makefile=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0|=C2=A0 2 +-
>=C2=A0 =C2=A0stand/i386/gptboot/Makefile=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0|=C2=A0 2 +-
>=C2=A0 =C2=A0stand/i386/gptzfsboot/Makefile=C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0 =C2=A0 |=C2=A0 2 +-
>=C2=A0 =C2=A0stand/i386/isoboot/Makefile=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0|=C2=A0 2 +-
>=C2=A0 =C2=A0stand/i386/libi386/Makefile=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0|=C2=A0 2 +-
>=C2=A0 =C2=A0stand/i386/libi386/comconsole.c=C2=A0 =C2=A0 =C2=A0 =C2=A0= =C2=A0 =C2=A0|=C2=A0 2 +-
>=C2=A0 =C2=A0stand/i386/zfsboot/Makefile=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0|=C2=A0 2 +-
>=C2=A0 =C2=A0stand/man/loader_simp.8=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0|=C2=A0 2 +-
>=C2=A0 =C2=A0sys/dev/usb/serial/usb_serial.c=C2=A0 =C2=A0 =C2=A0 =C2=A0= =C2=A0 =C2=A0|=C2=A0 2 +-
>=C2=A0 =C2=A0tools/tools/nanobsd/rescue/Files/etc/ttys |=C2=A0 8 ++++--= --
>=C2=A0 =C2=A020 files changed, 38 insertions(+), 27 deletions(-)
>
> diff --git a/UPDATING b/UPDATING
> index c05670e14f7c..705ca6431a32 100644
> --- a/UPDATING
> +++ b/UPDATING
> @@ -27,6 +27,18 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 14.x IS SLOW:=
>=C2=A0 =C2=A0 =C2=A0 =C2=A0world, or to merely disable the most expensi= ve debugging functionality
>=C2=A0 =C2=A0 =C2=A0 =C2=A0at runtime, run "ln -s 'abort:false= ,junk:false' /etc/malloc.conf".)
>=C2=A0 =C2=A0
> +20230817:
> +=C2=A0 =C2=A0 =C2=A0Serial communication (in boot loaders, kernel, an= d userland) has
> +=C2=A0 =C2=A0 =C2=A0been changed to default to 115200 bps, in line wi= th common industry
> +=C2=A0 =C2=A0 =C2=A0practice and typcial firmware serial console redi= rection
> +=C2=A0 =C2=A0 =C2=A0configuration.
> +
> +=C2=A0 =C2=A0 =C2=A0Note that the early x86 BIOS bootloader (i.e., bo= ot0sio) does not
> +=C2=A0 =C2=A0 =C2=A0support rates above 9600 bps and is not chagned.= =C2=A0 boot0sio users may

s/chagned/changed/

> +=C2=A0 =C2=A0 =C2=A0set BOOT_COMCONSOLE_SPEED=3D9600 to use 9600 for = all of the boot
> +=C2=A0 =C2=A0 =C2=A0components, or use the standard boot0 and have th= e boot2 stage start
> +=C2=A0 =C2=A0 =C2=A0with the serial port at 115200.

Actually, many of these tools permit leaving the speed unchanged to use any=
settings set by the BIOS.=C2=A0 For example, there's a comment about th= is in
boot0's Makefile:

# Comm settings for boot0sio.
#
# boot0sio uses BIOS INT $0x14 for serial ports, we can only support these<= br> # baudrates due to INT14's limited interface. In addition, if
# BOOT_BOOT0_COMCONSOLE_SPEED=3D0, then the baud rate and frame format will= remain
# unchanged. Some BIOSes initialize the serial ports to 115200, and this ma= y
# allow boot0sio access at that rate if so.

Arguably we should default to that as most people who are going to bother using this are also setting up console redirection in their BIOS.=C2=A0 Gra= nted,
all of this is for non-UEFI booting anyway so is a bit long in the tooth regardless.=C2=A0 Do we bother setting the speed at all for UEFI or do we j= ust
trust the firmware to do it I hope?

Trust the firmware to tell us what the s= peed is, but we do have some super hacky overrides.
=
Warner


--
John Baldwin

--00000000000062814e0603227c29-- From nobody Thu Aug 17 18:32:43 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RRYXC67Hdz4mWfd; Thu, 17 Aug 2023 18:32: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RRYXC5W1Xz3Rns; Thu, 17 Aug 2023 18:32:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692297163; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=RFClgTKhmZ07PTZOjfWMtzNlVQPyII1p93UdwgbJyfA=; b=i8t7NY7KfxuvwI4yTVlO2YkQ/1PGS647muKN0fQ1yNSNUi25HiBlmOeifKngMbW+cY2v3a Z7RzSvWphOrZFU6WiVYcvXbTjdO6WMrBnI5A4O60pTRopEEqYKS3iI8VMqN/2EpxZELYrF s0HQFBF4TlkYAK503yRX5/IDSdnAUDarOdTkzkDNyNekqr3rctKxY5f9EN6pXU9G5mOVfO Dc1Q68DUmzPI9BQQNkpexijkvPDEX4a6vZD1aO5Kh0aA9e0EpaHLrxQCzqNsLiPv4ztrSo P0kwZzf5yDdwnEfgS3sgy+4VvjjJTPBblU0OJpoHGnwBT0q+T396Om30OKENFw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692297163; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=RFClgTKhmZ07PTZOjfWMtzNlVQPyII1p93UdwgbJyfA=; b=XxFYFY9LU1KcqwOpO9qJn4b9e+y3oNTlvSkPBSjdqJwMPdSl5rybjQC4CKsuJ0qOnwXK0M q9+Jhm7OMs0JrAZk+yc01ZGaDxM72/63v3GW56GzpMPcp8ndn5pR5O9FzWinv6WZi+VnVA aME5nd3LsNkdy2vMm+nn9g+88OjwRd2FfkRekIEUVCxSAzGjz8FTpQikZdncwnfEwnLG23 q9w+qFXTOWniM1I/UMKegvKL29MKaDNX3R7OwiSrnPgUSdsnBMadA91QG1CYEq7m9PGgo2 xmy8Nfray2X3dS2ZtgNPtVHfOjyS16NS0naE2U+XtoBnrQ/vTxMdz8CC3BFeMQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692297163; a=rsa-sha256; cv=none; b=h1bduUP4xfPEdekLjFZvjCvA44Ld+2fdgBV5xKl1Bn0jSGsFcv4k25ghQWKqSs03smVnia 6rh7QQ0uXRyZ5Rvc6b1PaqNCFG6Kf+7VeTvawe4uqLU9tX1zyf1N6HDEpBf91AFe8LDAJ5 oWCFlgYeNhnz28fx104eUWq1izSvj0GJc8VEuT0E0PEsfgLGiy8Ql/FkHs7lD98y44egKp UUCUIA7SFevso9Hzw+sUZibtbx2BfX8PyC43TI4bOMDOvvYrbA7FHKP42lqRkLtJSfeQjL LgCZbKXKBVkiKQkDDidknNztVRv0ZVylPDHDaTzK3VMn8AJGmgEINOxIwhDA4A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RRYXC4ZBqzkCj; Thu, 17 Aug 2023 18:32:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37HIWh12045833; Thu, 17 Aug 2023 18:32:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37HIWhkg045830; Thu, 17 Aug 2023 18:32:43 GMT (envelope-from git) Date: Thu, 17 Aug 2023 18:32:43 GMT Message-Id: <202308171832.37HIWhkg045830@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: 18974bd616ae - main - bhyve: Store the FreeBSD OUI in little-endian in the controller data List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 18974bd616ae141c8721b8b01eb634670f5ccd56 Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=18974bd616ae141c8721b8b01eb634670f5ccd56 commit 18974bd616ae141c8721b8b01eb634670f5ccd56 Author: John Baldwin AuthorDate: 2023-08-17 18:30:50 +0000 Commit: John Baldwin CommitDate: 2023-08-17 18:32:32 +0000 bhyve: Store the FreeBSD OUI in little-endian in the controller data Section 7.10.3 of the NVME 1.4b specification states that the IEEE OUI in the identify controller structure is stored in little-endian format (unlike the embedded OUI in EUI64 identifiers). Reviewed by: corvink, chuck, imp Sponsored by: Chelsio Communications Differential Revision: https://reviews.freebsd.org/D41487 --- usr.sbin/bhyve/pci_nvme.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/usr.sbin/bhyve/pci_nvme.c b/usr.sbin/bhyve/pci_nvme.c index 5bdf4c454a23..d1b15d6f3a3c 100644 --- a/usr.sbin/bhyve/pci_nvme.c +++ b/usr.sbin/bhyve/pci_nvme.c @@ -525,9 +525,9 @@ pci_nvme_init_ctrldata(struct pci_nvme_softc *sc) cd->rab = 4; /* FreeBSD OUI */ - cd->ieee[0] = 0x58; + cd->ieee[0] = 0xfc; cd->ieee[1] = 0x9c; - cd->ieee[2] = 0xfc; + cd->ieee[2] = 0x58; cd->mic = 0; From nobody Thu Aug 17 18:32:44 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RRYXF09WLz4mWW1; Thu, 17 Aug 2023 18:32:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RRYXD6ZcYz3Rtp; Thu, 17 Aug 2023 18:32:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692297164; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=GhfJGQv+HljxxDX2AyWrDVRe1ftO2uGCc3dDQKQO0Rk=; b=A5ctQ59iBnLVhkCqfKfvw92RzYo7HJjE3GVHIlRMD2xAUKQcAgGAWjNpjeIurDg3y5S0N8 N/Nyq9l+0JwhrgAyicUg50zpJCdGYQwlLPG4WuaNJ86Sz4jrtrgoJ6vELmgC1/3ITxsC34 NjKQFCPBYHz5ZhQtPLopb4p7DSr0tvLX15NCCBCJH8S7KfjP0fFI9LlX0ubOd8czugty6w PEui0DPJUNi2jkJjqzMteXSSDZrQAXkFxQqeSB3Fl9cH6yVVrMG4/eE/JNeJaB0Me7kTyC rm0iv8R5sFrnN8KFwWKXxGPnjurAYFHd4lj5bq5Hy+EFeA0/pNng9+CGNKYEqA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692297164; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=GhfJGQv+HljxxDX2AyWrDVRe1ftO2uGCc3dDQKQO0Rk=; b=UQWyI26NdhXDFoXuafG0xP+42Q8O4IxavgpTHGa2K+jNxcetoYLVdzAh/xe4YOhV08e6bZ eDPhv9fif+3IgJF3YxVyvQkHLG+tHanEHD8PYwS5PqKG66cWlWLHrSwHZ3k4JOJ/a/5QQc lMDNUEdVWb2qjapCAxRDFXmaBLlmAkzBf+eySbg0HW3Nq85Qh9Sj7X/mvHuBeop5eiBaov GwVWVSGi4LYOkueDLj+tzuHNHiMdOu9UcR3jaim4qTdrx0qUXBVMf2c9kEtNRul5GBExe5 inGZV16O/VAqn3bk8DfD/1+jE8p28w4qP/rnBji51S5jS9QW9HuQyCnVW+adWg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692297164; a=rsa-sha256; cv=none; b=huumuNp5bxsz5A+9le/Ckxz1YCMztr0Ht8N1Ayw3Eqgcaf8GaKaOfsRu6T4/4YqxLD6YW4 nw1sYsoJ6OmnfF9f+cvZj3N4I2fe6Vq1bOMs+bLx0fu1l9RtUSCc0n/oR9bYcFfs/gxwFl gMmfdMsqAEkfb5hw/4Zy9CJR9AhhaRPbQP9LaIUizCyVH1fki3GqDzA0VD4+PsYr4UJpos 0zSyo+p237NLwUl9t+dGo2XaD7K6Z7W0MEBTJc1tPBpGIcZmhsRA5nFLeMeh7yXUgPvBZM iPzYnm0Fduk4sZGWn6Ez/ZkhvJ0qet86tmFss0tz8iccsVjOShu3yhqr4en/1w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RRYXD5XyRzlPN; Thu, 17 Aug 2023 18:32:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37HIWiQY045887; Thu, 17 Aug 2023 18:32:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37HIWinh045884; Thu, 17 Aug 2023 18:32:44 GMT (envelope-from git) Date: Thu, 17 Aug 2023 18:32:44 GMT Message-Id: <202308171832.37HIWinh045884@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: 638c68897fbd - main - arm64 db_trace: Ensure trapframe pointer is suitably aligned. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 638c68897fbd7623cc0b6fc8e8c31cb124202a55 Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=638c68897fbd7623cc0b6fc8e8c31cb124202a55 commit 638c68897fbd7623cc0b6fc8e8c31cb124202a55 Author: John Baldwin AuthorDate: 2023-08-17 18:31:20 +0000 Commit: John Baldwin CommitDate: 2023-08-17 18:32:32 +0000 arm64 db_trace: Ensure trapframe pointer is suitably aligned. Reviewed by: jrtc27, markj Sponsored by: DARPA Differential Revision: https://reviews.freebsd.org/D41486 --- sys/arm64/arm64/db_trace.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sys/arm64/arm64/db_trace.c b/sys/arm64/arm64/db_trace.c index 8e8fedc1c5f9..cb1c0789b03f 100644 --- a/sys/arm64/arm64/db_trace.c +++ b/sys/arm64/arm64/db_trace.c @@ -93,7 +93,8 @@ db_stack_trace_cmd(struct thread *td, struct unwind_state *frame) struct trapframe *tf; tf = (struct trapframe *)(uintptr_t)frame->fp - 1; - if (!kstack_contains(td, (vm_offset_t)tf, + if (!__is_aligned(tf, _Alignof(*tf)) || + !kstack_contains(td, (vm_offset_t)tf, sizeof(*tf))) { db_printf("--- invalid trapframe %p\n", tf); break; From nobody Thu Aug 17 18:32:45 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RRYXG14gJz4mWNT; Thu, 17 Aug 2023 18:32: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RRYXG0Kqmz3RhQ; Thu, 17 Aug 2023 18:32:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692297166; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3pyphwsWaiFqAPH5TGVfQa/Hs9/QW0Ybh8xHpnva9ko=; b=JsphWyF3ySdHjvpV1a/YRq+eFmqVzd/UTOZrZAYSIJhfUQg9OpfePUamk7kjx8ZVSiye4O hTXkKT44dqN7+j/u5+YqfiHviFPNBHPf0sGTeBOiAVWeHEx+GodkTL31vzTJMnkbiA2KK8 HHX4dZt4gf+X9oZKw3hP3jzetvlzyiIWlF9QekPTdh1IFWDr+67BFvanQeXNwjZaUE3L8M 6Z1+wtBWwWlVqQAVmuFqRUoEtatN9cvu8iN8viSK59zOAyRodTi8rxycZ47mq4ue5fsJwJ lhI8DtQSPGhsFTMriqYG6vqRpp77TBOd0fEHjsDk4byET6py/FipN8nycTAIgA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692297166; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3pyphwsWaiFqAPH5TGVfQa/Hs9/QW0Ybh8xHpnva9ko=; b=oII5yDKfGi5mcDqTzfG2s8G4zhifdzCODNjRX0scyBmZHa9Y/wPM7vVDkE+NppgFPchP9J 1r2iye95z0iPymQ4UrMzvfkxktdcCHY1eIlGWliO34mwMZdAvhz/ZkTxuyQV/pXtAFuczW +nCkK7rKT6NYgIeQLwuZlWOCoVCwpUKe0oEL5bNxZGLKkEAOzNywKy9K7o4KqtOba6nrly 5PpBU4OMWPKgnHhpzSZAYb7f+4FEfArCmM2iVGhlTogBi+rHxy8WCPL67pY4G0aKar36W/ rSh0i+Otv4XeCTzMpuBvKeUc4syL6CScDqxMhtfXYYeruNCPNbxGA811E2mZhg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692297166; a=rsa-sha256; cv=none; b=r0oMI/tqefk/mgbuVt62yL5PmadbIJO6RJZIfbdNFEMTzc+V1n1Efmjm54R5MQwiToSO3e ZmP0C57aAsdXlV13/bSh6YeV69c0LHDfdslK5y65Ddq/CPrC4kfIDmGMQWMSsLdnk2GR7F 8d5X10jcJV0I+kPa1oq/RJCytL8wYlJfmNUBNuApHuCHi0D3Kc491LaElqXTkVkoFgZA3v sJz36pMimT7UMngO9oMUNgayzyBz32yT5fLNRXnSYMXTvMAd3sa030Xo578lsnHmyPAGFv LYRK42USBxwiBrcRuHaunPdxGbBVpjlzhKosrCmay1DF1IiIblCO/64uytNg3g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RRYXF6WsvzkCk; Thu, 17 Aug 2023 18:32:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37HIWjIZ045936; Thu, 17 Aug 2023 18:32:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37HIWjHK045933; Thu, 17 Aug 2023 18:32:45 GMT (envelope-from git) Date: Thu, 17 Aug 2023 18:32:45 GMT Message-Id: <202308171832.37HIWjHK045933@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: ece58eaf5009 - main - Restore blank line after #include List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ece58eaf500974ba4ab1b56420414bf971a17ef7 Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=ece58eaf500974ba4ab1b56420414bf971a17ef7 commit ece58eaf500974ba4ab1b56420414bf971a17ef7 Author: John Baldwin AuthorDate: 2023-08-17 18:32:14 +0000 Commit: John Baldwin CommitDate: 2023-08-17 18:32:32 +0000 Restore blank line after #include --- lib/libc/arm/gen/_ctx_start.S | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/libc/arm/gen/_ctx_start.S b/lib/libc/arm/gen/_ctx_start.S index 39c282bf30c7..cd8d25b9e583 100644 --- a/lib/libc/arm/gen/_ctx_start.S +++ b/lib/libc/arm/gen/_ctx_start.S @@ -1,4 +1,5 @@ #include + ENTRY(_ctx_start) mov lr, pc mov pc, r4 From nobody Thu Aug 17 18:35:11 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RRYb33nhtz4mX2f; Thu, 17 Aug 2023 18:35: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RRYb33KGqz3TRT; Thu, 17 Aug 2023 18:35:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692297311; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=N0iQOQSOgwPF6JfJCLT16/LlMgqOmAvOd/78JilmtA8=; b=NhvIFJrtf+hk5ohPqk1iM5SoK8wFLHsDQMiK59+urnRJUi1hqfvkNeHVaR9xqrBZDd1w4K 3rZAsGuQkzwh7h8wWBYdjiMKmGLGVx6nYy5PqibHc6oY3zV9cPSPxhJWOglJ73R7GQX8wF 3LTLl8DF9mxrLRkKEcHhqDmrNTixwN6S/cWrWV6hQNu34QR7phRsrl8SMR7kiRqUjTWXVv bY2fbxjNVvRAPo4QCDSSzkSeEKVTvCBXBSNwx/WZBDqnawbbRjmns+gkGoxBc4uFJb8w+Z LS8Lr8Gsk39SV07wLjWGqi06gw+Vc+45RQZ2Wce5/05rjgSh7vJOeldvsY8k8Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692297311; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=N0iQOQSOgwPF6JfJCLT16/LlMgqOmAvOd/78JilmtA8=; b=GxeVLfS3jdbde4VhDa7lFw9hjhDUAShj2/EVpZ5SI+qvD2T43d3/Z6Pb/WyBis9/mMu9Pp PiAGhWuqLTzCTv4HQ8wBg8o4Bqqk6eO+oWNXxxku47g2C19wnJIUyOFL/YHElBJRJ9GWxo riDbCPKvEsOe72t2xXVBkacPemk79IisOwtWmuhhFduyCptIS9C2YmZcF+91SO/JDLkS51 XsSsH7xVNaYWx9EKGXJrAFb7cXztqYHlQagUieLdSbBiXN8afC6VsJp33kJD8f59WMtYKY LO3e8xLIQDuf/p3MWuxTA6KHTtqnk3SyJOPVRqBhokjQCDQnBfLm/YcaeyTmRg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692297311; a=rsa-sha256; cv=none; b=XUKeKD87Q7hX1bY9PruX8tfDjN745HEerxUtCR/moaaOr5hflC8gKN9sMK37MBC4XuQYhs +pi77qdhDS7HTVtlm3b9UMOAOFcnD7AW7o4+1OJpvJ+Fkj7jm9YI5K8j5u3w7w6JhlMFfq +8GfEWl22NA9CRn6+lWvCmEWg9f9TXrenUvphYd3gfdbRdKhnf3FxmdnUk/7UQoFrB5h1D oE11bgPWkfBPcNJj4MtB+bDM5a/5UOEr9KZik/V1Y4bINnRWxZ5o0q6Ui+zyPPPD/ldFjq tmy5n6Csn1ifD3ahM6jLTsVHBNaEn0U6nMKjel387EkuTjRS3z+P4Xyg+wir2Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RRYb32MsVzlM7; Thu, 17 Aug 2023 18:35:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37HIZBPj047111; Thu, 17 Aug 2023 18:35:11 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37HIZBXD047108; Thu, 17 Aug 2023 18:35:11 GMT (envelope-from git) Date: Thu, 17 Aug 2023 18:35:11 GMT Message-Id: <202308171835.37HIZBXD047108@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Marius Strobl Subject: git: 51e235148a4b - main - iflib drivers: Constify PCI ID LUTs List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: marius X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 51e235148a4becba94e824a44bd69687644a7f56 Auto-Submitted: auto-generated The branch main has been updated by marius: URL: https://cgit.FreeBSD.org/src/commit/?id=51e235148a4becba94e824a44bd69687644a7f56 commit 51e235148a4becba94e824a44bd69687644a7f56 Author: Marius Strobl AuthorDate: 2023-08-16 16:49:34 +0000 Commit: Marius Strobl CommitDate: 2023-08-17 18:34:23 +0000 iflib drivers: Constify PCI ID LUTs Since d49e83eac3baf16a22b1c5d42e8438b68b17e6f9, iflib(9) is ready for this change. While at it, make isc_driver_version strings (static) const where not apparently un-const on purpose, too. This reduces the size of the amd64 GENERIC by about 10 KiB. --- sys/dev/axgbe/if_axgbe_pci.c | 2 +- sys/dev/bnxt/bnxt.h | 2 +- sys/dev/bnxt/if_bnxt.c | 4 ++-- sys/dev/e1000/if_em.c | 8 ++++---- sys/dev/enetc/if_enetc.c | 2 +- sys/dev/enic/if_enic.c | 2 +- sys/dev/iavf/iavf_drv_info.h | 2 +- sys/dev/ice/ice_drv_info.h | 2 +- sys/dev/igc/if_igc.c | 2 +- sys/dev/ixgbe/if_ix.c | 4 ++-- sys/dev/ixgbe/if_ixv.c | 4 ++-- sys/dev/ixl/if_ixl.c | 2 +- sys/dev/mgb/if_mgb.c | 2 +- sys/dev/vmware/vmxnet3/if_vmx.c | 2 +- 14 files changed, 20 insertions(+), 20 deletions(-) diff --git a/sys/dev/axgbe/if_axgbe_pci.c b/sys/dev/axgbe/if_axgbe_pci.c index ac0bab896cb9..7f661e6d9c98 100644 --- a/sys/dev/axgbe/if_axgbe_pci.c +++ b/sys/dev/axgbe/if_axgbe_pci.c @@ -137,7 +137,7 @@ static struct resource_spec axgbe_pci_mac_spec[] = { { -1, 0 } }; -static pci_vendor_info_t axgbe_vendor_info_array[] = +static const pci_vendor_info_t axgbe_vendor_info_array[] = { PVID(0x1022, 0x1458, "AMD 10 Gigabit Ethernet Driver"), PVID(0x1022, 0x1459, "AMD 10 Gigabit Ethernet Driver"), diff --git a/sys/dev/bnxt/bnxt.h b/sys/dev/bnxt/bnxt.h index 78b7e4ca6bf5..2b5c16e263d7 100644 --- a/sys/dev/bnxt/bnxt.h +++ b/sys/dev/bnxt/bnxt.h @@ -206,7 +206,7 @@ #define BNXT_MIN_FRAME_SIZE 52 /* Frames must be padded to this size for some A0 chips */ -extern char bnxt_driver_version[]; +extern const char bnxt_driver_version[]; typedef void (*bnxt_doorbell_tx)(void *, uint16_t idx); typedef void (*bnxt_doorbell_rx)(void *, uint16_t idx); typedef void (*bnxt_doorbell_rx_cq)(void *, bool); diff --git a/sys/dev/bnxt/if_bnxt.c b/sys/dev/bnxt/if_bnxt.c index c77be218e677..2796eed94e11 100644 --- a/sys/dev/bnxt/if_bnxt.c +++ b/sys/dev/bnxt/if_bnxt.c @@ -67,7 +67,7 @@ * PCI Device ID Table */ -static pci_vendor_info_t bnxt_vendor_info_array[] = +static const pci_vendor_info_t bnxt_vendor_info_array[] = { PVID(BROADCOM_VENDOR_ID, BCM57301, "Broadcom BCM57301 NetXtreme-C 10Gb Ethernet Controller"), @@ -300,7 +300,7 @@ static driver_t bnxt_iflib_driver = { */ #define BNXT_DRIVER_VERSION "2.20.0.1" -char bnxt_driver_version[] = BNXT_DRIVER_VERSION; +const char bnxt_driver_version[] = BNXT_DRIVER_VERSION; extern struct if_txrx bnxt_txrx; static struct if_shared_ctx bnxt_sctx_init = { .isc_magic = IFLIB_MAGIC, diff --git a/sys/dev/e1000/if_em.c b/sys/dev/e1000/if_em.c index aabd1242b74c..4fa275f08e28 100644 --- a/sys/dev/e1000/if_em.c +++ b/sys/dev/e1000/if_em.c @@ -36,8 +36,8 @@ /********************************************************************* * Driver version: *********************************************************************/ -char em_driver_version[] = "7.7.8-fbsd"; -char igb_driver_version[] = "2.5.19-fbsd"; +static const char em_driver_version[] = "7.7.8-fbsd"; +static const char igb_driver_version[] = "2.5.19-fbsd"; /********************************************************************* * PCI Device ID Table @@ -49,7 +49,7 @@ char igb_driver_version[] = "2.5.19-fbsd"; * { Vendor ID, Device ID, SubVendor ID, SubDevice ID, String Index } *********************************************************************/ -static pci_vendor_info_t em_vendor_info_array[] = +static const pci_vendor_info_t em_vendor_info_array[] = { /* Intel(R) - lem-class legacy devices */ PVID(0x8086, E1000_DEV_ID_82540EM, "Intel(R) Legacy PRO/1000 MT 82540EM"), @@ -214,7 +214,7 @@ static pci_vendor_info_t em_vendor_info_array[] = PVID_END }; -static pci_vendor_info_t igb_vendor_info_array[] = +static const pci_vendor_info_t igb_vendor_info_array[] = { /* Intel(R) - igb-class devices */ PVID(0x8086, E1000_DEV_ID_82575EB_COPPER, "Intel(R) PRO/1000 82575EB (Copper)"), diff --git a/sys/dev/enetc/if_enetc.c b/sys/dev/enetc/if_enetc.c index 2924a8e19f86..04171698cd38 100644 --- a/sys/dev/enetc/if_enetc.c +++ b/sys/dev/enetc/if_enetc.c @@ -125,7 +125,7 @@ static int enetc_ctrl_send(struct enetc_softc*, static const char enetc_driver_version[] = "1.0.0"; -static pci_vendor_info_t enetc_vendor_info_array[] = { +static const pci_vendor_info_t enetc_vendor_info_array[] = { PVID(PCI_VENDOR_FREESCALE, ENETC_DEV_ID_PF, "Freescale ENETC PCIe Gigabit Ethernet Controller"), PVID_END diff --git a/sys/dev/enic/if_enic.c b/sys/dev/enic/if_enic.c index a386191a51ef..b2fc3af56006 100644 --- a/sys/dev/enic/if_enic.c +++ b/sys/dev/enic/if_enic.c @@ -57,7 +57,7 @@ static SYSCTL_NODE(_hw, OID_AUTO, enic, CTLFLAG_RW | CTLFLAG_MPSAFE, 0, "ENIC"); -static pci_vendor_info_t enic_vendor_info_array[] = +static const pci_vendor_info_t enic_vendor_info_array[] = { PVID(CISCO_VENDOR_ID, PCI_DEVICE_ID_CISCO_VIC_ENET, DRV_DESCRIPTION), diff --git a/sys/dev/iavf/iavf_drv_info.h b/sys/dev/iavf/iavf_drv_info.h index ed8e05fe9727..5a84a30662a8 100644 --- a/sys/dev/iavf/iavf_drv_info.h +++ b/sys/dev/iavf/iavf_drv_info.h @@ -66,7 +66,7 @@ const char iavf_driver_version[] = "3.0.26-k"; * to most-generic entry; e.g. PVIDV_OEM()s for a device ID must come before * the PVIDV() for it. */ -static pci_vendor_info_t iavf_vendor_info_array[] = { +static const pci_vendor_info_t iavf_vendor_info_array[] = { PVIDV(IAVF_INTEL_VENDOR_ID, IAVF_DEV_ID_VF, "Intel(R) Ethernet Virtual Function 700 Series"), PVIDV(IAVF_INTEL_VENDOR_ID, IAVF_DEV_ID_X722_VF, diff --git a/sys/dev/ice/ice_drv_info.h b/sys/dev/ice/ice_drv_info.h index f258650760bc..41598923dc94 100644 --- a/sys/dev/ice/ice_drv_info.h +++ b/sys/dev/ice/ice_drv_info.h @@ -85,7 +85,7 @@ const uint8_t ice_rc_version = 0; * to most-generic entry; e.g. PVIDV_OEM()s for a device ID must come before * the PVIDV() for it. */ -static pci_vendor_info_t ice_vendor_info_array[] = { +static const pci_vendor_info_t ice_vendor_info_array[] = { PVIDV(ICE_INTEL_VENDOR_ID, ICE_DEV_ID_E810C_BACKPLANE, "Intel(R) Ethernet Controller E810-C for backplane"), PVIDV_OEM(ICE_INTEL_VENDOR_ID, ICE_DEV_ID_E810C_QSFP, diff --git a/sys/dev/igc/if_igc.c b/sys/dev/igc/if_igc.c index 03c366207ff0..c59e379ca2c8 100644 --- a/sys/dev/igc/if_igc.c +++ b/sys/dev/igc/if_igc.c @@ -46,7 +46,7 @@ * { Vendor ID, Device ID, String } *********************************************************************/ -static pci_vendor_info_t igc_vendor_info_array[] = +static const pci_vendor_info_t igc_vendor_info_array[] = { /* Intel(R) PRO/1000 Network Connection - igc */ PVID(0x8086, IGC_DEV_ID_I225_LM, "Intel(R) Ethernet Controller I225-LM"), diff --git a/sys/dev/ixgbe/if_ix.c b/sys/dev/ixgbe/if_ix.c index ea705d427b86..e8fb5de493ce 100644 --- a/sys/dev/ixgbe/if_ix.c +++ b/sys/dev/ixgbe/if_ix.c @@ -45,7 +45,7 @@ /************************************************************************ * Driver version ************************************************************************/ -char ixgbe_driver_version[] = "4.0.1-k"; +static const char ixgbe_driver_version[] = "4.0.1-k"; /************************************************************************ * PCI Device ID Table @@ -56,7 +56,7 @@ char ixgbe_driver_version[] = "4.0.1-k"; * * { Vendor ID, Device ID, SubVendor ID, SubDevice ID, String Index } ************************************************************************/ -static pci_vendor_info_t ixgbe_vendor_info_array[] = +static const pci_vendor_info_t ixgbe_vendor_info_array[] = { PVID(IXGBE_INTEL_VENDOR_ID, IXGBE_DEV_ID_82598AF_DUAL_PORT, "Intel(R) 82598EB AF (Dual Fiber)"), PVID(IXGBE_INTEL_VENDOR_ID, IXGBE_DEV_ID_82598AF_SINGLE_PORT, "Intel(R) 82598EB AF (Fiber)"), diff --git a/sys/dev/ixgbe/if_ixv.c b/sys/dev/ixgbe/if_ixv.c index 1e902df0510a..66a1e4fe2df1 100644 --- a/sys/dev/ixgbe/if_ixv.c +++ b/sys/dev/ixgbe/if_ixv.c @@ -45,7 +45,7 @@ /************************************************************************ * Driver version ************************************************************************/ -char ixv_driver_version[] = "2.0.1-k"; +static const char ixv_driver_version[] = "2.0.1-k"; /************************************************************************ * PCI Device ID Table @@ -56,7 +56,7 @@ char ixv_driver_version[] = "2.0.1-k"; * * { Vendor ID, Device ID, SubVendor ID, SubDevice ID, String Index } ************************************************************************/ -static pci_vendor_info_t ixv_vendor_info_array[] = +static const pci_vendor_info_t ixv_vendor_info_array[] = { PVID(IXGBE_INTEL_VENDOR_ID, IXGBE_DEV_ID_82599_VF, "Intel(R) X520 82599 Virtual Function"), PVID(IXGBE_INTEL_VENDOR_ID, IXGBE_DEV_ID_X540_VF, "Intel(R) X540 Virtual Function"), diff --git a/sys/dev/ixl/if_ixl.c b/sys/dev/ixl/if_ixl.c index a1dfe523893e..60e66aeaf579 100644 --- a/sys/dev/ixl/if_ixl.c +++ b/sys/dev/ixl/if_ixl.c @@ -63,7 +63,7 @@ * ( Vendor ID, Device ID, Branding String ) *********************************************************************/ -static pci_vendor_info_t ixl_vendor_info_array[] = +static const pci_vendor_info_t ixl_vendor_info_array[] = { PVIDV(I40E_INTEL_VENDOR_ID, I40E_DEV_ID_SFP_XL710, "Intel(R) Ethernet Controller X710 for 10GbE SFP+"), PVIDV(I40E_INTEL_VENDOR_ID, I40E_DEV_ID_KX_B, "Intel(R) Ethernet Controller XL710 for 40GbE backplane"), diff --git a/sys/dev/mgb/if_mgb.c b/sys/dev/mgb/if_mgb.c index 60d0c21ccceb..4a23ef3cdcaf 100644 --- a/sys/dev/mgb/if_mgb.c +++ b/sys/dev/mgb/if_mgb.c @@ -86,7 +86,7 @@ #include "ifdi_if.h" #include "miibus_if.h" -static pci_vendor_info_t mgb_vendor_info_array[] = { +static const pci_vendor_info_t mgb_vendor_info_array[] = { PVID(MGB_MICROCHIP_VENDOR_ID, MGB_LAN7430_DEVICE_ID, "Microchip LAN7430 PCIe Gigabit Ethernet Controller"), PVID(MGB_MICROCHIP_VENDOR_ID, MGB_LAN7431_DEVICE_ID, diff --git a/sys/dev/vmware/vmxnet3/if_vmx.c b/sys/dev/vmware/vmxnet3/if_vmx.c index c819f3aae995..99e84e744d57 100644 --- a/sys/dev/vmware/vmxnet3/if_vmx.c +++ b/sys/dev/vmware/vmxnet3/if_vmx.c @@ -77,7 +77,7 @@ #define VMXNET3_VMWARE_VENDOR_ID 0x15AD #define VMXNET3_VMWARE_DEVICE_ID 0x07B0 -static pci_vendor_info_t vmxnet3_vendor_info_array[] = +static const pci_vendor_info_t vmxnet3_vendor_info_array[] = { PVID(VMXNET3_VMWARE_VENDOR_ID, VMXNET3_VMWARE_DEVICE_ID, "VMware VMXNET3 Ethernet Adapter"), /* required last entry */ From nobody Thu Aug 17 18:53:34 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RRZ0G66GNz4q1Y2; Thu, 17 Aug 2023 18:53: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RRZ0G5YhTz3Vgc; Thu, 17 Aug 2023 18:53:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692298414; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=k+HOHVzWYGquZOeHCFkCFzl2xQb3d5rvPrwZ8cnFYNc=; b=B5v/k9TA0g/MSY99bOy37zaRIncfyTPcSWvVLXY6dt9fzXBXstFYi+vzgdA3il39ckPwEM BxpVlIyf6ZzSfPOIPr27lUtblSF3yDdtu98tzQMMgH9ZZguxF3lcyhyfMOIN5qCUZXl94Y 56otfoz7pXaAmDuF2BKdRwVf9LYrAHbiQNW+g+bXxTgqOzhASZi9P1WTdmUYq/AFWoM9Ci UE+upSsxOyiHopzQtRAUcuFg5uNtbCIfGrKmJMnHAZvdmMhp5jTS3sPWzZGua/BTPUBVzC W/gCEO1KkOXLigUkW2raaFV/nyc/wAvDlWSgxAMCu/xIW8gbn8sxlWF7nAlBJQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692298414; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=k+HOHVzWYGquZOeHCFkCFzl2xQb3d5rvPrwZ8cnFYNc=; b=vR9LfM9Y3k32OINW/HXPTqpBshKVoddhoUjkvUfRhqkgwgRYM7+zS3JIjB6bh0rDpKyNyi Gdb4jVjkndMnppdH9EDzsLC5huvYILYvPowQprSBHmyLieIFJnmdd0jzfUQMDH7Tt8kf1i KGeyyc6WjG5dCU3P2XHuJbvTa9ZIUt8wXKx1ydWkOIAYn2K93WAmTZWiR9JjZW2Juo0dOH ACE1INskfbQ8FSQE6bXvW7LTIF980G8E1iPbeUysTqqzYW817xkMZYFtAG53hyyOnRYud6 vg9UCtVFnuWZxt1Q9h8ho1y9XD6DfP8V2p38TLG9ybsr7fBY0mkqp5HAsDr3PA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692298414; a=rsa-sha256; cv=none; b=lGxSDVFK0idbtJahg1PQCWMKWIyXJYENxugb1hDQdtTzOApJwVYI4jOuvkxem1n7p2i5Kf gFXFNI2yP06kCmHVnAQqG59XrZ21BESTjeFCLpjQyHrxpUy6dEn9mbMhgzkBS19DBQGwmt BaOfzVvNI1Kwcf/8t4/9JY6HqbM79ts6qhei7SwvcPCEfVg7CurqiHhXh+5iA+dx2n6rQB 1uuJo5tXT8qK+pnEbNtGxcZTVIRBpEXtxUe+1LtIljFrHst0atlItb0uEaD2unyYp0bopf LfVANe3lKi5WPBQFZ+yzMtFmpeWGC5xeU9oRoE3VumDO4MhD13O1rtS3qG5ncA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RRZ0G4cmQzljH; Thu, 17 Aug 2023 18:53:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37HIrYLN079240; Thu, 17 Aug 2023 18:53:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37HIrYmk079237; Thu, 17 Aug 2023 18:53:34 GMT (envelope-from git) Date: Thu, 17 Aug 2023 18:53:34 GMT Message-Id: <202308171853.37HIrYmk079237@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: d1eb515f14e2 - main - bhyve: default UART to 115200 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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/main X-Git-Reftype: branch X-Git-Commit: d1eb515f14e26e345ef5075648bfc18361c7d576 Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=d1eb515f14e26e345ef5075648bfc18361c7d576 commit d1eb515f14e26e345ef5075648bfc18361c7d576 Author: Ed Maste AuthorDate: 2023-08-17 17:36:02 +0000 Commit: Ed Maste CommitDate: 2023-08-17 18:53:23 +0000 bhyve: default UART to 115200 Reviewed by: jhb Differential Revision: https://reviews.freebsd.org/D41494 --- usr.sbin/bhyve/uart_emul.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr.sbin/bhyve/uart_emul.c b/usr.sbin/bhyve/uart_emul.c index 645abf6dc243..917ce36b67f6 100644 --- a/usr.sbin/bhyve/uart_emul.c +++ b/usr.sbin/bhyve/uart_emul.c @@ -64,7 +64,7 @@ #define COM4_IRQ 3 #define DEFAULT_RCLK 1843200 -#define DEFAULT_BAUD 9600 +#define DEFAULT_BAUD 115200 #define FCR_RX_MASK 0xC0 From nobody Thu Aug 17 19:58:34 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RRbRG3Mpnz4q54m; Thu, 17 Aug 2023 19:58: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RRbRG2rlwz4HTC; Thu, 17 Aug 2023 19:58:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692302314; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ev5whL04kMtWu3efabupViDXOiLchRr7tRTlsXsCr/8=; b=ceC0MGM5ANYadNN/Wu9A1wZDMiTFSJTlY77HkTzceAzOVkMgJEuFe9Z6KajIxwNhZfwmtx Hoja2M7pn02ICQMJMOJzquHevCvlehP+kz6FiJQEvrNwEFbHk/3atN+MATl2lC9ZrZ3iQZ aI9haXuncblSVra9p/SenB8orqzNqwU5Eoc6yqi1Fgj1qECB7wRMoJLvsqJFsBMd1bedN3 ClaQg+X7tn3jRHWxgPOtGJ95OJezEAEccbGfVNBGdjX+r7/UNWSm2/tRyRVWXQVIaPmnQq At8jF3EVrT3/vGcOxa4HF6JtVlZpCke7y7lrY5sLE+GzjtyZv2W/Bi800PMibQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692302314; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ev5whL04kMtWu3efabupViDXOiLchRr7tRTlsXsCr/8=; b=j74Mpnstb/exJhnhqt8oDPPUeQKmh1KUTB7T0MUcRhP8q2CHfV94zID2F3XbmmtQ4XE2jf wbLjuYlGNAfCGBlItwvnSUQ++lDcuox2Sh7FR+A0yEmaAcEuJin2B6wA/6CfSJpbPaTyI2 86xHhpiEGy3sg1SLdVLUkWWpe8kzN3jmGxNj/vm4WiZmdaaKzROXEuNpE5/+Ut4zLf+av3 P4L4qUasbh5kFroN1YS9eRP0eRAN5vHNwZIg0aCL7TtPQRo2vdPAAn1huUKTq7CkX+GB8E u7eIQ93o6qo9X5PcE/ivUonHJhdDsjgphdhYkcCVRlUZMI2qLpvDb8tlkxyvBg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692302314; a=rsa-sha256; cv=none; b=I9x8Y0C3e72q62cgy8BeneaIjQMBLAMzxAkTsDwk+AP03BNe3CWy+g+cOI78jVPLTIuIbD +AlpGsekbY5wQdd9sCeBtzccVWxkfG0Rq9wR4DnWEY8Pa+JUahK5xIgG6H8kGWnDNMZpVG uoj4L587lvsGm1/fIuQYNDDjFwpm1hv0960Gv0Aj7rw9Ppu50kUOEraz/49r+0XOJNlhIk 97zMMzHkd/vpKJ9FKZtL1EfvL9zd0HxTEb1zRk9UciaFIhq+7Soti0pLPVWnMDf8Bju5xh osYlTOsqMekTwY9LWM/P63+xY3y9U4y4qx4Kyc0E8BIB5Eufi4zWSXJ3SyZHXQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RRbRG1vNqzn60; Thu, 17 Aug 2023 19:58:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37HJwYjP080165; Thu, 17 Aug 2023 19:58:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37HJwYxd080162; Thu, 17 Aug 2023 19:58:34 GMT (envelope-from git) Date: Thu, 17 Aug 2023 19:58:34 GMT Message-Id: <202308171958.37HJwYxd080162@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dmitry Chagin Subject: git: 1f2b31f76e7d - main - linux(4): Add 2 Linux socket ioctl commands List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dchagin X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1f2b31f76e7d1ba591a4e7f4305c4acc2b1b4fa5 Auto-Submitted: auto-generated The branch main has been updated by dchagin: URL: https://cgit.FreeBSD.org/src/commit/?id=1f2b31f76e7d1ba591a4e7f4305c4acc2b1b4fa5 commit 1f2b31f76e7d1ba591a4e7f4305c4acc2b1b4fa5 Author: Alvin Chen AuthorDate: 2023-08-17 19:57:16 +0000 Commit: Dmitry Chagin CommitDate: 2023-08-17 19:57:16 +0000 linux(4): Add 2 Linux socket ioctl commands Support 2 Linux socket ioctl commands: SIOCGIFMETRIC, SIOCSIFMETRIC. Differential revision: https://reviews.freebsd.org/D39786 MFC after: 1 month --- sys/compat/linux/linux_ioctl.c | 6 ++++++ sys/compat/linux/linux_ioctl.h | 2 ++ 2 files changed, 8 insertions(+) diff --git a/sys/compat/linux/linux_ioctl.c b/sys/compat/linux/linux_ioctl.c index 709f3ded977b..3b2727afd179 100644 --- a/sys/compat/linux/linux_ioctl.c +++ b/sys/compat/linux/linux_ioctl.c @@ -2272,6 +2272,12 @@ linux_ioctl_socket_ifreq(struct thread *td, int fd, u_int cmd, case LINUX_SIOCGIFHWADDR: cmd = SIOCGHWADDR; break; + case LINUX_SIOCGIFMETRIC: + cmd = SIOCGIFMETRIC; + break; + case LINUX_SIOCSIFMETRIC: + cmd = SIOCSIFMETRIC; + break; /* * XXX This is slightly bogus, but these ioctls are currently * XXX only used by the aironet (if_an) network driver. diff --git a/sys/compat/linux/linux_ioctl.h b/sys/compat/linux/linux_ioctl.h index 42c36e43db6c..8a56e35d10c6 100644 --- a/sys/compat/linux/linux_ioctl.h +++ b/sys/compat/linux/linux_ioctl.h @@ -235,6 +235,8 @@ #define LINUX_SIOCGIFBRDADDR 0x8919 #define LINUX_SIOCGIFNETMASK 0x891b #define LINUX_SIOCSIFNETMASK 0x891c +#define LINUX_SIOCGIFMETRIC 0x891d +#define LINUX_SIOCSIFMETRIC 0x891e #define LINUX_SIOCGIFMTU 0x8921 #define LINUX_SIOCSIFMTU 0x8922 #define LINUX_SIOCSIFNAME 0x8923 From nobody Thu Aug 17 19:58:35 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RRbRJ0Cpqz4q50V; Thu, 17 Aug 2023 19:58: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RRbRH42Y8z4HWs; Thu, 17 Aug 2023 19:58:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692302315; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=eHHxyG8TGQ1ub+Cnz6lDpu/8xIoG1HTDxW69TVXAJ+M=; b=tN00H1jA3SWn2lOE2lRKsNGZxxlyJ+eLMnnRJuHypSNJhuZ3YRsFTKT53yD3yRAYj72Crq qtE0c2yds69i4nOaddZKkqMDPnag4sA5yYxnbUZ2tDlkGogYuRVQGRx1IMG73ZWR83gTnV l7gkfubQXtMwvvq905uC+w9LEXe7NQah+NVEsRWSc0J3kVY3AqpOChTgdXLWppKctv8S/d Gz908RrtoCuxVIdkzMmmX9oIKjQJkGRkz4XAtH3+1uiebPwseGrP+myT1J8MMCEj7gl+pp 4NNQg5+wtRRMNIrwTYwMr4V2vDdk9nlzeHEkdwP06WELm0WErvu2/0ApFtYupg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692302315; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=eHHxyG8TGQ1ub+Cnz6lDpu/8xIoG1HTDxW69TVXAJ+M=; b=AV97fhSKgYcechoU9Ktg49VqYjCtWrECQfnYHH+umrVQWSaRVIQ0VII4MjU/UzskgwzhiD wlPsy2NK1WYHSJHO6ejmJ+Qa+6gKwwvgyOXWawu0gO64VbtjEtcbAnYi5FHMAO8Wk4bdy0 LxUDtUnbop9Cs293BI9Vce33Ty9U0GNd46e1ktzL50+8hoguMMBV4sRsYEr+rULMunWze0 L2Xdv+30cHxnmqUQuDAm3aERf6QtQ3vuDqYA2v9mDOSzNYeREP+ym/RDySir1LOxyl+Vp1 Yin91Kbt3A+J5P3zSq8XBQLQtWMN+4snLVqoAQQmhyJIsGRVtis1wF7buZSfIA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692302315; a=rsa-sha256; cv=none; b=mDBSw1u9BJMmQndzRGXaAqhm3Nzq+JTf9UqRDndFLhXUyTam/b8T9BAbRkuJVccpiAw4q0 W8fB7LOc6Kjw0kYnaV7jSieyeT9hKHI6RenDaaqLWw+pbOhkMQBiwODROnsdNXpFvOJEw3 M/rzQTfcvLfWL53mOKhX1RuChoKWhx06gMO41kPkp1eNrBWQfOZBcYFo+3bAH+M+iGbOXS /qubLRJxoyxZkrbVDVldYfTWLZg40TJssp4rLjPoT7fHvRmCld/r0y3s575mXgId1FdONe qtcbkOBuZqOmV2X4zizaOAWOui7MnBaRuYD8JANpwqq8yM81RXy6YXlP7HxKSA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RRbRH2vsGzn61; Thu, 17 Aug 2023 19:58:35 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37HJwZNd080226; Thu, 17 Aug 2023 19:58:35 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37HJwZZ1080223; Thu, 17 Aug 2023 19:58:35 GMT (envelope-from git) Date: Thu, 17 Aug 2023 19:58:35 GMT Message-Id: <202308171958.37HJwZZ1080223@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dmitry Chagin Subject: git: 5ad5cf507910 - main - linux(4): Be verbose about unsupported ioctl commands on ifreq ioctl List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dchagin X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5ad5cf507910a87188e53f94cb046d6faa0de2bb Auto-Submitted: auto-generated The branch main has been updated by dchagin: URL: https://cgit.FreeBSD.org/src/commit/?id=5ad5cf507910a87188e53f94cb046d6faa0de2bb commit 5ad5cf507910a87188e53f94cb046d6faa0de2bb Author: Alvin Chen AuthorDate: 2023-08-17 19:57:16 +0000 Commit: Dmitry Chagin CommitDate: 2023-08-17 19:57:16 +0000 linux(4): Be verbose about unsupported ioctl commands on ifreq ioctl Differential revision: https://reviews.freebsd.org/D39786 MFC after: 1 month --- sys/compat/linux/linux_ioctl.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sys/compat/linux/linux_ioctl.c b/sys/compat/linux/linux_ioctl.c index 3b2727afd179..413d761520d3 100644 --- a/sys/compat/linux/linux_ioctl.c +++ b/sys/compat/linux/linux_ioctl.c @@ -2289,6 +2289,9 @@ linux_ioctl_socket_ifreq(struct thread *td, int fd, u_int cmd, cmd = SIOCGPRIVATE_1; break; default: + LINUX_RATELIMIT_MSG_OPT2( + "ioctl_socket_ifreq fd=%d, cmd=0x%x is not implemented", + fd, cmd); return (ENOIOCTL); } From nobody Thu Aug 17 19:58:36 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RRbRL1s8Yz4q4tS; Thu, 17 Aug 2023 19:58: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RRbRJ4wvmz4HC2; Thu, 17 Aug 2023 19:58:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692302316; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XgaRqV5GbcyXAUa3v6zsFOftIMqGiLQVEKWdE3boakY=; b=bvW52AT1ykJfDnLZj5hGWFQlHLgjLdfyFH9aYdMjESipVaDtbRFfHg4SHHTwX89PTlixS2 mpNtpebhJWWeI2Bv5aRBvT24qb47KEt7+J4gjn4et6F+d3qm+tmxKFMlie6hTfrBoEjY3T 8HmPKXfgO9zPleY8dx6auma7f8T2sAHQvq3DVgHbW0DZMfIawIWPhdfy75JU0zwHQKLJWC qS8KRQjJgHQV17z+sjznjtrZi48hzt719v/1S/j2TKhhbh1CZ35VTDaTBY33ltbi/Jg3z1 A6ETbsfFqI2Pu3Wt7Ao78yzodHi7U7IYFf+n6s6nfLT1TCfjBb3WZzSfxrffeg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692302316; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XgaRqV5GbcyXAUa3v6zsFOftIMqGiLQVEKWdE3boakY=; b=hdQMP8jtThzha36DbPGQoyQIAzFBlhcDRAPghZqOgQSfelDweofcz+XLR5gYV/e8VFqtDL HyZ7oBsBy+8L2fMqWg3FA7jMdW4Br1ijRF+LxvidxwKxoVtsf9rTcpo69fhdGSsCous208 fxsENaSpilifQMmx6EHgHKaYGRdhOfkLBCeZlK1f7qc/jqCLv8n+4mw9PNxC7dJR7Djm5H Lq2p4AoWNIXBWIsKwWSLed4OKjxJD8hcSGGOjvG4KxccuLbOJ9Q5CtQmawuMa1t1f3GhBl jHlvTp0ndyz9cKBrUP8lDO59/Pue4ibxkEntTJV6/4YKtT3GyzulNM+7BGxtYw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692302316; a=rsa-sha256; cv=none; b=QHgMQZGyQvTzMgG5In+WhJ3IhA7449Hw7lp3A8ZtBaR3riqFRcuM7trzp2cOw6w8ksk4Au Sb9c1ePR6tOrsCwvCJTV8s0ROv6gUrpC3zNQgw86P/uY/Kh812sCa5WRm1MF0ETQbbtHU5 aVI+kM88iSZ/WLOmPv3NgVj0yAbOAx22MGdCiG5B1ZXcN89YsqFX0PV+KnerwLEoyFqNHN iQ6SzFBM23X5kjzexV9NH6G5LYWTRF3RldnOmiKkI8mcSZQXdlTK2CylOl1XKaOdcLkmO9 ayM8ImxF4pxxPqI4lUlMFUDBwI4dYsoxwQoQrvT23vD+JeF9CFmuedA2izWhyA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RRbRJ3yzgzn62; Thu, 17 Aug 2023 19:58:36 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37HJwaXq080286; Thu, 17 Aug 2023 19:58:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37HJwaJ8080283; Thu, 17 Aug 2023 19:58:36 GMT (envelope-from git) Date: Thu, 17 Aug 2023 19:58:36 GMT Message-Id: <202308171958.37HJwaJ8080283@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dmitry Chagin Subject: git: 5068387f42f4 - main - linux(4): Use l_off_t type for offset argument in sendfile syscall List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dchagin X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5068387f42f4d863a276c3a55fc626d4cb6c0c91 Auto-Submitted: auto-generated The branch main has been updated by dchagin: URL: https://cgit.FreeBSD.org/src/commit/?id=5068387f42f4d863a276c3a55fc626d4cb6c0c91 commit 5068387f42f4d863a276c3a55fc626d4cb6c0c91 Author: Dmitry Chagin AuthorDate: 2023-08-17 19:57:16 +0000 Commit: Dmitry Chagin CommitDate: 2023-08-17 19:57:16 +0000 linux(4): Use l_off_t type for offset argument in sendfile syscall The off_t on Linux is a long, so it's non-functional change, just to avoid confusing future readers. MFC after: 1 month --- sys/amd64/linux32/syscalls.master | 2 +- sys/i386/linux/syscalls.master | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/amd64/linux32/syscalls.master b/sys/amd64/linux32/syscalls.master index a282ff00345f..9439a80b96f6 100644 --- a/sys/amd64/linux32/syscalls.master +++ b/sys/amd64/linux32/syscalls.master @@ -1020,7 +1020,7 @@ int linux_sendfile( l_int out, l_int in, - l_long *offset, + l_off_t *offset, l_size_t count ); } diff --git a/sys/i386/linux/syscalls.master b/sys/i386/linux/syscalls.master index 65a5aa69fce5..ff3a7d444600 100644 --- a/sys/i386/linux/syscalls.master +++ b/sys/i386/linux/syscalls.master @@ -1038,7 +1038,7 @@ int linux_sendfile( l_int out, l_int in, - l_long *offset, + l_off_t *offset, l_size_t count ); } From nobody Thu Aug 17 19:58:37 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RRbRL5zL3z4q5Lx; Thu, 17 Aug 2023 19:58: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RRbRK5z9cz4HPl; Thu, 17 Aug 2023 19:58:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692302317; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=lDse4G+osD/YgzlSqP2eMVb2nWHJYNiUzm7oY+oY7Rk=; b=l89LPluyO9GDPELGJK7/44xlvqJpX/yIIkIaAAlda5qHwbezejFpYijqNQjWiNwiHFaUkE QD82B7zcZCA7iSGGy66JU2mOsF5F+iGTk3qErZg2/E8moh74Md46Wka5XJNqjV6kXVWGU1 9O/wLwMjesWTrbi5zO/UwwiluwllvcDEccPK4O2npnBu/mX2g4QV6lIhht4hNz+CZr/rMW 7BmC43ta6xAC+Q1O9BLxdHj4j8KbU0ceDZ7/sjLXlTfHbG/O/dgmeTeegjNHJUSqG+098Z DgMgX15JP0eg+k7OjJzQgwMymsB6q74p/tukqGPdAYatCvAUzlSpTMlvM6BuUw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692302317; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=lDse4G+osD/YgzlSqP2eMVb2nWHJYNiUzm7oY+oY7Rk=; b=MWn9a+EOHZLsVLYmtUfu9RxnNStGuITDMIJZIfEaXWKu6yxC8ciDx/HHbym8HwF1zO8JBO 2cwc1Juek9lEejajOORoUt/d42VcZ4ki338GEgM8WdiUmMIq3wFOxvz+cd81NO4+yLrNRg tTCf3eTtIupQLJr9spnxKFNSPC1wIdkDDAkI0uFxAMB0vCvWvRr+oMStSE4LXMhGXD0Lk4 jXSvyZgjX39BYRvRrGffKGeaIfjmquwCPiDypaDK/xQTRhLNdb0gFGgrP3s/etuQx7SRhU cBBIBz6zndCaxwfesebYz4/7sLoAK+DvKAIlqnPQXi0j9dD7qqXYSX45a+bZqQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692302317; a=rsa-sha256; cv=none; b=VCy4tKlEXiU/1iYR5bQPuMUwWIGG9eAFp1RWo1T2ug7P30oVA8RKITTwCQMaiR/PauetRr vMJ9WBbFv35OYiXuwB9c3cin9fVA4Ro5nv7QcISz7jsg4pu0SefwvbvLD98Jfp0QeMtuS0 3kguKvOzl8kMus/IYa2oWjNCxPS7JQRYWqQViPnDPL9/Hd1EbECxOjBQxp+QrqveaSXd1S dq+xKgJiyeeONtnX+H/NvuSGpmhlouVFnWOo/WiPFt7xGw2DoGWsl0kwGCqfGfEa9i4RZf 231sv/ZEIgpnRIzeXcYnBKDEf5jb+OstScr9LIb98jq7WNSvxXdTT+TKJEA9uQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RRbRK51jnzmTV; Thu, 17 Aug 2023 19:58:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37HJwb6X080329; Thu, 17 Aug 2023 19:58:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37HJwb6E080326; Thu, 17 Aug 2023 19:58:37 GMT (envelope-from git) Date: Thu, 17 Aug 2023 19:58:37 GMT Message-Id: <202308171958.37HJwb6E080326@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dmitry Chagin Subject: git: 158b57295f06 - main - linux(4): Regen for sendfile List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dchagin X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 158b57295f068590a42c30997f5e9cebad137fb9 Auto-Submitted: auto-generated The branch main has been updated by dchagin: URL: https://cgit.FreeBSD.org/src/commit/?id=158b57295f068590a42c30997f5e9cebad137fb9 commit 158b57295f068590a42c30997f5e9cebad137fb9 Author: Dmitry Chagin AuthorDate: 2023-08-17 19:57:17 +0000 Commit: Dmitry Chagin CommitDate: 2023-08-17 19:57:17 +0000 linux(4): Regen for sendfile --- sys/amd64/linux32/linux32_proto.h | 2 +- sys/amd64/linux32/linux32_systrace_args.c | 4 ++-- sys/i386/linux/linux_proto.h | 2 +- sys/i386/linux/linux_systrace_args.c | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/sys/amd64/linux32/linux32_proto.h b/sys/amd64/linux32/linux32_proto.h index 4085791419ae..e0d52b2675d6 100644 --- a/sys/amd64/linux32/linux32_proto.h +++ b/sys/amd64/linux32/linux32_proto.h @@ -612,7 +612,7 @@ struct linux_sigaltstack_args { struct linux_sendfile_args { char out_l_[PADL_(l_int)]; l_int out; char out_r_[PADR_(l_int)]; char in_l_[PADL_(l_int)]; l_int in; char in_r_[PADR_(l_int)]; - char offset_l_[PADL_(l_long *)]; l_long * offset; char offset_r_[PADR_(l_long *)]; + char offset_l_[PADL_(l_off_t *)]; l_off_t * offset; char offset_r_[PADR_(l_off_t *)]; char count_l_[PADL_(l_size_t)]; l_size_t count; char count_r_[PADR_(l_size_t)]; }; struct linux_vfork_args { diff --git a/sys/amd64/linux32/linux32_systrace_args.c b/sys/amd64/linux32/linux32_systrace_args.c index 80940f5428d3..ba1c2c01852c 100644 --- a/sys/amd64/linux32/linux32_systrace_args.c +++ b/sys/amd64/linux32/linux32_systrace_args.c @@ -1297,7 +1297,7 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args) struct linux_sendfile_args *p = params; iarg[a++] = p->out; /* l_int */ iarg[a++] = p->in; /* l_int */ - uarg[a++] = (intptr_t)p->offset; /* l_long * */ + uarg[a++] = (intptr_t)p->offset; /* l_off_t * */ iarg[a++] = p->count; /* l_size_t */ *n_args = 4; break; @@ -5287,7 +5287,7 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *desc, size_t descsz) p = "l_int"; break; case 2: - p = "userland l_long *"; + p = "userland l_off_t *"; break; case 3: p = "l_size_t"; diff --git a/sys/i386/linux/linux_proto.h b/sys/i386/linux/linux_proto.h index ecd5f4cb3e75..5ed3630599c6 100644 --- a/sys/i386/linux/linux_proto.h +++ b/sys/i386/linux/linux_proto.h @@ -607,7 +607,7 @@ struct linux_sigaltstack_args { struct linux_sendfile_args { char out_l_[PADL_(l_int)]; l_int out; char out_r_[PADR_(l_int)]; char in_l_[PADL_(l_int)]; l_int in; char in_r_[PADR_(l_int)]; - char offset_l_[PADL_(l_long *)]; l_long * offset; char offset_r_[PADR_(l_long *)]; + char offset_l_[PADL_(l_off_t *)]; l_off_t * offset; char offset_r_[PADR_(l_off_t *)]; char count_l_[PADL_(l_size_t)]; l_size_t count; char count_r_[PADR_(l_size_t)]; }; struct linux_vfork_args { diff --git a/sys/i386/linux/linux_systrace_args.c b/sys/i386/linux/linux_systrace_args.c index 8121297a5fd8..20098469d72e 100644 --- a/sys/i386/linux/linux_systrace_args.c +++ b/sys/i386/linux/linux_systrace_args.c @@ -1330,7 +1330,7 @@ systrace_args(int sysnum, void *params, uint64_t *uarg, int *n_args) struct linux_sendfile_args *p = params; iarg[a++] = p->out; /* l_int */ iarg[a++] = p->in; /* l_int */ - uarg[a++] = (intptr_t)p->offset; /* l_long * */ + uarg[a++] = (intptr_t)p->offset; /* l_off_t * */ iarg[a++] = p->count; /* l_size_t */ *n_args = 4; break; @@ -5360,7 +5360,7 @@ systrace_entry_setargdesc(int sysnum, int ndx, char *desc, size_t descsz) p = "l_int"; break; case 2: - p = "userland l_long *"; + p = "userland l_off_t *"; break; case 3: p = "l_size_t"; From nobody Thu Aug 17 19:58:38 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RRbRM1dMGz4q50Z; Thu, 17 Aug 2023 19:58:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RRbRL6z0Mz4HTt; Thu, 17 Aug 2023 19:58:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692302319; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=u8+eIGTOBZwxnDY8ibMftXe7eyaaGlOdoGiXa299Uyk=; b=LqRP19NQggStZFk3PHbFQhTo5YJq+HTUULQOODzSGWG/WNX4FFZVigDqfejXjHwGUunlDU q56NJNPZdfbUJEhVjWj6IFqqI57i7kAMs9EEO0z2beWhB0kIBn8cdW4B1AeWupHRZ7rF0W DMVIQFWYXKRtVMCXunpGdMrM+LoSUrMhrdFLlxeSZN3z24kmj7wGTdqqOtPip5vX8z7m9U 7uLd4NWACA+rTPLhEx6iGtl71GZ0MXH3OQhGDY5UuavytBsokZaGsTRAei39qXdXGLwT2x ewpSvusMoT3EQ6MkE1+0+9GTusbxCmwh1lStk2ekmRCTEgLXAylr8rKhst+MhQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692302319; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=u8+eIGTOBZwxnDY8ibMftXe7eyaaGlOdoGiXa299Uyk=; b=jKkzIBkyrIwnaYZjEcWcCqoQIp28k6K/n2lIa1E8dqY4AN4qOUoRxxRprPzdQnOwYyXBLM YrIij+D9VzVMhdLTt55cd2bUYu7Z4EpBbp6UdXsXBKqpFQdrQJXEDf56Vub3mIVBRPUJ7i SbFPD9QohRnOdL6poAg9fe84sKvfdHmiE7oMkVG/yWtK8tqzGY8XohSVdekaBa37OF2sHN 6l/fFgCTJvsmCOWPYvnQ2/CkM0Xoa92Jhm/Qp/HZfTuLrCfRsFYQB4roJdiuIlqJgyJULs cHJVRgDk/+Lse+ALDmR0siP40EGzdx0DlAmxEFcIaXEkW0AYxRbnogruO/Ks6Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692302319; a=rsa-sha256; cv=none; b=lWsVIA/PAjKxOLtZgxpAevt+Mp4RPPb/OoBCEpk5NqkKfdIDMg5rSeUwOrFKwO+jpYfoC0 PMk7bcILHl3luUb4GpuQlzBRGojnQBQZC+jbIBLZl99Wi/OcaNaH3fYE/nBAx78oSA/v/C sGCeOCyPACUXoY5RoBUrPIX0A7tEM6VZ7/F3YQOZXJs9OZla7MZOkArFMlIGjtg6VgFQu1 j1nK5/X353b7QJjPlXA832OtjSlxRR7e6jtJkwfZ8nMmlA+k9chs6r9j3ZuMwXJOaxrJZt pPgtKNxJkrni7J42RGfCv4UvbGaYzELONa+2w4jBKPpx4uHcXji17p/hNZ2BBA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RRbRL62dqzmtv; Thu, 17 Aug 2023 19:58:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37HJwcAX080377; Thu, 17 Aug 2023 19:58:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37HJwc6e080374; Thu, 17 Aug 2023 19:58:38 GMT (envelope-from git) Date: Thu, 17 Aug 2023 19:58:38 GMT Message-Id: <202308171958.37HJwc6e080374@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dmitry Chagin Subject: git: 7307c4396347 - main - linux(4): Use native off_t for fo_sendfile call List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dchagin X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7307c4396347af670dc86e2e7a9dfadb55e1c458 Auto-Submitted: auto-generated The branch main has been updated by dchagin: URL: https://cgit.FreeBSD.org/src/commit/?id=7307c4396347af670dc86e2e7a9dfadb55e1c458 commit 7307c4396347af670dc86e2e7a9dfadb55e1c458 Author: Dmitry Chagin AuthorDate: 2023-08-17 19:57:17 +0000 Commit: Dmitry Chagin CommitDate: 2023-08-17 19:57:17 +0000 linux(4): Use native off_t for fo_sendfile call MFC after: 1 month --- sys/compat/linux/linux_socket.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/sys/compat/linux/linux_socket.c b/sys/compat/linux/linux_socket.c index 48db95d240cb..45b94cb2f994 100644 --- a/sys/compat/linux/linux_socket.c +++ b/sys/compat/linux/linux_socket.c @@ -2376,7 +2376,7 @@ out: static int linux_sendfile_common(struct thread *td, l_int out, l_int in, - l_loff_t *offset, l_size_t count) + off_t *offset, l_size_t count) { off_t bytes_read; int error; @@ -2447,8 +2447,8 @@ linux_sendfile(struct thread *td, struct linux_sendfile_args *arg) * returns 0. We use the 'bytes read' parameter to get this value. */ - l_loff_t offset64; - l_long offset; + off_t offset64; + l_off_t offset; int ret; int error; @@ -2456,7 +2456,7 @@ linux_sendfile(struct thread *td, struct linux_sendfile_args *arg) error = copyin(arg->offset, &offset, sizeof(offset)); if (error != 0) return (error); - offset64 = (l_loff_t)offset; + offset64 = offset; } ret = linux_sendfile_common(td, arg->out, arg->in, @@ -2468,7 +2468,7 @@ linux_sendfile(struct thread *td, struct linux_sendfile_args *arg) if (offset64 > INT32_MAX) return (EOVERFLOW); #endif - offset = (l_long)offset64; + offset = (l_off_t)offset64; error = copyout(&offset, arg->offset, sizeof(offset)); if (error != 0) return (error); @@ -2483,7 +2483,7 @@ linux_sendfile(struct thread *td, struct linux_sendfile_args *arg) int linux_sendfile64(struct thread *td, struct linux_sendfile64_args *arg) { - l_loff_t offset; + off_t offset; int ret; int error; From nobody Thu Aug 17 19:58:39 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RRbRN47lcz4q4rL; Thu, 17 Aug 2023 19:58:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RRbRN0xlmz4Hcb; Thu, 17 Aug 2023 19:58:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692302320; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=NIY23sgL37WOTCGg5OOb/jp1HG917SbVd1NiY4hPWqU=; b=coik099CZ2OWW/PxIXTmLCFNDwi6FlUagJmNiqenMCmZbpnVJBqYKiT8SD7deTbOpW9/dx 8CztoR1FoJPipDG6dSyXbKf2HG0X58IGBS+cxWaxHgGsU1N1w9WHfVlqJHdCokLOvNpt9T WbwS0kvOuhPHvxE6s9hnQzY8NEvoBKN8+igu4Ejo/9nzF8CdFj/p3BqDz2dz80LRdeIeYW 7JTG3bH6PcTfU+sa9up+ptGjaPboNpoA/5spTLqkBpMrmU7Xyf8ZDeGqafSsvig0X2VQHY RAzsXlKLP0ZTnsynI83qbPghDpcEEZE+ZdfftC+ZC4QULaWBtaycUgI5mdBdFA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692302320; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=NIY23sgL37WOTCGg5OOb/jp1HG917SbVd1NiY4hPWqU=; b=C8KIRacdMS2w6n9NvzQiDLGrtPeCiwc5eVREtgYh1Wx3taETIwNKGYogsuSkPg89WA4KyR iaW2xGumiIIwErkfZJBrxkD4YXSHADZsJ12suzvoimOzHdTcpTGu/uWkpMeh2TWOZ4amU+ PXF4MXl1eUNbLNkrdBcv34wJ7mT3vBh+D0OhYRTpDYoumwlyQ8Ct2x52tQ/OjsuL93UlYM IKwhjsGy/3v/8mcpY4CNSwGPyoNYmIu74eG9OGCRssVGoa1vK4YKUinWz6/9n+YyfrfcLY pHMMq4QP+r+cx7nTtvIUkyd6jK+zaSHDz3r8acYg6waSagjReNb3bl26+nuQZQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692302320; a=rsa-sha256; cv=none; b=Mqo5fv/uKrnZK1fu0J5gINJ6RE7RtfAY9Du+AtpD5xeCbcc4VnRivMzfx/SPPac1hkih9Q mSdP+BiMJvl6ALwc6amhXLl35+6Ll2fjPExotFS2nnotiwzl5D3cDYJD6D9tUJXwMvL33i 5AWeTsllfV1sxzVHz4/TqymuLZcM8waHYi5G24EWlr3ojp8/iJap0y2n3/SdCbxZDzTvDh fFcOva0bMmRkRTaZNlcHWgIMK90/lH/tlF8KFYzJNTdiKW6qCk5rzDOPHcZXUNu/N95YsO h6WNsciV/ds5z86F+sTu9XFKH5rHYXQakxN7HpMk2gVt3JkeRzG2fdM72g5t5Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RRbRM73Kvzmtw; Thu, 17 Aug 2023 19:58:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37HJwdkI080430; Thu, 17 Aug 2023 19:58:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37HJwdLn080427; Thu, 17 Aug 2023 19:58:39 GMT (envelope-from git) Date: Thu, 17 Aug 2023 19:58:39 GMT Message-Id: <202308171958.37HJwdLn080427@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dmitry Chagin Subject: git: bb66c5975383 - main - linux(4): Add sendfile fallback for non-socket fds List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dchagin X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: bb66c59753836cd8abb596fe316dcdb77ea66999 Auto-Submitted: auto-generated The branch main has been updated by dchagin: URL: https://cgit.FreeBSD.org/src/commit/?id=bb66c59753836cd8abb596fe316dcdb77ea66999 commit bb66c59753836cd8abb596fe316dcdb77ea66999 Author: James McLaughlin AuthorDate: 2023-08-17 19:57:17 +0000 Commit: Dmitry Chagin CommitDate: 2023-08-17 19:57:17 +0000 linux(4): Add sendfile fallback for non-socket fds Before Linux 2.6.33, out_fd must refer to a socket. Since Linux 2.6.33 it can be any file. The patch was originally provided by James McLaughlin and adapted by me for copy_file_range. PR: 262535 Differential revision: https://reviews.freebsd.org/D34555 MFC after: 1 month --- sys/compat/linux/linux_socket.c | 209 ++++++++++++++++++++++++++++++++++------ 1 file changed, 177 insertions(+), 32 deletions(-) diff --git a/sys/compat/linux/linux_socket.c b/sys/compat/linux/linux_socket.c index 45b94cb2f994..f768392be546 100644 --- a/sys/compat/linux/linux_socket.c +++ b/sys/compat/linux/linux_socket.c @@ -36,10 +36,12 @@ #include #include #include +#include #include #include #include #include +#include #include #include @@ -2374,57 +2376,200 @@ out: return (error); } +/* + * Based on sendfile_getsock from kern_sendfile.c + * Determines whether an fd is a stream socket that can be used + * with FreeBSD sendfile. + */ +static bool +is_stream_socket(struct file *fp) +{ + struct socket *so; + + /* + * The socket must be a stream socket and connected. + */ + if (fp->f_type != DTYPE_SOCKET) + return (false); + so = fp->f_data; + if (so->so_type != SOCK_STREAM) + return (false); + /* + * SCTP one-to-one style sockets currently don't work with + * sendfile(). + */ + if (so->so_proto->pr_protocol == IPPROTO_SCTP) + return (false); + return (!SOLISTENING(so)); +} + +static bool +is_regular_file(struct file *fp) +{ + + return (fp->f_type == DTYPE_VNODE && fp->f_vnode != NULL && + fp->f_vnode->v_type == VREG); +} + static int -linux_sendfile_common(struct thread *td, l_int out, l_int in, - off_t *offset, l_size_t count) +sendfile_fallback(struct thread *td, struct file *fp, l_int out, + off_t *offset, l_size_t count, off_t *sbytes) { - off_t bytes_read; - int error; - l_loff_t current_offset; - struct file *fp; + off_t current_offset, out_offset, to_send; + l_size_t bytes_sent, n_read; + struct file *ofp; + struct iovec aiov; + struct uio auio; + bool seekable; + size_t bufsz; + void *buf; + int flags, error; - AUDIT_ARG_FD(in); - error = fget_read(td, in, &cap_pread_rights, &fp); + if (offset == NULL) { + if ((error = fo_seek(fp, 0, SEEK_CUR, td)) != 0) + return (error); + current_offset = td->td_uretoff.tdu_off; + } else { + if ((fp->f_ops->fo_flags & DFLAG_SEEKABLE) == 0) + return (ESPIPE); + current_offset = *offset; + } + error = fget_write(td, out, &cap_pwrite_rights, &ofp); if (error != 0) return (error); - - if (offset != NULL) { - current_offset = *offset; - } else { - error = (fp->f_ops->fo_flags & DFLAG_SEEKABLE) != 0 ? - fo_seek(fp, 0, SEEK_CUR, td) : ESPIPE; - if (error != 0) + seekable = (ofp->f_ops->fo_flags & DFLAG_SEEKABLE) != 0; + if (seekable) { + if ((error = fo_seek(ofp, 0, SEEK_CUR, td)) != 0) goto drop; + out_offset = td->td_uretoff.tdu_off; + } else + out_offset = 0; + + flags = FOF_OFFSET | FOF_NOUPDATE; + bufsz = min(count, MAXPHYS); + buf = malloc(bufsz, M_LINUX, M_WAITOK); + bytes_sent = 0; + while (bytes_sent < count) { + to_send = min(count - bytes_sent, bufsz); + aiov.iov_base = buf; + aiov.iov_len = bufsz; + auio.uio_iov = &aiov; + auio.uio_iovcnt = 1; + auio.uio_segflg = UIO_SYSSPACE; + auio.uio_td = td; + auio.uio_rw = UIO_READ; + auio.uio_offset = current_offset; + auio.uio_resid = to_send; + error = fo_read(fp, &auio, fp->f_cred, flags, td); + if (error != 0) + break; + n_read = to_send - auio.uio_resid; + if (n_read == 0) + break; + aiov.iov_base = buf; + aiov.iov_len = bufsz; + auio.uio_iov = &aiov; + auio.uio_iovcnt = 1; + auio.uio_segflg = UIO_SYSSPACE; + auio.uio_td = td; + auio.uio_rw = UIO_WRITE; + auio.uio_offset = (seekable) ? out_offset : 0; + auio.uio_resid = n_read; + error = fo_write(ofp, &auio, ofp->f_cred, flags, td); + if (error != 0) + break; + bytes_sent += n_read; + current_offset += n_read; + out_offset += n_read; + } + free(buf, M_LINUX); + + if (error == 0) { + *sbytes = bytes_sent; + if (offset != NULL) + *offset = current_offset; + else + error = fo_seek(fp, current_offset, SEEK_SET, td); + } + if (error == 0 && seekable) + error = fo_seek(ofp, out_offset, SEEK_SET, td); + +drop: + fdrop(ofp, td); + return (error); +} + +static int +sendfile_sendfile(struct thread *td, struct file *fp, l_int out, + off_t *offset, l_size_t count, off_t *sbytes) +{ + off_t current_offset; + int error; + + if (offset == NULL) { + if ((fp->f_ops->fo_flags & DFLAG_SEEKABLE) == 0) + return (ESPIPE); + if ((error = fo_seek(fp, 0, SEEK_CUR, td)) != 0) + return (error); current_offset = td->td_uretoff.tdu_off; + } else + current_offset = *offset; + error = fo_sendfile(fp, out, NULL, NULL, current_offset, count, + sbytes, 0, td); + if (error == 0) { + current_offset += *sbytes; + if (offset != NULL) + *offset = current_offset; + else + error = fo_seek(fp, current_offset, SEEK_SET, td); } + return (error); +} - bytes_read = 0; +static int +linux_sendfile_common(struct thread *td, l_int out, l_int in, + off_t *offset, l_size_t count) +{ + struct file *fp, *ofp; + off_t sbytes; + int error; /* Linux cannot have 0 count. */ - if (count <= 0 || current_offset < 0) { + if (count <= 0 || (offset != NULL && *offset < 0)) + return (EINVAL); + + AUDIT_ARG_FD(in); + error = fget_read(td, in, &cap_pread_rights, &fp); + if (error != 0) + return (error); + if ((fp->f_type != DTYPE_SHM && fp->f_type != DTYPE_VNODE) || + (fp->f_type == DTYPE_VNODE && + (fp->f_vnode == NULL || fp->f_vnode->v_type != VREG))) { error = EINVAL; goto drop; } - - error = fo_sendfile(fp, out, NULL, NULL, current_offset, count, - &bytes_read, 0, td); + error = fget_unlocked(td, out, &cap_no_rights, &ofp); if (error != 0) goto drop; - current_offset += bytes_read; - if (offset != NULL) { - *offset = current_offset; + if (is_regular_file(fp) && is_regular_file(ofp)) { + error = kern_copy_file_range(td, in, offset, out, NULL, count, + 0); } else { - error = fo_seek(fp, current_offset, SEEK_SET, td); - if (error != 0) - goto drop; + sbytes = 0; + if (is_stream_socket(ofp)) + error = sendfile_sendfile(td, fp, out, offset, count, + &sbytes); + else + error = sendfile_fallback(td, fp, out, offset, count, + &sbytes); + if (error == 0) + td->td_retval[0] = sbytes; } + fdrop(ofp, td); - td->td_retval[0] = (ssize_t)bytes_read; drop: fdrop(fp, td); - if (error == ENOTSOCK) - error = EINVAL; return (error); } @@ -2434,10 +2579,10 @@ linux_sendfile(struct thread *td, struct linux_sendfile_args *arg) /* * Differences between FreeBSD and Linux sendfile: * - Linux doesn't send anything when count is 0 (FreeBSD uses 0 to - * mean send the whole file.) In linux_sendfile given fds are still - * checked for validity when the count is 0. + * mean send the whole file). * - Linux can send to any fd whereas FreeBSD only supports sockets. - * The same restriction follows for linux_sendfile. + * We therefore use FreeBSD sendfile where possible for performance, + * but fall back on a manual copy (sendfile_fallback). * - Linux doesn't have an equivalent for FreeBSD's flags and sf_hdtr. * - Linux takes an offset pointer and updates it to the read location. * FreeBSD takes in an offset and a 'bytes read' parameter which is From nobody Thu Aug 17 19:58:41 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RRbRP4x5Vz4q4tY; Thu, 17 Aug 2023 19:58:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RRbRP1hyNz4HSR; Thu, 17 Aug 2023 19:58:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692302321; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kbR9EcABJvYpsO776hoyaHuG5DqZ2HQ4mxtLzGd/1qY=; b=e8NFt4Gq3kRScByK1iOABKu3gMX1Mvnkwxc0eVA/ZFm/vUvYSmN7VgBRwwDc9F+e3qFlq6 iTo3Uytzip4++7JxZuMOj2HA8IgWWFU9LYdog/qUQCHVdAYr5I6+nSgoLojItOxMjZLL4G v+YVm6dm3x3ztvorsgWJYcXbOl0L1ITXSAgw+oHoMK1xssfMfKt+sueuD1fsniBzkXBGOL tmUYwTHrrhKWUaWy5H798ixOORro9T2l2kMvyGuB+lfCp/ueOre3LkOVAvf6qIYZqCglq8 vXkwC5aneI88TXcepC/CiujFoNGn7NZQNDL4pCKQ3zWJOxVoTEO+KveH7Q58TA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692302321; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kbR9EcABJvYpsO776hoyaHuG5DqZ2HQ4mxtLzGd/1qY=; b=wDVw3jjUyWu0q3aQPFzf9YJNMlAgScAShS0phSzxXUQurIwxhwfuVkGSRnqYNl9m/8BnqL HNRhpH9o7fMgG08dDgPAe0g6A8ejkpPElcGLQ7cVci8/DeMb6Nm99F0QFnHae+9owsmSgC b4oOPdcIRSXLzIt0ioJJddb3Y4RFMD5dVh9EFVPazLNkcaSf0IG2/tMtmJO3cAcaDgXdfI fwo2d5CWay5wodYy30Z36fuob3avwLe+L/oAdxkMH2ma0exek7KR+jca58qK1UUHrvcOgs Zi3V3zSGEWYHS1RLNtKvbEKTky8ooXqekL73asUjShbq4wk966rX0bT/fWLObA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692302321; a=rsa-sha256; cv=none; b=RoKOL+I3ipQa1xVRuunaSYb2BCF9YWCvnq33BOSLDK/FKRkroRFV2YP6hIQpJxokXr7K01 VOURrKDFOn8zNy67DHaonc+86yC76aDEnBTRFnY4+gIsqAfOMynxaPCTdOWvxR7yV8yjxG nRvcNPaVpQLG8sx+dQjaHT8TwumhHvdE7VHkckCW5F3ZX9QVfiB8rC/YlYNs1Gf4obDXJd xSBXDzQyW8uz9yzrMJBJBElXuExPoBCVD6P9g527hd7lf1/OzXcWieWnT24sBLMlxgFyGa tz0jk3rbegLFKqidRZTNkAdnFWSVVgskM2NdtU3DNcDqsmTFspBMAXMxLuaBqw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RRbRP0pc3zn63; Thu, 17 Aug 2023 19:58:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37HJwfB0080481; Thu, 17 Aug 2023 19:58:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37HJwf1b080478; Thu, 17 Aug 2023 19:58:41 GMT (envelope-from git) Date: Thu, 17 Aug 2023 19:58:41 GMT Message-Id: <202308171958.37HJwf1b080478@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dmitry Chagin Subject: git: 4a521544a683 - main - linux(4): Don't miss error from underlying in sendfile List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dchagin X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4a521544a683bd2140dcf596ee571a0f10f52890 Auto-Submitted: auto-generated The branch main has been updated by dchagin: URL: https://cgit.FreeBSD.org/src/commit/?id=4a521544a683bd2140dcf596ee571a0f10f52890 commit 4a521544a683bd2140dcf596ee571a0f10f52890 Author: Dmitry Chagin AuthorDate: 2023-08-17 19:57:17 +0000 Commit: Dmitry Chagin CommitDate: 2023-08-17 19:57:17 +0000 linux(4): Don't miss error from underlying in sendfile MFC after: 1 month --- sys/compat/linux/linux_socket.c | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) diff --git a/sys/compat/linux/linux_socket.c b/sys/compat/linux/linux_socket.c index f768392be546..8def4dfaa665 100644 --- a/sys/compat/linux/linux_socket.c +++ b/sys/compat/linux/linux_socket.c @@ -2594,7 +2594,6 @@ linux_sendfile(struct thread *td, struct linux_sendfile_args *arg) off_t offset64; l_off_t offset; - int ret; int error; if (arg->offset != NULL) { @@ -2604,10 +2603,10 @@ linux_sendfile(struct thread *td, struct linux_sendfile_args *arg) offset64 = offset; } - ret = linux_sendfile_common(td, arg->out, arg->in, + error = linux_sendfile_common(td, arg->out, arg->in, arg->offset != NULL ? &offset64 : NULL, arg->count); - if (arg->offset != NULL) { + if (error == 0 && arg->offset != NULL) { #if defined(__i386__) || defined(__arm__) || \ (defined(__amd64__) && defined(COMPAT_LINUX32)) if (offset64 > INT32_MAX) @@ -2615,11 +2614,9 @@ linux_sendfile(struct thread *td, struct linux_sendfile_args *arg) #endif offset = (l_off_t)offset64; error = copyout(&offset, arg->offset, sizeof(offset)); - if (error != 0) - return (error); } - return (ret); + return (error); } #if defined(__i386__) || defined(__arm__) || \ @@ -2629,7 +2626,6 @@ int linux_sendfile64(struct thread *td, struct linux_sendfile64_args *arg) { off_t offset; - int ret; int error; if (arg->offset != NULL) { @@ -2638,16 +2634,13 @@ linux_sendfile64(struct thread *td, struct linux_sendfile64_args *arg) return (error); } - ret = linux_sendfile_common(td, arg->out, arg->in, + error = linux_sendfile_common(td, arg->out, arg->in, arg->offset != NULL ? &offset : NULL, arg->count); - if (arg->offset != NULL) { + if (error == 0 && arg->offset != NULL) error = copyout(&offset, arg->offset, sizeof(offset)); - if (error != 0) - return (error); - } - return (ret); + return (error); } /* Argument list sizes for linux_socketcall */ From nobody Thu Aug 17 19:58:42 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RRbRQ718dz4q55B; Thu, 17 Aug 2023 19:58: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RRbRQ2rVdz4HVs; Thu, 17 Aug 2023 19:58:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692302322; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=BprTZLVZUBTM6O9BgI9C83m+FHeqUJ6Olg+PLIt90JM=; b=ulSAGFjltGtCzS2nZC+dTmw9+Ao4q1JlvV73USxZfZnTsWRRdVu4JYZ3NuXeOMF5O7L8Y4 ELUxBRXjuJDJ6zxvoViKm3yPY1kNEkobui0EvKO6N87j/nRr8ixQcvrboYS+3rMVPv3oXH 28eE00SAeKm3y00vw5yyk2QLvyyslN0nt9j0vflSiFWLL8o3sTQOuPsKRJzFT+1g+Hg28R wtfAST2CA2v0QM9d4SbRd4PF4oLb0/Zmf0nkoWNnN0zgN6DV1dtLvbmBDvgCco5ydUAuSO C1cUpfp//3hLk+Pbvnyd0IYq6nU+IA2nn3Ss+gXZeAtJIqGrpXu1zSImewDH5Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692302322; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=BprTZLVZUBTM6O9BgI9C83m+FHeqUJ6Olg+PLIt90JM=; b=MJfdGIN8GKR+PB3q6qYd1pTerx5AxWuqK24XvtbzyB7bkhGbcCEclyyTZCafRKWIE/Lt/1 7XQLZR9IChV1PmRTGTAcApNX3t0yYqtRB3eP+KzUckzdnI9NNbc3J3SX/HNYUvyaSOGATZ qB3HI3KUntZkoX/rumx7T7sUNLpBSSL6WHaXU0tsvFavXgoG+7d9CfwUk3rEWjR5jODd0s dj1UJpCJuMq+XQlgkJ9+CrBHRw1a4lizRK9SrOOfy7EBGRG8vDOZ9sN1IG7NpbnzHDV1Nj zUTinyUxOfNlRIQangk7NVjObcAPobKZwSO3PqyXZDRQNO8M2rOBJDzfYONcpQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692302322; a=rsa-sha256; cv=none; b=P6gQf+PXDw1TNfN9AN8cfTcbvPfAlzGuEwz/6WGWS+0Xvoldrz8061yQ/X8qusDJQlMOtU 9TujEed2ZfE35ORTZjUimtdpNKwz8qlk11vO2Pivsi8Y4QDi8lFzWrOH1aqJna/obwSH0y Z9d6fzi1/LfG+IaPHlme7Ivk4rmiHf4C1m7SoFnTLrkJxcSgwUJaHtAguZeUrTOwnjuKeY 83i276JN3sc8QJZyiV511QN98XePJpdRTT2RZLSMro1oKyuKlfS3/ST25ElLkSPsRFuPCK C132DR/1lzQUckSN5B0csoZh4tpb4SNIn/tRxcgYoTA41HfGol4ZnbHyu/zaAw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RRbRQ1yWBznKN; Thu, 17 Aug 2023 19:58:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37HJwg4W080544; Thu, 17 Aug 2023 19:58:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37HJwgpj080541; Thu, 17 Aug 2023 19:58:42 GMT (envelope-from git) Date: Thu, 17 Aug 2023 19:58:42 GMT Message-Id: <202308171958.37HJwgpj080541@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dmitry Chagin Subject: git: 6ecab3949493 - main - linux(4): Drop bogus __arm__ condition due to lack of 32-bit arm support List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dchagin X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6ecab3949493026b51d67b38fcd026a8bc64e69a Auto-Submitted: auto-generated The branch main has been updated by dchagin: URL: https://cgit.FreeBSD.org/src/commit/?id=6ecab3949493026b51d67b38fcd026a8bc64e69a commit 6ecab3949493026b51d67b38fcd026a8bc64e69a Author: Dmitry Chagin AuthorDate: 2023-08-17 19:57:17 +0000 Commit: Dmitry Chagin CommitDate: 2023-08-17 19:57:17 +0000 linux(4): Drop bogus __arm__ condition due to lack of 32-bit arm support MFC after: 1 month --- sys/compat/linux/linux_socket.c | 9 +++------ sys/compat/linux/linux_socket.h | 5 ++--- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/sys/compat/linux/linux_socket.c b/sys/compat/linux/linux_socket.c index 8def4dfaa665..eaccfab76eee 100644 --- a/sys/compat/linux/linux_socket.c +++ b/sys/compat/linux/linux_socket.c @@ -2607,8 +2607,7 @@ linux_sendfile(struct thread *td, struct linux_sendfile_args *arg) arg->offset != NULL ? &offset64 : NULL, arg->count); if (error == 0 && arg->offset != NULL) { -#if defined(__i386__) || defined(__arm__) || \ - (defined(__amd64__) && defined(COMPAT_LINUX32)) +#if defined(__i386__) || (defined(__amd64__) && defined(COMPAT_LINUX32)) if (offset64 > INT32_MAX) return (EOVERFLOW); #endif @@ -2619,9 +2618,7 @@ linux_sendfile(struct thread *td, struct linux_sendfile_args *arg) return (error); } -#if defined(__i386__) || defined(__arm__) || \ - (defined(__amd64__) && defined(COMPAT_LINUX32)) - +#if defined(__i386__) || (defined(__amd64__) && defined(COMPAT_LINUX32)) int linux_sendfile64(struct thread *td, struct linux_sendfile64_args *arg) { @@ -2731,4 +2728,4 @@ linux_socketcall(struct thread *td, struct linux_socketcall_args *args) linux_msg(td, "socket type %d not implemented", args->what); return (ENOSYS); } -#endif /* __i386__ || __arm__ || (__amd64__ && COMPAT_LINUX32) */ +#endif /* __i386__ || (__amd64__ && COMPAT_LINUX32) */ diff --git a/sys/compat/linux/linux_socket.h b/sys/compat/linux/linux_socket.h index 2b4691bb9eca..68176c3cc401 100644 --- a/sys/compat/linux/linux_socket.h +++ b/sys/compat/linux/linux_socket.h @@ -124,8 +124,7 @@ struct l_ucred { uint32_t gid; }; -#if defined(__i386__) || defined(__arm__) || \ - (defined(__amd64__) && defined(COMPAT_LINUX32)) +#if defined(__i386__) || (defined(__amd64__) && defined(COMPAT_LINUX32)) struct linux_accept_args { register_t s; @@ -158,7 +157,7 @@ int linux_accept(struct thread *td, struct linux_accept_args *args); #define LINUX_SENDMMSG 20 #define LINUX_SENDFILE 21 -#endif /* __i386__ || __arm__ || (__amd64__ && COMPAT_LINUX32) */ +#endif /* __i386__ || (__amd64__ && COMPAT_LINUX32) */ /* Socket defines */ #define LINUX_SOL_SOCKET 1 From nobody Thu Aug 17 20:55:10 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RRchb2vP7z4q7qs; Thu, 17 Aug 2023 20:55: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RRchb2Fwtz4Qnb; Thu, 17 Aug 2023 20:55:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692305711; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XMWOaGU7HRwecw6o3uTg98lTm2HKva5o+qvTOgyEMNM=; b=lSDoEelFedCtDxsIPZBHpWHssmA0ldVu3e1vXDx+c4+zGH6MnKlfvXGARqy7uKYUdTghO4 msaFS0ilfDRiy4NFS6KXXTegc8+skJ+fhHn+TiGW2yTSHv/4gnvTgT+p8kXF2WvRd6rl77 4HCcrIH6Wbalp7hUwA/Hif6VstV8c/tL1gNy59NsFcjQR1R5USZ7s5KhsYOYPblMzoERQ1 XWowVHdlBfBMubnhY4Qncqzz3u4sJQ0Kfon8XEqo3aopSYWIrfIxNSOEPyEF4n/vhpLdnC hy1vkxmboyb40e7/ZdBHceavOBjBMjFKU//ebXa0+zchtcx31ywoj2dx/p+x5Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692305711; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XMWOaGU7HRwecw6o3uTg98lTm2HKva5o+qvTOgyEMNM=; b=olYXnEE97g1cSRPuUFRDSh9feoFiyh/nRLDMj8Goy+XC5yRu6Az8B4ZQBNrlkZztQisQs4 wzQrSwZEL73k4vHXpYYNNIoOqQMBgNffcoARxB9WSPW9ErSOyiHSQzIUS0SoBwTlGeKNZS BcCHbTZQJb1Wsp0adIJGNnOCiFI/3y72qNVm6EYAXBbb4KTWggnDxIbFgBIflwnDlBOLkO iHDqCfQ6HlplLH1g9G85ZLjSfMyVCgkTwXkNceeMjI5YP7qqep8rdeEEtcTWz6Nu9LxoIe O3oe/Qzqgd/H3CSrnvrH/8R5kchOAzoGtp3tN2vYZgh1AKP8WlvGzuQQ4sKlJA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692305711; a=rsa-sha256; cv=none; b=chHBIzpwEGVGPObidvSPttnBlhuTaFVy3LBqeHHwBNYdfS10ZiwGwlE2UtQbzblhIXqhHQ 0dLQDFCALkDuSB5xQx0yZIaOZd73tjTCBnMy0qiTzrHcGbQTOwfj13nWrGEeLh4NZWwcJh BgfH74h7KCLMXi8tq08WiWNiHGq1JJKcZj6Air0C4ltD/l3c7z156UqgRntnjLzN81AVK/ /kBX9L2TjSM2UU2kKkXWBwXUcBCF46wnagOIGKlUN5WPG/CfZHc3gCiEzIH+GPtIVyV2Cc i0oNj9LkNralFoJqaGq3Sp8TygL7MNe293mAz+NzcohwUT/Coe/lxYiKiXxCNA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RRchb0vwXzphx; Thu, 17 Aug 2023 20:55:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37HKtAfV079098; Thu, 17 Aug 2023 20:55:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37HKtA1N079095; Thu, 17 Aug 2023 20:55:10 GMT (envelope-from git) Date: Thu, 17 Aug 2023 20:55:10 GMT Message-Id: <202308172055.37HKtA1N079095@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dmitry Chagin Subject: git: 270e01d4686e - main - linux(4): Fix leftovers after 2ff63af9 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dchagin X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 270e01d4686ea99ac9760a2cebb84d848352e28b Auto-Submitted: auto-generated The branch main has been updated by dchagin: URL: https://cgit.FreeBSD.org/src/commit/?id=270e01d4686ea99ac9760a2cebb84d848352e28b commit 270e01d4686ea99ac9760a2cebb84d848352e28b Author: Dmitry Chagin AuthorDate: 2023-08-17 20:54:00 +0000 Commit: Dmitry Chagin CommitDate: 2023-08-17 20:54:00 +0000 linux(4): Fix leftovers after 2ff63af9 --- sys/amd64/linux32/linux32_vdso_gtod.c | 1 - sys/arm64/linux/linux.h | 2 -- sys/arm64/linux/linux_vdso_gtod.c | 1 - sys/compat/linux/linux_persona.h | 2 -- sys/compat/linux/linux_timer.c | 1 + sys/compat/linux/linux_videodev2_compat.h | 3 --- sys/compat/linux/linux_videodev_compat.h | 3 --- 7 files changed, 1 insertion(+), 12 deletions(-) diff --git a/sys/amd64/linux32/linux32_vdso_gtod.c b/sys/amd64/linux32/linux32_vdso_gtod.c index 9f01e5241025..3552f37bae8e 100644 --- a/sys/amd64/linux32/linux32_vdso_gtod.c +++ b/sys/amd64/linux32/linux32_vdso_gtod.c @@ -25,7 +25,6 @@ * SUCH DAMAGE. */ - #include #include #include diff --git a/sys/arm64/linux/linux.h b/sys/arm64/linux/linux.h index 9d08e3bb28e9..d612ba8e5d9e 100644 --- a/sys/arm64/linux/linux.h +++ b/sys/arm64/linux/linux.h @@ -25,8 +25,6 @@ * SUCH DAMAGE. */ -/* - */ #ifndef _ARM64_LINUX_H_ #define _ARM64_LINUX_H_ diff --git a/sys/arm64/linux/linux_vdso_gtod.c b/sys/arm64/linux/linux_vdso_gtod.c index 466f4ccaa2e9..eef6022dbae3 100644 --- a/sys/arm64/linux/linux_vdso_gtod.c +++ b/sys/arm64/linux/linux_vdso_gtod.c @@ -26,7 +26,6 @@ * SUCH DAMAGE. */ - #include #include #include diff --git a/sys/compat/linux/linux_persona.h b/sys/compat/linux/linux_persona.h index c3d669c8ea6b..18aef6f02d76 100644 --- a/sys/compat/linux/linux_persona.h +++ b/sys/compat/linux/linux_persona.h @@ -1,5 +1,3 @@ -/* - */ #ifndef LINUX_PERSONALITY_H #define LINUX_PERSONALITY_H diff --git a/sys/compat/linux/linux_timer.c b/sys/compat/linux/linux_timer.c index bfa17d7e8aa5..66fd309a9485 100644 --- a/sys/compat/linux/linux_timer.c +++ b/sys/compat/linux/linux_timer.c @@ -27,6 +27,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. */ + #include #include #include diff --git a/sys/compat/linux/linux_videodev2_compat.h b/sys/compat/linux/linux_videodev2_compat.h index d9c3b3d07373..cd7ca5f002e1 100644 --- a/sys/compat/linux/linux_videodev2_compat.h +++ b/sys/compat/linux/linux_videodev2_compat.h @@ -1,6 +1,3 @@ -/* - */ - /* * This file defines compatibility versions of several video structures * defined in the Linux videodev2.h header (linux_videodev2.h). The diff --git a/sys/compat/linux/linux_videodev_compat.h b/sys/compat/linux/linux_videodev_compat.h index 0d612fb6f976..c35a59d2ecf8 100644 --- a/sys/compat/linux/linux_videodev_compat.h +++ b/sys/compat/linux/linux_videodev_compat.h @@ -1,6 +1,3 @@ -/* - */ - /* * This file defines compatibility versions of several video structures * defined in the Linux videodev.h header (linux_videodev.h). The From nobody Thu Aug 17 20:55:12 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RRchd35yHz4q7qt; Thu, 17 Aug 2023 20:55:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RRchc2cn0z4QkT; Thu, 17 Aug 2023 20:55:12 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692305712; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=axBVxQtS8BqDkwL4YbmCmm2G+Ltc5080lAdj+PABtQQ=; b=AmVPvxbiIAY7Pk/tu66QGmEG34hA7832+qG8y9RPy+PzZESsPQbxbfFbkouZ4vwpvq9tyI PE85rSWvt+1PG4O11qD4puhQlaGzThXaUBQK0p0s4ayzTNczgiXmpd1H8Bbg3nRLr4K+c8 aL7PJPz9RkuVqJWdjvRTkX80hIuCUtmfZUaDl/7YKHIMBF8sJNGSEbFO8/mrW6+BSr5jEp FWuENeGm8PfO4VIrnR4gFkpw0CzuZOxCxfluIw4CtIK/Yd6jVkzNNSCOaF6rFKm9lAtZtA Zx89cJJbiE99Dbii0KmuGOk4iYB0RGddIwHuVHFyd15lXPT0QCyGnjQ19qEONw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692305712; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=axBVxQtS8BqDkwL4YbmCmm2G+Ltc5080lAdj+PABtQQ=; b=C5jgp+k9PVphbNL0c3Hc6eFNm9D+vdjuJ3Px7DY1ep0kTG2UG7Nlig/4MRERr2aSHpePHN qmwmXTLXXdfq1oPgS99Nh5pMwa0SStPAwNz52yqvWV0BF/2WQtKuAbTYc6eJ+fVFnWRznN gjwxhDyoUPfmebnwrgjSFpwq+gjg1zcFKbNV7ApS4ZCAQGIUqsYmDsebMi0cpu6LPmoZwd wivKuGkz/O9mm0s4P3ruCOulPfUfDsBH4KIwool2hVTeNCaGcBUT3BihwUP/rJXXErUPVX dCjPr10x976mEXQvSi1oXCIuxhhHrVs74/WQ+cepR6/bETh3wbPB6YZtVp5bpg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692305712; a=rsa-sha256; cv=none; b=Rkiv/z35j2FvxH5JNBkIMfEnpFx4Ap9CFMI6zkW1Vsddq7FYm7AtyLXDRUEHPhoBhNm8T7 mR94/rIFFuREJoFlWWUmZLRFwfiq2BI5+yCgl5GDku8Mwt5cpv0xQ9t6VXwpr1zpR+lh5V EgvwU9M2ahGvV4nxJd5zBGhXpWVPc3shfoqPyjq1FRCyVpUNz1iyCCxrMdxdzp7ga5w147 pUzB7a8/pCjgKBR//iMt7JCFqIhyVKxPJYAgp3urh7LNYzgS1oLTLsr+9q9VUxTHU57peL 2TydEJnEXxPOFJd//Sv/ylxUB8jZz/lbZGMA/dE9MuMcJ5U7ZscbIJjHbVXfaw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RRchc1fPLzp88; Thu, 17 Aug 2023 20:55:12 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37HKtCqJ079159; Thu, 17 Aug 2023 20:55:12 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37HKtC3a079156; Thu, 17 Aug 2023 20:55:12 GMT (envelope-from git) Date: Thu, 17 Aug 2023 20:55:12 GMT Message-Id: <202308172055.37HKtC3a079156@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dmitry Chagin Subject: git: c47116e90951 - main - linux(4): Update my copyrights, add SPDX tag List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dchagin X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c47116e90951621196c72b7def866cadfdabf80e Auto-Submitted: auto-generated The branch main has been updated by dchagin: URL: https://cgit.FreeBSD.org/src/commit/?id=c47116e90951621196c72b7def866cadfdabf80e commit c47116e90951621196c72b7def866cadfdabf80e Author: Dmitry Chagin AuthorDate: 2023-08-17 20:54:36 +0000 Commit: Dmitry Chagin CommitDate: 2023-08-17 20:54:36 +0000 linux(4): Update my copyrights, add SPDX tag --- sys/compat/linux/linux.h | 2 ++ sys/compat/linux/linux_fork.h | 2 ++ sys/compat/linux/linux_vdso.c | 26 ++++++++++++++------------ sys/compat/linux/linux_vdso.h | 26 ++++++++++++++------------ 4 files changed, 32 insertions(+), 24 deletions(-) diff --git a/sys/compat/linux/linux.h b/sys/compat/linux/linux.h index 85fdd139152f..5a0d6e0b68c5 100644 --- a/sys/compat/linux/linux.h +++ b/sys/compat/linux/linux.h @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: BSD-2-Clause + * * Copyright (c) 2015 Dmitry Chagin * * Redistribution and use in source and binary forms, with or without diff --git a/sys/compat/linux/linux_fork.h b/sys/compat/linux/linux_fork.h index e24ea3673168..6e2d204a81ea 100644 --- a/sys/compat/linux/linux_fork.h +++ b/sys/compat/linux/linux_fork.h @@ -1,4 +1,6 @@ /*- + * SPDX-License-Identifier: BSD-2-Clause + * * Copyright (c) 2021 Dmitry Chagin * * Redistribution and use in source and binary forms, with or without diff --git a/sys/compat/linux/linux_vdso.c b/sys/compat/linux/linux_vdso.c index e8481ecd4412..949fb660a2ff 100644 --- a/sys/compat/linux/linux_vdso.c +++ b/sys/compat/linux/linux_vdso.c @@ -1,26 +1,28 @@ /*- + * SPDX-License-Identifier: BSD-2-Clause + * * Copyright (c) 2013-2021 Dmitry Chagin * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer - * in this position and unchanged. + * notice, this list of conditions and the following disclaimer. * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR - * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF - * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. */ #include diff --git a/sys/compat/linux/linux_vdso.h b/sys/compat/linux/linux_vdso.h index 48b0c7c75757..afd994b6c4fc 100644 --- a/sys/compat/linux/linux_vdso.h +++ b/sys/compat/linux/linux_vdso.h @@ -1,26 +1,28 @@ /*- + * SPDX-License-Identifier: BSD-2-Clause + * * Copyright (c) 2013-2021 Dmitry Chagin * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer - * in this position and unchanged. + * notice, this list of conditions and the following disclaimer. * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR - * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. - * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, - * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT - * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, - * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY - * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT - * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF - * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. */ #ifndef _LINUX_VDSO_H_ From nobody Thu Aug 17 21:27:13 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RRdPY6BL5z4q9gR; Thu, 17 Aug 2023 21:27:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RRdPY5gGtz4TtY; Thu, 17 Aug 2023 21:27:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692307633; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=TUm7VOzhA3IKJzwywwIsVnYDbKEb+l+CKleEFcJyfrE=; b=xCwlH8VzNq+kTp6yB1KQryy2YYRRblsI2dtTS/J3loHgIoBvgK3J0+Kh+JL9fpuCquRPr1 Dts9cQBby2TdmiMJXiyXySWEa/25m5DVtgM63XFW9fYlqBxXMcq7hqNqMvt1ge2yq8N7Ly JVfIzpOSWI8w+7dfOV0HJvmZcvBUfLX2P+wxDZpwWd7YNaK3dsCpu1SsOJe/WLQqBlW/7L JSYDAbj060cbKMu8irSbpYR8ro9Q+rPGK2WCz0ffOrCirtXgBsoBULDX6oYaAi4VkgvCjZ I6KJTRG9sxt15WJhJPy8kIRe7XYgOrwYW5MJPfn/Vv+96+e2IxnZMTiFkSpyFQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692307633; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=TUm7VOzhA3IKJzwywwIsVnYDbKEb+l+CKleEFcJyfrE=; b=f6f+p4pycIDaJoBgX0IjSZIP/tSxpTur9n93/ZZP1nGAAo/mkdmzEf2EPo+n9ouRbmoJ2P eW0TMOH4CzjS8OAnWssf3GzBdqab0a6n5biT9X+SUcEaDXw0uWwOM8Nb4TI8XCwcVWT/Aw cQTi85OIUIbiJH9iY89cG3FS5hybQXe5PVOv2cOnLNqEdyScHGVBlk1kUqQjsIygzDgh2i V9ZOM25KP2/1De8/rp77zhTnkQpA2919Cru5PoGbC8+hWBMLX+HciYsWJrnzpptk7wfk4j nr/v8YzHEeNJE2hRpXv3k52x1Cjsesvu2YBC/iqivNzmSK1S3JUb3cOstObgVw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692307633; a=rsa-sha256; cv=none; b=ZTm4ecK7rENqjYaBdknrUxP9V+SYkqRl/szQ7McYmWBT6WNOXMcOzzM/ap0snf4lg17uvn nCNuJ9dUlitAhbGxHktLEphczX34hC/jZ88Jh8KjysEJGPEuQHtfBsyS2JlqU3zpdwqLlp PkEfDw4ykFC813SD0UFYlQjByYSQEjtvmSGho5MHnm4n+BblcwDHx62b5FOAZBMQ7Ny5QO hGqGb2fa6AFSSzHj68w0YyBC51vSi2e3WzauTk3tPqu1UAqTBkhB4P+S6AjL4m8KsSetby hfBLsNvuEpWY9nAgwWcxCx+8JjaQUL3nMRejmWTrF9cABUdbD+Opicnz+wI6Gw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RRdPY4mnkzpyQ; Thu, 17 Aug 2023 21:27:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37HLRDvM030876; Thu, 17 Aug 2023 21:27:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37HLRDKn030873; Thu, 17 Aug 2023 21:27:13 GMT (envelope-from git) Date: Thu, 17 Aug 2023 21:27:13 GMT Message-Id: <202308172127.37HLRDKn030873@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: 768489c721fb - main - RELNOTES: Clarify package building on older branches for 32-bit. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 768489c721fbf02eef221cd336f3f8b468182561 Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=768489c721fbf02eef221cd336f3f8b468182561 commit 768489c721fbf02eef221cd336f3f8b468182561 Author: John Baldwin AuthorDate: 2023-08-17 21:25:44 +0000 Commit: John Baldwin CommitDate: 2023-08-17 21:25:44 +0000 RELNOTES: Clarify package building on older branches for 32-bit. "on" could be read to require native builds only vs cross-builds via qemu-user and that was not the intention. Suggested by: Mark Millard --- RELNOTES | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/RELNOTES b/RELNOTES index 5f75215807f4..0ff123618e14 100644 --- a/RELNOTES +++ b/RELNOTES @@ -31,7 +31,7 @@ Changes to this file should not be MFCed. stable/14 and earlier branches will retain existing 32-bit kernel and world support. Ports will retain existing support - for building ports and packages on 32-bit systems on stable/14 + for building ports and packages for 32-bit systems on stable/14 and earlier branches as long as those branches are supported by the ports system. However, all 32-bit platforms are Tier-2 or Tier-3 and support for individual ports should be expected From nobody Thu Aug 17 22:11:30 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RRfNg04q6z4qDlf; Thu, 17 Aug 2023 22:11:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RRfNf6Y7bz4ZRm; Thu, 17 Aug 2023 22:11:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692310290; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=AWIkz1CLZ5tAK1a7IWsrLFx+z11kJvB6L6ee0cZQB4c=; b=tgifz7Sp2yFPSQaGX1MQW0V0gkmpISGZuHMxf2P6FYsWvoCMYNL0aDlZDFcriZF7z4z+A2 xPlXCbWTSr3nI1bIgGoBiTwsL+q8YMPJtOfkHGJikDS1DyMNFryGdw49GXqe6m4gHZHlIG O8EHXzdJPpcazyHbBIA/PIlWIbKzcaZH4PAKGrQwxwprk5D0+5oivQedZUFp0w45sFqIn2 W6bHA2FJcELXR0wDSB+7AxjYq6fZ/Kbf95vcLhKwoijF13T4rOBGefXTUet8LN/OzJUncp LpuAROm4cy6c/YGQUa5Z1VY/EgHHLM3p1p/FUvmA3uNZwpAAnL72+TL/KBm52A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692310290; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=AWIkz1CLZ5tAK1a7IWsrLFx+z11kJvB6L6ee0cZQB4c=; b=XLPHFdpd6TZp7H6leoh+pQAaoGkRNIK17ogn3MdWo8XScAn4fLL1LNEf5lazOljDzMQ71Q 9RSa7Y4cowsVqvZD4YhiWHxycSPiWco8xr1GJc+v8moG3cNZ9oDA2NZ9seZgAnnsO8Ndtv S7UekW6nbybY32mP1nKMnXx/n3QHsXb7CxnCPSnmCt3CnmqRrdFwmPOjCkTefcz5CmU/cd 3ZAnKS2GNsT/1lPG1vl/2fP3+Ei3m6BUMiExVE2TrECNt4y2zIbyb/fuoFYOBX6uSgqMbt 1+8uvc1lwBlO3g4hfcyAGnGTYKEeXqTAU+xwEFWmPP6lIR4Pb4AfZ3zf254Z+A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692310290; a=rsa-sha256; cv=none; b=OMNRXULTRYDPE2r7i5N1xu7SInN2gNVgyoEsIEV6SgymKjRpOdJ0x/uGjeyh4KYGgYlG6v OxlMPKVjLZO/MtWDq3Cg83oOUhXxCdE4EENmgqMa1dhG4uRRoNldJVn28ZQExarwDxYYCd Yd/h34+ZKYuVxcbOs4ysvq7cAa4aH4zgMk02XjCG+DjOMH2TiV+LaF3yFvXLXBoEFS9FkY 3cw9TOx1Fw6ekeCcvz9C/CUWYUF6qTd2Yi/LZKJ3aiKI8vw1eQ7iz2dwAFBKCH5Mm6Yr7I fad8OTBteY0rloL8ucpf24dpYoKpc8pAPlY/m3i32Zy7hNEe3v8b2w12dzbKTQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RRfNf5bhpzrbT; Thu, 17 Aug 2023 22:11:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37HMBU6B011757; Thu, 17 Aug 2023 22:11:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37HMBU8b011754; Thu, 17 Aug 2023 22:11:30 GMT (envelope-from git) Date: Thu, 17 Aug 2023 22:11:30 GMT Message-Id: <202308172211.37HMBU8b011754@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: d8099e33c79b - main - intr: move MAX_STRAY_LOG to interrupt.h List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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/main X-Git-Reftype: branch X-Git-Commit: d8099e33c79b98666232c73d9ceee62fff853fad Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=d8099e33c79b98666232c73d9ceee62fff853fad commit d8099e33c79b98666232c73d9ceee62fff853fad Author: Elliott Mitchell AuthorDate: 2022-06-19 15:05:20 +0000 Commit: Mark Johnston CommitDate: 2023-08-17 22:10:02 +0000 intr: move MAX_STRAY_LOG to interrupt.h The two interrupt controllers which implement squelching of reports after a maximum use the same limit. Move the limit to interrupt.h, the better to encourage other interrupt controllers to implement the same. Reviewed by: markj MFC after: 2 weks Differential Revision: https://reviews.freebsd.org/D35527 --- sys/powerpc/powerpc/intr_machdep.c | 8 +++----- sys/sys/interrupt.h | 3 +++ sys/x86/x86/intr_machdep.c | 6 ++---- 3 files changed, 8 insertions(+), 9 deletions(-) diff --git a/sys/powerpc/powerpc/intr_machdep.c b/sys/powerpc/powerpc/intr_machdep.c index 605f436804d4..d64d15775ab5 100644 --- a/sys/powerpc/powerpc/intr_machdep.c +++ b/sys/powerpc/powerpc/intr_machdep.c @@ -87,8 +87,6 @@ #include "pic_if.h" -#define MAX_STRAY_LOG 5 - static MALLOC_DEFINE(M_INTR, "intr", "interrupt handler data"); struct powerpc_intr { @@ -660,11 +658,11 @@ powerpc_dispatch_intr(u_int vector, struct trapframe *tf) stray: stray_count++; - if (stray_count <= MAX_STRAY_LOG) { + if (stray_count <= INTR_STRAY_LOG_MAX) { printf("stray irq %d\n", i ? i->irq : -1); - if (stray_count >= MAX_STRAY_LOG) { + if (stray_count >= INTR_STRAY_LOG_MAX) { printf("got %d stray interrupts, not logging anymore\n", - MAX_STRAY_LOG); + INTR_STRAY_LOG_MAX); } } if (i != NULL) diff --git a/sys/sys/interrupt.h b/sys/sys/interrupt.h index 9eeda4a3ed16..9fa0adf9139f 100644 --- a/sys/sys/interrupt.h +++ b/sys/sys/interrupt.h @@ -148,6 +148,9 @@ struct intr_event { #define SWI_TQ 6 #define SWI_TQ_GIANT 6 +/* Maximum number of stray interrupts to log */ +#define INTR_STRAY_LOG_MAX 5 + struct proc; extern struct intr_event *clk_intr_event; diff --git a/sys/x86/x86/intr_machdep.c b/sys/x86/x86/intr_machdep.c index e53d86a8cef8..4a1bc942234a 100644 --- a/sys/x86/x86/intr_machdep.c +++ b/sys/x86/x86/intr_machdep.c @@ -72,8 +72,6 @@ #include -#define MAX_STRAY_LOG 5 - typedef void (*mask_fn)(void *); static int intrcnt_index; @@ -355,9 +353,9 @@ intr_execute_handlers(struct intsrc *isrc, struct trapframe *frame) if (intr_event_handle(ie, frame) != 0) { isrc->is_pic->pic_disable_source(isrc, PIC_EOI); (*isrc->is_straycount)++; - if (*isrc->is_straycount < MAX_STRAY_LOG) + if (*isrc->is_straycount < INTR_STRAY_LOG_MAX) log(LOG_ERR, "stray irq%d\n", vector); - else if (*isrc->is_straycount == MAX_STRAY_LOG) + else if (*isrc->is_straycount == INTR_STRAY_LOG_MAX) log(LOG_CRIT, "too many stray irq %d's: not logging anymore\n", vector); From nobody Thu Aug 17 22:11:31 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RRfNh17n7z4qDqZ; Thu, 17 Aug 2023 22:11:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RRfNh0XF6z4ZM2; Thu, 17 Aug 2023 22:11:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692310292; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=cvw5E2FszLHfbA3M1D+uvW0qq3JRzJnSFhb96o15m48=; b=HhTO8KM+13En4i5BNys2IFynpQKNlKzB+WfgxIFPgnVg1su7jIcqVVNhblh6Xg/p+1odKZ kMnYJsLwrtArucRoHwaUMvAqkKP7O5+9hl1wXohJCN2sDhtI08mUW5xQThPx4n5sf4CDLa Z1ZtAy1YRuequfbe5ksuRTy1F4TZ4PnvCi/oDdj6P0N0yzi0mU2+GTNmpoAmv2CkwM2Qu+ 2NdsnA8eUeRPYjiw83ZXZGhmKMLLKWJ9UowYlm2h4vESf5cxWlKer65BrJKmvvzB8fEeR8 H+U9WzgOGYEI9vV0FjlMEc/0nkNMoLPkXAcIJAN7UYHmwTFO5IDQq4Mc8v1M+g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692310292; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=cvw5E2FszLHfbA3M1D+uvW0qq3JRzJnSFhb96o15m48=; b=uk9xIAtyJ6kDrfyIjhZPFG4ftZEEmAoSwjUBoPYpqvCdFxh/aABLOv29ORgIu22liHggOC pjcjhBPUxUJMuuz/E7n3VzZj6aExmt7fl3peymgvzLn42vz+xjS37UyucjsTHsccuG4CM3 Xz8vPokG2hEw81nH9J60Gmx1lOW+CJsKbKF3qz8EGIJZFdgsZDTfd6DJusEg913GuQqxKq 6VXFuSfcWuq3N/nCFqpKoq2FrZv8mFzTmcapEqkLiWz85g0eThJRI4VBhhVneFB+B2kr9F IDE5S+2f7yK0sVonw757Efs9PokESUFvpky1Xs5DcLZo5Ref5cVQGV+6jQj6cg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692310292; a=rsa-sha256; cv=none; b=vbV/X09UPFgS4GFI7Gig0u8Wew4yx4vlH99n5Zh9LzoTuDA9GKcZjYybZuUkdV49GG3yW1 MRi+3Y5OeblnL3eHhauP+TMatplBMOSkXMgWHIToKKv5r7CVCF9gvqTDa+AoITu5D+fKV8 PVt2E8gNVP/WrMZOFra48BcsRsANqavhkHK7D3iUqjT24y5PGLe64xafLu9BROJHxV3TOg lpmaYuTTX53dZGz7Pn0V1DAeb+/OQABA2WaKd4IIhYAGvrd5Vpb+4SdgHxv/3D2F5rlsJp T0DZhEFh7UMsPWuMgq9qc9cvwLVIjV8NH4fWzRjszHEKtNgNo+mO5EL4ygH/eA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RRfNg6dWDzrRk; Thu, 17 Aug 2023 22:11:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37HMBVoK011811; Thu, 17 Aug 2023 22:11:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37HMBVVd011808; Thu, 17 Aug 2023 22:11:31 GMT (envelope-from git) Date: Thu, 17 Aug 2023 22:11:31 GMT Message-Id: <202308172211.37HMBVVd011808@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 5ad59b91535f - main - intr: merge interrupt table uses of MAXCOMLEN into INTRNAME_LEN List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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/main X-Git-Reftype: branch X-Git-Commit: 5ad59b91535f2df176c132be10e344c4a302f619 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=5ad59b91535f2df176c132be10e344c4a302f619 commit 5ad59b91535f2df176c132be10e344c4a302f619 Author: Elliott Mitchell AuthorDate: 2023-01-20 02:24:32 +0000 Commit: Mark Johnston CommitDate: 2023-08-17 22:10:02 +0000 intr: merge interrupt table uses of MAXCOMLEN into INTRNAME_LEN The repeated uses of `MAXCOMLEN + 1` seem a bit hazardous. If there was a future need to change the size, the repeats will be troublesome. Merge everything into `#define INTRNAME_LEN` (matches the name used by INTRNG). Reviewed by: markj MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D38455 --- sys/powerpc/powerpc/intr_machdep.c | 9 +++++---- sys/x86/x86/intr_machdep.c | 13 +++++++------ 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/sys/powerpc/powerpc/intr_machdep.c b/sys/powerpc/powerpc/intr_machdep.c index d64d15775ab5..69a6bda1337f 100644 --- a/sys/powerpc/powerpc/intr_machdep.c +++ b/sys/powerpc/powerpc/intr_machdep.c @@ -127,6 +127,7 @@ static u_int nirqs = 0; /* Allocated IRQs. */ #endif static u_int stray_count; +#define INTRNAME_LEN (MAXCOMLEN + 1) u_long *intrcnt; char *intrnames; size_t sintrcnt = sizeof(intrcnt); @@ -152,8 +153,8 @@ static void intrcnt_setname(const char *name, int index) { - snprintf(intrnames + (MAXCOMLEN + 1) * index, MAXCOMLEN + 1, "%-*s", - MAXCOMLEN, name); + snprintf(intrnames + INTRNAME_LEN * index, INTRNAME_LEN, "%-*s", + INTRNAME_LEN - 1, name); } static void @@ -177,10 +178,10 @@ intr_init_sources(void *arg __unused) #endif intrcnt = mallocarray(nintrcnt, sizeof(u_long), M_INTR, M_WAITOK | M_ZERO); - intrnames = mallocarray(nintrcnt, MAXCOMLEN + 1, M_INTR, M_WAITOK | + intrnames = mallocarray(nintrcnt, INTRNAME_LEN, M_INTR, M_WAITOK | M_ZERO); sintrcnt = nintrcnt * sizeof(u_long); - sintrnames = nintrcnt * (MAXCOMLEN + 1); + sintrnames = nintrcnt * INTRNAME_LEN; intrcnt_setname("???", 0); intrcnt_index = 1; diff --git a/sys/x86/x86/intr_machdep.c b/sys/x86/x86/intr_machdep.c index 4a1bc942234a..b8dbe3611a42 100644 --- a/sys/x86/x86/intr_machdep.c +++ b/sys/x86/x86/intr_machdep.c @@ -93,6 +93,7 @@ u_int num_io_irqs; static int assign_cpu; #endif +#define INTRNAME_LEN (MAXCOMLEN + 1) u_long *intrcnt; char *intrnames; size_t sintrcnt = sizeof(intrcnt); @@ -187,10 +188,10 @@ intr_init_sources(void *arg) #endif intrcnt = mallocarray(nintrcnt, sizeof(u_long), M_INTR, M_WAITOK | M_ZERO); - intrnames = mallocarray(nintrcnt, MAXCOMLEN + 1, M_INTR, M_WAITOK | + intrnames = mallocarray(nintrcnt, INTRNAME_LEN, M_INTR, M_WAITOK | M_ZERO); sintrcnt = nintrcnt * sizeof(u_long); - sintrnames = nintrcnt * (MAXCOMLEN + 1); + sintrnames = nintrcnt * INTRNAME_LEN; intrcnt_setname("???", 0); intrcnt_index = 1; @@ -428,8 +429,8 @@ static void intrcnt_setname(const char *name, int index) { - snprintf(intrnames + (MAXCOMLEN + 1) * index, MAXCOMLEN + 1, "%-*s", - MAXCOMLEN, name); + snprintf(intrnames + INTRNAME_LEN * index, INTRNAME_LEN, "%-*s", + INTRNAME_LEN - 1, name); } static void @@ -442,14 +443,14 @@ intrcnt_updatename(struct intsrc *is) static void intrcnt_register(struct intsrc *is) { - char straystr[MAXCOMLEN + 1]; + char straystr[INTRNAME_LEN]; KASSERT(is->is_event != NULL, ("%s: isrc with no event", __func__)); mtx_lock_spin(&intrcnt_lock); MPASS(intrcnt_index + 2 <= nintrcnt); is->is_index = intrcnt_index; intrcnt_index += 2; - snprintf(straystr, MAXCOMLEN + 1, "stray irq%d", + snprintf(straystr, sizeof(straystr), "stray irq%d", is->is_pic->pic_vector(is)); intrcnt_updatename(is); is->is_count = &intrcnt[is->is_index]; From nobody Thu Aug 17 22:11:32 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RRfNj2Q6bz4qDw7; Thu, 17 Aug 2023 22:11: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RRfNj1ZGtz4Zdv; Thu, 17 Aug 2023 22:11:33 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692310293; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=I1IkIQ+rkEtrI1ePU0mg0t58WJxumV5BvnjNcLkZdys=; b=xCYBQIo9RlyAD1e4KbC9O1wMMDQel50Q2iet3dzXTn574Pzv6xygDTumictzrYGyCnCdRW wSzJdOk/2W/WRvnw8v64VxCd/bFEEMKxTCJs2BMsuI9dsBfsXjnPFrAWu4+PNOmAx+4uhk U72eFuaDiW/b6Mhqz+krltNBdVEHeduJjglH2oKcKGPs5vLwbmKOVPD6J2QaDUOguovJtt SE4rCMvUnP6lh8BCupCjisB+VyqbrCyyDsofPP9JEJS4gp5AOHCPUQZsMCyuIeNkH/5053 Y5DYPc111qnvMnn4rjIqojNh/s81uC+eLWoUd1haKHK/FD+7xxpw5OeSEU4e/Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692310293; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=I1IkIQ+rkEtrI1ePU0mg0t58WJxumV5BvnjNcLkZdys=; b=R5wS3kP7x14TWoCYysDPwMbVnUPVznuIrjLcq2VidAv5Kta+8a8dOXZeS6SIUzzaRLaX+9 wttZaPGieokLFum8GIM9GqqnZjWHwH0YKl1+6bDF2Goy7KhSomEggDvQj5UMnMimJEUVwG 1R4tUq5UdzhtWLh29DEH5bTHZJbywbaGNy6yZTd6MiFEFiYRNcwQmYfTc/uVKBrHuKByc8 bI03cvH8mZ5Xru5Y9aGhgdQpP4g338069wkI6kl+NFKhFHaRmkK6IMK44067fvnzbvCBz/ q6jW6vgt2FxIZVbOerIJV1ZxJ/rosXTvuDYSmf3ommhT4bHDGvWiuuwcwEX+9w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692310293; a=rsa-sha256; cv=none; b=CNuqdBE+b5lWPpj+Z1mTRkjKv7+AqqSLEWNgoZHgJ8YDAICT5QKdn6os98+yrcRZomKWnx AwWq5Cd5xFLpqYVnyAsaGZAgcD3dp1JiLruCJLmEfHxdIxG1jCAzrKM6aLEKkx7w0LlPCw poZ3Ves2G/n+nT6uKBdUhadYqWzD2FT+avaRRNRYCr2qHcDR3psCuBzcaYh8SRrTWcq9W8 a7PSXVylxAtVzkXlOZev6brRxV39N1BSpnjj9jOH+j/Xy2hXYBORi43wuWstq157wK0siY HEPzc2pro/hNHnpv+Yk76TKqm07AyHJfxAlSHsoih8ed4r2ISeb/nuP/RuPrWQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RRfNj0WMgzrRl; Thu, 17 Aug 2023 22:11:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37HMBWic011851; Thu, 17 Aug 2023 22:11:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37HMBW0h011848; Thu, 17 Aug 2023 22:11:32 GMT (envelope-from git) Date: Thu, 17 Aug 2023 22:11:32 GMT Message-Id: <202308172211.37HMBW0h011848@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 5635d5b61e21 - main - vmm: Fix VM_GET_CPUS compatibility List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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/main X-Git-Reftype: branch X-Git-Commit: 5635d5b61e2113b91db921267cb476b1fde93e9e Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=5635d5b61e2113b91db921267cb476b1fde93e9e commit 5635d5b61e2113b91db921267cb476b1fde93e9e Author: Mark Johnston AuthorDate: 2023-08-17 18:49:54 +0000 Commit: Mark Johnston CommitDate: 2023-08-17 22:10:02 +0000 vmm: Fix VM_GET_CPUS compatibility bhyve in a 13.x jail fails to boot guests with more than one vCPU because they pass too small a buffer to VM_GET_CPUS, causing the ioctl handler to return ERANGE. Handle this the same way as cpuset system calls: make sure that the result can fit in the truncated space, and relax the check on the cpuset buffer. As a side effect, fix an insufficient bounds check on "size". The signed/unsigned comparison with sizeof(cpuset_t) fails to exclude negative values, so we can end up allocating impossibly large amounts of memory. Reviewed by: jhb MFC after: 1 week Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D41496 --- sys/amd64/vmm/vmm_dev.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/sys/amd64/vmm/vmm_dev.c b/sys/amd64/vmm/vmm_dev.c index c13adfd599ee..cae15d7059cb 100644 --- a/sys/amd64/vmm/vmm_dev.c +++ b/sys/amd64/vmm/vmm_dev.c @@ -989,11 +989,12 @@ vmmdev_ioctl(struct cdev *cdev, u_long cmd, caddr_t data, int fflag, error = 0; vm_cpuset = (struct vm_cpuset *)data; size = vm_cpuset->cpusetsize; - if (size < sizeof(cpuset_t) || size > CPU_MAXSIZE / NBBY) { + if (size < 1 || size > CPU_MAXSIZE / NBBY) { error = ERANGE; break; } - cpuset = malloc(size, M_TEMP, M_WAITOK | M_ZERO); + cpuset = malloc(max(size, sizeof(cpuset_t)), M_TEMP, + M_WAITOK | M_ZERO); if (vm_cpuset->which == VM_ACTIVE_CPUS) *cpuset = vm_active_cpus(sc->vm); else if (vm_cpuset->which == VM_SUSPENDED_CPUS) @@ -1002,6 +1003,8 @@ vmmdev_ioctl(struct cdev *cdev, u_long cmd, caddr_t data, int fflag, *cpuset = vm_debug_cpus(sc->vm); else error = EINVAL; + if (error == 0 && size < howmany(CPU_FLS(cpuset), NBBY)) + error = ERANGE; if (error == 0) error = copyout(cpuset, vm_cpuset->cpus, size); free(cpuset, M_TEMP); From nobody Thu Aug 17 22:26:43 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RRfkC461kz4qFSB; Thu, 17 Aug 2023 22:26: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RRfkC3YmKz4bxP; Thu, 17 Aug 2023 22:26:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692311203; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=w7k3ns03Q+IcJRrf0kso7RvT4O8HpXmNNLMQKORYfaA=; b=Jp9jx8LKIOKV/TqdXam/QGAYAsQPyDOsSprRAxG65jfzZqAdG4cDTv3I08j+12wmxdy839 UmpdRn19fe7oYoI01+FN746oUZXWK96tRM2acJoCbuoBqH/D62U/VMjzxooLO7+6Ribr7K wzgWX6gtY86HJr5vulVlnSf/j3XG6hYSjbAXz8X4fQVOSLR6Ly8kGpCxltNUZlNSnFCP6M oaWekwGjGZBEAQFnCok5wPFmwBykSc1UmV/G8AlBob8IC5GYXiscozNj7l1zhn/Plbrwdj b+/vfHvIW0Pk/V/yfZFrqfu+ezPD1Cz2owYPV1VBWhdyrnkVWvcERp4vgUBfQw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692311203; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=w7k3ns03Q+IcJRrf0kso7RvT4O8HpXmNNLMQKORYfaA=; b=o7SEtD43ENdxtQt9Mpa8NshfvPTkDZi6BKspFT+57kQnDLLdrfjLf/0iatsOCG6f0v8Ulq umMv00yy4ro6YcUOzwGulDFtrzEAWFPiAR8skrY2rvVO0K1JsZLwr/EEBPwZcwU0KvJDIW nhSF5b06KXkaUZE60H4rMr/+ODrE8LBsajDUfpfKWVE9pQ5UBx2y3LCKhSAWeihkBLPWKa 5F0fbDqP2CntabUbj5Pn9zR94+OgiODYiACakJ+5ruh2jQZQmoGVg80xq/Qhl7V5vdMq0u gR8g1UuN1s1LKFKAkX6N80CnQL48zpYgKR3DMct6NkSLeftxZrlvd0Ea/GLVMA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692311203; a=rsa-sha256; cv=none; b=sFfa2hnUmJS/LDmccOdQ0TgUVlyec+uPPpfr3smBEl6ltOBw2fQNdFHi9t/NRldWog6FcE zezgCbBJGVp42mlelIDDhoNPR2KCm2+9fWTSj8qdEyxY2MpMQuT8n6zi/Cn5W7rF7SD/ji MSwcfiCORy82e7W+QPnnX1M6pIGRe2ZiQ1S1rsPxY24nA7tOs2gT2SwIMv4Shvy1FWScZo /w5SEtBaBcDIp4B1T2UAXTnmF1f7s/YVyyYWF7GOrPmoQqz+hgv3a5zViPJCgBb/3MBBZL VQWcIwOh1H4e2fHnm16LfahrQ+9Z9bHvOdSyiPG6ZyMcoEzqGi4xXZIHI0hsyw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RRfkC2d3VzrG2; Thu, 17 Aug 2023 22:26:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37HMQhLq030692; Thu, 17 Aug 2023 22:26:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37HMQhDW030689; Thu, 17 Aug 2023 22:26:43 GMT (envelope-from git) Date: Thu, 17 Aug 2023 22:26:43 GMT Message-Id: <202308172226.37HMQhDW030689@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: 91d0876a20ce - main - arm64 makectx: Fix overflow of tf_x array List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 91d0876a20cee993f3cd17b4638e779c6975d15b Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=91d0876a20cee993f3cd17b4638e779c6975d15b commit 91d0876a20cee993f3cd17b4638e779c6975d15b Author: John Baldwin AuthorDate: 2023-08-17 22:26:16 +0000 Commit: John Baldwin CommitDate: 2023-08-17 22:26:16 +0000 arm64 makectx: Fix overflow of tf_x array PCB_LR isn't stored in tf_x, so trying to store it as pcb_x[PCB_LR] = tf->tf_x[PCB_LR + PCB_X_START] overflowed the tf_x array. Reported by: Morello (bounds check crash) Reviewed by: jrtc27, andrew, markj Sponsored by: DARPA Differential Revision: https://reviews.freebsd.org/D41485 --- sys/arm64/arm64/machdep.c | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/sys/arm64/arm64/machdep.c b/sys/arm64/arm64/machdep.c index 2a26da3d65b6..4bfbfcaa91bd 100644 --- a/sys/arm64/arm64/machdep.c +++ b/sys/arm64/arm64/machdep.c @@ -359,11 +359,14 @@ makectx(struct trapframe *tf, struct pcb *pcb) { int i; - for (i = 0; i < nitems(pcb->pcb_x); i++) - pcb->pcb_x[i] = tf->tf_x[i + PCB_X_START]; - /* NB: pcb_x[PCB_LR] is the PC, see PC_REGS() in db_machdep.h */ - pcb->pcb_x[PCB_LR] = tf->tf_elr; + for (i = 0; i < nitems(pcb->pcb_x); i++) { + if (i == PCB_LR) + pcb->pcb_x[i] = tf->tf_elr; + else + pcb->pcb_x[i] = tf->tf_x[i + PCB_X_START]; + } + pcb->pcb_sp = tf->tf_sp; } From nobody Fri Aug 18 00:06:48 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RRhxj1wVDz4qM6L; Fri, 18 Aug 2023 00:06:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RRhxh5Lz3z3DcM; Fri, 18 Aug 2023 00:06:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692317208; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=K8dWgF3evVKxHqyNvc8pNNNtuHpZz7ICMjsci5ZrTdA=; b=kSAy0JcaHyk9pBHGnZ+zidGYUy+A45fGMiU2PFrV9eEbxeywgKxKMCi6WGpNhc8XZuSWGi T3hyXe21b4tjpgZTWg6E3K60ApybTJgLJgHb2CNGtv8GNmNy6eaJBOQPj8C50MA9UR6Xnm rWuIBr0Fo/Z/tsZeMXR2rFcDkN1/vZfQv06gkp82SqpM58q4MICFPoK4YlSbQsQsurKW7b r4C2ztmEHvQZOkEo7ma8efrS0lzKM6fa3a9MnGfWXlv81vXG8hOeXg1a1B9UL6CdAPtcCo xzN9sPs4FjJ7PA17sJm6CIeSBvSg/+45IylpRkX15dz3dNr+Y6q/vLI9sLBzug== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692317208; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=K8dWgF3evVKxHqyNvc8pNNNtuHpZz7ICMjsci5ZrTdA=; b=XgOhIS0Of4ILOo5X4OUH6LhWteuOK//JoCCO/GYjN9axK025rNRkaALfEEudBTVIXpO7kT RWjB1O/G18ihKh1r1OH4db3aNl4axGzAk9h0MbGozp7cX/MYm6YVmEUsxT/Op1TJ4tuQ2P SzJZJ7HQrzLRErfiAUsrPboDmOJI7oV5h/xLkBWUvnEuEyWp7PwqV89huR8/gROLZFenzC EXmeaTz4XbVSkZ/cvWPAWWakiO4kuAAFN7RRmhpzkaj9p4LcMHNJ2p7j9cuiSbreMwF+EG Nega8TVjtI3H5qXaFl0pQqu6DZ6cz6mW3bq6X7EzKbIid6FRlRcbZDn8k/tX8A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692317208; a=rsa-sha256; cv=none; b=KHLsprMiGfBGHZiVb7gRIMvvZdA9PjHkq4zEjgswAKz5eWbLtdenikT+hXWUkdKU5hNoRk AzMX6dPgiS6ZNPjpvEs+ZHpYCqQVTVhFf/YM6Vgtvyuz1lKdwoGXmR3Tx/idPmcAmRCn6/ IZqSBPTTY7mA/5grOumZyLGgROmXv30zjbIYd0KlOI9uad33/JZkN3N7UyqHqxdsC27EpL WdJaHzRLqoWJh4gGcyseTGBD9aRO6Qv/cidm7ILyMoqA+X5SpEDlZAYU7iVaXFyHSODJs0 j1hRNZvCpsRKoOiCJLUhFqqs0jBnffOnofXnFaK2v2VnTBiQcfNp+iiyWf5FMQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RRhxh4S5Gzv0j; Fri, 18 Aug 2023 00:06:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37I06mJT096791; Fri, 18 Aug 2023 00:06:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37I06mOf096788; Fri, 18 Aug 2023 00:06:48 GMT (envelope-from git) Date: Fri, 18 Aug 2023 00:06:48 GMT Message-Id: <202308180006.37I06mOf096788@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: fa5f94140a83 - main - msi: handle error from BUS_REMAP_INTR in msi_assign_cpu List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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/main X-Git-Reftype: branch X-Git-Commit: fa5f94140a83b4704c654ababd67cd9addb7cd29 Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=fa5f94140a83b4704c654ababd67cd9addb7cd29 commit fa5f94140a83b4704c654ababd67cd9addb7cd29 Author: Ed Maste AuthorDate: 2023-08-14 16:56:12 +0000 Commit: Ed Maste CommitDate: 2023-08-18 00:03:48 +0000 msi: handle error from BUS_REMAP_INTR in msi_assign_cpu Previously errors from BUS_REMAP_INTR were silently ignored, and we ended up with non-functional interrupts. Now we allocate and enable new vectors, but postpone assignment of new APIC IDs and vectors where we can, until after BUS_REMAP_INTR is successful. We then disable and free the old vectors. If BUS_REMAP_INTR fails we restore the old configuration, and disable and free the new, unused vectors. Thanks to AMD for providing hardware (with APIC IDs above 255) for testing. Reviewed by: jhb MFC after: 1 month Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D41455 --- sys/x86/x86/msi.c | 47 ++++++++++++++++++++++++++++++++--------------- 1 file changed, 32 insertions(+), 15 deletions(-) diff --git a/sys/x86/x86/msi.c b/sys/x86/x86/msi.c index 8751c621a5e1..7f4d87c09453 100644 --- a/sys/x86/x86/msi.c +++ b/sys/x86/x86/msi.c @@ -244,7 +244,7 @@ msi_assign_cpu(struct intsrc *isrc, u_int apic_id) struct msi_intsrc *sib, *msi = (struct msi_intsrc *)isrc; int old_vector; u_int old_id; - int i, vector; + int error, i, vector; /* * Only allow CPUs to be assigned to the first message for an @@ -274,31 +274,48 @@ msi_assign_cpu(struct intsrc *isrc, u_int apic_id) if (vector == 0) return (ENOSPC); + /* Must be set before BUS_REMAP_INTR as it may call back into MSI. */ msi->msi_cpu = apic_id; msi->msi_vector = vector; if (msi->msi_intsrc.is_handlers > 0) apic_enable_vector(msi->msi_cpu, msi->msi_vector); - if (bootverbose) - printf("msi: Assigning %s IRQ %d to local APIC %u vector %u\n", - msi->msi_msix ? "MSI-X" : "MSI", msi->msi_irq, - msi->msi_cpu, msi->msi_vector); for (i = 1; i < msi->msi_count; i++) { sib = (struct msi_intsrc *)intr_lookup_source(msi->msi_irqs[i]); - sib->msi_cpu = apic_id; - sib->msi_vector = vector + i; if (sib->msi_intsrc.is_handlers > 0) - apic_enable_vector(sib->msi_cpu, sib->msi_vector); - if (bootverbose) - printf( - "msi: Assigning MSI IRQ %d to local APIC %u vector %u\n", - sib->msi_irq, sib->msi_cpu, sib->msi_vector); + apic_enable_vector(apic_id, vector + i); } - BUS_REMAP_INTR(device_get_parent(msi->msi_dev), msi->msi_dev, + error = BUS_REMAP_INTR(device_get_parent(msi->msi_dev), msi->msi_dev, msi->msi_irq); + if (error == 0) { + if (bootverbose) { + printf("msi: Assigning %s IRQ %d to local APIC %u vector %u\n", + msi->msi_msix ? "MSI-X" : "MSI", msi->msi_irq, + msi->msi_cpu, msi->msi_vector); + } + for (i = 1; i < msi->msi_count; i++) { + sib = (struct msi_intsrc *)intr_lookup_source( + msi->msi_irqs[i]); + sib->msi_cpu = apic_id; + sib->msi_vector = vector + i; + if (bootverbose) + printf("msi: Assigning MSI IRQ %d to local APIC %u vector %u\n", + sib->msi_irq, sib->msi_cpu, + sib->msi_vector); + } + } else { + device_printf(msi->msi_dev, + "remap irq %u to APIC ID %u failed (error %d)\n", + msi->msi_irq, apic_id, error); + msi->msi_cpu = old_id; + msi->msi_vector = old_vector; + old_id = apic_id; + old_vector = vector; + } /* * Free the old vector after the new one is established. This is done - * to prevent races where we could miss an interrupt. + * to prevent races where we could miss an interrupt. If BUS_REMAP_INTR + * failed then we disable and free the new, unused vector(s). */ if (msi->msi_intsrc.is_handlers > 0) apic_disable_vector(old_id, old_vector); @@ -309,7 +326,7 @@ msi_assign_cpu(struct intsrc *isrc, u_int apic_id) apic_disable_vector(old_id, old_vector + i); apic_free_vector(old_id, old_vector + i, msi->msi_irqs[i]); } - return (0); + return (error); } void From nobody Fri Aug 18 00:08:41 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RRhzs2xyNz4qMHP; Fri, 18 Aug 2023 00:08: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RRhzs22VRz3FLD; Fri, 18 Aug 2023 00:08:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692317321; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kmYyi/w4EUuUs3nHm5eKZevfFeoRluygeHXizCYfeQU=; b=Fnasoos2it1KmRJl2d9mvsbEBKj224SY7pqBnRO9wSchAd81rwZkJXBPVzPC7vkIpCBfty klwO+VF6GMZIj9gD/CG9OnWjneeuASEg5XjJn0B63dfmZTLMWhpnRogdkr1hwr/6YaHvHK bXNFEeuCoksQMw3bkrag8Oj4IqfqpEAOIF9C3C4a9RKtaaE7lsoJoIDYUwnCL9E2A6OweN VqyKmz4kx3y/RUbt28lEygjW8wIOyaL2cegzxyMqvtPhJdkaQVDaNF0V8seoDZZP/vIdO+ zPKVGY8OP/B59r2iZ+XaD6PEJELilTS6X24grDnqASUmiI/Brg36FhdjcttoiQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692317321; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kmYyi/w4EUuUs3nHm5eKZevfFeoRluygeHXizCYfeQU=; b=CwnrqbnpWWtDipTp2MkR5SaP+eHSh+YquUTT2iL/SwrtAvPEC6J/easn08omSra40JEY/7 SX2BR86nUhA3tV+Qe7ou8Dym+Q+vTZ97yo3EFlk4JkbySvWsqyEN9xxyLljUsdVfsEA+de Daj+corDCG2SiKosWMZ6Fel20605f5JnrZBungM8rNYNSzgJKe5hPD8w0AhyTyQ7oUAaV7 8QmG8IQkkZaQ0CYZbZjg8W1ictBtIJGlReV7a62gugUd6ywm/HVYwahHPWcmRahkMc3e8k fLZdMs7BvCKg5dcSWhEkOUlfkkFeaRaMnwFCvonRZrwxno5h5dMxnvEVapRx6Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692317321; a=rsa-sha256; cv=none; b=Q6rHde3rdYR4m4ST/mAXwE3qykgKUCs534g6hjoC7AoPjGauEf3+ufwdmVvUpRvoEN1SIZ yN7a79ki54Fjq5l81ZkjpvDRC516SoCYM1IJx+UzYITH3MgssHkMkhyg6UYwnVDHuW5FK0 W1MawNKfDJ77UEKfegNFDIvc3o8hk1wAf3M6p01VNAPxZfY0+ovWhmOgLxvCWaZ8f1+/1Y +6E8qb023upskL0/VVIqK3QaSjF+d4MeptN40WI3339JmY0ZMLLDrs1coGX1RGk3EckjLZ 2xe5KKliEMBdqCFf3XWCDqlcatyjtSzgZRG4E8HNvgBDbPb3Qfu08bj28GZzuw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RRhzs16MGzv35; Fri, 18 Aug 2023 00:08:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37I08fCo097248; Fri, 18 Aug 2023 00:08:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37I08fBp097245; Fri, 18 Aug 2023 00:08:41 GMT (envelope-from git) Date: Fri, 18 Aug 2023 00:08:41 GMT Message-Id: <202308180008.37I08fBp097245@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Glen Barber Subject: git: 77013f29d048 - main - release: update main to ALPHA2 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gjb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 77013f29d04806b72668615e701978b19cb96097 Auto-Submitted: auto-generated The branch main has been updated by gjb: URL: https://cgit.FreeBSD.org/src/commit/?id=77013f29d04806b72668615e701978b19cb96097 commit 77013f29d04806b72668615e701978b19cb96097 Author: Glen Barber AuthorDate: 2023-08-18 00:08:32 +0000 Commit: Glen Barber CommitDate: 2023-08-18 00:08:32 +0000 release: update main to ALPHA2 Due to an issue being investigated, the branch of stable/14 will be delayed a week. This should not impact the rest of the schedule for this cycle. Sponsored by: GoFundMe https://www.gofundme.com/f/gjbbsd Sponsored by: PayPal https://paypal.me/gjbbsd --- sys/conf/newvers.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/conf/newvers.sh b/sys/conf/newvers.sh index 43ccf383678b..fcdfadcad175 100644 --- a/sys/conf/newvers.sh +++ b/sys/conf/newvers.sh @@ -53,7 +53,7 @@ TYPE="FreeBSD" REVISION="14.0" -BRANCH="ALPHA1" +BRANCH="ALPHA2" if [ -n "${BRANCH_OVERRIDE}" ]; then BRANCH=${BRANCH_OVERRIDE} fi From nobody Fri Aug 18 00:33:18 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RRjXG46lCz4qNdD; Fri, 18 Aug 2023 00:33:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RRjXG3Pgqz3Gpr; Fri, 18 Aug 2023 00:33:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692318798; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4hlUqt1PIXafAPoMNE0UI7k4OBUzTpcTTBss4tMyjfw=; b=bg6yOwwxJo1L6L0w6cN+ZsLgSsv9y1wLRjY/v8c/w2Tx1LPUgRG/b0ofTZiTOH8+HUi2JT EGL/rWcRTwibjtv0WpgFTaoMn30MXZCagO2uI5+KemWyQjwf5h065kaIOYAQ+xuF4D+tb3 VcAor14eJwwqME2oLJl6OBMaQkv0ua25aYpVMuW+wGUKZo0An70ZrA9hyjGE+1L1nEer9f eSNzoPSutYi2/K33GM0PpwhzyMQVo1jm9j35RqDxAAoIdMD+hZ8O3wD1TsSBEETVdYQgBR gsjfclv529+AzK5eKjn3MKk1Yxm6Coy+eXOKN/XX6B1IGHxPmQQkZzpJNqjaow== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692318798; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4hlUqt1PIXafAPoMNE0UI7k4OBUzTpcTTBss4tMyjfw=; b=YiHdS8eixwNgzZeirxSdzp5r14Zy06ezpYSaNirvdPoHVMdqkHLmw5m2oaVLvKW0cFbhPI 2tAnasGXT2If6/ovqe//Snu8QcUf1QmCS798COBeqX0jf56ltHKm4U7Kb4rHHFjEannHsc 9aHLXYAiJvHThqJWd6Txyhm5NNcn2RkY1l7rNQfsrm63eu0vt/8V3Ug7IIMe08udVUP818 Ot1Z4Lx1/WagmeQORZPw+VaVbwys2ZKnDFCq4rVulsWbBaYZuaiSJk6Tp5yBItFX4d7YzY ip54hyvWjpD9cwfXxOHiRCjVOmqMUx+tQZAXo6fiX0WjHOEl4uSS4y29tMPmVg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692318798; a=rsa-sha256; cv=none; b=S1B5z8YgPTMSh8IhhIL3DtgIW2150XPgapnju4WVJir20qUk9Z0XqeEWphHNYjaR85T5oJ Q7fFQ96dgEiGygX9Ts0xMdC5/mstpOd7juj9ATUXGaPympB/B06umbRYSMl925nLh0FmAJ /u/kOFU9ywL6NzsYQwbQTW6po1IVoCs+2sF+3zTNsR46E0Bvr1XM89lCJBMfFkk456dUh2 VtQ0HQseihHZmZQ1KbeVBbSSQnoJoxoP9SjyNJh31iUGf6KKI57o9E+RprwrtPAk0tUW75 CGuzQCfIZt7He2PsNeKOd97tTU4PrAA01NX5iDaXRMYzotuEy/3b5m1ujsoTwQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RRjXG2QLWzvML; Fri, 18 Aug 2023 00:33:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37I0XIaQ046225; Fri, 18 Aug 2023 00:33:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37I0XIBW046222; Fri, 18 Aug 2023 00:33:18 GMT (envelope-from git) Date: Fri, 18 Aug 2023 00:33:18 GMT Message-Id: <202308180033.37I0XIBW046222@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kevin Bowling Subject: git: 3bbf655b2826 - stable/13 - e1000: Fix off by one ipcse List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kbowling X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 3bbf655b282690a70051f386c64aa95430b5fb64 Auto-Submitted: auto-generated The branch stable/13 has been updated by kbowling: URL: https://cgit.FreeBSD.org/src/commit/?id=3bbf655b282690a70051f386c64aa95430b5fb64 commit 3bbf655b282690a70051f386c64aa95430b5fb64 Author: Kevin Bowling AuthorDate: 2023-08-15 21:37:43 +0000 Commit: Kevin Bowling CommitDate: 2023-08-18 00:33:08 +0000 e1000: Fix off by one ipcse This has been off by one in the FreeBSD drivers as far back as I've looked. Emperically HW and SW emulations I have available don't seem to mind. Noticed while debugging other issues. (cherry picked from commit eac761e967b34066aa7183474249df87d79a2f32) --- sys/dev/e1000/em_txrx.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/dev/e1000/em_txrx.c b/sys/dev/e1000/em_txrx.c index b90ab21cd825..765458d621f9 100644 --- a/sys/dev/e1000/em_txrx.c +++ b/sys/dev/e1000/em_txrx.c @@ -290,7 +290,7 @@ em_transmit_checksum_setup(struct e1000_softc *sc, if_pkt_info_t pi, offsetof(struct ip, ip_sum); if (csum_flags & CSUM_IP) { *txd_upper |= E1000_TXD_POPTS_IXSM << 8; - TXD->lower_setup.ip_fields.ipcse = htole16(hdr_len); + TXD->lower_setup.ip_fields.ipcse = htole16(hdr_len - 1); cmd |= E1000_TXD_CMD_IP; } else if (csum_flags & (CSUM_IP6_TCP | CSUM_IP6_UDP)) TXD->lower_setup.ip_fields.ipcse = htole16(0); From nobody Fri Aug 18 00:35:14 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RRjZV4rj9z4qNPC; Fri, 18 Aug 2023 00:35:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RRjZV4LXmz3HLg; Fri, 18 Aug 2023 00:35:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692318914; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6wrdaCrj9k3HX7emJBZka0ai0g/mAYrA7Au/edtN8k0=; b=T4htQZqMV6fhLI3oRnVU7rhC/DrfpxwyFHvwqhWGXlGPyRj0/Z0x9+RsQYG5PeUZz0S0wq qZ/Y7aeYgUHhXELRILMaEneCyFlRk2cQ2ko1B84ULub0GkDVXL2G/hrmzNq+9PO3NrgXye x15VZ5hef1JP2MvatYQ+dg8ElZszk4caUCXlxVaLZhmjwjRMIcYmu3eL2OMaaZ3U0UIjyp g60xeVOha41Z0E8k5ryW2VhJGP0SET42WIjE3tXMJ7TpXxw95WwtAfeOEp1FnorVTi1C0N MhVfgYKqpGGXFoDbBuwrXkaO3yAwUAr/CZfkBmZuJOZKGnrZFa3fhbLdigeneQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692318914; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6wrdaCrj9k3HX7emJBZka0ai0g/mAYrA7Au/edtN8k0=; b=dejSIkVmHuAGwfrq80xu3ec4xz8nXfhS3mIjvg1jss4j2M/vWQFLGLx/NwImUPwAzb9zsC hoMhudDezxNIxl+une93hX5Kp/sKnsG+r2JENt6hCODBX2vTTpwipmUzBi1FrpabH9fb8n b2kGe8xtqim9sak7ncl9ZnMuZ0Fv0TkrWDPWDzhbTJA+U9heo10a0kYsluwENsGbfcpkE0 Mqizr0CJJqp6KDU7FfW+nT6d+Y6GG73zs2YPKYxFCaoLJD1uAK7lFSzP+mZVktW6ReuQtm aHHTtdbgHD15JXq9iFKrlGkeA8TCBbeRRhJVOuZzHVRBNn01uy8lM+aGczzydw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692318914; a=rsa-sha256; cv=none; b=mOYzA/xcCkzSTJ8jT3uDudHF+ar88HlSIdhSkHJFtefaUgN7qSXoE7HhWQwMOgdZKqiXyI 0jI69WXZO9er9WhboGOyRn5dxVQf8Bnbu808wz6ILEhx4mIxTASzR90oJgXIh6og3ljGrh kldE6ZOwvkS7rqDXN4yBjKwgWB+C9LLnZcnAKDZGRKOxzaPfKdezaHdQggTRnX1OZxOmvz Do6VxxpHIAIs5XALFvwYz7tGdl62C8Z9jqbWZlfeGm1i7XNpRcRkWL2MQy9pUPoSMNov1J KWuVZWDHjuL8cDi1VBSFBAtAaLmZ48l8NPpDkPCk4WZq1OrPtYDxsBpwOf6Qqw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RRjZV3P1Hzvvy; Fri, 18 Aug 2023 00:35:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37I0ZE2n046740; Fri, 18 Aug 2023 00:35:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37I0ZEhd046737; Fri, 18 Aug 2023 00:35:14 GMT (envelope-from git) Date: Fri, 18 Aug 2023 00:35:14 GMT Message-Id: <202308180035.37I0ZEhd046737@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gregory Neil Shapiro Subject: git: 98fd1add6763 - main - Remove confDH_PARAMETERS settings in favor of using sendmail's built-in default which was added in sendmail 8.15.2 (the config line predates that 8.15.2 feature). This also alleviates the need for admins to create the DH parameters file if they opt to use Diffie-Hellman. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: gshapiro X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 98fd1add676321978db72d77d34ef51ca454c814 Auto-Submitted: auto-generated The branch main has been updated by gshapiro: URL: https://cgit.FreeBSD.org/src/commit/?id=98fd1add676321978db72d77d34ef51ca454c814 commit 98fd1add676321978db72d77d34ef51ca454c814 Author: Gregory Neil Shapiro AuthorDate: 2023-08-18 00:32:56 +0000 Commit: Gregory Neil Shapiro CommitDate: 2023-08-18 00:32:56 +0000 Remove confDH_PARAMETERS settings in favor of using sendmail's built-in default which was added in sendmail 8.15.2 (the config line predates that 8.15.2 feature). This also alleviates the need for admins to create the DH parameters file if they opt to use Diffie-Hellman. PR: 248387 MFC after: 2 weeks --- etc/sendmail/freebsd.mc | 1 - 1 file changed, 1 deletion(-) diff --git a/etc/sendmail/freebsd.mc b/etc/sendmail/freebsd.mc index 97264805a67f..5fd201da3900 100644 --- a/etc/sendmail/freebsd.mc +++ b/etc/sendmail/freebsd.mc @@ -66,7 +66,6 @@ define(`confCLIENT_CERT', `CERT_DIR/host.cert')dnl define(`confCLIENT_KEY', `CERT_DIR/host.key')dnl define(`confCACERT', `CERT_DIR/cacert.pem')dnl define(`confCACERT_PATH', `CERT_DIR')dnl -define(`confDH_PARAMETERS', `CERT_DIR/dh.param')dnl dnl Uncomment to allow relaying based on your MX records. dnl NOTE: This can allow sites to use your server as a backup MX without From nobody Fri Aug 18 00:56:48 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RRk3N5VH8z4qPxD; Fri, 18 Aug 2023 00:56:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RRk3N51L4z3JPL; Fri, 18 Aug 2023 00:56:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692320208; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0LTxpd/O6SRTx3OKhMfHqi+1CuqR+yie7Uh2Vus3f6w=; b=XTzMofhXxVqaGqfFYiCi6xwLCQriZL+ECmHEkeuJpDZSKh6hALKqLcg1OeZKG4xMf2R7SX 53rVr6a7l9Bjgp97g2n0heehQxyjn+rrHa9H1tSZvoncXpJ4aH8mdLjRFwPef1nGCUKaa+ geizpIlKPJEGKn39EzaqskvIHxLqVq2PQY+Jdp69Rv2mCUuGlW43BaITU82Kk4vkTH/hZH dZ5MJqHovznUnMRiOtMB6uNd5v3LUXruVO5iqH/zxDRkdDy9hIt8e8bSbnPOMDenkknIkn 9OOrTX59EcC3VRG9K/DHV9S3+lgEbwOF0LQIWqNfhu6CNLIkIySYk5f665kkXQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692320208; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0LTxpd/O6SRTx3OKhMfHqi+1CuqR+yie7Uh2Vus3f6w=; b=Vr3CtZ+zuEGATvV7r5t4UBjCQ0gvRKrXc1SBWxD+4npOrerHKzgLCE6Er1RQNV283yRhfy NJQ9AfzvDMYSUM5Vzw5fQSTMMfvgCG5XgrO8ugpKL+30LaRWS0MnKSIiMY5wYssXNkprSm xQCCJv1WKhuHs3KwpGr3CCQt7k/bmb6gRNxdrPRdGLAhkiBFluCCXoIu6rcORturRA/G1o ey/hSgHeOeTLcGY8H27KrpQx9HL8jwW3zhivnk8WiPx++ztPOyvqqv8a5q6EfKCrRmmrOt EH3gwx2kBwgrtGcHObAb2Cb53i/cJuibm4Pdn3bS1VX28VEvwPbBLDJ+2+n5MQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692320208; a=rsa-sha256; cv=none; b=V7dzT03XmZ7Yszw+b49upWDzDd2NXoFruzqb0jXkVxnm7GpIHRJwWL5u5TUYsO0TbmbFEs tSqQd75TvJNrz1PGeOqVGweejFko0ObtYai7DXzCmpcTraQI/boGgPQOtAwlK3+jCDushs SmZLDEQJqf4+AuNj53WmFd7vNWx9rb+PYAbGNj8ER2mdB56LmlnWCMA9xh2hYRBqo5cWKo JB6Ksw4UbZ7mhX/cWyK5hAM5HbGlMs6F8c5z5rQ1waszR0mI99UbjISp9Sufr73aWVjN15 8OkGKpGE3VBAmTVUjbWpO5+PyVjnWAEZhImEHRYYyf9b4Ho+YfTUBoyoiC5YcA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RRk3N44rJzw9d; Fri, 18 Aug 2023 00:56:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37I0umlt079880; Fri, 18 Aug 2023 00:56:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37I0umh9079877; Fri, 18 Aug 2023 00:56:48 GMT (envelope-from git) Date: Fri, 18 Aug 2023 00:56:48 GMT Message-Id: <202308180056.37I0umh9079877@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kevin Bowling Subject: git: b8e5efdd24b0 - stable/13 - e1000: Some fixes for hardware capabilities List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kbowling X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: b8e5efdd24b09fffa345a64db585ed9d66b00f84 Auto-Submitted: auto-generated The branch stable/13 has been updated by kbowling: URL: https://cgit.FreeBSD.org/src/commit/?id=b8e5efdd24b09fffa345a64db585ed9d66b00f84 commit b8e5efdd24b09fffa345a64db585ed9d66b00f84 Author: Kevin Bowling AuthorDate: 2023-08-03 20:49:15 +0000 Commit: Kevin Bowling CommitDate: 2023-08-18 00:54:54 +0000 e1000: Some fixes for hardware capabilities This MFC squash retains disabled TSO ultimately, but contains some capability fixes. f1b5488f: e1000: Enable TSO for lem(4) and em(4) Most em(4) devices now enjoy TSO and TSO6, matching NetBSD and Linux defaults. A prior commit automasks TSO on 10/100 Ethernet due to errata and other bugs for IPv6 were fixed recently allowing this. Mike Karels identified a performance anomaly on Intel 82574L devices. These are multiqueue enabled on FreeBSD since the conversion to iflib. I am investigating whether this can be fixed, in the mean time MSI-X with checksum offloads remain default. i219 SPT devices have an errata that downclocks the DMA engine, which results in TSO not being able to acheive line rate. Therefore, it is disabled on: * Intel(R) I219-LM and I219-V SPT * Intel(R) I219-LM and I219-V SPT-H (2) * Intel(R) I219-LM and I219-V LBG (3) * Intel(R) I219-LM and I219-V SPT (4) * Intel(R) I219-LM and I219-V SPT (5) Many lem(4) devices enjoy TSO, exceptions being 82542, 82543, 82547. TSO6 may be possible for some chipsets but I am still working through my testing matrix and that is hidden behind hw.em.unsupported_tso. If you encounter issues, you may disable TSO with for example: ifconfig em0 -tso -tso6. I ask to be informed of any deviations from normal operation requiring this. Thanks to cc@ for access to emulab.net. On a sample I219 system it saves about 16% CPU on IPv4 and 19% on IPv6. iperf3 -Vc reported numbers: total% user% system% IPv4 TSO 21.3 7 14.4 21.4 6 15.4 21.5 6 15.5 IPv4 no TSO 36.8 5.4 31.4 38.5 5.1 33.5 38.2 5.7 32.6 IPv4 no TSO no TXCSUM 45.1 5.8 39.3 46 6.3 39.7 46.2 5.9 40.4 IPv6 TSO6 21.7 5.4 16.3 21.6 5.1 16.5 21.9 5.6 16.3 IPv6 no TSO6 41.2 5.2 36 41 5.1 36 40.8 5.2 35.7 IPv6 no TSO6 no TXCSUM6 49 5.9 43.1 48.8 4.9 43.9 49 5.6 43.4 Tested by: cc (lem(4)), karels (82574L) Relnotes: yes Sponsored by: BBOX.io Differential Revision: https://reviews.freebsd.org/D41170 13da8423: e1000: Enable TSO on 82574 Further testing indicates something wrong with particular reciever, enabling TSO 82574 for wider testing. Tested by: karels 797e480c: e1000: disable TSO on lem(4) and em(4) Disable TSO on lem(4) and em(4) until a ring stall can be debugged. I am not able to reproduce the issue on lem(4) but disabling there in abundance of caution in case the issue is not specific to em(4). Reported by: grog (cherry picked from commit f1b5488f7bba7f25a57750f87cbcbccbd5b9d16b) (cherry picked from commit 13da84237a37961938e9e237171ac111ddc1897c) (cherry picked from commit 797e480cba8834e584062092c098e60956d28180) --- sys/dev/e1000/if_em.c | 69 +++++++++++++++++++++++++++++---------------------- 1 file changed, 40 insertions(+), 29 deletions(-) diff --git a/sys/dev/e1000/if_em.c b/sys/dev/e1000/if_em.c index bf5fec7e9e3a..7f72ae53d0a2 100644 --- a/sys/dev/e1000/if_em.c +++ b/sys/dev/e1000/if_em.c @@ -905,25 +905,19 @@ em_if_attach_pre(if_ctx_t ctx) scctx->isc_tx_tso_size_max = EM_TSO_SIZE; scctx->isc_tx_tso_segsize_max = EM_TSO_SEG_SIZE; scctx->isc_capabilities = scctx->isc_capenable = EM_CAPS; - /* - * For EM-class devices, don't enable IFCAP_{TSO4,VLAN_HWTSO,TSO6} - * by default as we don't have workarounds for all associated - * silicon errata. E. g., with several MACs such as 82573E, - * TSO only works at Gigabit speed and otherwise can cause the - * hardware to hang (which also would be next to impossible to - * work around given that already queued TSO-using descriptors - * would need to be flushed and vlan(4) reconfigured at runtime - * in case of a link speed change). Moreover, MACs like 82579 - * still can hang at Gigabit even with all publicly documented - * TSO workarounds implemented. Generally, the penality of - * these workarounds is rather high and may involve copying - * mbuf data around so advantages of TSO lapse. Still, TSO may - * work for a few MACs of this class - at least when sticking - * with Gigabit - in which case users may enable TSO manually. - */ - scctx->isc_capenable &= ~(IFCAP_TSO4 | IFCAP_VLAN_HWTSO | IFCAP_TSO6); scctx->isc_tx_csum_flags = CSUM_TCP | CSUM_UDP | CSUM_IP_TSO | CSUM_IP6_TCP | CSUM_IP6_UDP; + + /* Disable TSO on all em(4) until ring stalls can be debugged */ + scctx->isc_capenable &= ~IFCAP_TSO; + + /* + * Disable TSO on SPT due to errata that downclocks DMA performance + * i218-i219 Specification Update 1.5.4.5 + */ + if (hw->mac.type == e1000_pch_spt) + scctx->isc_capenable &= ~IFCAP_TSO; + /* * We support MSI-X with 82574 only, but indicate to iflib(4) * that it shall give MSI at least a try with other devices. @@ -946,24 +940,41 @@ em_if_attach_pre(if_ctx_t ctx) scctx->isc_capabilities = scctx->isc_capenable = LEM_CAPS; if (em_unsupported_tso) scctx->isc_capabilities |= IFCAP_TSO6; - /* - * For LEM-class devices, don't enable IFCAP_{TSO4,VLAN_HWTSO} - * by default as we don't have workarounds for all associated - * silicon errata. TSO4 may work on > 82544 but its status - * is unknown by the authors. Please report any success or failures. - */ - scctx->isc_capenable &= ~(IFCAP_TSO4 | IFCAP_VLAN_HWTSO); scctx->isc_tx_csum_flags = CSUM_TCP | CSUM_UDP | CSUM_IP_TSO | CSUM_IP6_TCP | CSUM_IP6_UDP; + /* Disable TSO on all lem(4) until ring stalls can be debugged */ + scctx->isc_capenable &= ~IFCAP_TSO; + + /* 82541ER doesn't do HW tagging */ + if (hw->device_id == E1000_DEV_ID_82541ER || + hw->device_id == E1000_DEV_ID_82541ER_LOM) { + scctx->isc_capabilities &= ~IFCAP_VLAN_HWTAGGING; + scctx->isc_capenable = scctx->isc_capabilities; + } + /* This is the first e1000 chip and it does not do offloads */ + if (hw->mac.type == e1000_82542) { + scctx->isc_capabilities &= ~(IFCAP_HWCSUM | IFCAP_VLAN_HWCSUM | + IFCAP_HWCSUM_IPV6 | IFCAP_VLAN_HWTAGGING | + IFCAP_VLAN_HWFILTER | IFCAP_TSO | IFCAP_VLAN_HWTSO); + scctx->isc_capenable = scctx->isc_capabilities; + } + /* These can't do TSO for various reasons */ + if (hw->mac.type < e1000_82544 || hw->mac.type == e1000_82547 || + hw->mac.type == e1000_82547_rev_2) { + scctx->isc_capabilities &= ~(IFCAP_TSO | IFCAP_VLAN_HWTSO); + scctx->isc_capenable = scctx->isc_capabilities; + } + /* XXXKB: No IPv6 before this? */ + if (hw->mac.type < e1000_82545){ + scctx->isc_capabilities &= ~IFCAP_HWCSUM_IPV6; + scctx->isc_capenable = scctx->isc_capabilities; + } /* "PCI/PCI-X SDM 4.0" page 33 (b) - FDX requirement on these chips */ - if (hw->mac.type == e1000_82542 || hw->mac.type == e1000_82547 || - hw->mac.type == e1000_82547_rev_2) + if (hw->mac.type == e1000_82547 || hw->mac.type == e1000_82547_rev_2) scctx->isc_capenable &= ~(IFCAP_HWCSUM | IFCAP_VLAN_HWCSUM | IFCAP_HWCSUM_IPV6); - /* 82541ER doesn't do HW tagging */ - if (hw->device_id == E1000_DEV_ID_82541ER || hw->device_id == E1000_DEV_ID_82541ER_LOM) - scctx->isc_capenable &= ~IFCAP_VLAN_HWTAGGING; + /* INTx only */ scctx->isc_msix_bar = 0; } From nobody Fri Aug 18 00:59:42 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RRk6l1Kh8z4qPsj; Fri, 18 Aug 2023 00:59: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RRk6k6CmFz3KZm; Fri, 18 Aug 2023 00:59:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692320382; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3NumkOSnyM14tqEMz6hRwJrN0QIMkq+rNXoisDiunHk=; b=yHXQu3oBNyVEvrKdgEVTN2BmFNgkt7sEkEaVOhHxMmFESqRPE6uNGHTigNRhHDZcATgpVj IKXoddvDbqq/E7JQkZ8Fd6oyEUupPbw0b+lusFWG0dwbMJSozP8+/qlyrhwKHEws876dYE 3vMJUDKgyiG9Yuej9EDjf/KY7mymD06qcCmX2x0CmHzYR3rsC1MAYfA2r47W1ddMN9RNaB jewuKqUmF+LvWSxIZQgnGMkonu9pW8wNzubVBnWyJsDJWAWyrPOljW+nlm8mIxz1GM9kXn hrkAiRbRHOpYCyUFbG7e6Hu+lBubXcVugYO8ZiKUfmuEfWMJe6htz5bohaj2rQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692320382; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3NumkOSnyM14tqEMz6hRwJrN0QIMkq+rNXoisDiunHk=; b=CZri242y1KwIfLPI7fxfulMXpGhfpXWWT9Qqn2jr0XQ77QZgZ6eeCiFYygnglRoUhYBEnS 5zOYWtmTuf8GrtcGRhxQKFz+eTMlnHyBS3s3kuruc3jfF9Do6t26xNBmBFB/zvR6RHcDLW kIpsqbFFCshhdto/jb40UoA1aHCpXhxqBx3wj4fNWNUx8R6B2UkshhlM+49V/wRF2I64A6 0di/KyAo+SAGLVESrXhq/hwPyBovw9yngECnPpddLe4qzqN5tcA0vWFkE/ynnzyeRT3qfB lpwX2sGZodwpTWYGHwlg0DYu7/PBF/XGRucFOqmrdDkiV67b+Tja2priz8I19w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692320382; a=rsa-sha256; cv=none; b=FZqOzFn/Sj1Sf2XGL2ICi8W3RxUfth/6NZbsbMXAxmvPba0bvpWd5aR40MCja4TmaByKSy Qph74oQvZVQYG0+r4+VpjEMJJJehdG2oF8sdgB8GwIdG0XyG4bUtZ3tFoJ7Nzj/NG7ojzn kSYquGaR3RMHjj/VhWPoe0VMD/FlX902oeFMbZi1XGF38dqK6wy+BEwflOREKHndqtpVCv RVMC2oUvROV/z0BQjI57XBKCfEdSvvF6zumhH34lnauu1e9GBbPImg62HI2JbHjWN+tJXr eBdZ7YzzJvMpH9ZH2OyNatUyONglGOQQ+sOnTJtJHeVzxs51YSKlyKP6DXfXhA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RRk6k5HGrzvxS; Fri, 18 Aug 2023 00:59:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37I0xgEP080385; Fri, 18 Aug 2023 00:59:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37I0xgjR080382; Fri, 18 Aug 2023 00:59:42 GMT (envelope-from git) Date: Fri, 18 Aug 2023 00:59:42 GMT Message-Id: <202308180059.37I0xgjR080382@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kevin Bowling Subject: git: f73eb35106cc - stable/13 - vlan: Respect IFCAP_LRO mask List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kbowling X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: f73eb35106cc65d19af0f2e82a111308c5090c3a Auto-Submitted: auto-generated The branch stable/13 has been updated by kbowling: URL: https://cgit.FreeBSD.org/src/commit/?id=f73eb35106cc65d19af0f2e82a111308c5090c3a commit f73eb35106cc65d19af0f2e82a111308c5090c3a Author: Kevin Bowling AuthorDate: 2023-08-12 16:31:22 +0000 Commit: Kevin Bowling CommitDate: 2023-08-18 00:59:30 +0000 vlan: Respect IFCAP_LRO mask vlan_capabilities(), used by the IFCAP ioctl, was not respecting the IFCAP_LRO bit if it was masked by the requestor. This prevented if_bridge(4) from automasking LRO with a message like: bridge0: can't disable some capabilities on em3.11: 0x400 This also prevented manually disabling LRO from any vlan interface. PR: 254596 Reported by: Paul Vixie (cherry picked from commit b1a39c31a3569bd045a0f40057c3773fc8166f6d) --- sys/net/if_vlan.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/net/if_vlan.c b/sys/net/if_vlan.c index 21082f2d5741..d34575dd61fc 100644 --- a/sys/net/if_vlan.c +++ b/sys/net/if_vlan.c @@ -1850,7 +1850,7 @@ vlan_capabilities(struct ifvlan *ifv) if (p->if_capabilities & IFCAP_VLAN_HWCSUM) cap |= p->if_capabilities & IFCAP_LRO; if (p->if_capenable & IFCAP_VLAN_HWCSUM) - ena |= p->if_capenable & IFCAP_LRO; + ena |= mena & IFCAP_LRO; /* * If the parent interface can offload TCP connections over VLANs then From nobody Fri Aug 18 01:00:18 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RRk7R3br8z4qPpX; Fri, 18 Aug 2023 01:00: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RRk7R18z2z3L7b; Fri, 18 Aug 2023 01:00:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692320419; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5CflBasuSv/jedMjuZpWZCVjUcnnIiKj0w5KRw1VUmM=; b=wN6/mxoaa8TtHsxbJOXtkafmGVPHD3NFegEUgJF9OxjyKPbE6O1t5OjC/JjNrEFbKXm0Ej F/A6PpM5vAqk3jQC5qnqVdexPwRQVOsG3nTagkH3bLTwaqUeio9hgpNlFowvn0dP+7iSHQ 4hjwCtd/ekPd7BZqBqsUKZs+DF9w2PIk3wIEkvhXHSUPbrTYhwz3tn/DBv4RuxmMzhY+8o o8x3WYIsa9tbJoUc0W2ES89mLVcSbPoJJR3jo1xHOQtGqSUyQWWF39vtzXdsGQYAMXBrf4 gWrIY+uE6TIk3mMqgoV6hLHLARdWnf+PQmiKZWubNilyQkegShLWdjBCFQXXRg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692320419; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5CflBasuSv/jedMjuZpWZCVjUcnnIiKj0w5KRw1VUmM=; b=i+ezwrEcWqRxHfHxW2yWF+dY2elZ6RBeh//Rcbf9EoI+UFchZXNqMNWDV78162RRVFiCE5 eVEJn+DP9ZHtWQxTBAIhgZIHT6o2MRwXyU/e7WOPEldo6VuiLIk46f3tLQxxVrClNUj/x+ H0jL5T7NfHW4yAos+M6/gFj3tYGAncM7TNIrECkc9D6BdJJ2TCWkDPeuVABwujtxOMHYRA Leq5UIOiAf9+QvSolEAFoqg5zRPPcpKfo2QH6kB1Aj6TJIgxOpgsdxmUZ97o2Qq4s9Wugc zObxgYkdMRXa/gIoVaXqMmBLTFX6oTRq54uECSMRu03Kj2DcsDQsPDKeiYZlCQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692320419; a=rsa-sha256; cv=none; b=rY7R2ci+cZvbCQiGBzehuEVRgCFCdw+Sy9NiFcTcUc6qfVh4LyMKY82qRnE8qQyzpjvZtq 4qiXh1f5Ej1LJgomP9Mhbw9zwNuNvY1i9LYezS6AYF6St7CrLHpZH+F7HxU9KiNVkE/Vln 90hZMwzwMYLvvP1689UaJ6+yaZTMXyUyFlCXO6bPGqOajmJFdAVavMHFfG13SfcKmOnRWq vQeA3/qSGvtSdpdKT0VrIdE8qzsmIRqNSY8Ut7OAgZzq2wLoZlGBzHashG5iodDByMH1/A oek1pQUvuyyT1KPmJBvc66gainaR8ABp1bffK3LqYefaU4Y7/lSIsmnwJj2QxQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RRk7R05m8zwSN; Fri, 18 Aug 2023 01:00:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37I10Ieu090137; Fri, 18 Aug 2023 01:00:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37I10IEh090134; Fri, 18 Aug 2023 01:00:18 GMT (envelope-from git) Date: Fri, 18 Aug 2023 01:00:18 GMT Message-Id: <202308180100.37I10IEh090134@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Kevin Bowling Subject: git: 50b52fe14b89 - stable/12 - vlan: Respect IFCAP_LRO mask List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kbowling X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: 50b52fe14b8949539e7fe583d4578b1f2c96dc59 Auto-Submitted: auto-generated The branch stable/12 has been updated by kbowling: URL: https://cgit.FreeBSD.org/src/commit/?id=50b52fe14b8949539e7fe583d4578b1f2c96dc59 commit 50b52fe14b8949539e7fe583d4578b1f2c96dc59 Author: Kevin Bowling AuthorDate: 2023-08-12 16:31:22 +0000 Commit: Kevin Bowling CommitDate: 2023-08-18 01:00:07 +0000 vlan: Respect IFCAP_LRO mask vlan_capabilities(), used by the IFCAP ioctl, was not respecting the IFCAP_LRO bit if it was masked by the requestor. This prevented if_bridge(4) from automasking LRO with a message like: bridge0: can't disable some capabilities on em3.11: 0x400 This also prevented manually disabling LRO from any vlan interface. PR: 254596 Reported by: Paul Vixie (cherry picked from commit b1a39c31a3569bd045a0f40057c3773fc8166f6d) --- sys/net/if_vlan.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/net/if_vlan.c b/sys/net/if_vlan.c index 491c1a4fa371..5c84480e15d3 100644 --- a/sys/net/if_vlan.c +++ b/sys/net/if_vlan.c @@ -1748,7 +1748,7 @@ vlan_capabilities(struct ifvlan *ifv) if (p->if_capabilities & IFCAP_VLAN_HWCSUM) cap |= p->if_capabilities & IFCAP_LRO; if (p->if_capenable & IFCAP_VLAN_HWCSUM) - ena |= p->if_capenable & IFCAP_LRO; + ena |= mena & IFCAP_LRO; /* * If the parent interface can offload TCP connections over VLANs then From nobody Fri Aug 18 01:21:25 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RRkbp2Rtmz4qR3s; Fri, 18 Aug 2023 01:21: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RRkbp0QNbz3PvL; Fri, 18 Aug 2023 01:21:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692321686; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=AlqkZIVUvmVH35mJHB2LlcyphjVhndtOdsYdc3Pi0lg=; b=C0Ce2d6cmNyEChmc1FEQWtanhLVWTytPqExRxCPDR426ueUelVHCUj9wjAatMeH2J1x+M+ Ne4c31s4SRECl38ETS3rWs8hs1/A+p/koXaAMLqhDHmA9BBaEAQPrvLdNdZhz0jRqa/Ljw oSY3v9nUNSz5l1xb2/hssDkS4MQ6IPacBQrnGhL5RLhhi0LGeRFyZ3qS/FBkpIVkd/N2dH WVggL0k4dw9SFAQcMqne7yHNL1B9d4/lF2yihaoqPIhoG2dda41ah2IIAXNeblyb3E3NVZ 4vBvb+jxXNqPDsK74G77bmbQshll3zoEb+GYdnhFWohoGrPb6IrGTqR6oW885w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692321686; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=AlqkZIVUvmVH35mJHB2LlcyphjVhndtOdsYdc3Pi0lg=; b=nngpsQ1ZUuckQXcqpe5d/nZQ3RZKh6E5KbZU2Dat4xQbDjSPyyD2ANeQr0maDmro8lwjUN zgucPpdv2wIegeTYOAFdLYCzveCYExh/CYNI/nhAlznUjH+smcRMmVchRl+LSBucqvi6OJ KWD89Tse8Utb/VFhvgt2+RbKIXzxJVI7841ACeI2P+X8NIOCfh4W1IzajjWNEZpoEP/1/C 5DuTOFOOYEnr4Zk5Il+SZK94e/nbETEAJTHS2CoUHU50wFCmJTpmAM9odH/nKV8gKAIrf0 Jk8MzNfrjWPSimefWQTWAjjTWab1tC45maEbD/CswPZwvVaIu8uL8rfWImy5CA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692321686; a=rsa-sha256; cv=none; b=iVn7gJrR0itUgFfrGq9bg0WjVPW2CLiFE8nOqJgDX3RpiMbLBdHrFrS8uAHOOMMQg2kgJK 9jS/cNGJXeiwE0AZZv0N1JQnMYh6HrYmT9AuBY75beQ/BQj2QI4Db2yYVVeohZJxKtwwku Trk1R74SpSVuvk+NpBE5zq85UA4XBYGV0E4RgeIoBUfmBR1p+CE5IclMgICRYeD6cghLK1 4yzOfJwLqTXYyvZ+VnJ8PMpkiHobabxbnx94IkqPmZqChyycFwXhD/mfb1eATDQq4isUbT 6aBo8HUWl+WjAktH8spAZqpjNglFDBSTf6Kej1X24Zd64G361ekWUFDnHUZmKQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RRkbn6cj1zwlv; Fri, 18 Aug 2023 01:21:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37I1LPj5024074; Fri, 18 Aug 2023 01:21:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37I1LPTc024071; Fri, 18 Aug 2023 01:21:25 GMT (envelope-from git) Date: Fri, 18 Aug 2023 01:21:25 GMT Message-Id: <202308180121.37I1LPTc024071@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: b80ea452375f - main - LinuxKPI: implement mul_u64_u64_div_u64() List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b80ea452375f52a3ab7d82a9aef10da0d89985d9 Auto-Submitted: auto-generated The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=b80ea452375f52a3ab7d82a9aef10da0d89985d9 commit b80ea452375f52a3ab7d82a9aef10da0d89985d9 Author: Bjoern A. Zeeb AuthorDate: 2023-05-16 20:55:00 +0000 Commit: Bjoern A. Zeeb CommitDate: 2023-08-18 01:20:39 +0000 LinuxKPI: implement mul_u64_u64_div_u64() Implement mul_u64_u64_div_u64() for an updated iwlwifi driver (though we do not yet use it there; it is used for in-kernel ptp on wifi). Sponsored by: The FreeBSD Foundation Submitted by: cperciva MFC after: 10 days Reviewed by: cperciva, dwmalone Differential Revision: https://reviews.freebsd.org/D40120 --- sys/compat/linuxkpi/common/include/linux/math64.h | 48 +++++++++++++++++++++++ 1 file changed, 48 insertions(+) diff --git a/sys/compat/linuxkpi/common/include/linux/math64.h b/sys/compat/linuxkpi/common/include/linux/math64.h index 1b00fd71e69f..e4ddce5b823e 100644 --- a/sys/compat/linuxkpi/common/include/linux/math64.h +++ b/sys/compat/linuxkpi/common/include/linux/math64.h @@ -106,6 +106,54 @@ mul_u64_u32_div(uint64_t x, uint32_t y, uint32_t div) return ((x / div) * y + (rem * y) / div); } +static inline uint64_t +mul_u64_u64_div_u64(uint64_t x, uint64_t y, uint64_t z) +{ + uint64_t res, rem; + uint64_t x1, y1, y1z; + + res = rem = 0; + x1 = x; + y1z = y / z; + y1 = y - y1z * z; + + /* + * INVARIANT: x * y = res * z + rem + (y1 + y1z * z) * x1 + * INVARIANT: y1 < z + * INVARIANT: rem < z + */ + while (x1 > 0) { + /* Handle low bit. */ + if (x1 & 1) { + x1 &= ~1; + res += y1z; + rem += y1; + if ((rem < y1) || (rem >= z)) { + res += 1; + rem -= z; + } + } + + /* Shift x1 right and (y1 + y1z * z) left */ + x1 >>= 1; + if ((y1 * 2 < y1) || (y1 * 2 >= z)) { + y1z = y1z * 2 + 1; + y1 = y1 * 2 - z; + } else { + y1z *= 2; + y1 *= 2; + } + } + + KASSERT(res * z + rem == x * y, ("%s: res %ju * z %ju + rem %ju != " + "x %ju * y %ju", __func__, (uintmax_t)res, (uintmax_t)z, + (uintmax_t)rem, (uintmax_t)x, (uintmax_t)y)); + KASSERT(rem < z, ("%s: rem %ju >= z %ju\n", __func__, + (uintmax_t)rem, (uintmax_t)z); + + return (res); +} + static inline uint64_t mul_u64_u32_shr(uint64_t x, uint32_t y, unsigned int shift) { From nobody Fri Aug 18 01:23:24 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RRkf471DQz4qR8X; Fri, 18 Aug 2023 01:23:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RRkf44WpPz3QFT; Fri, 18 Aug 2023 01:23:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692321804; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1N/4vqeMw2bqtAuMMFb7BntILYzOsQh69lLVqRYWKlc=; b=YX3PCCDjgUNzBWgLe6gJA1FOAg3sZJDKvkRfECFg5sX3Q2sgGAZGWbqzxYEQfAjqb3Eca4 JXY6RqEQxh8sLjGfx51FbLnfWbw+pBGw/FO7ztF7aggjE4IfLS0Xvnnb6hLc5x1Cd93ZO+ dehUaXbBnPcANYT2JrrkzpT59Z6f0Tu0VqvutyKAI9uPQKiFBtfUbOZq6nKh+kA48LU/A4 gBYHQDkOSBpDNTeAa1ZwcWnTHFVOwG6OMs8r4QbR+tRiYvpZEUGf7P+d2itmUcxdXxJDhG WYTaoFWuonKDnXcB4nK9IRHOTpA1MvMcJqXP1GWoS7TLEvSRf4HLur/DQ7sD3A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692321804; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1N/4vqeMw2bqtAuMMFb7BntILYzOsQh69lLVqRYWKlc=; b=N9so4UMq56PYGH5rgm3W2guILabLR+Dnzi38YGLWJn4h/Bts599mgeXUkf8bMxultyalyj h5jRG0QQ0+qgMLzluc7lQqo3qN3bsfcAuWHsVBAlKbfK/+zT/UpMqme5jr5Dpom26g4TcX pSZbFHDr2Dx0OHl05KaLBVNL70H7vGeBhwMIJTykAjguimCfVW+3OpQmuEH3P9Rts+R8IQ m8Nb8zXO/gzexG3MDhCD1EOJg15Q4Ti/jOGv1qLlun6VgnVlnELzcnWOvOEVSB4FRx5/B8 nhu2xarSc6OtZzmRPJERDuIhWV/H2gD2uzw6KK136Eyn8T9MQ69u0l5BBIv7uA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692321804; a=rsa-sha256; cv=none; b=McjMdEYRJgNpMdD7a3XCIj9fJZBgmEJn99DISStILE2aretpJeIDVnViYGwE/wfU3dDBYc uiifjsoY+ZqbWVIHTc043/A+54YJb1hWm/0zpLy5gSVyQFfdaNLcnwiiRNqJcuw6dAyaQW 1Yj7N7ZQff9pcns9FFTV1EF83a7Dht1pUUjI7V+j5/7Sh33YUZvglSYcF3MkRqRi/2yawg 4fI679QP5pOyfbmSzWY0qh+1zf7MW2JVKXzQZU9AP3s9hMSOm/SLDaH6iGSSRz1uTQ0NfN a/Cgmo3axnmgwZ8q7FQoljbfM19y4f2SB0hLMidMvXRmVgLuP+i8YGbrXenAPQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RRkf43bR1zwV5; Fri, 18 Aug 2023 01:23:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37I1NONS030312; Fri, 18 Aug 2023 01:23:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37I1NOh3030309; Fri, 18 Aug 2023 01:23:24 GMT (envelope-from git) Date: Fri, 18 Aug 2023 01:23:24 GMT Message-Id: <202308180123.37I1NOh3030309@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: 214e3e09b338 - main - fwget: fix installing multiple firmware files List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 214e3e09b3381e44bf5d9c1dcd19c4b1b923a796 Auto-Submitted: auto-generated The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=214e3e09b3381e44bf5d9c1dcd19c4b1b923a796 commit 214e3e09b3381e44bf5d9c1dcd19c4b1b923a796 Author: Bjoern A. Zeeb AuthorDate: 2023-08-15 20:29:03 +0000 Commit: Bjoern A. Zeeb CommitDate: 2023-08-18 01:22:22 +0000 fwget: fix installing multiple firmware files Remove quotes around the list of packages to install. Otherwise pkg is only fed one argument which results in a non-working solution: pkg: No packages available to install matching 'wifi-firmware-ath10k-kmod wifi-firmware-mt76-kmod wifi-firmware-ath11k-kmod' have been found in the repositories MFC after: 10 days Reviewed by: manu Differential Revision: https://reviews.freebsd.org/D41474 --- usr.sbin/fwget/fwget.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/usr.sbin/fwget/fwget.sh b/usr.sbin/fwget/fwget.sh index 90bc23b07077..154fb7dc92e1 100644 --- a/usr.sbin/fwget/fwget.sh +++ b/usr.sbin/fwget/fwget.sh @@ -122,4 +122,4 @@ if [ "${DRY_RUN}" = "y" ]; then exit 0 fi -pkg install -qy "${packages}" +pkg install -qy ${packages} From nobody Fri Aug 18 04:03:57 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RRpCK559kz4qc3Z; Fri, 18 Aug 2023 04:03: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RRpCK4Pbzz3ddR; Fri, 18 Aug 2023 04:03:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692331437; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pAejLlSelIxx13AFby1jK4GVIbgfmmAXRnyHTrZVojY=; b=Zk/nDbe+Sp4m6TeQPBePpkCbuGDDyw2uELOjcjMMlR3BiN7l75FwTWMBIBXRynbI7ae1Bj OUpi1Vo/T2mts4gcRPq51K3uKEfx7Y9L3hrEWZub98D0U9hk/SYtTl2Obr4VU8tO7aM6Ks CD+DCbvX4dqYdsfejX1yw2byx9uJSnDF3waT0eQXBrU/yk7LIEIV5xhVHhxJx/8Rz4AZeL x1Fkbs0g5zQL6iiq9OypfULBkVxm7VUzkBCtLBwOCOYA4og2FK3lhJAsg67u8HT02LXCoG bvs97mE/AlE6tRVvshebN4+JEwIFE255RGOBgbFcixFpaXVk7z2gJR6wkhsS1g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692331437; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pAejLlSelIxx13AFby1jK4GVIbgfmmAXRnyHTrZVojY=; b=dqHx5I6Cjw5I1UfVv93RN8WotEwYdh1oe6sWStn9vgB+UZ3HL3THesS0IFZ3TW1E53oMgC Op7+pOZXDYy8EiEqsfwgSjhKIu/HwlZ+OOkR8qVFbSWrxnIzCEWlVe9agjvNNiCWOGiMpD /l2hs0X0MWumjkcYPRr7Xe8GoMJS8j1PVinToHPq8vvfKVSacpak5BctbDqjkmP/gtnvEq FfqK8GNur5B9wQGZowf4pBCu/fELEio5y4GSXLivT1ph+R0cxTKRW/QeUAAnDdhQ1GvzCU v+1gRah1VK+FHbS6S09+ckOPj06exdIhAlPBkkIsdc5U9YQ8AYNOCmjp7KHZ8g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692331437; a=rsa-sha256; cv=none; b=t98YozohKEJ7RSadbJwoHQhuT90QR11EOp8oAef8rsrfVTyF563C/J1QjSlxy9n1h5yuNj BJ7wWGCpfHWC5rucbUvH9Wl2sjI6sfCnV/zoOXYrtBQtl8f9AEe0aTXae4kuyKdTtRTn4t amoZ/q01VnZUmcf1HzJTZsRP67S736xXTyjIBCEymvOwmev4VEymPt9YFaV0j608bmxzRi 1bVesVRTbBmr6QPTHQLG3HfOwH1u0wRCJGSPe6xs/FAkdBK95mT2OYoJoUN5Tip8rLlJtY jJGfd8yUcWKN/bT9b5c1LwbIy8tnSv6da53xJRW4xR1njygg1fR9bCr0OLpAyg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RRpCK3Gbcz11kP; Fri, 18 Aug 2023 04:03:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37I43vfG098758; Fri, 18 Aug 2023 04:03:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37I43vjm098755; Fri, 18 Aug 2023 04:03:57 GMT (envelope-from git) Date: Fri, 18 Aug 2023 04:03:57 GMT Message-Id: <202308180403.37I43vjm098755@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: f0ebed6a313b - stable/13 - kern: osd: avoid dereferencing freed slots List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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: f0ebed6a313b8cdd91859287aad8015392352bc1 Auto-Submitted: auto-generated The branch stable/13 has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=f0ebed6a313b8cdd91859287aad8015392352bc1 commit f0ebed6a313b8cdd91859287aad8015392352bc1 Author: Kyle Evans AuthorDate: 2023-08-10 17:32:33 +0000 Commit: Kyle Evans CommitDate: 2023-08-18 04:02:46 +0000 kern: osd: avoid dereferencing freed slots If a slot is freed that isn't the last one, we'll set its destructor to NULL to indicate that it's been freed and leave a hole in the slot map. Check osd_destructors in osd_call() to avoid dereferencing a method that is potentially from a module that's been unloaded. This scenario would most commonly surface when two modules are loaded that osd_register(), then the earlier one deregisters and an osd_call() is made after the fact. In the specific report that triggered the investigation, kldload if_wg -> kldload linux* -> kldunload if_wg -> destroy a jail -> panic. Noted in the review, but left for follow-up work, is that the realloc that may happen in osd_deregister() should likely go away and the assumption that reallocating to a smaller size cannot fail is actually not correct. Reported by: dim (cherry picked from commit 2bd446d7f1a03fbf6d98ace4548f8793599f48fb) --- sys/kern/kern_osd.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sys/kern/kern_osd.c b/sys/kern/kern_osd.c index 23178731b899..ced6df31cf44 100644 --- a/sys/kern/kern_osd.c +++ b/sys/kern/kern_osd.c @@ -396,6 +396,9 @@ osd_call(u_int type, u_int method, void *obj, void *data) error = 0; sx_slock(&osdm[type].osd_module_lock); for (i = 0; i < osdm[type].osd_ntslots; i++) { + /* Hole in the slot map; avoid dereferencing. */ + if (osdm[type].osd_destructors[i] == NULL) + continue; methodfun = osdm[type].osd_methods[i * osdm[type].osd_nmethods + method]; if (methodfun != NULL && (error = methodfun(obj, data)) != 0) From nobody Fri Aug 18 04:09:17 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RRpKV2Qk6z4qcH2; Fri, 18 Aug 2023 04:09: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RRpKV0rGxz3fXh; Fri, 18 Aug 2023 04:09:18 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692331758; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/VDkYP6f+/zIe0CsBSTP3+QXhB5nqLl24SYD7m+3vN8=; b=Kkmr1Dg89cCOmjr02i2Cd+Mtija7/nr4tDXKJumO/L272IqZWi65o3lE0GhxjZW/Y8J/NL kSbJuW8OHXaaGV7pgqgSoPiZINrjW69EjWC9adwpXyMcE7hXFlLDGQ025xeSJp4IsEDr3d 0WGvtrDvoZnD4vpzKPTr4ao5IrjWrl+X/bR5/ShEqgbv70B63z7GsrpK9LcNeqrKFuTEKv S7PcTBC5pwSJ4cMmZaCUtSQFsS7+4SHWhSUkQyyLRPK0XImSKHmLC4C4NRIu8dFtyJEhF9 2L2JdiRYnuwOZvwAWACxrAkr6r0YEazy8BiO08DJNDXHyFynzTGHdYKgbdkKWw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692331758; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/VDkYP6f+/zIe0CsBSTP3+QXhB5nqLl24SYD7m+3vN8=; b=ZSEv+cqI4B239R7hG4pmAZXqs539MKhHbZPXbjtYvHSMf29a6dTMqo3JgQizk+8UCkY1Hz SLoYDwqyJQJ+pcDV35WnQ26ivwJVoNSzq2sUqIhveGO9w8lRBlu4/Iobu+F2UKuypyt4r7 7t2eZv1OuBeeP2Su2/75wt2uChzilxYVPup1hVhQCSlpEHo8fr2DYLz15mf5O2nXYqX8Z8 N7hXJgv1XfrruVA9TpFX4CAy9RBc5s6FsBS10fFwQ0wgoBTkKPegpkZSDypinuJfX8jbud nEXsH1oJe7ZRgWvsJ5dt1MkPi1OpLP7CJt5yZ1mE4i3D7Kp1V3e9/uY41b+Xgg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692331758; a=rsa-sha256; cv=none; b=Dgkm1OYyBB2UCVexYN9TmMK+5WhAdx7xq/lGkmofwa2uIer/nIn8YSPwSEYQbQpyUVbd6t MLfAgfuZE4LOTiV2ef7/YLKrHmQCAdmbzIzfgAWvWtB8O3T6ApVqQTi4HxitU+nDT+WmuG RtsMH4hlILldW057oghzytR2cGWrGeKQVQ0NTVuUFpNoBPkHHmHzQqpREFyCKK2GA+YzpL THryZUa9VIOUVf8oI4UM2i+215mZjkQIzOQIsjNvQqNm5T5Dw1bgDfn/7O3ER11e+fnpWK Eg8UEyFCcvzJh5F2YZngJuUyrDF5xU4RuEUIl0ntO/f5WVQ/wR5tID33CvKZzA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RRpKT6r09z11mb; Fri, 18 Aug 2023 04:09:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37I49HvJ099628; Fri, 18 Aug 2023 04:09:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37I49Hv2099625; Fri, 18 Aug 2023 04:09:17 GMT (envelope-from git) Date: Fri, 18 Aug 2023 04:09:17 GMT Message-Id: <202308180409.37I49Hv2099625@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kyle Evans Subject: git: a76629cb0381 - main - kern: osd: stop downsizing arrays when the last slot deregisters List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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/main X-Git-Reftype: branch X-Git-Commit: a76629cb0381ee1ccd9b233259ca8130a53b6583 Auto-Submitted: auto-generated The branch main has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=a76629cb0381ee1ccd9b233259ca8130a53b6583 commit a76629cb0381ee1ccd9b233259ca8130a53b6583 Author: Kyle Evans AuthorDate: 2023-08-18 04:05:55 +0000 Commit: Kyle Evans CommitDate: 2023-08-18 04:06:12 +0000 kern: osd: stop downsizing arrays when the last slot deregisters It was noted in D41404 that these reallocations aren't actually guaranteed to succeed, despite assertions to the contrary. We're talking relatively small allocations, so just free up the individual slot to be reused later as needed. Note that this doesn't track the last active slot as of this moment, but this could be done later if we find it's worth the complexity for what little that would allow to be optimized (osd_call, slightly). While we're here, fix the debug message that indicates which slot we just allocated when we find an unused one; the slot # is actually one higher than the index. Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D41409 --- sys/kern/kern_osd.c | 34 ++++++++++------------------------ 1 file changed, 10 insertions(+), 24 deletions(-) diff --git a/sys/kern/kern_osd.c b/sys/kern/kern_osd.c index 1b623d822cee..1f93f7021201 100644 --- a/sys/kern/kern_osd.c +++ b/sys/kern/kern_osd.c @@ -112,7 +112,7 @@ osd_register(u_int type, osd_destructor_t destructor, osd_method_t *methods) for (i = 0; i < osdm[type].osd_ntslots; i++) { if (osdm[type].osd_destructors[i] == NULL) { OSD_DEBUG("Unused slot found (type=%u, slot=%u).", - type, i); + type, i + 1); break; } } @@ -166,32 +166,18 @@ osd_deregister(u_int type, u_int slot) LIST_FOREACH_SAFE(osd, &osdm[type].osd_list, osd_next, tosd) do_osd_del(type, osd, slot, 1); mtx_unlock(&osdm[type].osd_list_lock); + /* - * Set destructor to NULL to free the slot. + * Set destructor to NULL to free the slot. We don't bother actually + * freeing any memory here because we'll gracefully reuse any freed + * slots, and reallocating the arrays as a smaller chunk of memory isn't + * actually guaranteed to succeed. As such, we'll err on the side of + * caution and just leave it be since these are generally modestly sized + * allocations. */ osdm[type].osd_destructors[slot - 1] = NULL; - if (slot == osdm[type].osd_ntslots) { - osdm[type].osd_ntslots--; - osdm[type].osd_destructors = realloc(osdm[type].osd_destructors, - sizeof(osd_destructor_t) * osdm[type].osd_ntslots, M_OSD, - M_NOWAIT | M_ZERO); - if (osdm[type].osd_nmethods != 0) - osdm[type].osd_methods = realloc(osdm[type].osd_methods, - sizeof(osd_method_t) * osdm[type].osd_ntslots * - osdm[type].osd_nmethods, M_OSD, M_NOWAIT | M_ZERO); - /* - * We always reallocate to smaller size, so we assume it will - * always succeed. - */ - KASSERT(osdm[type].osd_destructors != NULL && - (osdm[type].osd_nmethods == 0 || - osdm[type].osd_methods != NULL), ("realloc() failed")); - OSD_DEBUG("Deregistration of the last slot (type=%u, slot=%u).", - type, slot); - } else { - OSD_DEBUG("Slot deregistration (type=%u, slot=%u).", - type, slot); - } + OSD_DEBUG("Slot deregistration (type=%u, slot=%u).", type, slot); + rm_wunlock(&osdm[type].osd_object_lock); sx_xunlock(&osdm[type].osd_module_lock); } From nobody Fri Aug 18 04:19:53 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RRpYk0fqkz4qcvT; Fri, 18 Aug 2023 04:19: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RRpYj5LRQz4DZh; Fri, 18 Aug 2023 04:19:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692332393; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=J/JgflBGfadOcjS8oSj3jjrXymZ/6kFlxzymdbjUk1s=; b=xAnTqpShTtYW62cCMtqZlhZ6BT0zDC3LzeYBb4tLHnlL0RwEl1sO5pD7bgYC7B3TrjUqWA JhR9nr6MJJpWOb44io8TA+G3cJVxL6NpXw/6TuNKvnjmdObHV/s6pkIDR+f3BlN0oqs/a6 WrRVcufv0T8Xdf3qCNQXVD7tDzwhg/TX2BzcZXfQXnu9Fs7PG3kIB73mvfIR1vIYkkgeaU hxrdUiSKSt5C6HPJOtXwJHo04Wf4llWV+ol6dOjD6pLw7nfi2yPRO8J0EboNOpkMC1XudP 9eSPeDReEZQB1sWD1MRQ8pHkMvsKuNcrrKvoScuwRF8drieWKGG6KSq0pl0oLA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692332393; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=J/JgflBGfadOcjS8oSj3jjrXymZ/6kFlxzymdbjUk1s=; b=lnlcGCEYm3/YzN3JBRKqo9d+qOIlCvX2YJ8zWlccggX4trEZ7InNXTCLEVHcm8wQdY1jxo FSpDl6foFRDXio1z8FUQmRlN9hsZXMPJrDTrz6xrlBtN7qYKZJBlzJA5paf+5LayrWbxw7 izIcclQlF9SqXDWa7J8AC2atqVqXixGwEUykVoYi/v6+QwxPXjOT6C0uBmnhsl9zpRv7w9 FTWIPMBViOd7v01hO5phmD3q6nuaqi9wrETvG0dOiM7LEJauK7iKZu4qLuNCJQUUExM/jf 4YK2hhrMQIVdVgWD5rl/C6bdaQuRxT+2aOzl6JUyvpd5ZxIUWUZm52gJpjTuIA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692332393; a=rsa-sha256; cv=none; b=PiFt5C5houJn2fXxoQYU6yT1w56rtuRfwvfThrU8pXf7x1mLhzrZIi0fnmbNuGrhv7GjeV ZCGZm+fCDBjSuuLDDzVEjO1yVAHdo2aAS6LoRfd0TR/7ySbA3V0lW1YSZ5KaRgTvt1HSZv 1lwTuow6Ko8eVsfEgyr8hDxNhK56em4beSJYMwZ4zfXwLk1jRcaKqtFH8M4Re7i2N838tW q9Gci/JeD8NG3iI9Vg2xX77cyMPFGI2cIfbF+SBnG7wzWcDrNMZ7V++lY0YnT5SexZhVmu jv6PiE2U5vceBKK4DSENyx1EhyW+JPBbQGdhL3kNsTOaMj6FTW5U7ewhFEjVng== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RRpYj3jgWz129P; Fri, 18 Aug 2023 04:19:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37I4Jr0t016407; Fri, 18 Aug 2023 04:19:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37I4Jr6Q016404; Fri, 18 Aug 2023 04:19:53 GMT (envelope-from git) Date: Fri, 18 Aug 2023 04:19:53 GMT Message-Id: <202308180419.37I4Jr6Q016404@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Enji Cooper Subject: git: 22dc8901a73f - main - Use proper convention for relative path linking List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ngie X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 22dc8901a73fcb30ff434ddf5aada43ab10021ae Auto-Submitted: auto-generated The branch main has been updated by ngie: URL: https://cgit.FreeBSD.org/src/commit/?id=22dc8901a73fcb30ff434ddf5aada43ab10021ae commit 22dc8901a73fcb30ff434ddf5aada43ab10021ae Author: Enji Cooper AuthorDate: 2023-08-18 11:13:06 +0000 Commit: Enji Cooper CommitDate: 2023-08-18 11:20:32 +0000 Use proper convention for relative path linking The change made in e835ee68e13361b841c983fa4a49dd6c19dcdec4 did not follow the convention for relative path symlinks. Per the convention, paths be prefixed with `${BINDIR}`, not `/bin/`. `${BINDIR}` can be modified from the Makefile, on the command line, or in the environment. This convention is the canonically correct way to do things. This follows the convention used in `bin/pkill/Makefile`, `bin/timeout/Makefile`, etc. MFC after: 1 week MFC with: f05948d4e98d3abd0965a2994e9e42add6908ff3 MFC with: e835ee68e13361b841c983fa4a49dd6c19dcdec4 Requested by: jrtc27, kevans --- bin/cpuset/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/cpuset/Makefile b/bin/cpuset/Makefile index a200c4fc1aac..6e88614a6a6e 100644 --- a/bin/cpuset/Makefile +++ b/bin/cpuset/Makefile @@ -3,6 +3,6 @@ PROG= cpuset LIBADD= jail -SYMLINKS+= ../../bin/cpuset /usr/bin/cpuset +SYMLINKS+= ../..${BINDIR}/cpuset /usr/bin/cpuset .include From nobody Fri Aug 18 05:09:51 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RRqgP0JNpz4qgSK; Fri, 18 Aug 2023 05:09:53 +0000 (UTC) (envelope-from kevans@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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RRqgN5zJwz4Jb2; Fri, 18 Aug 2023 05:09:52 +0000 (UTC) (envelope-from kevans@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692335392; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=RMVn905q3mGimf19sTX6YqnmN+if8OI43Bz4Q4B/GUc=; b=O6tbCkOjnAVnj9IUQQFONyEewh3e4Mmv6LiKiCICN5Un+0qdYnhswjDtE4wCyq5kX3MfQl XWrw02QxuLR9GUOsGK/Xpyzz8Viv014bl8o7V6ZXet6sqRciKgWpjcEwoEaR6RnhK9LWid jevIfRgOPEpAuJ1mWBSFv0IK18uF4J/LCQRcbEJC2wiMJ4pbSTdMCsXNh1OFf42oFxCqzM B6SNizeKlrlv6Ou4waMDZs0GhEitaZ4jznFC4Qqd5ZHpZAnSIBQ8XmigdIUp9KeZdXtQl1 XeqAN4TW8B5dwjHBkTnEAc++0igNNKy2yKz7Fu8w+wkNAEl5BGQmzL+4FF3GGw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692335392; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=RMVn905q3mGimf19sTX6YqnmN+if8OI43Bz4Q4B/GUc=; b=d/YEPEtsWKMeqoT6FnbJuDJx/453MRp1XVTQcLvXUBG/DmKrMpmiZnIYhNnn+XA9PsuM+H e+u+d/kC/SYMqr2TLHx6vzR3UPArUfcywWb98TNMiJcoRUosJDH3yY9EfuWNH3qCiav6t9 FHtSvftYteH/mycw5TKPRhM2RE+WnIn2zdl9uhiRsaGxFgwh5F/q65ChHOzHuqHHzCKhPO fQNn46Xcl/LQGOYRhQRWAaQ/uq/PbQwJniiSr1ZSg1LC587mmEeaZy3VEBJ7BRXyBz4vOh 1lsH5hZt7aWzGxWjfkPeDp1aB32iHvhcYaXNcsrAmNuZ66cR/Ji4Lj7fnCKRlQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692335392; a=rsa-sha256; cv=none; b=SWn1Zd0L/DbHkhyjG6uIVNkwUFxrFrVcvdXYRB7rUOGkaXQCNMu18GKkA/9ZCCgdiDeWw7 kBkyHMwD/PrHegBWXQi/A4YWD+jonFuBowzspgdht2V/2YaB+k6E5hrUxO8mI0IEKqdC37 yg7GxlmjBfMANxovMcPYfB7GquRHfiWyGOlZhL6+wjeoNAqFmjbixs5YXN2gFWaDJ4dnWR aroN1orzF8UdmuztU5mNXl4RAEYC2skagNxrfgLDfUSBzf/14wJjlkU5xGqbp99cabT7aO wxXzH6PaR9JVePa3CF0HbpdQP9Zv1wNTb0LzutYnXtCGfvLOn5YBuF4DHYO6Yg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from [10.9.4.95] (unknown [209.182.120.176]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) (Authenticated sender: kevans/mail) by smtp.freebsd.org (Postfix) with ESMTPSA id 4RRqgN2BZPz141k; Fri, 18 Aug 2023 05:09:52 +0000 (UTC) (envelope-from kevans@FreeBSD.org) Message-ID: Date: Fri, 18 Aug 2023 00:09:51 -0500 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:102.0) Gecko/20100101 Thunderbird/102.13.0 Subject: Re: git: b80ea452375f - main - LinuxKPI: implement mul_u64_u64_div_u64() Content-Language: en-US To: "Bjoern A. Zeeb" , src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org References: <202308180121.37I1LPTc024071@gitrepo.freebsd.org> From: Kyle Evans In-Reply-To: <202308180121.37I1LPTc024071@gitrepo.freebsd.org> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit On 8/17/23 20:21, Bjoern A. Zeeb wrote: > The branch main has been updated by bz: > > URL: https://cgit.FreeBSD.org/src/commit/?id=b80ea452375f52a3ab7d82a9aef10da0d89985d9 > > commit b80ea452375f52a3ab7d82a9aef10da0d89985d9 > Author: Bjoern A. Zeeb > AuthorDate: 2023-05-16 20:55:00 +0000 > Commit: Bjoern A. Zeeb > CommitDate: 2023-08-18 01:20:39 +0000 > > LinuxKPI: implement mul_u64_u64_div_u64() > > Implement mul_u64_u64_div_u64() for an updated iwlwifi driver (though > we do not yet use it there; it is used for in-kernel ptp on wifi). > > Sponsored by: The FreeBSD Foundation > Submitted by: cperciva > MFC after: 10 days > Reviewed by: cperciva, dwmalone > Differential Revision: https://reviews.freebsd.org/D40120 This broke buildkernel on multiple architectures, it seems: https://ci.freebsd.org/tinderbox/ I've confirmed that reverting this commit fixes it. I'd be lying if I claimed to understand what's going on: 23:09:45 In file included from /usr/src/sys/dev/cxgbe/iw_cxgbe/device.c:39: 23:09:45 In file included from /usr/src/sys/compat/linuxkpi/common/include/linux/module.h:41: 23:09:45 In file included from /usr/src/sys/compat/linuxkpi/common/include/linux/kobject.h:34: 23:09:45 In file included from /usr/src/sys/compat/linuxkpi/common/include/linux/kernel.h:48: 23:09:45 In file included from /usr/src/sys/compat/linuxkpi/common/include/linux/sched.h:43: 23:09:45 In file included from /usr/src/sys/compat/linuxkpi/common/include/linux/hrtimer.h:32: 23:09:45 /usr/src/sys/compat/linuxkpi/common/include/linux/ktime.h:34:2: error: embedding a #include directive within macro arguments is not supported 23:09:45 #include 23:09:45 ^ 23:09:45 /usr/src/sys/compat/linuxkpi/common/include/linux/math64.h:151:2: note: expansion of macro 'KASSERT' requested here 23:09:45 KASSERT(rem < z, ("%s: rem %ju >= z %ju\n", __func__, 23:09:45 ^ > --- > sys/compat/linuxkpi/common/include/linux/math64.h | 48 +++++++++++++++++++++++ > 1 file changed, 48 insertions(+) > > diff --git a/sys/compat/linuxkpi/common/include/linux/math64.h b/sys/compat/linuxkpi/common/include/linux/math64.h > index 1b00fd71e69f..e4ddce5b823e 100644 > --- a/sys/compat/linuxkpi/common/include/linux/math64.h > +++ b/sys/compat/linuxkpi/common/include/linux/math64.h > @@ -106,6 +106,54 @@ mul_u64_u32_div(uint64_t x, uint32_t y, uint32_t div) > return ((x / div) * y + (rem * y) / div); > } > > +static inline uint64_t > +mul_u64_u64_div_u64(uint64_t x, uint64_t y, uint64_t z) > +{ > + uint64_t res, rem; > + uint64_t x1, y1, y1z; > + > + res = rem = 0; > + x1 = x; > + y1z = y / z; > + y1 = y - y1z * z; > + > + /* > + * INVARIANT: x * y = res * z + rem + (y1 + y1z * z) * x1 > + * INVARIANT: y1 < z > + * INVARIANT: rem < z > + */ > + while (x1 > 0) { > + /* Handle low bit. */ > + if (x1 & 1) { > + x1 &= ~1; > + res += y1z; > + rem += y1; > + if ((rem < y1) || (rem >= z)) { > + res += 1; > + rem -= z; > + } > + } > + > + /* Shift x1 right and (y1 + y1z * z) left */ > + x1 >>= 1; > + if ((y1 * 2 < y1) || (y1 * 2 >= z)) { > + y1z = y1z * 2 + 1; > + y1 = y1 * 2 - z; > + } else { > + y1z *= 2; > + y1 *= 2; > + } > + } > + > + KASSERT(res * z + rem == x * y, ("%s: res %ju * z %ju + rem %ju != " > + "x %ju * y %ju", __func__, (uintmax_t)res, (uintmax_t)z, > + (uintmax_t)rem, (uintmax_t)x, (uintmax_t)y)); > + KASSERT(rem < z, ("%s: rem %ju >= z %ju\n", __func__, > + (uintmax_t)rem, (uintmax_t)z); > + > + return (res); > +} > + > static inline uint64_t > mul_u64_u32_shr(uint64_t x, uint32_t y, unsigned int shift) > { From nobody Fri Aug 18 05:13:27 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RRqlX0xq4z4qh4p; Fri, 18 Aug 2023 05:13: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RRqlW5tk4z4KCp; Fri, 18 Aug 2023 05:13:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692335607; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vNkUhw8CFV6cf3yYrwxhaSAbw5F7OsDIin8NVdv3gmE=; b=gDFZvw8PHqqyZ2vgzKea6CuDADmRDLkhasPLDL/VTLkKVRfkTcPLV/0DiN54rj6e3lfEEm MAhKG3cWB+Ls0/f+5YUq/f2HEi6PCc/vp7693nsOKek8zNjQoHxcCpN/nQRfZZo5/oMFQi Ncyr++wGjGQRDzVkRy2M9IXFFLBkpqpIZKL8950XfV3H9f84UkstfJ1QY8LvTllC2GZiyn 2Gd6KM7X3AUGlJT3dgYFgw068Ygl4zEa4qwyDW+NkZ3mJy5tMylpKwe/pJqqfxX4+rpvKZ umVNv1NBo3LP4J0rENZ9MR2xigZqn1DZzNjitVIQuBwoO8GCA3akDAvetxBS7A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692335607; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vNkUhw8CFV6cf3yYrwxhaSAbw5F7OsDIin8NVdv3gmE=; b=aMk+MNi37vpAGvFyFz7gv18J6f873e2rcaB86jYrls9YUoAERBiYxVC1rZmPKT4lnBGJI7 4NN9o1jnwnYBEIOLWZoNRru0xxuxILKqh5yfIv1nCCsK2RtexVUspF035L22uApG4n9sAf UyBonhIEXAVLUic7LhB9UgQjPV1MGW0vE43csdMQXqZF11N9FlHiSsfNwefTJdiGyxm/Pz pVHMQtr7MpqXRVtmBjHiG4M7yF1kLTXwcwUEwqfiH2fiuz8TGURV7C6hWvZqpWyn/RfbEk lwDyaG2KrFMabLXUTkFFdjBoT405Mcr4nYZ0xoz4Ot67je942QEwWorjbGBdeA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692335607; a=rsa-sha256; cv=none; b=oYnTpVysVmKyDbG7UsBFMxROXB/60B64W3g0J4DvbvXp5DOqBCwNHU9tBCBzitJTPMt3ON JazBH+0yqK1NYmjOMVJYy7NJABOpwUA1AExvBHM7KsS11V3ccfqCox8nhwAqDS0ULDcfxs dlA/l1v4O3qqex1lREUsKX9dmN23A4ort3AhacgabrDVvh7PzhutNcDxhYsdczb5yHqu9i zZ0t1YcAJoKtWGcqdfpPZjt3JFP6J0AwdrbUGvO+io8GAzJdYlTRAP4+93FrLaN0vtFIa7 u9KE61B7aoykjY03xHu5iplrzNjhlMb4HzG90/r+zKr72xF8m+1dxRZsGSkNxA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RRqlW4Xn5z13fQ; Fri, 18 Aug 2023 05:13:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37I5DREb015780; Fri, 18 Aug 2023 05:13:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37I5DR65015777; Fri, 18 Aug 2023 05:13:27 GMT (envelope-from git) Date: Fri, 18 Aug 2023 05:13:27 GMT Message-Id: <202308180513.37I5DR65015777@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Kyle Evans Subject: git: dabbbebcb0f5 - main - linuxkpi: fix buildkernel after b80ea452375f List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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/main X-Git-Reftype: branch X-Git-Commit: dabbbebcb0f5ced163454cd08b78e551b4a365b5 Auto-Submitted: auto-generated The branch main has been updated by kevans: URL: https://cgit.FreeBSD.org/src/commit/?id=dabbbebcb0f5ced163454cd08b78e551b4a365b5 commit dabbbebcb0f5ced163454cd08b78e551b4a365b5 Author: Kyle Evans AuthorDate: 2023-08-18 05:12:37 +0000 Commit: Kyle Evans CommitDate: 2023-08-18 05:12:37 +0000 linuxkpi: fix buildkernel after b80ea452375f Unbalanced parentheses broke the build; re-balance. Fixes: b80ea452375f ("LinuxKPI: implement mul_u64_u64_div_u64()") --- sys/compat/linuxkpi/common/include/linux/math64.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/compat/linuxkpi/common/include/linux/math64.h b/sys/compat/linuxkpi/common/include/linux/math64.h index e4ddce5b823e..df629a10af8a 100644 --- a/sys/compat/linuxkpi/common/include/linux/math64.h +++ b/sys/compat/linuxkpi/common/include/linux/math64.h @@ -149,7 +149,7 @@ mul_u64_u64_div_u64(uint64_t x, uint64_t y, uint64_t z) "x %ju * y %ju", __func__, (uintmax_t)res, (uintmax_t)z, (uintmax_t)rem, (uintmax_t)x, (uintmax_t)y)); KASSERT(rem < z, ("%s: rem %ju >= z %ju\n", __func__, - (uintmax_t)rem, (uintmax_t)z); + (uintmax_t)rem, (uintmax_t)z)); return (res); } From nobody Fri Aug 18 05:14:47 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RRqn54V9gz4qhGg; Fri, 18 Aug 2023 05:14:49 +0000 (UTC) (envelope-from kevans@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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RRqn50mHbz4Kjd; Fri, 18 Aug 2023 05:14:49 +0000 (UTC) (envelope-from kevans@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692335689; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=h2SjV+vrv/00vssyO+GGvcsmXiSx2XoV270ePRyB65c=; b=N1/2c/TCFXXSIXS9v2sx4euG1FHqJYQn6V2khYrqvE+zlhazd4JkNu5Vu6+pJQjB1Jrv/H c0h1wVZ982u9WqkrEKPkMJ8WVNA+XkDNrPpvkwVD8ExAn0T9rIhibivxcJvMTPFFt0vEMQ lJ6LALXRLjsi9YMpl2yjDtONU3sAKLlhJyJRYz3w/LYGeg+auJL11lIeh6fVVqEr+KdtPy 444TpOklUAoS8SgGSwIqOjxYGaXCCv4iRwYLzjs/m3q3tRaSr1HfBlMHetUnocqrtdJx+h 3ZBrFy8grAjFqQqBH59/kPheino+3BgREz1lRsq6CnRCm7EbzpWnSl4SoC/L+w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692335689; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=h2SjV+vrv/00vssyO+GGvcsmXiSx2XoV270ePRyB65c=; b=BtToUAQY1ubiW0NHwd+udnRKdE/H24PUfRFmzADBBCCoGrEtXZsvEvRljGqO6mLHoKp+Fk 3V06o7+ykCBZ+R4DIMUosLtO1H/S9HkcHcBuPtUcijCDjqa8QKQaU1wlDy1DdH63BbbDKo nYNskzzxLZz8IzIdzqdarr56LgJdDvNGeu2knAVGF+M/Aqz35dV1ZEQrxeaR6qrKVSfkbC N6WO1CZMyquEY7xf8c7Iks6gWzv1QQAZUR518R8zndBezbSA+Y/eqRMuzomkg8OrIKyEG+ S62TkJRmU7FgyIxyAkYluuNPCqJF8gFajutgF3uswZM/e7dBs4+ovLBjjYDAYA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692335689; a=rsa-sha256; cv=none; b=ccqDA6aDvS8g5cnqq2Y2uEvnGeDebBRpN3/lKeR0FwzYlrZqXa5lZb71O+/vK1bPi9IBee z4sQhJtSsvnuVAE4HMCBdhDQ4EuN50ttYF49soz2npvGLPEySLh+LWADJbCMBoygMaTJL2 YPRswIi+8GlJ26vVkj8pq56hiLKcT77WR1k2fEL5lZilqyv1OQ6psWCw/aFbRPoDXF/nBS k37xtlgRVYNdZyNAHiXKcS4+E4L4uJkaQ+Dox4iv7ajCWCnVxfLV4l2aGSRjsUDGRuhe55 SganQhgy9Efrdy9XJu8TpicXcDwPw8NifjDMB79cwSLERjklBFXg8PulD27CLQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from [10.9.4.95] (unknown [209.182.120.176]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (Client did not present a certificate) (Authenticated sender: kevans/mail) by smtp.freebsd.org (Postfix) with ESMTPSA id 4RRqn439C1z14dD; Fri, 18 Aug 2023 05:14:48 +0000 (UTC) (envelope-from kevans@FreeBSD.org) Message-ID: <3e99dded-478b-8bb7-cbe0-78587040c3d9@FreeBSD.org> Date: Fri, 18 Aug 2023 00:14:47 -0500 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:102.0) Gecko/20100101 Thunderbird/102.13.0 Subject: Re: git: b80ea452375f - main - LinuxKPI: implement mul_u64_u64_div_u64() Content-Language: en-US From: Kyle Evans To: "Bjoern A. Zeeb" , src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org References: <202308180121.37I1LPTc024071@gitrepo.freebsd.org> In-Reply-To: Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit On 8/18/23 00:09, Kyle Evans wrote: > On 8/17/23 20:21, Bjoern A. Zeeb wrote: >> The branch main has been updated by bz: >> >> URL: >> https://cgit.FreeBSD.org/src/commit/?id=b80ea452375f52a3ab7d82a9aef10da0d89985d9 >> >> commit b80ea452375f52a3ab7d82a9aef10da0d89985d9 >> Author:     Bjoern A. Zeeb >> AuthorDate: 2023-05-16 20:55:00 +0000 >> Commit:     Bjoern A. Zeeb >> CommitDate: 2023-08-18 01:20:39 +0000 >> >>      LinuxKPI: implement mul_u64_u64_div_u64() >>      Implement mul_u64_u64_div_u64() for an updated iwlwifi driver >> (though >>      we do not yet use it there; it is used for in-kernel ptp on wifi). >>      Sponsored by:   The FreeBSD Foundation >>      Submitted by:   cperciva >>      MFC after:      10 days >>      Reviewed by:    cperciva, dwmalone >>      Differential Revision: https://reviews.freebsd.org/D40120 > > This broke buildkernel on multiple architectures, it seems: > https://ci.freebsd.org/tinderbox/ > > I've confirmed that reverting this commit fixes it. I'd be lying if I > claimed to understand what's going on: I lied; I looked again at the context and realized it was just missing an extra closing parentheses. I went ahead and hammered it away in dabbbebcb0f5... Thanks, Kyle Evans From nobody Fri Aug 18 05:18:08 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RRqrw4Dyrz4qhH0; Fri, 18 Aug 2023 05:18:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RRqrw3CnKz4LZX; Fri, 18 Aug 2023 05:18:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692335888; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=DsxMvuNTIVOxPGExDaqP11nNs+3wOwfbE6mhndFxZjk=; b=dI803iUUVkSaA4Ep9wWY9hgIT6S4C4iBH2RM5JGGgyrVBpgo8yI+FYLsAiTWd3mNzE30wG gnD/Wi6uX+a7z5xPPXzgREOwbxEk4bZ62CwmuhKcAp0k9YTRHgFLmxPmLmSZNDEBqg13aA epK7diGxYDzUU96rk00AlLHxCqr5eZH4Wx9+CafG6LIxrtGKWNHzUvilEKAXD4l9Ap8U6a nCjueH+vhrbqlBsPPDqBRtGzhysE0vo59/PHDfdKdNoACho+8YVW/Wk7I03WU4TV/C8NJu KOmBfBjSV2OpiSeNhdoHpDDlmyDkxB2R5bu24HTYLttShUV4fd+EKq+xsuHO5A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692335888; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=DsxMvuNTIVOxPGExDaqP11nNs+3wOwfbE6mhndFxZjk=; b=N0KvKBhi52vN2aO6JtS7vosyM4zSKB7j019LAmJBYd4OKRDZFPKbbObIrd128LG4hIm0RF 75RhqbKlIjDVR/hhE/XvPAPMe1x83eKWVxCcdKNoiSoRthKw6aJ1Bi+s6Hzr9cMBLeTkGr e1sn2NvE2BZCkTbDUZFcZb6AwmYGkKLVtfXn4MK2Td2s9nl7+P9cWtIc66JmxeF/RJ4vV9 94u19c2Ffjzu2iWWCwXKBxHaso/DDl26EffCOFEUPB9P/8QEOpyx8uL2SiIyOf8Xswnpgg rKVVLHxilqv3xT+5/6gnKBAF84MzWl8g+AvY5NAgj2kBs0g8UW8jXayc0g9Cmw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692335888; a=rsa-sha256; cv=none; b=e2xua6xb0dozq78DU2MRu42M+m4M6eYGX3JjnSFy9ovgU2yrR5rYtj8icdqupLG7OPsUOk c2LvokG/LoQ3cT7jxzgsnFAV69HBFN4jWJJiUo5/64SAj9Ht43oszdKHSVEeas8s3/7d1p Oq+F/Y/kv2/rYXuDW+X+4q0gejBIEuLk5O3Y3L+nGIsxa+7c+JzwO9DzzvxZr9LaBbwbe2 c+470PknyAxewLW+MXjCx60wJOCgRDlPUo5Rd7F64y16vk0n1x7uzvThBvZRmZ5hnwA6wR IIMnxcZaax256yFZGYYiNPFA17g2mOG5O+O1z8v+7s3TtFh/O7dOHH9FoMWvEQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RRqrw2Cxjz1341; Fri, 18 Aug 2023 05:18:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37I5I8jS016696; Fri, 18 Aug 2023 05:18:08 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37I5I8R1016693; Fri, 18 Aug 2023 05:18:08 GMT (envelope-from git) Date: Fri, 18 Aug 2023 05:18:08 GMT Message-Id: <202308180518.37I5I8R1016693@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Enji Cooper Subject: git: 47fc52b18170 - main - Update `make delete-old` List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ngie X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 47fc52b181703b49df2daf868eed783447f6398e Auto-Submitted: auto-generated The branch main has been updated by ngie: URL: https://cgit.FreeBSD.org/src/commit/?id=47fc52b181703b49df2daf868eed783447f6398e commit 47fc52b181703b49df2daf868eed783447f6398e Author: Enji Cooper AuthorDate: 2023-08-18 12:15:14 +0000 Commit: Enji Cooper CommitDate: 2023-08-18 12:18:36 +0000 Update `make delete-old` This change updates `make delete-old` to account for files installed by the following options: - MK_BSDINSTALL - MK_DMAGENT - MK_EXAMPLES - MK_SENDMAIL MFC after: 2 weeks --- tools/build/mk/OptionalObsoleteFiles.inc | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/tools/build/mk/OptionalObsoleteFiles.inc b/tools/build/mk/OptionalObsoleteFiles.inc index 1758650f230a..d358af7bf588 100644 --- a/tools/build/mk/OptionalObsoleteFiles.inc +++ b/tools/build/mk/OptionalObsoleteFiles.inc @@ -418,6 +418,7 @@ OLD_FILES+=usr/libexec/bsdinstall/distextract OLD_FILES+=usr/libexec/bsdinstall/distfetch OLD_FILES+=usr/libexec/bsdinstall/docsinstall OLD_FILES+=usr/libexec/bsdinstall/entropy +OLD_FILES+=usr/libexec/bsdinstall/fetchmissingdists OLD_FILES+=usr/libexec/bsdinstall/hardening OLD_FILES+=usr/libexec/bsdinstall/hostname OLD_FILES+=usr/libexec/bsdinstall/jail @@ -1680,7 +1681,9 @@ OLD_DIRS+=etc/dma OLD_FILES+=usr/libexec/dma OLD_FILES+=usr/libexec/dma-mbox-create OLD_FILES+=usr/share/man/man8/dma.8.gz +OLD_FILES+=usr/share/examples/dma/auth.conf OLD_FILES+=usr/share/examples/dma/mailer.conf +OLD_DIRS+=usr/share/examples/dma .endif .if ${MK_EE} == no @@ -1744,6 +1747,7 @@ OLD_FILES+=usr/share/examples/etc/wpa_supplicant.conf OLD_FILES+=usr/share/examples/find_interface/Makefile OLD_FILES+=usr/share/examples/find_interface/README OLD_FILES+=usr/share/examples/find_interface/find_interface.c +OLD_FILES+=usr/share/examples/flua/libjail.lua OLD_FILES+=usr/share/examples/hast/ucarp.sh OLD_FILES+=usr/share/examples/hast/ucarp_down.sh OLD_FILES+=usr/share/examples/hast/ucarp_up.sh @@ -1823,6 +1827,8 @@ OLD_FILES+=usr/share/examples/kld/syscall/module/Makefile OLD_FILES+=usr/share/examples/kld/syscall/module/syscall.c OLD_FILES+=usr/share/examples/kld/syscall/test/Makefile OLD_FILES+=usr/share/examples/kld/syscall/test/call.c +OLD_FILES+=usr/share/examples/kyua/Kyuafile.top +OLD_FILES+=usr/share/examples/kyua/kyua.conf OLD_FILES+=usr/share/examples/libusb20/Makefile OLD_FILES+=usr/share/examples/libusb20/README OLD_FILES+=usr/share/examples/libusb20/bulk.c @@ -1894,6 +1900,7 @@ OLD_FILES+=usr/share/examples/scsi_target/scsi_cmds.c OLD_FILES+=usr/share/examples/scsi_target/scsi_target.8 OLD_FILES+=usr/share/examples/scsi_target/scsi_target.c OLD_FILES+=usr/share/examples/scsi_target/scsi_target.h +OLD_FILES+=usr/share/examples/sendmail/mailer.conf OLD_FILES+=usr/share/examples/ses/Makefile OLD_FILES+=usr/share/examples/ses/Makefile.inc OLD_FILES+=usr/share/examples/ses/getencstat/Makefile @@ -1920,6 +1927,11 @@ OLD_FILES+=usr/share/examples/smbfs/print/lj6l OLD_FILES+=usr/share/examples/smbfs/print/ljspool OLD_FILES+=usr/share/examples/smbfs/print/printcap.sample OLD_FILES+=usr/share/examples/smbfs/print/tolj +OLD_FILES+=usr/share/examples/sound/basic.c +OLD_FILES+=usr/share/examples/sound/ossmidi.h +OLD_FILES+=usr/share/examples/sound/ossinit.h +OLD_FILES+=usr/share/examples/sound/README +OLD_FILES+=usr/share/examples/sound/midi.c OLD_FILES+=usr/share/examples/sunrpc/Makefile OLD_FILES+=usr/share/examples/sunrpc/dir/Makefile OLD_FILES+=usr/share/examples/sunrpc/dir/dir.x @@ -1953,6 +1965,7 @@ OLD_DIRS+=usr/share/examples/dwatch OLD_DIRS+=usr/share/examples/etc OLD_DIRS+=usr/share/examples/etc/defaults OLD_DIRS+=usr/share/examples/find_interface +OLD_DIRS+=usr/share/examples/flua OLD_DIRS+=usr/share/examples/hast OLD_DIRS+=usr/share/examples/ibcs2 OLD_DIRS+=usr/share/examples/hostapd @@ -1972,6 +1985,7 @@ OLD_DIRS+=usr/share/examples/kld/khelp OLD_DIRS+=usr/share/examples/kld/syscall OLD_DIRS+=usr/share/examples/kld/syscall/module OLD_DIRS+=usr/share/examples/kld/syscall/test +OLD_DIRS+=usr/share/examples/kyua OLD_DIRS+=usr/share/examples/libusb20 OLD_DIRS+=usr/share/examples/libvgl OLD_DIRS+=usr/share/examples/mdoc @@ -1982,6 +1996,7 @@ OLD_DIRS+=usr/share/examples/ppi OLD_DIRS+=usr/share/examples/ppp OLD_DIRS+=usr/share/examples/printing OLD_DIRS+=usr/share/examples/scsi_target +OLD_DIRS+=usr/share/examples/sendmail OLD_DIRS+=usr/share/examples/ses OLD_DIRS+=usr/share/examples/ses/getencstat OLD_DIRS+=usr/share/examples/ses/sesd @@ -1990,6 +2005,7 @@ OLD_DIRS+=usr/share/examples/ses/setobjstat OLD_DIRS+=usr/share/examples/ses/srcs OLD_DIRS+=usr/share/examples/smbfs OLD_DIRS+=usr/share/examples/smbfs/print +OLD_DIRS+=usr/share/examples/sound OLD_DIRS+=usr/share/examples/sunrpc OLD_DIRS+=usr/share/examples/sunrpc/dir OLD_DIRS+=usr/share/examples/sunrpc/msg @@ -7167,6 +7183,8 @@ OLD_FILES+=usr/sbin/makemap OLD_FILES+=usr/sbin/praliases OLD_FILES+=usr/share/doc/smm/08.sendmailop/paper.ascii.gz OLD_DIRS+=usr/share/doc/smm/08.sendmailop +OLD_FILES+=usr/share/examples/sendmail/mailer.conf +OLD_DIRS+=usr/share/examples/sendmail OLD_FILES+=usr/share/man/man1/mailq.1.gz OLD_FILES+=usr/share/man/man1/newaliases.1.gz OLD_FILES+=usr/share/man/man1/vacation.1.gz @@ -7240,6 +7258,7 @@ OLD_FILES+=usr/share/sendmail/cf/feature/bitdomain.m4 OLD_FILES+=usr/share/sendmail/cf/feature/blacklist_recipients.m4 OLD_FILES+=usr/share/sendmail/cf/feature/block_bad_helo.m4 OLD_FILES+=usr/share/sendmail/cf/feature/check_cert_altnames.m4 +OLD_FILES+=usr/share/sendmail/cf/feature/check_other.m4 OLD_FILES+=usr/share/sendmail/cf/feature/compat_check.m4 OLD_FILES+=usr/share/sendmail/cf/feature/conncontrol.m4 OLD_FILES+=usr/share/sendmail/cf/feature/delay_checks.m4 @@ -7282,6 +7301,7 @@ OLD_FILES+=usr/share/sendmail/cf/feature/relay_mail_from.m4 OLD_FILES+=usr/share/sendmail/cf/feature/require_rdns.m4 OLD_FILES+=usr/share/sendmail/cf/feature/smrsh.m4 OLD_FILES+=usr/share/sendmail/cf/feature/stickyhost.m4 +OLD_FILES+=usr/share/sendmail/cf/feature/sts.m4 OLD_FILES+=usr/share/sendmail/cf/feature/tls_failures.m4 OLD_FILES+=usr/share/sendmail/cf/feature/tls_session_features.m4 OLD_FILES+=usr/share/sendmail/cf/feature/use_client_ptr.m4 From nobody Fri Aug 18 05:22:39 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RRqyC61Bbz4qhFT; Fri, 18 Aug 2023 05:22:43 +0000 (UTC) (envelope-from unkadoug@gmail.com) Received: from mail-ot1-x331.google.com (mail-ot1-x331.google.com [IPv6:2607:f8b0:4864:20::331]) (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 "GTS CA 1D4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RRqyC12fFz4MZ3; Fri, 18 Aug 2023 05:22:43 +0000 (UTC) (envelope-from unkadoug@gmail.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-ot1-x331.google.com with SMTP id 46e09a7af769-6bcbb0c40b1so511318a34.3; Thu, 17 Aug 2023 22:22:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1692336161; x=1692940961; h=content-transfer-encoding:in-reply-to:from:references:to :content-language:subject:user-agent:mime-version:date:message-id :from:to:cc:subject:date:message-id:reply-to; bh=gG47YfGq3EvxBFom/G071PmwJZZ7B6de85MX14T/SAI=; b=g9Fl6WomOqy19Gd0J0cy2kVmvqnJZUSEK1gch3uj1C4+uhRk7CA3zpqxHRtQcsjIso F84O8nA3Rb/wykAdVUaT/7wa+q/XiUQp4vZPwhhJF6sc9OKtfd3gXqiK/FoxD6srounS 0occ11iuKU7WvZBlWejeYk2zQBWNZoBgWfkwdnuLHwGkFObSCLGv2+bBdAKmuODKz5N8 Vcw3L0f6IvwDZjsLOmC2u984gHGiqyz3wagalmF7svoictyhUWo6xbwIuOLH1CFjhQOG wtY9MU0duw2gPdBJnuB5C1Q6ny4cx6zKlzTGDbfPu/q6mkl/iiRB0lLpxFlPlz2yytRR +z+w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1692336161; x=1692940961; h=content-transfer-encoding:in-reply-to:from:references:to :content-language:subject:user-agent:mime-version:date:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=gG47YfGq3EvxBFom/G071PmwJZZ7B6de85MX14T/SAI=; b=hp5ukd/ZoOuR4HE+Gz4QYrAYU7VP/aX/hGL1ItOB8Hcowv2xtxfceO63B5BPB+7X1r E+iMa9YxyfGuC3nvbQ0mYc9NvmUQtuPV6FkpjTeEY0kLVK6prC7U89rpDA9wFgtqHPap nMzjkD0dLH9sUq1dAKngH88R540/GO8TFzTIcUxKOkBjVDInHlb2j6UnRcWDhvvMxMfJ +YJa/0gaUAAjRUAT0EXfm67pQyZbyiK/Cfg04t/2MzdqDvSlusHWrz5fhGN/Q8n+ucvR zFIWdug3ZfM4HJn+dd16gyjYRFOlxRaLvoOvBjwqdbThmR4noxZ2xLAnHU5FRaJS3s71 yVDQ== X-Gm-Message-State: AOJu0Yz6jm8o/yLg08so0iHuJkobi0mkSy5sb59t+MtFYe41ZmRkzci9 TDYPGe3QSqHOZNXOFINRWFyOl0wtg8JD6A== X-Google-Smtp-Source: AGHT+IGtkgj2IDPSWbbhORYxxxgSHYnqc8fK5KOglr+UyNXVbdlFO6PP/z18Ih31lxO6CdnoA+po6Q== X-Received: by 2002:a05:6830:1609:b0:6b5:eb27:ce24 with SMTP id g9-20020a056830160900b006b5eb27ce24mr1368351otr.38.1692336161479; Thu, 17 Aug 2023 22:22:41 -0700 (PDT) Received: from [108.254.203.202] (108-254-203-202.lightspeed.hstntx.sbcglobal.net. [108.254.203.202]) by smtp.gmail.com with ESMTPSA id h15-20020a9d798f000000b006b954f7f422sm545055otm.6.2023.08.17.22.22.40 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 17 Aug 2023 22:22:41 -0700 (PDT) Message-ID: <77da3b75-5f7e-5c4b-caf3-4285bb87c6fe@gmail.com> Date: Fri, 18 Aug 2023 00:22:39 -0500 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:102.0) Gecko/20100101 Thunderbird/102.10.0 Subject: Re: git: b80ea452375f - main - LinuxKPI: implement mul_u64_u64_div_u64() Content-Language: en-US To: Kyle Evans , "Bjoern A. Zeeb" , src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org References: <202308180121.37I1LPTc024071@gitrepo.freebsd.org> <3e99dded-478b-8bb7-cbe0-78587040c3d9@FreeBSD.org> From: Doug Moore In-Reply-To: <3e99dded-478b-8bb7-cbe0-78587040c3d9@FreeBSD.org> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 4RRqyC12fFz4MZ3 X-Spamd-Bar: ---- 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] It remains the case, for me at least, that KASSERT is not defined where it is used in math64.h, and so compilation still fails. On 8/18/23 00:14, Kyle Evans wrote: > On 8/18/23 00:09, Kyle Evans wrote: >> On 8/17/23 20:21, Bjoern A. Zeeb wrote: >>> The branch main has been updated by bz: >>> >>> URL: >>> https://cgit.FreeBSD.org/src/commit/?id=b80ea452375f52a3ab7d82a9aef10da0d89985d9 >>> >>> commit b80ea452375f52a3ab7d82a9aef10da0d89985d9 >>> Author:     Bjoern A. Zeeb >>> AuthorDate: 2023-05-16 20:55:00 +0000 >>> Commit:     Bjoern A. Zeeb >>> CommitDate: 2023-08-18 01:20:39 +0000 >>> >>>      LinuxKPI: implement mul_u64_u64_div_u64() >>>      Implement mul_u64_u64_div_u64() for an updated iwlwifi driver >>> (though >>>      we do not yet use it there; it is used for in-kernel ptp on wifi). >>>      Sponsored by:   The FreeBSD Foundation >>>      Submitted by:   cperciva >>>      MFC after:      10 days >>>      Reviewed by:    cperciva, dwmalone >>>      Differential Revision: https://reviews.freebsd.org/D40120 >> >> This broke buildkernel on multiple architectures, it seems: >> https://ci.freebsd.org/tinderbox/ >> >> I've confirmed that reverting this commit fixes it. I'd be lying if I >> claimed to understand what's going on: > > I lied; I looked again at the context and realized it was just missing > an extra closing parentheses. I went ahead and hammered it away in > dabbbebcb0f5... > > Thanks, > > Kyle Evans > From nobody Fri Aug 18 05:33:13 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RRrBK4fCSz4qjLF; Fri, 18 Aug 2023 05:33:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RRrBK3g39z4NbN; Fri, 18 Aug 2023 05:33:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692336793; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=uI8bHFatr3IxAWe423+m++x10ePJ7p0vQg6mAr//800=; b=BzIDbTQ/Z2Tw1r/Ih6UNUDBYIPfNauReBljLHwCRAn87MY9l64toD7G/xgIA+Ao8n1mbAR RFI0ml4bmZZEYDhqAYH0RrmGCDBKhhcIDW5alCgBH+S8dirCwLj5y5KTup+Z/bVweUIB5x T8nAb/if6QBQBT6AYBAeu3118jfUkMntecT8i3GwZHvPlV4DXzgBYOIoLbCA61ug7zzdWc 2RA+0GQBoKI6v2Gqv4Jo572oSaZBaOsxKNe/PWL+zA8qq6So+X8G6BnmF0iB55pVDStPD5 Pm3mr11L5pDWpVMqshVPRC+L+ZtSx1p7YQcpfAh9PYAPnO7WlppTj6ZY3Uk4aw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692336793; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=uI8bHFatr3IxAWe423+m++x10ePJ7p0vQg6mAr//800=; b=nkd/QuZoO4SNrVYWmKfP8NNn13ouJ6Y0UTSwJeRqJGxLUPaxVhXnSzwbAM1GH3h/qoJ74N fSnTBG8JMb/QfGy7UO40OVQwvy4KMvbfNmHRXS0ymV63X8/Lek/Rfo+ICATJFmQzFwzweM oRgI50m4LbvJPMr9XXcZxMWAVONpowD/gq2/O4473TqKx8OrPy4tDnHFIoKENyml7gncA9 iN+kMFTEp8OKOHueGubbH9tqcm1LStK+UMLd6iPDVN4mk5xDRtSMMUt9H/KP3m3gXjR00u LdEodiqPukrDNiTyRqJL94xK5Zn0Kd4DRKU3NQJZz2l2GN18GwTnjX0wtSderQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692336793; a=rsa-sha256; cv=none; b=x726m71jJqgvW6f+CksPFMm5tJ0g8ggSk+FNdtZbJ2FIpPeLufsBWzgz2kzGTehuKkI/0R ZyuQcafMYjKaUJBMhtupNJorn5VnsxjMbMnsIxrOS2eEe1s1x/S8+KipM1tcUAboEOh7f3 TRjI2j75eF/bxjitxMS7BlRxWl6IbaQTW6CMonjZShIHVUsNbELd3qyJtVpmbEYGINo5q2 nPLz/ksVyjNT3GE+CWFWJ+qtUt/WFZiqcDtHT1EXDqevV4vG+jefJ29x3cvwqRWbVpGJDb M61gHdxS1paAOiK87i4e1xoNmcn6rkESf+Dezqp0cltwpTxm/l5s0xryp/sNYQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RRrBK2jZ7z13Rj; Fri, 18 Aug 2023 05:33:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37I5XDPS049495; Fri, 18 Aug 2023 05:33:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37I5XDuk049492; Fri, 18 Aug 2023 05:33:13 GMT (envelope-from git) Date: Fri, 18 Aug 2023 05:33:13 GMT Message-Id: <202308180533.37I5XDuk049492@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Doug Moore Subject: git: b6a61d6836d9 - main - linuxkpi math: fix kassert in math64.h List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dougm X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b6a61d6836d90ff2756d804eb981a02b0828f496 Auto-Submitted: auto-generated The branch main has been updated by dougm: URL: https://cgit.FreeBSD.org/src/commit/?id=b6a61d6836d90ff2756d804eb981a02b0828f496 commit b6a61d6836d90ff2756d804eb981a02b0828f496 Author: Doug Moore AuthorDate: 2023-08-18 05:31:03 +0000 Commit: Doug Moore CommitDate: 2023-08-18 05:31:03 +0000 linuxkpi math: fix kassert in math64.h Include in math64.h, so that KASSERT and bool are defined, to allow compilation to succeed after b80ea452375f52a3ab7d82a9aef10da0d89985d9 and dabbbebcb0f5... --- sys/compat/linuxkpi/common/include/linux/math64.h | 1 + 1 file changed, 1 insertion(+) diff --git a/sys/compat/linuxkpi/common/include/linux/math64.h b/sys/compat/linuxkpi/common/include/linux/math64.h index df629a10af8a..cae5e30b08df 100644 --- a/sys/compat/linuxkpi/common/include/linux/math64.h +++ b/sys/compat/linuxkpi/common/include/linux/math64.h @@ -29,6 +29,7 @@ #define _LINUXKPI_LINUX_MATH64_H #include +#include #define do_div(n, base) ({ \ uint32_t __base = (base); \ From nobody Fri Aug 18 07:18:43 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RRtX41PyHz4qq2q; Fri, 18 Aug 2023 07:18:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RRtX36NT4z4dkx; Fri, 18 Aug 2023 07:18:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692343123; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bXy7fWdYTNwjarIi7BFafJMCqS4DnTPJBXylUs1pY+8=; b=KOuzIrr0VVHVVzf7w1ARchXXuMd1miYBBJ4pdQGimsL6cmnXu8rtIpDXZdj33H4lQvXb56 lkFlB6VRV9xeP80hop3F1CamhJCVXmHDwBqGHSUznTOYfW04AOeYgTNsbsgbV/wc2qGDgY nmP+jddQ035zayxKzIeqxkr24eKOu+FOzzAAZ4wNMS6Bb9GtTYTjWgTjcXRGh6q+dJmgto GMglbzOtmll+AxbZzhHyHini9lmzDVlcBPaeCXt7N66LoEtDa/LHr+6avQcqzD6SEOKOh6 N/ZrzPBIPFfo/NAp/misgKJU0bjprtWGDqiImqHkVncIiotuJJK0GPb2xi5fRQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692343123; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bXy7fWdYTNwjarIi7BFafJMCqS4DnTPJBXylUs1pY+8=; b=Q/pVk779yYWzMhzT45Zsz1MXDLCGYuDtiaMZiawSbemB5+TVmnUbKYtGcxDF95ZtMf+dGI /3+/Vaej7thMC7QXhMF1tBPmMoASRa7SE0bI0j9MAORdrcoVAAvWt5ihZjkAD53S6bs5cV XIN3B0qmzlgQ4w/IpVYlfE0b5aLJp+5uLePT6HG70Nt6/CwjbQyS67J5I12IQWZi2kOpji ZDJSEQZSlhBnLYWTke/oLiTPsdS1nzGTgLDLd0O1J2gmaNJmuLKYF12IrPXA5xDciT9hnN 69aVO3J9OUYKLcGQRT383IRQA5aO/SA6GeV0SzHAzCeCujrDDiJSZSznKOw/lg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692343123; a=rsa-sha256; cv=none; b=QSsnbBavWlAUVLoPZv4asYaVlYQtoLsvB22P6tSmz2ojJx0vERDxNsq65P8L9Is4cTEHCy NDoYah37XyA4GlSgyFJB3/0eg/VnOfE3a2tExOao/R+iYeVdITmyD1v+u2NY6JDf6/nzKB LW0VUXZzWV+CLgk1Uzz7mnXTutefkvcbxUh6ZqhO6tmTZ9FftBdLePED5tnh6U6jMTW0pU j083ChTMzclrv7vOi1v3HmnB37mzPvAxS1jJYX1psK3sYqU/Js10PDSIpEDfKXoCL58DN1 P/t+4l8hi71ZA+WkMt8ZTnbiZam23KFUo1lBY5eIwjy8hXhXspN2/MtqDVWj7g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RRtX35Rqpz16KX; Fri, 18 Aug 2023 07:18:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37I7IhvH017495; Fri, 18 Aug 2023 07:18:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37I7Ih2M017492; Fri, 18 Aug 2023 07:18:43 GMT (envelope-from git) Date: Fri, 18 Aug 2023 07:18:43 GMT Message-Id: <202308180718.37I7Ih2M017492@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Corvin =?utf-8?Q?K=C3=B6hne?= Subject: git: 3e520a8fc711 - stable/13 - bhyve: save/restore pir_desc List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: corvink X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 3e520a8fc7115f0e5015e5c3ce4a13b6d9cf00e4 Auto-Submitted: auto-generated The branch stable/13 has been updated by corvink: URL: https://cgit.FreeBSD.org/src/commit/?id=3e520a8fc7115f0e5015e5c3ce4a13b6d9cf00e4 commit 3e520a8fc7115f0e5015e5c3ce4a13b6d9cf00e4 Author: Vitaliy Gusev AuthorDate: 2023-05-09 08:27:29 +0000 Commit: Corvin Köhne CommitDate: 2023-08-18 07:04:25 +0000 bhyve: save/restore pir_desc Failing to preserve pir_desc can result in pending interrupts being lost on resume leading to a hung VM. Reviewed by: corvink, jhb MFC after: 1 week Sponsored by: vStack Differential Revision: https://reviews.freebsd.org/D35447 (cherry picked from commit c543e09f1f8ef98f201f7dd3f34ae023d61dfa83) --- sys/amd64/vmm/intel/vmx.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sys/amd64/vmm/intel/vmx.c b/sys/amd64/vmm/intel/vmx.c index 9c2672c9ae23..6d9e11972948 100644 --- a/sys/amd64/vmm/intel/vmx.c +++ b/sys/amd64/vmm/intel/vmx.c @@ -4179,6 +4179,9 @@ vmx_vcpu_snapshot(void *vcpui, struct vm_snapshot_meta *meta) SNAPSHOT_BUF_OR_LEAVE(vcpu->guest_msrs, sizeof(vcpu->guest_msrs), meta, err, done); + SNAPSHOT_BUF_OR_LEAVE(vcpu->pir_desc, + sizeof(*vcpu->pir_desc), meta, err, done); + vmxctx = &vcpu->ctx; SNAPSHOT_VAR_OR_LEAVE(vmxctx->guest_rdi, meta, err, done); SNAPSHOT_VAR_OR_LEAVE(vmxctx->guest_rsi, meta, err, done); From nobody Fri Aug 18 07:18:44 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RRtX53MGVz4qph6; Fri, 18 Aug 2023 07:18:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RRtX51gS9z4dl7; Fri, 18 Aug 2023 07:18:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692343125; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=d9JJRb+rz9swNBWwVN6cy7sl6nZOmsnZwQhcolxynt4=; b=wZBZ0dR3FVeQV0b3+bI+1IZewD1jum5bLOdgpgYvWCt8tLXdAxWDlonsBfJ5KcDQmLDLAj m1IGfpDzH0JC9JTbK5xBV4BLOsADy6zt3QrCXW0Yvg5FYfkxdWNkBqAz5id3SgNxSpXTnb j/GJ+5JHDG7WpyJh6GpM7h2XonPK31YZ9rvRI6ECWt7ckefYy052tdwJvj+NGxaF40zOzw 3NNbgO2dksfrpSRbMcLoVAX/lYZfe1Us6pz1iGMSrztKxwsWh/55TIDuIH3hGCQRY1zGlD 1RK1dufwqs980sHZNhfxbsRTAC2/hUFlG9OmnJcBPZmRQPuuYVJHiMIBw0W11w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692343125; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=d9JJRb+rz9swNBWwVN6cy7sl6nZOmsnZwQhcolxynt4=; b=mLkgr53yyxka3fvNTXiNTZWggNajHfh7FiMEhK/OggoI3T6xk9blUdzJt+MFqoc8qT2tqC S7W+A/8FxAGcslF6uC7ngWDqOtmgiCdMauTjQtpiqBjDU+qDra5uvMH7GnUok4IakvXh+a RsKvJLeA7MXrBRyuBSOHN9ci7WnC2MrjtWiOCLqeXKr+Ih7Y2/gAuiodAAx3XBWiV9QPSJ s7D7EYc+YntaCwwzt1nIsddh8JdA7KKQC9be294PeBQ1HZnaexkbT+GdNmxXgh8ZvyW7Dx 7qRZqtYpcr7e3uttAYw6RELvIJtIDTJo79lKetuHmCp984W7aplUhyIhitOv4Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692343125; a=rsa-sha256; cv=none; b=mLSGRZhMlqQzUz/NZahl5dI/YcgdUE6jJPTZgmxL09pEh9Cw1cNtQtRaleaj6H36L3NRA5 bBAtxSN9t46rqQd+UjnpFypGXPp6K0qwl7/rDrPDxnRyyRtygIIjmWqY8xd5wsPOIqHbNF q5UNGePeMp478OBOzLOWqIDXry4R/8krs9Gscp46z4L4b0V/qSgAoNSH3bWajxaoXRkvwp pil1TGc4p5MV3/5NGP6Q3Mu7rzLKc3gLTcE3JIuRhoIBq9yLwh+FR5eBApMWi6JtOnXG0v iQsbJ3MZEE8iaFXG1SFrNn/1XxPQMloKBLSeUWXta83b2fIObyQWW2Lxf2KFlw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RRtX46dkhz16gx; Fri, 18 Aug 2023 07:18:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37I7IiN2017546; Fri, 18 Aug 2023 07:18:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37I7IiWT017543; Fri, 18 Aug 2023 07:18:44 GMT (envelope-from git) Date: Fri, 18 Aug 2023 07:18:44 GMT Message-Id: <202308180718.37I7IiWT017543@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Corvin =?utf-8?Q?K=C3=B6hne?= Subject: git: 5573404166b0 - stable/13 - bhyve: rename 'user_dev' with 'devices' List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: corvink X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 5573404166b090ccf8556888efd9657657b54032 Auto-Submitted: auto-generated The branch stable/13 has been updated by corvink: URL: https://cgit.FreeBSD.org/src/commit/?id=5573404166b090ccf8556888efd9657657b54032 commit 5573404166b090ccf8556888efd9657657b54032 Author: Vitaliy Gusev AuthorDate: 2023-05-15 14:28:14 +0000 Commit: Corvin Köhne CommitDate: 2023-08-18 07:04:25 +0000 bhyve: rename 'user_dev' with 'devices' Bhyve don't use 'user' specifier for emulated devices. And using 'user' adds duality. Reviewed by: corvink, rew MFC after: 1 week Sponsored by: vStack Differential Revision: https://reviews.freebsd.org/D40106 (cherry picked from commit b10d65a420f068bccf6aaf2942157a5347211dc5) --- usr.sbin/bhyve/bhyverun.c | 6 +++--- usr.sbin/bhyve/snapshot.c | 23 +++++++++++------------ usr.sbin/bhyve/snapshot.h | 6 +++--- 3 files changed, 17 insertions(+), 18 deletions(-) diff --git a/usr.sbin/bhyve/bhyverun.c b/usr.sbin/bhyve/bhyverun.c index 63ca9439d6e6..4db8274335cd 100644 --- a/usr.sbin/bhyve/bhyverun.c +++ b/usr.sbin/bhyve/bhyverun.c @@ -1520,7 +1520,7 @@ main(int argc, char *argv[]) #ifdef BHYVE_SNAPSHOT if (restore_file != NULL) { fprintf(stdout, "Pausing pci devs...\r\n"); - if (vm_pause_user_devs() != 0) { + if (vm_pause_devices() != 0) { fprintf(stderr, "Failed to pause PCI device state.\n"); exit(1); } @@ -1532,7 +1532,7 @@ main(int argc, char *argv[]) } fprintf(stdout, "Restoring pci devs...\r\n"); - if (vm_restore_user_devs(ctx, &rstate) != 0) { + if (vm_restore_devices(ctx, &rstate) != 0) { fprintf(stderr, "Failed to restore PCI device state.\n"); exit(1); } @@ -1544,7 +1544,7 @@ main(int argc, char *argv[]) } fprintf(stdout, "Resuming pci devs...\r\n"); - if (vm_resume_user_devs() != 0) { + if (vm_resume_devices() != 0) { fprintf(stderr, "Failed to resume PCI device state.\n"); exit(1); } diff --git a/usr.sbin/bhyve/snapshot.c b/usr.sbin/bhyve/snapshot.c index 5f9ef2053990..451839944bd6 100644 --- a/usr.sbin/bhyve/snapshot.c +++ b/usr.sbin/bhyve/snapshot.c @@ -926,7 +926,7 @@ vm_restore_kern_structs(struct vmctx *ctx, struct restore_state *rstate) } static int -vm_restore_user_dev(struct vmctx *ctx, struct restore_state *rstate, +vm_restore_device(struct vmctx *ctx, struct restore_state *rstate, const struct vm_snapshot_dev_info *info) { void *dev_ptr; @@ -971,15 +971,14 @@ vm_restore_user_dev(struct vmctx *ctx, struct restore_state *rstate, return (0); } - int -vm_restore_user_devs(struct vmctx *ctx, struct restore_state *rstate) +vm_restore_devices(struct vmctx *ctx, struct restore_state *rstate) { size_t i; int ret; for (i = 0; i < nitems(snapshot_devs); i++) { - ret = vm_restore_user_dev(ctx, rstate, &snapshot_devs[i]); + ret = vm_restore_device(ctx, rstate, &snapshot_devs[i]); if (ret != 0) return (ret); } @@ -988,7 +987,7 @@ vm_restore_user_devs(struct vmctx *ctx, struct restore_state *rstate) } int -vm_pause_user_devs(void) +vm_pause_devices(void) { const struct vm_snapshot_dev_info *info; size_t i; @@ -1008,7 +1007,7 @@ vm_pause_user_devs(void) } int -vm_resume_user_devs(void) +vm_resume_devices(void) { const struct vm_snapshot_dev_info *info; size_t i; @@ -1163,7 +1162,7 @@ vm_snapshot_dev_write_data(int data_fd, xo_handle_t *xop, const char *array_key, } static int -vm_snapshot_user_dev(const struct vm_snapshot_dev_info *info, +vm_snapshot_device(const struct vm_snapshot_dev_info *info, int data_fd, xo_handle_t *xop, struct vm_snapshot_meta *meta, off_t *offset) { @@ -1185,7 +1184,7 @@ vm_snapshot_user_dev(const struct vm_snapshot_dev_info *info, } static int -vm_snapshot_user_devs(struct vmctx *ctx, int data_fd, xo_handle_t *xop) +vm_snapshot_devices(struct vmctx *ctx, int data_fd, xo_handle_t *xop) { int ret; off_t offset; @@ -1227,7 +1226,7 @@ vm_snapshot_user_devs(struct vmctx *ctx, int data_fd, xo_handle_t *xop) meta->buffer.buf = meta->buffer.buf_start; meta->buffer.buf_rem = meta->buffer.buf_size; - ret = vm_snapshot_user_dev(&snapshot_devs[i], data_fd, xop, + ret = vm_snapshot_device(&snapshot_devs[i], data_fd, xop, meta, &offset); if (ret != 0) goto snapshot_err; @@ -1365,7 +1364,7 @@ vm_checkpoint(struct vmctx *ctx, const char *checkpoint_file, bool stop_vm) vm_vcpu_pause(ctx); - ret = vm_pause_user_devs(); + ret = vm_pause_devices(); if (ret != 0) { fprintf(stderr, "Could not pause devices\r\n"); error = ret; @@ -1394,7 +1393,7 @@ vm_checkpoint(struct vmctx *ctx, const char *checkpoint_file, bool stop_vm) goto done; } - ret = vm_snapshot_user_devs(ctx, kdata_fd, xop); + ret = vm_snapshot_devices(ctx, kdata_fd, xop); if (ret != 0) { fprintf(stderr, "Failed to snapshot device state.\n"); error = -1; @@ -1409,7 +1408,7 @@ vm_checkpoint(struct vmctx *ctx, const char *checkpoint_file, bool stop_vm) } done: - ret = vm_resume_user_devs(); + ret = vm_resume_devices(); if (ret != 0) fprintf(stderr, "Could not resume devices\r\n"); vm_vcpu_resume(ctx); diff --git a/usr.sbin/bhyve/snapshot.h b/usr.sbin/bhyve/snapshot.h index 9bf881fded92..5f98be875544 100644 --- a/usr.sbin/bhyve/snapshot.h +++ b/usr.sbin/bhyve/snapshot.h @@ -95,9 +95,9 @@ void checkpoint_cpu_suspend(int vcpu); int restore_vm_mem(struct vmctx *ctx, struct restore_state *rstate); int vm_restore_kern_structs(struct vmctx *ctx, struct restore_state *rstate); -int vm_restore_user_devs(struct vmctx *ctx, struct restore_state *rstate); -int vm_pause_user_devs(void); -int vm_resume_user_devs(void); +int vm_restore_devices(struct vmctx *ctx, struct restore_state *rstate); +int vm_pause_devices(void); +int vm_resume_devices(void); int get_checkpoint_msg(int conn_fd, struct vmctx *ctx); void *checkpoint_thread(void *param); From nobody Fri Aug 18 07:18:45 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RRtX64NMtz4qpkb; Fri, 18 Aug 2023 07:18: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RRtX62sWDz4djH; Fri, 18 Aug 2023 07:18:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692343126; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kAL9+JpVi7ASGwQrAjwIqGFd2/c1PwIhMDrZmdL3HGM=; b=jaJZoBftBnP5jNItIaRHz8fd0uCXUFbeoErzIXYEvVZjLH1nN+v/l2Fdnqb9Fh3Xs7Yaiy 4teUUaRS5r6tj/9InzAaWn6QWfJOrSQ9U1jEbWLh0sknjoX3rGezZlq3dQanwykiEtse1r +jNwKyh0j3KozWk1qmtC6fHbzw543AQ6xKlpbM6l0CQWc7l6PHoHEmu/pDw20D3Up1+Hgz madistXxWfPBVXsqMrc5Ec2bHw88YbsA9OHPZEutYP84/7It27nZFGvX3kz4FiQc5jkHAW hu2yU3+1o2xQYBE9nc4LJHE3l79ZIm7hknI6cItQx7tyduVwqo5uDWwf/m5qAg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692343126; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kAL9+JpVi7ASGwQrAjwIqGFd2/c1PwIhMDrZmdL3HGM=; b=sQHSahODMXnuslooFnNduDtWXKHsgn1s5YdgkZeIux6mrjAf8wmEEkZUZi8o/PpzrhaGuX XS8XdOGsItz9VaO5EpcxmoXkvbBmJfLm6LHjUbAMskX7Sr0mjjvhFl0AxS2clEW3n1upNn vLQhvzYSBRSVM8qwYVfoLym2SWNjXwZ0EOzis0c0f2zhTMd/8LukISbTEXDS2cfVAZdgY3 adqA9m4c/nfg3V5cqQVXHRbQQIHvzT64lNXgFsUrTxU8KpiL3jknUuqo73gVNT1x9sow1W huq4N7vLygSkAZQilQT7atcqPPa1vUtFMAEbGPECfsQgFKRUXOoWX4byGC/1gw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692343126; a=rsa-sha256; cv=none; b=um1o+DOqkXCXShXRaDBALEHoIwsjUtcgq7lSGM/2yCZAqjR7qVWdmW3cpLJafkOzsTFf51 8mnCAZB6te0/l0l+KX5hhP/a1e/kTq3U5hEeCHR6xCxhE6PAzBYUKSUVk6wWBXRpmSYxHJ 1KkjqVGD+d15BH4mZqh+wAFQltS3dvoUfe8/v5rnDug3LHzgnvgM1/u0sCg/zRsgVZ6av2 62JSjA70bnj4XA3eeNWKs39RVyMGbEnfJCVPKVyVZDR7b/di+OddMyQuWSC7aFiTgxZ3Nd Ap7zUui0IAAxTxsggSuJGgmdc5WrjBeoUU/RFrgSxxNy/51pxJIT+SN2g3bD/A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RRtX60Yckz16Mv; Fri, 18 Aug 2023 07:18:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37I7Ijep017603; Fri, 18 Aug 2023 07:18:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37I7Ijfw017600; Fri, 18 Aug 2023 07:18:45 GMT (envelope-from git) Date: Fri, 18 Aug 2023 07:18:45 GMT Message-Id: <202308180718.37I7Ijfw017600@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Corvin =?utf-8?Q?K=C3=B6hne?= Subject: git: 51e32fe73405 - stable/13 - bhyve: add bus, slot and func to device name List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: corvink X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 51e32fe73405a20caed05cd24310d4e6bb718507 Auto-Submitted: auto-generated The branch stable/13 has been updated by corvink: URL: https://cgit.FreeBSD.org/src/commit/?id=51e32fe73405a20caed05cd24310d4e6bb718507 commit 51e32fe73405a20caed05cd24310d4e6bb718507 Author: Vitaliy Gusev AuthorDate: 2023-05-15 14:28:45 +0000 Commit: Corvin Köhne CommitDate: 2023-08-18 07:04:26 +0000 bhyve: add bus, slot and func to device name Each device needs a unique identifier to store and restore snapshots properly. Adding the pci bsf information to the device name creates a unique identifier as a bsf can't be occupied twice. Reviewed by: corvink MFC after: 1 week Sponsored by: vStack Differential Revision: https://reviews.freebsd.org/D40107 (cherry picked from commit 14c80457b0f6a5eb6ff9a1db573462410c64a454) --- usr.sbin/bhyve/pci_emul.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/usr.sbin/bhyve/pci_emul.c b/usr.sbin/bhyve/pci_emul.c index 47ddf3f1809c..f52bf94b7c3d 100644 --- a/usr.sbin/bhyve/pci_emul.c +++ b/usr.sbin/bhyve/pci_emul.c @@ -1023,7 +1023,8 @@ pci_emul_init(struct vmctx *ctx, struct pci_devemu *pde, int bus, int slot, pdi->pi_lintr.pirq_pin = 0; pdi->pi_lintr.ioapic_irq = 0; pdi->pi_d = pde; - snprintf(pdi->pi_name, PI_NAMESZ, "%s-pci-%d", pde->pe_emu, slot); + snprintf(pdi->pi_name, PI_NAMESZ, "%s@pci.%d.%d.%d", pde->pe_emu, bus, + slot, func); /* Disable legacy interrupts */ pci_set_cfgdata8(pdi, PCIR_INTLINE, 255); From nobody Fri Aug 18 07:18:47 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RRtX73f6Sz4qq2y; Fri, 18 Aug 2023 07:18:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RRtX72VLHz4f3w; Fri, 18 Aug 2023 07:18:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692343127; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fJdwswUkcrEudALMkMv+HFKCp/UFLQB4YJV6gMEAozY=; b=i8vODGjxCDCJnJ7fy7bfffDk+imus0+WE8Ha3wWyPObFx7HjCDrPlfOO8L+G8tGv1sC0AS GXIWkqWMaBsY6Ei7UKSk9e7pF6iyBd4lcgTnLtA5fY00583yhoZHZWB4/JugnahGDCFM3I Lee0xayw4DYuBo392cdkLWj4Q6SV7fHnv0XQpalZ7t21SqTlewtSic73VjinQWZ+ytXlYL oL8QsMlnNqbKaIjMPis1JNiT2X+geakoWEgRiCtug3LJhIb/IGQzv9Kk+05M26Pa+PRAUF IRiucgzD80kSoRiyFbavyOsKVQoaexlv8aQiWOAikPLyH/e0kqvP80l2Lg+KPA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692343127; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fJdwswUkcrEudALMkMv+HFKCp/UFLQB4YJV6gMEAozY=; b=BUVjYxsZQXnvE7RxZjS4aO1D7bc4OFSvnXh0KL0+2hV/2t2Z6lNB0sPjHJX/Dtrg3UuMJF 2ODP8TRFlmYGclFErt6+MJiBTGOTfG1WoBzbFVFDTG4smcntWtMU3ysAi49grSyDXwWsoF vuhcpHQH3Vb2sIndnFGhouudIL7XgnWpx1qDUW53wVO2X7QGV8uIESvzhWlGH8llcdcbCC mF9ywTbPaKShrwWf49l0wWEBtmHu611q8vWLKfR84syC7ulmn1gTxRgqaGB65IHEYdF90v 24erN3M7yYMitJxgKayl+UG/kRBTNBy3zm+wWxPeIgzKpwXbclbfZPMUCaUlGA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692343127; a=rsa-sha256; cv=none; b=jrxvXpyO9bn3wwM1a8XRVOktcXf7RVEPt1zeXJbeEknGMqNpehiIXlATUYiKrj9uAkNBgw 0ZL1Twdxva5HkVhk+KYkI4dkM1NFn3iLRXAu8ILNrfxsN4/h8lHQ+zkbAmpDygyaBmCDdj 9ic2kN80HIviGg7JHqi9dvsyoisKrvltxD0Hos7J3ORIMl1bRkGYzQ13EfHHj9Sptvzfou 1qOUSCq3Tg+Urxp1T7fEHR4UNI8pDDEU1dsQbRaV8BO+d4hQwbomSpfCe6xqendJz2DGEu nZaC4QSs5fgYHjYl03s2TOKxzDwe/QA9Pocw0krLgnnLJRpL8yPfjBzG+FFp1w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RRtX71Zpqz16Mw; Fri, 18 Aug 2023 07:18:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37I7Ilpn017656; Fri, 18 Aug 2023 07:18:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37I7IlSb017653; Fri, 18 Aug 2023 07:18:47 GMT (envelope-from git) Date: Fri, 18 Aug 2023 07:18:47 GMT Message-Id: <202308180718.37I7IlSb017653@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Corvin =?utf-8?Q?K=C3=B6hne?= Subject: git: 295d69c8b00f - stable/13 - bhyve: add .pe_snapshot method for PCI 'hostbridge' List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: corvink X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 295d69c8b00f99e97eebd1858f99c037942c5c96 Auto-Submitted: auto-generated The branch stable/13 has been updated by corvink: URL: https://cgit.FreeBSD.org/src/commit/?id=295d69c8b00f99e97eebd1858f99c037942c5c96 commit 295d69c8b00f99e97eebd1858f99c037942c5c96 Author: Vitaliy Gusev AuthorDate: 2023-05-15 16:29:56 +0000 Commit: Corvin Köhne CommitDate: 2023-08-18 07:04:26 +0000 bhyve: add .pe_snapshot method for PCI 'hostbridge' There is no error when dump doesn't have it, but to be more consistent this PCI devices should be saved as well. Reviewed by: corvink, rew MFC after: 1 week Sponsored by: vStack Differential Revision: https://reviews.freebsd.org/D40108 (cherry picked from commit 6f7d2cf8bbb5ce6c4dbe0153d54cdc474b5266f4) --- usr.sbin/bhyve/pci_hostbridge.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/usr.sbin/bhyve/pci_hostbridge.c b/usr.sbin/bhyve/pci_hostbridge.c index 03eacc5e134a..90ccda0a79cd 100644 --- a/usr.sbin/bhyve/pci_hostbridge.c +++ b/usr.sbin/bhyve/pci_hostbridge.c @@ -86,6 +86,14 @@ pci_amd_hostbridge_legacy_config(nvlist_t *nvl, const char *opts __unused) return (0); } +#ifdef BHYVE_SNAPSHOT +static int +pci_de_snapshot(struct vm_snapshot_meta *meta __unused) +{ + return (0); +} +#endif + static const struct pci_devemu pci_de_amd_hostbridge = { .pe_emu = "amd_hostbridge", .pe_legacy_config = pci_amd_hostbridge_legacy_config, @@ -96,5 +104,8 @@ PCI_EMUL_SET(pci_de_amd_hostbridge); static const struct pci_devemu pci_de_hostbridge = { .pe_emu = "hostbridge", .pe_init = pci_hostbridge_init, +#ifdef BHYVE_SNAPSHOT + .pe_snapshot = pci_de_snapshot, +#endif }; PCI_EMUL_SET(pci_de_hostbridge); From nobody Fri Aug 18 07:18:48 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RRtX84dbyz4qpdt; Fri, 18 Aug 2023 07:18:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RRtX83Tvfz4f5q; Fri, 18 Aug 2023 07:18:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692343128; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=62SqdEQAmQCyO4Ho27ykRNwuM78gUqEyMG04uFyS12Y=; b=Kntpl98EZ0ULLw9bbU/sx6i4iq2teXzeH4wj2eFFtqmB1btm3N+veJzpI7vgWg71nU3vcw Ws0cw4G4jrMQVEk5eC2yeqNwl9NMlWv5gLpBiJIrxTcW9INyoRWIg+ZoMT8z7E1l9Wa4r8 iwmeDcofnCBtXkjKUjcwpZ4zPTfBSE4tu/nA12X9vbSOeIjTmwZnsd9Ej4kHVEHwgIQg4C rEibgkPY2cngGztHYZk3hfnIg/2FsgDuBbUN3dt3FDMur52c61NPvxtwgrff1noPYSMYkb gA3IWUVf1XhVleh9LmigIwZF+ddV6I6+HZ07o3Y3+IIEd16yFacLj8j6KjyyYg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692343128; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=62SqdEQAmQCyO4Ho27ykRNwuM78gUqEyMG04uFyS12Y=; b=c0JIXe9+Q2H/BMIxMZ2W/QQ6pQQcZ4nnc7w47Ba6Bj+mWsZYLI9nhKp+wLYTu43nrb5WxJ rOz9xW0rkzuxumDbOMqnOoEj6QlBRLq6GL+r84QRj9AbK/fz333fQIkgt2lfV6GobhyLYQ o1bp677kAb+rmKHW5xOK3aNa4VfeKhOKXOfjRhP6CYZpaTxVvhIgzNJQOWi8j9YTm/C2sm KsbknD4v6mdw7kRB13N6s3/dy3E3Qk9Q7GMYspmvHkw1cyvoMMn3U3i/f9cO2aKKEF84UX Biwhh0+BXcj/SqWmKHsr6axazwHBLIVRggiWei2iCl+w3eJBHviVsyisFxwq6A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692343128; a=rsa-sha256; cv=none; b=MMuBcdtmPBqmcNQqN/uaFXE8gu65spEKy25RauyH4mJrSLzvbkwPJ8d72Zy3eMM2ESZP27 JNpLU1YFKYtU97Kl6mgmN/gTP7E1/k2QJSQKyB5KKPtsuRewuJUk5udZQoNra1K6AaeVNj BFOSIgKm20OsoH3SytMd6QWO0SCbjqdEYTXXdMOfLyF04N0JmkjZ3aw4tqrJihPqUXCgF6 A9sz11Oh5DY8u6gsQ2dm8p8QVVBwu2rC++y2+0WfZsaMp5+qCCpRpfBeYbKkXEccPPg0U7 5f63EDHPvk3Oe90Xg3y/IhhB9L+4HFoL0+LQbxcn0NLgcKbNB9NZWIyyfMSC2g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RRtX82bmqz16gy; Fri, 18 Aug 2023 07:18:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37I7ImF1017710; Fri, 18 Aug 2023 07:18:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37I7ImDx017707; Fri, 18 Aug 2023 07:18:48 GMT (envelope-from git) Date: Fri, 18 Aug 2023 07:18:48 GMT Message-Id: <202308180718.37I7ImDx017707@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Corvin =?utf-8?Q?K=C3=B6hne?= Subject: git: 5a07451f796f - stable/13 - bhyve: rename 'structs' snapshot key with 'kern_structs' List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: corvink X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 5a07451f796f9f619ee8c2da9aaa314c5b570992 Auto-Submitted: auto-generated The branch stable/13 has been updated by corvink: URL: https://cgit.FreeBSD.org/src/commit/?id=5a07451f796f9f619ee8c2da9aaa314c5b570992 commit 5a07451f796f9f619ee8c2da9aaa314c5b570992 Author: Vitaliy Gusev AuthorDate: 2023-05-15 14:25:15 +0000 Commit: Corvin Köhne CommitDate: 2023-08-18 07:04:26 +0000 bhyve: rename 'structs' snapshot key with 'kern_structs' Using key 'structs' is ambiguous. This section contains data related to the kernel. It should use a more informative naming. Reviewed by: corvink, rew MFC after: 1 week Sponsored by: vStack Differential Revision: https://reviews.freebsd.org/D40104 (cherry picked from commit 50aef9f62c1be9e723169ef57920c3fca07bd2fb) --- usr.sbin/bhyve/snapshot.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/usr.sbin/bhyve/snapshot.c b/usr.sbin/bhyve/snapshot.c index 451839944bd6..9cd1ce34eeea 100644 --- a/usr.sbin/bhyve/snapshot.c +++ b/usr.sbin/bhyve/snapshot.c @@ -118,10 +118,10 @@ static sig_t old_winch_handler; #define SNAPSHOT_BUFFER_SIZE (20 * MB) -#define JSON_STRUCT_ARR_KEY "structs" +#define JSON_KERNEL_ARR_KEY "kern_structs" #define JSON_DEV_ARR_KEY "devices" #define JSON_BASIC_METADATA_KEY "basic metadata" -#define JSON_SNAPSHOT_REQ_KEY "snapshot_req" +#define JSON_SNAPSHOT_REQ_KEY "device" #define JSON_SIZE_KEY "size" #define JSON_FILE_OFFSET_KEY "file_offset" @@ -422,16 +422,16 @@ lookup_struct(enum snapshot_req struct_id, struct restore_state *rstate, ucl_object_iter_t it = NULL; int64_t snapshot_req, size, file_offset; - structs = ucl_object_lookup(rstate->meta_root_obj, JSON_STRUCT_ARR_KEY); + structs = ucl_object_lookup(rstate->meta_root_obj, JSON_KERNEL_ARR_KEY); if (structs == NULL) { fprintf(stderr, "Failed to find '%s' object.\n", - JSON_STRUCT_ARR_KEY); + JSON_KERNEL_ARR_KEY); return (NULL); } if (ucl_object_type(structs) != UCL_ARRAY) { fprintf(stderr, "Object '%s' is not an array.\n", - JSON_STRUCT_ARR_KEY); + JSON_KERNEL_ARR_KEY); return (NULL); } @@ -1059,7 +1059,7 @@ vm_snapshot_kern_struct(int data_fd, xo_handle_t *xop, const char *array_key, meta->dev_req); xo_emit_h(xop, "{:" JSON_SIZE_KEY "/%lu}\n", data_size); xo_emit_h(xop, "{:" JSON_FILE_OFFSET_KEY "/%lu}\n", *offset); - xo_close_instance_h(xop, JSON_STRUCT_ARR_KEY); + xo_close_instance_h(xop, JSON_KERNEL_ARR_KEY); *offset += data_size; @@ -1095,7 +1095,7 @@ vm_snapshot_kern_structs(struct vmctx *ctx, int data_fd, xo_handle_t *xop) .op = VM_SNAPSHOT_SAVE, }; - xo_open_list_h(xop, JSON_STRUCT_ARR_KEY); + xo_open_list_h(xop, JSON_KERNEL_ARR_KEY); for (i = 0; i < nitems(snapshot_kern_structs); i++) { meta->dev_name = snapshot_kern_structs[i].struct_name; meta->dev_req = snapshot_kern_structs[i].req; @@ -1111,7 +1111,7 @@ vm_snapshot_kern_structs(struct vmctx *ctx, int data_fd, xo_handle_t *xop) goto err_vm_snapshot_kern_data; } } - xo_close_list_h(xop, JSON_STRUCT_ARR_KEY); + xo_close_list_h(xop, JSON_KERNEL_ARR_KEY); err_vm_snapshot_kern_data: if (buffer != NULL) From nobody Fri Aug 18 07:18:49 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RRtX962tYz4qq32; Fri, 18 Aug 2023 07:18: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RRtX94Yv9z4fBB; Fri, 18 Aug 2023 07:18:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692343129; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0PdCezLeZANGrksxA6NZCbHO58IM6FZDbVAOpzoDGOw=; b=hyQXPDv+JtX1upvcb+IsIrFKEYprbElKHxK6vki5cWYvi4UdUh74BH0xqCu5gA2nd949nN ZyDgqJjE+fcSmRwzFvRtaOPURnrei7YQKh2TPjuvuL4C3elb9BfTv6HCtmNCtM4CI5zgDD rq4/mfTR3nqvh/nXsIwb+BFUMdWsfHXUhh86K6rNMxoSNfCkGhmyOb32g1YY60fN6GcEUR lB0YFEFvAD6iB+k8vWDEDqF7V499pDK25UsDECDfBxo14xXNIIrTIVcvWmzM/AgHnnYL0I xrvR69McvSxDQOnW3pdvpEjXN/lwaFKqS1Ev6LFCTyhdemdDIAWPZ5GLkvCriA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692343129; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0PdCezLeZANGrksxA6NZCbHO58IM6FZDbVAOpzoDGOw=; b=a7Mh0GUCr18GuJSozt1iz1r6sja5SO7SUUR3eOY/uzOnkF0znR3gKN5zfnsKj7g3ktjJn5 /sxDsoPiBTv5Ipj8viWNSRTlFFkdUF1X4YDSmmBytmOCrvrKo5t0tx2yH14QkEl2ozlpNG mRfxFOrZAnHLXZl+ycV09p/p2jwkXzw52NMVNYwKpE+NU2MAsXGge36lXbIZ4IcM6kT9uL T4/mQylxrX61iYzVfs4Nz1Bd/wVcR/Tct81j0r5FcN/1nSVRo9EldcKrFOEmQ67THN3gQM GqYYjt/BzqwW7aYLp1/m99k6cY3MP2VbCF63+LBzI2tcGcgI/dumY1VPTphFCQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692343129; a=rsa-sha256; cv=none; b=UPa99R4QeNm878KNYq37jCD2U4UZrL2Y2XCeVRFuFuE1jQlMoaF6tYW2gzE6oXpVpgIWNx LeJlyY+49nF0sYdTy1mp4sbpYTfkz/RbyxWS/+eDGrW4xJPPDNsWat/onuDgh2MguHg+DV 6Uol81sDgADvkZi9GTmPqDSvqmYbipQw1lTXaiEVx+SSTVL/eFdVqPU1RST4H0Y4albZ8k J6xDXwArAJeUpmMwbtBnKUfzsFZh2zcl0p4WzA3/hGeYwkwqMhzyuvMFfdW2Dq1e0VTW+w KcobYJZcsAFG+9eYDRT2gZgY+Ebdbdhs5UVDg1AHkvbdLElrRPCj7aaj+f+tdA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RRtX93fmcz16Sb; Fri, 18 Aug 2023 07:18:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37I7Inn0017752; Fri, 18 Aug 2023 07:18:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37I7In4P017749; Fri, 18 Aug 2023 07:18:49 GMT (envelope-from git) Date: Fri, 18 Aug 2023 07:18:49 GMT Message-Id: <202308180718.37I7In4P017749@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Corvin =?utf-8?Q?K=C3=B6hne?= Subject: git: 8caac07ce933 - stable/13 - bhyvectl: Add '--get-debug-cpus' command List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: corvink X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 8caac07ce933a5d8c3a57e12d6b1537c6235d712 Auto-Submitted: auto-generated The branch stable/13 has been updated by corvink: URL: https://cgit.FreeBSD.org/src/commit/?id=8caac07ce933a5d8c3a57e12d6b1537c6235d712 commit 8caac07ce933a5d8c3a57e12d6b1537c6235d712 Author: Vitaliy Gusev AuthorDate: 2023-07-25 12:03:54 +0000 Commit: Corvin Köhne CommitDate: 2023-08-18 07:04:26 +0000 bhyvectl: Add '--get-debug-cpus' command vmm and libvmmapi already have handlers for that. When adding debug cpus, they were only used for the debug stub. Over time, they were reused by other parts like snapshots or idle APs. Reviewed by: corvink, jhb MFC after: 1 week Sponsored by: vStack Differential Revision: https://reviews.freebsd.org/D40804 (cherry picked from commit 65f8467e3351c38a9d57b538b85cf6c5fab5818e) --- usr.sbin/bhyvectl/bhyvectl.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/usr.sbin/bhyvectl/bhyvectl.c b/usr.sbin/bhyvectl/bhyvectl.c index 2a022c550d54..dfa523ea16c8 100644 --- a/usr.sbin/bhyvectl/bhyvectl.c +++ b/usr.sbin/bhyvectl/bhyvectl.c @@ -190,6 +190,7 @@ usage(bool cpu_intel) " [--set-rtc-nvram=]\n" " [--rtc-nvram-offset=]\n" " [--get-active-cpus]\n" + " [--get-debug-cpus]\n" " [--get-suspended-cpus]\n" " [--get-intinfo]\n" " [--get-eptp]\n" @@ -265,7 +266,7 @@ static int force_reset, force_poweroff; static const char *capname; static int create, destroy, get_memmap, get_memseg; static int get_intinfo; -static int get_active_cpus, get_suspended_cpus; +static int get_active_cpus, get_debug_cpus, get_suspended_cpus; static uint64_t memsize; static int set_cr0, get_cr0, set_cr2, get_cr2, set_cr3, get_cr3; static int set_cr4, get_cr4; @@ -1450,6 +1451,7 @@ setup_options(bool cpu_intel) { "force-reset", NO_ARG, &force_reset, 1 }, { "force-poweroff", NO_ARG, &force_poweroff, 1 }, { "get-active-cpus", NO_ARG, &get_active_cpus, 1 }, + { "get-debug-cpus", NO_ARG, &get_debug_cpus, 1 }, { "get-suspended-cpus", NO_ARG, &get_suspended_cpus, 1 }, { "get-intinfo", NO_ARG, &get_intinfo, 1 }, { "get-cpu-topology", NO_ARG, &get_cpu_topology, 1 }, @@ -2324,6 +2326,12 @@ main(int argc, char *argv[]) print_cpus("active cpus", &cpus); } + if (!error && (get_debug_cpus || get_all)) { + error = vm_debug_cpus(ctx, &cpus); + if (!error) + print_cpus("debug cpus", &cpus); + } + if (!error && (get_suspended_cpus || get_all)) { error = vm_suspended_cpus(ctx, &cpus); if (!error) From nobody Fri Aug 18 07:28:40 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RRtlY0H6Xz4qqhJ; Fri, 18 Aug 2023 07:28: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RRtlX5Fhtz3DdR; Fri, 18 Aug 2023 07:28:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692343720; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=sftZjTwyoKzOtiL9J6Eqq3IUEULtEck8gV68l0+3nXg=; b=QH1dZeYkLb9yNAiGfApjFz5geAReQzxGYsBtI9kd963r1jigYqclMVHJhXhwpV7owoBOl6 jLoRu5DtRYksXWvfmtdd9xQdzIYxd7dmK2LruHEjJd6vKPXcfN4lKNrGNSoRh4MoR7IGPk QTxA4MnJtbwBBWx13fz5pJRK/Y2ynyhDjfLkR8YSR8JXLq4ewFD82C/Jr59+X7xg6VB06q g5t4P7d9hz6N7whDkuMNn7No+2hvGIDLnsWLlb35pTQJX2Q3JYQG4o1W7ouDNjb92GtZ4F zjLfNoIJCN8IOdfnvOLucDQ7NhAPv9mQqh6ejUS79vpgMXtndC3BjZ5EKeJ/Pw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692343720; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=sftZjTwyoKzOtiL9J6Eqq3IUEULtEck8gV68l0+3nXg=; b=H2n4GSjxUPtReMuUjnMx7bcGiCxWWFMuyjNx+sUQuB6Nii2IqY1B+iioLMQMEEJZ3Rykr0 hiGdngY36UhZluktmIf43HbN4BxXcveHGoSErt8Jv3yjvm+0VxRlrhsGAwDl435DZk/0uj e6cVEssPFr68sdQRPkxtI4A7S6oh/RbRFZpM+3DqvbOOy4vAZI2I3H8UEhG3jeRRl+tFYd PYN7XjJfTKY0pGcn1g30OxKmeTLZVB9kOPO7aXOpdqdxungAywC8EuUveVbb0zRLFn2QYU C+nAJHN2Umpt79EcvYfuc12HOxENz955/tWQjT0+zxnqF+DGsvxS9TseLdi98g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692343720; a=rsa-sha256; cv=none; b=r+F6KWmegyPGcuWjSrB3efW2jbZmFPI2zVPft6tNaVUwX0FeL/I47uwKkJ+59iddPTFS7A /9bXLYdoaLYosgONeSyvcSC3YD0Ol5Fzz0IriaY6tZ2pnK5gaJuRY8vZWt7ev5R38qSwpa PMdK065tYjoDYHnYt7S2b9l0FdSzDJT0VvelG2TndoXRy3gnm6DzjpX3QXGHcBiXoS9fc1 B3c8RvS3JvkwhAPMjoIu5577JF8Sif3Wmen5Jx0gKAZkjYICv7gt0Qu+mRtYymxnJXI4gT UmgpjGSsffI3zjuFaFfvbTKY7HKQRl+lv8ljl0HAPPJ354MWiDdSE4gxPL0ZvQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RRtlX4LDhz16Wc; Fri, 18 Aug 2023 07:28:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37I7Sejh034238; Fri, 18 Aug 2023 07:28:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37I7SelL034235; Fri, 18 Aug 2023 07:28:40 GMT (envelope-from git) Date: Fri, 18 Aug 2023 07:28:40 GMT Message-Id: <202308180728.37I7SelL034235@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Corvin =?utf-8?Q?K=C3=B6hne?= Subject: git: b1fffed683ab - stable/13 - bhyve: add cmdline option for user defined fw_cfg items List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: corvink X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: b1fffed683ab82b2693e7b5bb81ca72be4d348ba Auto-Submitted: auto-generated The branch stable/13 has been updated by corvink: URL: https://cgit.FreeBSD.org/src/commit/?id=b1fffed683ab82b2693e7b5bb81ca72be4d348ba commit b1fffed683ab82b2693e7b5bb81ca72be4d348ba Author: Corvin Köhne AuthorDate: 2021-09-08 09:31:21 +0000 Commit: Corvin Köhne CommitDate: 2023-08-18 07:24:54 +0000 bhyve: add cmdline option for user defined fw_cfg items Some guest allow to configure themself by fw_cfg. E.g. Fedora CoreOs can be provisioned by adding a JSON file as fw_cfg item. Reviewed by: jhb MFC after: 1 week Sponsored by: Beckhoff Automation GmbH & Co. KG Differential Revision: https://reviews.freebsd.org/D38338 (cherry picked from commit ca14781c8170f3517ae79e198c0c880dbc3142dd) bhyve: error out if fwcfg user file isn't read completely At the moment, fwcfg reads the file once at startup and passes these data to the guest. Therefore, we should always read the whole file. Otherwise we should error out. Additionally, GCC12 complains that the comparison whether fwcfg_file->size is lower than 0 is always false due to the limited range of data type. Reviewed by: markj Fixes: ca14781c8170f3517ae79e198c0c880dbc3142dd ("bhyve: add cmdline option for user defined fw_cfg items") MFC after: 1 week Sponsored by: Beckhoff Automation GmbH & Co. KG Differential Revision: https://reviews.freebsd.org/D40076 (cherry picked from commit 26d9f973d8691eccc098ded7326137d6f76ad243) --- usr.sbin/bhyve/bhyve.8 | 19 ++++++ usr.sbin/bhyve/bhyverun.c | 9 ++- usr.sbin/bhyve/qemu_fwcfg.c | 145 ++++++++++++++++++++++++++++++++++++++++++++ usr.sbin/bhyve/qemu_fwcfg.h | 1 + 4 files changed, 172 insertions(+), 2 deletions(-) diff --git a/usr.sbin/bhyve/bhyve.8 b/usr.sbin/bhyve/bhyve.8 index ed9c045c3159..b764807c7980 100644 --- a/usr.sbin/bhyve/bhyve.8 +++ b/usr.sbin/bhyve/bhyve.8 @@ -45,6 +45,15 @@ .Op Cm ,threads= Ar n .Oc .Sm on +.Oo Fl f +.Sm off +.Ar name Cm \&, +.Oo +.Cm string No | Cm file +.Oc +.Cm \&= Ar data +.Sm on +.Oc .Oo .Sm off .Fl G\~ @@ -145,6 +154,16 @@ Force .Nm to exit when a guest issues an access to an I/O port that is not emulated. This is intended for debug purposes. +.It Fl f Ar name Ns Cm \&, Ns Oo Cm string Ns No | Ns Cm file Ns Oc Ns Cm \&= Ns Ar data +Add a fw_cfg file +.Ar name +to the fw_cfg interface. +If a +.Cm string +is specified, the fw_cfg file contains the string as data. +If a +.Cm file +is specified, bhyve reads the file and adds the file content as fw_cfg data. .It Fl G Xo .Sm off .Oo Ar w Oc diff --git a/usr.sbin/bhyve/bhyverun.c b/usr.sbin/bhyve/bhyverun.c index 4db8274335cd..7cc293827518 100644 --- a/usr.sbin/bhyve/bhyverun.c +++ b/usr.sbin/bhyve/bhyverun.c @@ -1258,9 +1258,9 @@ main(int argc, char *argv[]) progname = basename(argv[0]); #ifdef BHYVE_SNAPSHOT - optstr = "aehuwxACDHIPSWYk:o:p:G:c:s:m:l:K:U:r:"; + optstr = "aehuwxACDHIPSWYk:f:o:p:G:c:s:m:l:K:U:r:"; #else - optstr = "aehuwxACDHIPSWYk:o:p:G:c:s:m:l:K:U:"; + optstr = "aehuwxACDHIPSWYk:f:o:p:G:c:s:m:l:K:U:"; #endif while ((c = getopt(argc, argv, optstr)) != -1) { switch (c) { @@ -1288,6 +1288,11 @@ main(int argc, char *argv[]) case 'C': set_config_bool("memory.guest_in_core", true); break; + case 'f': + if (qemu_fwcfg_parse_cmdline_arg(optarg) != 0) { + errx(EX_USAGE, "invalid fwcfg item '%s'", optarg); + } + break; case 'G': parse_gdb_options(optarg); break; diff --git a/usr.sbin/bhyve/qemu_fwcfg.c b/usr.sbin/bhyve/qemu_fwcfg.c index e88608d90cae..e845c70950b1 100644 --- a/usr.sbin/bhyve/qemu_fwcfg.c +++ b/usr.sbin/bhyve/qemu_fwcfg.c @@ -7,13 +7,18 @@ #include #include +#include +#include #include #include #include +#include +#include #include #include +#include #include "acpi_device.h" #include "bhyverun.h" @@ -98,6 +103,15 @@ struct qemu_fwcfg_softc { static struct qemu_fwcfg_softc fwcfg_sc; +struct qemu_fwcfg_user_file { + STAILQ_ENTRY(qemu_fwcfg_user_file) chain; + uint8_t name[QEMU_FWCFG_MAX_NAME]; + uint32_t size; + void *data; +}; +static STAILQ_HEAD(qemu_fwcfg_user_file_list, + qemu_fwcfg_user_file) user_files = STAILQ_HEAD_INITIALIZER(user_files); + static int qemu_fwcfg_selector_port_handler(struct vmctx *const ctx __unused, const int in, const int port __unused, const int bytes, uint32_t *const eax, @@ -384,6 +398,22 @@ qemu_fwcfg_add_file(const char *name, const uint32_t size, void *const data) return (0); } +static int +qemu_fwcfg_add_user_files(void) +{ + const struct qemu_fwcfg_user_file *fwcfg_file; + int error; + + STAILQ_FOREACH(fwcfg_file, &user_files, chain) { + error = qemu_fwcfg_add_file(fwcfg_file->name, fwcfg_file->size, + fwcfg_file->data); + if (error) + return (error); + } + + return (0); +} + static const struct acpi_device_emul qemu_fwcfg_acpi_device_emul = { .name = QEMU_FWCFG_ACPI_DEVICE_NAME, .hid = QEMU_FWCFG_ACPI_HARDWARE_ID, @@ -458,6 +488,11 @@ qemu_fwcfg_init(struct vmctx *const ctx) } if ((error = qemu_fwcfg_add_item_file_dir()) != 0) { warnx("%s: Unable to add file_dir item", __func__); + } + + /* add user defined fwcfg files */ + if ((error = qemu_fwcfg_add_user_files()) != 0) { + warnx("%s: Unable to add user files", __func__); goto done; } @@ -468,3 +503,113 @@ done: return (error); } + +static void +qemu_fwcfg_usage(const char *opt) +{ + warnx("Invalid fw_cfg option \"%s\"", opt); + warnx("-f [name=],(string|file)="); +} + +/* + * Parses the cmdline argument for user defined fw_cfg items. The cmdline + * argument has the format: + * "-f [name=],(string|file)=" + * + * E.g.: "-f opt/com.page/example,string=Hello" + */ +int +qemu_fwcfg_parse_cmdline_arg(const char *opt) +{ + struct qemu_fwcfg_user_file *fwcfg_file; + struct stat sb; + const char *opt_ptr, *opt_end; + ssize_t bytes_read; + int fd; + + fwcfg_file = malloc(sizeof(*fwcfg_file)); + if (fwcfg_file == NULL) { + warnx("Unable to allocate fw_cfg_user_file"); + return (ENOMEM); + } + + /* get pointer to */ + opt_ptr = opt; + /* If [name=] is specified, skip it */ + if (strncmp(opt_ptr, "name=", sizeof("name=") - 1) == 0) { + opt_ptr += sizeof("name=") - 1; + } + + /* get the end of */ + opt_end = strchr(opt_ptr, ','); + if (opt_end == NULL) { + qemu_fwcfg_usage(opt); + return (EINVAL); + } + + /* check if is too long */ + if (opt_end - opt_ptr >= QEMU_FWCFG_MAX_NAME) { + warnx("fw_cfg name too long: \"%s\"", opt); + return (EINVAL); + } + + /* save */ + strncpy(fwcfg_file->name, opt_ptr, opt_end - opt_ptr); + fwcfg_file->name[opt_end - opt_ptr] = '\0'; + + /* set opt_ptr and opt_end to */ + opt_ptr = opt_end + 1; + opt_end = opt_ptr + strlen(opt_ptr); + + if (strncmp(opt_ptr, "string=", sizeof("string=") - 1) == 0) { + opt_ptr += sizeof("string=") - 1; + fwcfg_file->data = strdup(opt_ptr); + if (fwcfg_file->data == NULL) { + warnx("Can't duplicate fw_cfg_user_file string \"%s\"", + opt_ptr); + return (ENOMEM); + } + fwcfg_file->size = strlen(opt_ptr) + 1; + } else if (strncmp(opt_ptr, "file=", sizeof("file=") - 1) == 0) { + opt_ptr += sizeof("file=") - 1; + + fd = open(opt_ptr, O_RDONLY); + if (fd < 0) { + warn("Can't open fw_cfg_user_file file \"%s\"", + opt_ptr); + return (EINVAL); + } + + if (fstat(fd, &sb) < 0) { + warn("Unable to get size of file \"%s\"", opt_ptr); + close(fd); + return (-1); + } + + fwcfg_file->data = malloc(sb.st_size); + if (fwcfg_file->data == NULL) { + warnx( + "Can't allocate fw_cfg_user_file file \"%s\" (size: 0x%16lx)", + opt_ptr, sb.st_size); + close(fd); + return (ENOMEM); + } + bytes_read = read(fd, fwcfg_file->data, sb.st_size); + if (bytes_read < 0 || bytes_read != sb.st_size) { + warn("Unable to read file \"%s\"", opt_ptr); + free(fwcfg_file->data); + close(fd); + return (-1); + } + fwcfg_file->size = bytes_read; + + close(fd); + } else { + qemu_fwcfg_usage(opt); + return (EINVAL); + } + + STAILQ_INSERT_TAIL(&user_files, fwcfg_file, chain); + + return (0); +} diff --git a/usr.sbin/bhyve/qemu_fwcfg.h b/usr.sbin/bhyve/qemu_fwcfg.h index def0487fdf02..5c73e8309c6e 100644 --- a/usr.sbin/bhyve/qemu_fwcfg.h +++ b/usr.sbin/bhyve/qemu_fwcfg.h @@ -23,3 +23,4 @@ struct qemu_fwcfg_item { int qemu_fwcfg_add_file(const char *name, const uint32_t size, void *const data); int qemu_fwcfg_init(struct vmctx *const ctx); +int qemu_fwcfg_parse_cmdline_arg(const char *opt); From nobody Fri Aug 18 07:28:41 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RRtlZ13X6z4qqbT; Fri, 18 Aug 2023 07:28: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RRtlY6dR2z3DNK; Fri, 18 Aug 2023 07:28:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692343721; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2xtYrA0BUl/eRSezIINUreKkNMlByNb5CjQBq2QdaEw=; b=GwXgu58DOsY1QKzxuZ/G+QTxhbJnUJLH6eyAMHG6Dc1OZWJdEIoom9gJ5cORtug0W0/Z/y tcRPXQPGLd+8iOJfMx/fur8RTbjiQOSLyYESl2gbq0lytKYaRkb97bEl41LOPp120AyvmY tQxeA7Rcj69hLytbnajsRcg+Ezd6cArHiz/ARPpfEhw0kTW0A6vO4hoBXOI4cAvQaTJoWr owBpULGX1vwsSX3DzbirZnM674TmBNqZRLKe58mORESXG1c3yYKk96KCC13C5c3ag4c0+y 7TYgZ9HwjkZDvi4ZubpioUJTXT2z61REqDa0spQSh84Lvsn5WsqAwnYFLnJDEw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692343721; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2xtYrA0BUl/eRSezIINUreKkNMlByNb5CjQBq2QdaEw=; b=S7tPOolnF7/+yh9jZoXBn2OigOjSRWGje3BsxlJehwH02C0ljUVqCabJ7/yXrpMwGOR3Hu MSpszdSR2BS8mh3EBkwd87l65AUMgB/pI4S6mOyjwTy3U92HTh5MeX+4GdsMzLbROgHYVl HOGpgIVUInPjdD0Re8jp7Pq00VNXF9uA6O1ev9J8uzEta3Rakz3P4wtWARqtFv9HOFszqT e4DrY8mmOG/p2+icYcXe+9+1LwmcEJzPe9eoL0MH7xQjg4ousPkrj9/EOQmkdt0vcwaSTR kV4sOdvBw/ydJzYo4lyYgpj6L3dRCU6SFXwc0UonNGfJNJUIlwX2OXJT2+SNlw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692343721; a=rsa-sha256; cv=none; b=cfjWEhDLhb6+o2kjH0NdcNdNB+G4BGXt8AJnNIXDQUE5wdIL9P0b8gn19kN+8FWvrYvv17 JzIAfm4ciEzizgt+iBF2ieMENRbGQUY6zArUZCZHiTWto9e7sHegDjHZUFdzb/scPCT00d i3pIUHznsuOQO2fYskMTZwBZuL0nweSAof6S9zs1BB+MtR+Wjy4YXYWNCHLLxxQWom2wFo l8WblQLAWi87arWAmXD0Jif1XO7IkbvY840DyhCu69MRvC+uLZw3rEkD4ooJTN3Ij7eopL asgjCOtMMkDmqLY6m2wwKgO06jpalFmyi0uPdeIemVLgKTWVjb5lFim5xCMwYg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RRtlY5Kp7z16RQ; Fri, 18 Aug 2023 07:28:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37I7SfN5034293; Fri, 18 Aug 2023 07:28:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37I7Sf7h034290; Fri, 18 Aug 2023 07:28:41 GMT (envelope-from git) Date: Fri, 18 Aug 2023 07:28:41 GMT Message-Id: <202308180728.37I7Sf7h034290@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Corvin =?utf-8?Q?K=C3=B6hne?= Subject: git: b3f053b4f46e - stable/13 - bhyve: allow adding FwCfg items to ACPI tables List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: corvink X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: b3f053b4f46ef1b1c64b2e2870f7cd172941946b Auto-Submitted: auto-generated The branch stable/13 has been updated by corvink: URL: https://cgit.FreeBSD.org/src/commit/?id=b3f053b4f46ef1b1c64b2e2870f7cd172941946b commit b3f053b4f46ef1b1c64b2e2870f7cd172941946b Author: Corvin Köhne AuthorDate: 2022-07-22 08:58:01 +0000 Commit: Corvin Köhne CommitDate: 2023-08-18 07:25:06 +0000 bhyve: allow adding FwCfg items to ACPI tables A TPM has an event log. Therefore, qemu adds a FwCfg item and adds it to an ACPI table. We like to use the same OVMF driver as qemu, so we should do the same. This commit adds the ability to basl to do it. Reviewed by: markj MFC after: 1 week Sponsored by: Beckhoff Automation GmbH & Co. KG Differential Revision: https://reviews.freebsd.org/D40451 (cherry picked from commit 4e46ab0ebe96b56d4fa7ea7df4a81cd533109f07) --- usr.sbin/bhyve/basl.c | 17 +++++++++++++++++ usr.sbin/bhyve/basl.h | 3 +++ 2 files changed, 20 insertions(+) diff --git a/usr.sbin/bhyve/basl.c b/usr.sbin/bhyve/basl.c index 348174c6520d..90cb608aecc6 100644 --- a/usr.sbin/bhyve/basl.c +++ b/usr.sbin/bhyve/basl.c @@ -490,6 +490,23 @@ basl_table_append_content(struct basl_table *table, void *data, uint32_t len) len - sizeof(ACPI_TABLE_HEADER))); } +int +basl_table_append_fwcfg(struct basl_table *const table, + const uint8_t *fwcfg_name, const uint32_t alignment, const uint8_t size) +{ + assert(table != NULL); + assert(fwcfg_name != NULL); + assert(size <= sizeof(uint64_t)); + + BASL_EXEC(qemu_loader_alloc(basl_loader, fwcfg_name, alignment, + QEMU_LOADER_ALLOC_HIGH)); + BASL_EXEC(qemu_loader_add_pointer(basl_loader, table->fwcfg_name, + fwcfg_name, table->len, size)); + BASL_EXEC(basl_table_append_int(table, 0, size)); + + return (0); +} + int basl_table_append_gas(struct basl_table *const table, const uint8_t space_id, const uint8_t bit_width, const uint8_t bit_offset, diff --git a/usr.sbin/bhyve/basl.h b/usr.sbin/bhyve/basl.h index 4d9ab4c589a8..e12173b701a2 100644 --- a/usr.sbin/bhyve/basl.h +++ b/usr.sbin/bhyve/basl.h @@ -82,6 +82,9 @@ int basl_table_append_checksum(struct basl_table *table, uint32_t start, /* Add an ACPI_TABLE_* to basl without its header. */ int basl_table_append_content(struct basl_table *table, void *data, uint32_t len); +int basl_table_append_fwcfg(struct basl_table *table, + const uint8_t *fwcfg_name, uint32_t alignment, + uint8_t size); int basl_table_append_gas(struct basl_table *table, uint8_t space_id, uint8_t bit_width, uint8_t bit_offset, uint8_t access_width, uint64_t address); From nobody Fri Aug 18 07:41:43 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RRv2b4rkmz4qrNm; Fri, 18 Aug 2023 07:41: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RRv2b40d0z3FkB; Fri, 18 Aug 2023 07:41:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692344503; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=c5fOY8mgMLkxXhFnSbXMWiICihaN+Vx47XYnXHt5IxQ=; b=sa6uG1xYg+I+Vw0fKvksArdKoSEfCyT6kFbk0M33PS8mK/ZshkEUzWqi3KkD5/AP7qL/qe C+EJE8B2tf+xvNTKdCLHLpSgHrmLeguqgapwXA0/oe2u3E/TasFt4qWzog/BV9rBp82a8k VyEXOBQqwmqsAqN/JUGTv5jSU/pRU23E6fZGwkXL+rNHg/oh1Kq1EaBJBMICHyB0gMJ3ae 4VPxeojZAGi/zNm7cn5WKUANw/FOKrXIfB73lMQ4Wd0gGSzEM1gq2fK/iOYzjuev1DJzwq /qfq1/8a0kFYqw/IYeg3gKvqPArNFDLFYssZ+M6HO1CFSaQAD/9+Cts/CAx0dA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692344503; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=c5fOY8mgMLkxXhFnSbXMWiICihaN+Vx47XYnXHt5IxQ=; b=CGjNvlIMtG2jShzSENt1YILW9UoLHzokvc0Rtl39h2OYMqHKKIQ45mD4LIIQGtFBgyyq1G anjJbBAC6ILCTw6GC8vtVBNdRthqeWdl/4l7BsJ+cAeEBy3KNYsPzde7BQC+g3fAwN01jF BtSr1MaVWH8CuLVTdXNFMGZVtT4meDLpxY0i6+8EkwvM0bFuW+eqQQBWug+2h7WGfkaJGc AF1c9MQChI7BXc/8p4RihXs0+hJjvlxnjio3Nt+gSbR9fS4GpGjc2m/cUKVgjTkmW4yra8 /AOTFRudZqucwd29JHNcD1WJ9bjQcVLUoeumrSRnbe/nS9wISOPuoLZCP8v0FQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692344503; a=rsa-sha256; cv=none; b=AGmDLk3lkYsdTt/j+ks2XILns8nAwAVUh26Y5tfyEUgzytk54gXadLUHKw8KrmrJ8oCDvT PVkmjeGAbTr7cFsfRVZ+M6kv4qYlkdS2xZaDugnH3Gvb39iQpJDsKY/TzntG2pIWj5N9co c/2dIRWkOqR92oUfneDmnpv8xaJyN0lejGdpk8jkqoR5Dkjnsr3p9/MxnX5WOnDY3yXUex 1jgYzQm7WR61YH5dfkja3E5YcgN7q2hPd8cENfV5qmB1EhRdA0+GlwayhQcuk2sOXFYnxG 9Za1Rj5FNLiQHVxTvpPRZ+UFVUVJ85pOvHvPdjq0GgsvkE8d3Y79vmifGeudag== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RRv2b33tdz16tD; Fri, 18 Aug 2023 07:41:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37I7fhJD065700; Fri, 18 Aug 2023 07:41:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37I7fhhR065697; Fri, 18 Aug 2023 07:41:43 GMT (envelope-from git) Date: Fri, 18 Aug 2023 07:41:43 GMT Message-Id: <202308180741.37I7fhhR065697@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Corvin =?utf-8?Q?K=C3=B6hne?= Subject: git: 194d65b5f860 - stable/13 - bhyve: make passthru sel public available List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: corvink X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 194d65b5f86024a0d0e63b16710b0d04c74ad250 Auto-Submitted: auto-generated The branch stable/13 has been updated by corvink: URL: https://cgit.FreeBSD.org/src/commit/?id=194d65b5f86024a0d0e63b16710b0d04c74ad250 commit 194d65b5f86024a0d0e63b16710b0d04c74ad250 Author: Corvin Köhne AuthorDate: 2023-05-10 10:19:49 +0000 Commit: Corvin Köhne CommitDate: 2023-08-18 07:29:26 +0000 bhyve: make passthru sel public available The GVT-d emulation requires access to this selector to read from the device. Reviewed by: markj MFC after: 1 week Sponsored by: Beckhoff Automation GmbH & Co. KG Differential Revision: https://reviews.freebsd.org/D40035 (cherry picked from commit 60793cee27993048864f60e3c19039386e4a4ab0) --- usr.sbin/bhyve/pci_passthru.c | 8 ++++++++ usr.sbin/bhyve/pci_passthru.h | 1 + 2 files changed, 9 insertions(+) diff --git a/usr.sbin/bhyve/pci_passthru.c b/usr.sbin/bhyve/pci_passthru.c index 2475a574249c..10e77990c283 100644 --- a/usr.sbin/bhyve/pci_passthru.c +++ b/usr.sbin/bhyve/pci_passthru.c @@ -660,6 +660,14 @@ done: return (error); } +struct pcisel * +passthru_get_sel(struct passthru_softc *sc) +{ + assert(sc != NULL); + + return (&sc->psc_sel); +} + int set_pcir_handler(struct passthru_softc *sc, int reg, int len, cfgread_handler rhandler, cfgwrite_handler whandler) diff --git a/usr.sbin/bhyve/pci_passthru.h b/usr.sbin/bhyve/pci_passthru.h index d18839e116fa..9b9293cdba7b 100644 --- a/usr.sbin/bhyve/pci_passthru.h +++ b/usr.sbin/bhyve/pci_passthru.h @@ -24,5 +24,6 @@ int passthru_cfgread_emulate(struct passthru_softc *sc, struct pci_devinst *pi, int coff, int bytes, uint32_t *rv); int passthru_cfgwrite_emulate(struct passthru_softc *sc, struct pci_devinst *pi, int coff, int bytes, uint32_t val); +struct pcisel *passthru_get_sel(struct passthru_softc *sc); int set_pcir_handler(struct passthru_softc *sc, int reg, int len, cfgread_handler rhandler, cfgwrite_handler whandler); From nobody Fri Aug 18 07:41:44 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RRv2c71bhz4qrLK; Fri, 18 Aug 2023 07:41:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RRv2c5XVMz3Fsf; Fri, 18 Aug 2023 07:41:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692344504; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kiIxTNFiyYKiY4M6bICBw6Q1YQVl0kBZdDD+VE4CJt8=; b=ZY320oydF3Pq47gojvMGuJbk9ZFwc+EQzlKTxCYZfPmSqjsO9kRmvNMdHgqMsuJGeCmF1g 68RtudJZjoSJxdDXC5e2G0lgpbWhoZr3yhclGJom/Fc7KZ8/Hbh+RTrIo6kR0VUX0imy0k VsYGY1TWQPl4fzD9ZauxBN+sk7cDFgPly+d3nAOhl/3Y60XyGJ3mxhYQc2oGyI7xJ3hxLR yR8aPcBU+PRITyAJ/R7HFtw2tmsloYpLGZgiD9tFEA3QXBGY8hHwhIyJwsmIDUQvpJZnMS 4xE725c+pqmwTzHVE/pNmDetwQ1kMMoGdAuYxekLY8bkV4sQmz57fnOnNRxWMw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692344504; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kiIxTNFiyYKiY4M6bICBw6Q1YQVl0kBZdDD+VE4CJt8=; b=iW+IISRPciF/4UFSIH/jJhiAY/8h04QMBvMpZOzmzLc2xvsrO9LqM1FZGPhN2FA4x3QiAr w2r6I3n6Ag93QKPbJpHVQZTgo2je7H6auJevr8ECnwpJTzovpPAH/kUScTWY2J0lrPTlRZ /K2SEzRnKpWEHhR7eOhAwTgs3/D1ETPYESd6ktQBW4N0Ww2DSKadGrAYJfkZYHtQodRK/u yqG850jMnYvpvwre5rQsBNJRdfr3Y83uUnJLGxbNDNGxQ2V1PsT4w39Xd0juBU3a9UM2hN xCWVPWrVXzirNJgZ3pNGP6HfMxJqTCKI0KsfArieZ2F8VHXQqeMg4sipJQg/CQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692344504; a=rsa-sha256; cv=none; b=V63L/oZxwIDb23CC94Nl9cZxc/Xu/g15SelKx9hMp4tA3bjoI8PL3ceU0GYT36iTP9EhCs cN28uttdaFcWmwA70Ma19mFkUvSH+gxe/4YPAlypLsChZx2Kc8/zl9mvfTCYIi2nXCiCkt r4stnjwRNuz6JXmkRbUAza0D6u+ICEboDnzl3TaFu2DyiJKZWhXlVD+iqPyGVelYYvYHR6 /s9tgAaIY6MrmRzN5Q9MfnQN5zThbA8h5aq52Q/9y2SYQIeKIWmkJih0DxSAM2XndTJNx8 n4RKJBlTzZt/RjAzyv+r/PuwYRN9Q4SEOycMBwprVDgOIc/75h47b2K0fcuZMA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RRv2c43j6z176T; Fri, 18 Aug 2023 07:41:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37I7fieA065755; Fri, 18 Aug 2023 07:41:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37I7fi3E065752; Fri, 18 Aug 2023 07:41:44 GMT (envelope-from git) Date: Fri, 18 Aug 2023 07:41:44 GMT Message-Id: <202308180741.37I7fi3E065752@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Corvin =?utf-8?Q?K=C3=B6hne?= Subject: git: 7ffa1d667f74 - stable/13 - bhyve: add helper for passthru specific mmio ranges List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: corvink X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 7ffa1d667f748bc6dd84a63ff5f805a1d99c9124 Auto-Submitted: auto-generated The branch stable/13 has been updated by corvink: URL: https://cgit.FreeBSD.org/src/commit/?id=7ffa1d667f748bc6dd84a63ff5f805a1d99c9124 commit 7ffa1d667f748bc6dd84a63ff5f805a1d99c9124 Author: Corvin Köhne AuthorDate: 2023-05-10 10:22:33 +0000 Commit: Corvin Köhne CommitDate: 2023-08-18 07:29:26 +0000 bhyve: add helper for passthru specific mmio ranges Intel GPUs have two special memory regions. They are called Graphics Stolen Memory and OpRegion. bhyve has to emulate both of them. In order to keep track of those special regions, add generic mmio ranges to the passthru emulation. Reviewed by: markj MFC after: 1 week Sponsored by: Beckhoff Automation GmbH & Co. KG Differential Revision: https://reviews.freebsd.org/D40036 (cherry picked from commit 93cf93179c505cebbcdbeef196d523d36890ed4a) --- usr.sbin/bhyve/pci_passthru.c | 12 ++++++++++++ usr.sbin/bhyve/pci_passthru.h | 10 ++++++++++ 2 files changed, 22 insertions(+) diff --git a/usr.sbin/bhyve/pci_passthru.c b/usr.sbin/bhyve/pci_passthru.c index 10e77990c283..d6978a1be822 100644 --- a/usr.sbin/bhyve/pci_passthru.c +++ b/usr.sbin/bhyve/pci_passthru.c @@ -78,6 +78,8 @@ __FBSDID("$FreeBSD$"); #define MSIX_TABLE_COUNT(ctrl) (((ctrl) & PCIM_MSIXCTRL_TABLE_SIZE) + 1) #define MSIX_CAPLEN 12 +#define PASSTHRU_MMIO_MAX 2 + static int pcifd = -1; struct passthru_softc { @@ -94,6 +96,7 @@ struct passthru_softc { } psc_msix; struct pcisel psc_sel; + struct passthru_mmio_mapping psc_mmio_map[PASSTHRU_MMIO_MAX]; cfgread_handler psc_pcir_rhandler[PCI_REGMAX + 1]; cfgwrite_handler psc_pcir_whandler[PCI_REGMAX + 1]; }; @@ -660,6 +663,15 @@ done: return (error); } +struct passthru_mmio_mapping * +passthru_get_mmio(struct passthru_softc *sc, int num) +{ + assert(sc != NULL); + assert(num < PASSTHRU_MMIO_MAX); + + return (&sc->psc_mmio_map[num]); +} + struct pcisel * passthru_get_sel(struct passthru_softc *sc) { diff --git a/usr.sbin/bhyve/pci_passthru.h b/usr.sbin/bhyve/pci_passthru.h index 9b9293cdba7b..7ce12a27bba4 100644 --- a/usr.sbin/bhyve/pci_passthru.h +++ b/usr.sbin/bhyve/pci_passthru.h @@ -11,6 +11,14 @@ #include "pci_emul.h" +struct passthru_mmio_mapping { + vm_paddr_t gpa; /* guest physical address */ + void *gva; /* guest virtual address */ + vm_paddr_t hpa; /* host physical address */ + void *hva; /* guest virtual address */ + vm_paddr_t len; +}; + struct passthru_softc; typedef int (*cfgread_handler)(struct passthru_softc *sc, @@ -24,6 +32,8 @@ int passthru_cfgread_emulate(struct passthru_softc *sc, struct pci_devinst *pi, int coff, int bytes, uint32_t *rv); int passthru_cfgwrite_emulate(struct passthru_softc *sc, struct pci_devinst *pi, int coff, int bytes, uint32_t val); +struct passthru_mmio_mapping *passthru_get_mmio(struct passthru_softc *sc, + int num); struct pcisel *passthru_get_sel(struct passthru_softc *sc); int set_pcir_handler(struct passthru_softc *sc, int reg, int len, cfgread_handler rhandler, cfgwrite_handler whandler); From nobody Fri Aug 18 07:41:45 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RRv2f1S5kz4qrFX; Fri, 18 Aug 2023 07:41: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RRv2d6FCXz3FnZ; Fri, 18 Aug 2023 07:41:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692344505; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=l+zzv6VnZqQE6nigHleZHHbEjp8u3XCBrWCnj3Pl83o=; b=Sw8iuBfTYvk0dz5biQ52kQV9C0GFuqtFrqgkmZU0hA8iTaUpVJ9vip8BYE/FVYRewFK8Dk bwXzN+vSVEWYnfiSfEnxkb+48auHGIk00l2gHSqV23ZM/4QK0xEgBDZZSoUXKgK0LH+3cO nXJGwkaHd5vBEjJVP2nzUW+UADSRPbFBqFTW+iI3RumN2zBOy4Gty7dHMjeR7+ViftL3kC XFqVJ3bDOGtC6A9Ttm1a1rNzUviK8nguI5J9pUG5WIbsN3kpum7ciOGGyIVSD5Rbl9dhhB ivrqK1DZZ5foCcYSUCAs8ZltP5jLTodFo3A4UOrU0+qEmZQ1XvYvY6DHQ3VsSQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692344505; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=l+zzv6VnZqQE6nigHleZHHbEjp8u3XCBrWCnj3Pl83o=; b=RCnMGyRANzLg6XNu26b6DrgUlwg8Q2LxiMJsaZl9O54J6vEWN7SivQFmXcsCCpl14epoNO Cq3Y5BPa2VOG5ZZGlygCm5vHa/4WByKvWO6+zuE36VdxehtI2SNGfCIb5gFFh+ZMTvu+mo zUJ4AEJXMG9xH5VFx64SVc/gYMJswxYEe8z3om6pCCc729nHrUwJqJQ7pWWxMEZECzTV+g yIXh78S3d+TI6GlqLirGsUsmaiyj/nQbQwMoNwQYV0TLh4zMxqu45xzmduTePoucy9H13p o4VK0LBShgBpGjgq4Nx0t8yxpg/vb42PEApFBC2I5dt24BwPY3FUdyqC0SYv8w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692344505; a=rsa-sha256; cv=none; b=Av033rs5qG1ifmDU/1s/RsYqJSYtFOuM7JJ1ntBz3lnCHpby40YdEG35kBOl6KXIX75XoT aZlrU4pXExUClOdGLiQwXCAbFQzGp327hk7xqtl3JcQtq7FckrMbNJSJIn+6deJp1ebuJL VoONVqGiJgYy+TzI+/0y3IJZBD70Lz72kcCFYP3XL4FpohSkmZqWwcdLHnE7tx7EPAaVdl /NppbiyFv6dMwa7wOsie9UzkefhJWbGKygMuVcH+8y+nsLS7k6IlkVC/0FKZoHxEgEcinr Mej8JznvfVmULCXc15ubCL/f6C0ws5yNperWOGx0sn5Om2vyr4inis8e8cl0VQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RRv2d531rz176V; Fri, 18 Aug 2023 07:41:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37I7fjcK065797; Fri, 18 Aug 2023 07:41:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37I7fjqU065794; Fri, 18 Aug 2023 07:41:45 GMT (envelope-from git) Date: Fri, 18 Aug 2023 07:41:45 GMT Message-Id: <202308180741.37I7fjqU065794@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Corvin =?utf-8?Q?K=C3=B6hne?= Subject: git: 6ae7ed9e3854 - stable/13 - bhyve: import OpRegion definitions List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: corvink X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 6ae7ed9e3854e92d776b650e12f54391432c6470 Auto-Submitted: auto-generated The branch stable/13 has been updated by corvink: URL: https://cgit.FreeBSD.org/src/commit/?id=6ae7ed9e3854e92d776b650e12f54391432c6470 commit 6ae7ed9e3854e92d776b650e12f54391432c6470 Author: Corvin Köhne AuthorDate: 2023-05-10 10:25:19 +0000 Commit: Corvin Köhne CommitDate: 2023-08-18 07:29:27 +0000 bhyve: import OpRegion definitions Those definitions are required for the GVT-d emulation to parse the OpRegion. Reviewed by: markj MFC after: 1 week Sponsored by: Beckhoff Automation GmbH & Co. KG Differential Revision: https://reviews.freebsd.org/D40037 (cherry picked from commit b67f0d360b87d6e8a71ab5118a8acb350505c20a) --- usr.sbin/bhyve/pci_gvt-d-opregion.h | 186 ++++++++++++++++++++++++++++++++++++ 1 file changed, 186 insertions(+) diff --git a/usr.sbin/bhyve/pci_gvt-d-opregion.h b/usr.sbin/bhyve/pci_gvt-d-opregion.h new file mode 100644 index 000000000000..f506f1449e48 --- /dev/null +++ b/usr.sbin/bhyve/pci_gvt-d-opregion.h @@ -0,0 +1,186 @@ +/** @file + IGD OpRegion definition from Intel Integrated Graphics Device OpRegion + Specification. + + https://01.org/sites/default/files/documentation/skl_opregion_rev0p5.pdf + + Copyright (c) 2016 - 2019, Intel Corporation. All rights reserved.
+ SPDX-License-Identifier: BSD-2-Clause-Patent + +**/ + +/* + * See + * + */ + +#pragma once + +#include + +#define IGD_OPREGION_HEADER_SIGN "IntelGraphicsMem" +#define IGD_OPREGION_HEADER_MBOX1 BIT0 +#define IGD_OPREGION_HEADER_MBOX2 BIT1 +#define IGD_OPREGION_HEADER_MBOX3 BIT2 +#define IGD_OPREGION_HEADER_MBOX4 BIT3 +#define IGD_OPREGION_HEADER_MBOX5 BIT4 + +#define IGD_OPREGION_VBT_SIZE_6K (6 * 1024UL) + +/** + OpRegion structures: + Sub-structures define the different parts of the OpRegion followed by the + main structure representing the entire OpRegion. + @note These structures are packed to 1 byte offsets because the exact + data location is required by the supporting design specification due to + the fact that the data is used by ASL and Graphics driver code compiled + separately. +**/ + +/// +/// OpRegion Mailbox 0 Header structure. The OpRegion Header is used to +/// identify a block of memory as the graphics driver OpRegion. +/// Offset 0x0, Size 0x100 +/// +struct igd_opregion_header { + int8_t sign[0x10]; ///< Offset 0x00 OpRegion Signature + uint32_t size; ///< Offset 0x10 OpRegion Size + uint32_t over; ///< Offset 0x14 OpRegion Structure Version + uint8_t sver[0x20]; ///< Offset 0x18 System BIOS Build Version + uint8_t vver[0x10]; ///< Offset 0x38 Video BIOS Build Version + uint8_t gver[0x10]; ///< Offset 0x48 Graphic Driver Build Version + uint32_t mbox; ///< Offset 0x58 Supported Mailboxes + uint32_t dmod; ///< Offset 0x5C Driver Model + uint32_t pcon; ///< Offset 0x60 Platform Configuration + int16_t dver[0x10]; ///< Offset 0x64 GOP Version + uint8_t rm01[0x7C]; ///< Offset 0x84 Reserved Must be zero +} __packed; + +/// +/// OpRegion Mailbox 1 - Public ACPI Methods +/// Offset 0x100, Size 0x100 +/// +struct igd_opregion_mbox1 { + uint32_t drdy; ///< Offset 0x100 Driver Readiness + uint32_t csts; ///< Offset 0x104 Status + uint32_t cevt; ///< Offset 0x108 Current Event + uint8_t rm11[0x14]; ///< Offset 0x10C Reserved Must be Zero + uint32_t didl[8]; ///< Offset 0x120 Supported Display Devices ID List + uint32_t + cpdl[8]; ///< Offset 0x140 Currently Attached Display Devices List + uint32_t + cadl[8]; ///< Offset 0x160 Currently Active Display Devices List + uint32_t nadl[8]; ///< Offset 0x180 Next Active Devices List + uint32_t aslp; ///< Offset 0x1A0 ASL Sleep Time Out + uint32_t tidx; ///< Offset 0x1A4 Toggle Table Index + uint32_t chpd; ///< Offset 0x1A8 Current Hotplug Enable Indicator + uint32_t clid; ///< Offset 0x1AC Current Lid State Indicator + uint32_t cdck; ///< Offset 0x1B0 Current Docking State Indicator + uint32_t sxsw; ///< Offset 0x1B4 Display Switch Notification on Sx + ///< StateResume + uint32_t evts; ///< Offset 0x1B8 Events supported by ASL + uint32_t cnot; ///< Offset 0x1BC Current OS Notification + uint32_t NRDY; ///< Offset 0x1C0 Driver Status + uint8_t did2[0x1C]; ///< Offset 0x1C4 Extended Supported Devices ID + ///< List(DOD) + uint8_t + cpd2[0x1C]; ///< Offset 0x1E0 Extended Attached Display Devices List + uint8_t rm12[4]; ///< Offset 0x1FC - 0x1FF Reserved Must be zero +} __packed; + +/// +/// OpRegion Mailbox 2 - Software SCI Interface +/// Offset 0x200, Size 0x100 +/// +struct igd_opregion_mbox2 { + uint32_t scic; ///< Offset 0x200 Software SCI Command / Status / Data + uint32_t parm; ///< Offset 0x204 Software SCI Parameters + uint32_t dslp; ///< Offset 0x208 Driver Sleep Time Out + uint8_t rm21[0xF4]; ///< Offset 0x20C - 0x2FF Reserved Must be zero +} __packed; + +/// +/// OpRegion Mailbox 3 - BIOS/Driver Notification - ASLE Support +/// Offset 0x300, Size 0x100 +/// +struct igd_opregion_mbox3 { + uint32_t ardy; ///< Offset 0x300 Driver Readiness + uint32_t aslc; ///< Offset 0x304 ASLE Interrupt Command / Status + uint32_t tche; ///< Offset 0x308 Technology Enabled Indicator + uint32_t alsi; ///< Offset 0x30C Current ALS Luminance Reading + uint32_t bclp; ///< Offset 0x310 Requested Backlight Brightness + uint32_t pfit; ///< Offset 0x314 Panel Fitting State or Request + uint32_t cblv; ///< Offset 0x318 Current Brightness Level + uint16_t bclm[0x14]; ///< Offset 0x31C Backlight Brightness Levels Duty + ///< Cycle Mapping Table + uint32_t cpfm; ///< Offset 0x344 Current Panel Fitting Mode + uint32_t epfm; ///< Offset 0x348 Enabled Panel Fitting Modes + uint8_t plut[0x4A]; ///< Offset 0x34C Panel Look Up Table & Identifier + uint32_t pfmb; ///< Offset 0x396 PWM Frequency and Minimum Brightness + uint32_t ccdv; ///< Offset 0x39A Color Correction Default Values + uint32_t pcft; ///< Offset 0x39E Power Conservation Features + uint32_t srot; ///< Offset 0x3A2 Supported Rotation Angles + uint32_t iuer; ///< Offset 0x3A6 Intel Ultrabook(TM) Event Register + uint64_t fdss; ///< Offset 0x3AA DSS Buffer address allocated for IFFS + ///< feature + uint32_t fdsp; ///< Offset 0x3B2 Size of DSS buffer + uint32_t stat; ///< Offset 0x3B6 State Indicator + uint64_t rvda; ///< Offset 0x3BA Absolute/Relative Address of Raw VBT + ///< Data from OpRegion Base + uint32_t rvds; ///< Offset 0x3C2 Raw VBT Data Size + uint8_t rsvd2[0x3A]; ///< Offset 0x3C6 - 0x3FF Reserved Must be zero. + ///< Bug in spec 0x45(69) +} __packed; + +/// +/// OpRegion Mailbox 4 - VBT Video BIOS Table +/// Offset 0x400, Size 0x1800 +/// +struct igd_opregion_mbox4 { + uint8_t rvbt[IGD_OPREGION_VBT_SIZE_6K]; ///< Offset 0x400 - 0x1BFF Raw + ///< VBT Data +} __packed; + +/// +/// OpRegion Mailbox 5 - BIOS/Driver Notification - Data storage BIOS to Driver +/// data sync Offset 0x1C00, Size 0x400 +/// +struct igd_opregion_mbox5 { + uint32_t phed; ///< Offset 0x1C00 Panel Header + uint8_t bddc[0x100]; ///< Offset 0x1C04 Panel EDID (DDC data) + uint8_t rm51[0x2FC]; ///< Offset 0x1D04 - 0x1FFF Reserved Must be zero +} __packed; + +/// +/// IGD OpRegion Structure +/// +struct igd_opregion { + struct igd_opregion_header + header; ///< OpRegion header (Offset 0x0, Size 0x100) + struct igd_opregion_mbox1 mbox1; ///< Mailbox 1: Public ACPI Methods + ///< (Offset 0x100, Size 0x100) + struct igd_opregion_mbox2 mbox2; ///< Mailbox 2: Software SCI Interface + ///< (Offset 0x200, Size 0x100) + struct igd_opregion_mbox3 + mbox3; ///< Mailbox 3: BIOS to Driver Notification (Offset 0x300, + ///< Size 0x100) + struct igd_opregion_mbox4 mbox4; ///< Mailbox 4: Video BIOS Table (VBT) + ///< (Offset 0x400, Size 0x1800) + struct igd_opregion_mbox5 + mbox5; ///< Mailbox 5: BIOS to Driver Notification Extension (Offset + ///< 0x1C00, Size 0x400) +} __packed; + +/// +/// VBT Header Structure +/// +struct vbt_header { + uint8_t product_string[20]; + uint16_t version; + uint16_t header_size; + uint16_t table_size; + uint8_t checksum; + uint8_t reserved1; + uint32_t bios_data_offset; + uint32_t aim_data_offset[4]; +} __packed; From nobody Fri Aug 18 07:41:46 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RRv2g0wSmz4qrNn; Fri, 18 Aug 2023 07:41:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RRv2f6yPmz3G6n; Fri, 18 Aug 2023 07:41:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692344507; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2HjHZHn1FfIFIfOKZq3WRXpUiPt/z7Nsdae3N/7PZNc=; b=iGwlbqRBCPCneISzxZouuD0k54X9iEiQjvAXef10AQDOPdw8c6DnfoISM9FrRvzwIXBGL/ AXcbxndAEGXv5V31yN/9SQKls934vzAy+JjHbgsylOHOcB/DnYzBRQLJ64dTrotA38MkPs MtybGs50OyLpS4lufTt3UKghrc/MALzkAC/0SLifvS9SzIgwD1qgGmKfZDCxI7MC9AE9zF UjqhLdMgdY8ZVn3+1WIthKlnoQ+2TLWwGKRv9bpDJgOlaVpvFz4ESwjzNZ3v8FDINJhbr5 M8xqWBFZEyjTq7wyEdbjoko1+YCrCBXsSE6u0UMhxjQccJDQ5oa2BL92TToGwA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692344507; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=2HjHZHn1FfIFIfOKZq3WRXpUiPt/z7Nsdae3N/7PZNc=; b=OEJyLAA2WL+CUwfw3ZmKI+Tt4OiYfXHBQV40E/6PIlr7NtSn+rPLT0x0Zw8HSObPluBH8W gjnXl+MoGVzMOwmB3EwW+p8ompoLidcA1YNyyXa5EfY3sM/MIV3uahgX4/UmW4RgARmoPF NvwIFZsPSHbbSgaJphDGT8A89pDcUDX61eAQPbdyxgZOtGEv1QVGSxziwNj/9JU2O7fJ69 BirxU/OPNpCr3YiBpy9cl3Ewcm+OwbmS1TZlQAgOTGFODgTOEqGu5+Xp7Rk9RZ90b0vvFv nrvQKtzHZtzq53jzyu980FpXruTG+KSO06oT2CozzsJlJn0KcWP6yF2A7PcHQQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692344507; a=rsa-sha256; cv=none; b=w1+p9pGoGuULma/yQcMFSwlGCNu2B2vV7LmHleDtRvjAVeSNUahqzZ+TXq7mv0qKguTzyg 7cdGINlszrsR5SBXZeyvpUS9T2nV6eYI6pRMP7IsuLlep6ez1RycNd223g1RkZdNigR92U nQzwyO8m7dFyg15ANEbsz4W3I3Vqdu4X4CTbMYzLtuwdrxqrfZsOC6kIZgHHJprcIXkfiy T6pTE8+ytyidZGlTFEAWY4w0K3wkET4ykbFXsRg3srW1mR/FZO1dCZuxbLY5nB2TK6PJIS W8t0JnNWCwi/EhoO4MxGPrJL7SEhZEhL6RBriHIjyAMkVmJMPEGBAmYLtJw+2Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RRv2f63HWz16tG; Fri, 18 Aug 2023 07:41:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37I7fkRM065842; Fri, 18 Aug 2023 07:41:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37I7fkYM065839; Fri, 18 Aug 2023 07:41:46 GMT (envelope-from git) Date: Fri, 18 Aug 2023 07:41:46 GMT Message-Id: <202308180741.37I7fkYM065839@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Corvin =?utf-8?Q?K=C3=B6hne?= Subject: git: 3b81aa26ab4c - stable/13 - bhyve: add empty GVT-d emulation List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: corvink X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 3b81aa26ab4c8fb360d25a6cd2fedc49cff67e51 Auto-Submitted: auto-generated The branch stable/13 has been updated by corvink: URL: https://cgit.FreeBSD.org/src/commit/?id=3b81aa26ab4c8fb360d25a6cd2fedc49cff67e51 commit 3b81aa26ab4c8fb360d25a6cd2fedc49cff67e51 Author: Corvin Köhne AuthorDate: 2023-05-10 10:31:50 +0000 Commit: Corvin Köhne CommitDate: 2023-08-18 07:32:05 +0000 bhyve: add empty GVT-d emulation Don't emulate anything yet. Just check if the user would like to pass an Intel GPU to the guest. Reviewed by: jhb, markj MFC after: 1 week Sponsored by: Beckhoff Automation GmbH & Co. KG Differential Revision: https://reviews.freebsd.org/D40038 (cherry picked from commit 90c3a1b6629c80a7e4c3fa86d6b794596fdf06b4) --- usr.sbin/bhyve/Makefile | 1 + usr.sbin/bhyve/pci_gvt-d.c | 55 +++++++++++++++++++++++++++++++++++++++++++ usr.sbin/bhyve/pci_passthru.c | 22 ++++++++++++++++- usr.sbin/bhyve/pci_passthru.h | 10 ++++++++ 4 files changed, 87 insertions(+), 1 deletion(-) diff --git a/usr.sbin/bhyve/Makefile b/usr.sbin/bhyve/Makefile index c2b426359c22..2f282567eb87 100644 --- a/usr.sbin/bhyve/Makefile +++ b/usr.sbin/bhyve/Makefile @@ -45,6 +45,7 @@ SRCS= \ pci_emul.c \ pci_hda.c \ pci_fbuf.c \ + pci_gvt-d.c \ pci_hostbridge.c \ pci_irq.c \ pci_lpc.c \ diff --git a/usr.sbin/bhyve/pci_gvt-d.c b/usr.sbin/bhyve/pci_gvt-d.c new file mode 100644 index 000000000000..767b8ee3127f --- /dev/null +++ b/usr.sbin/bhyve/pci_gvt-d.c @@ -0,0 +1,55 @@ +/*- + * SPDX-License-Identifier: BSD-2-Clause + * + * Copyright (c) 2020 Beckhoff Automation GmbH & Co. KG + * Author: Corvin Köhne + */ + +#include + +#include + +#include + +#include "pci_gvt-d-opregion.h" +#include "pci_passthru.h" + +#define PCI_VENDOR_INTEL 0x8086 + +static int +gvt_d_probe(struct pci_devinst *const pi) +{ + struct passthru_softc *sc; + uint16_t vendor; + uint8_t class; + + sc = pi->pi_arg; + + vendor = read_config(passthru_get_sel(sc), PCIR_VENDOR, 0x02); + if (vendor != PCI_VENDOR_INTEL) + return (ENXIO); + + class = read_config(passthru_get_sel(sc), PCIR_CLASS, 0x01); + if (class != PCIC_DISPLAY) + return (ENXIO); + + return (0); +} + +static int +gvt_d_init(struct pci_devinst *const pi __unused, nvlist_t *const nvl __unused) +{ + return (0); +} + +static void +gvt_d_deinit(struct pci_devinst *const pi __unused) +{ +} + +static struct passthru_dev gvt_d_dev = { + .probe = gvt_d_probe, + .init = gvt_d_init, + .deinit = gvt_d_deinit, +}; +PASSTHRU_DEV_SET(gvt_d_dev); diff --git a/usr.sbin/bhyve/pci_passthru.c b/usr.sbin/bhyve/pci_passthru.c index d6978a1be822..793fe3762530 100644 --- a/usr.sbin/bhyve/pci_passthru.c +++ b/usr.sbin/bhyve/pci_passthru.c @@ -64,7 +64,6 @@ __FBSDID("$FreeBSD$"); #include -#include "config.h" #include "debug.h" #include "mem.h" #include "pci_passthru.h" @@ -82,6 +81,8 @@ __FBSDID("$FreeBSD$"); static int pcifd = -1; +SET_DECLARE(passthru_dev_set, struct passthru_dev); + struct passthru_softc { struct pci_devinst *psc_pi; /* ROM is handled like a BAR */ @@ -856,6 +857,8 @@ passthru_init(struct pci_devinst *pi, nvlist_t *nvl) { int bus, slot, func, error, memflags; struct passthru_softc *sc; + struct passthru_dev **devpp; + struct passthru_dev *devp, *dev = NULL; const char *value; sc = NULL; @@ -919,9 +922,26 @@ passthru_init(struct pci_devinst *pi, nvlist_t *nvl) if ((error = set_pcir_handler(sc, PCIR_COMMAND, 0x04, NULL, NULL)) != 0) goto done; + SET_FOREACH(devpp, passthru_dev_set) { + devp = *devpp; + assert(devp->probe != NULL); + if (devp->probe(pi) == 0) { + dev = devp; + break; + } + } + + if (dev != NULL) { + error = dev->init(pi, nvl); + if (error != 0) + goto done; + } + error = 0; /* success */ done: if (error) { + if (dev != NULL) + dev->deinit(pi); free(sc); vm_unassign_pptdev(pi->pi_vmctx, bus, slot, func); } diff --git a/usr.sbin/bhyve/pci_passthru.h b/usr.sbin/bhyve/pci_passthru.h index 7ce12a27bba4..49d2bb309f71 100644 --- a/usr.sbin/bhyve/pci_passthru.h +++ b/usr.sbin/bhyve/pci_passthru.h @@ -7,8 +7,11 @@ #pragma once +#include + #include +#include "config.h" #include "pci_emul.h" struct passthru_mmio_mapping { @@ -21,6 +24,13 @@ struct passthru_mmio_mapping { struct passthru_softc; +struct passthru_dev { + int (*probe)(struct pci_devinst *pi); + int (*init)(struct pci_devinst *pi, nvlist_t *nvl); + void (*deinit)(struct pci_devinst *pi); +}; +#define PASSTHRU_DEV_SET(x) DATA_SET(passthru_dev_set, x) + typedef int (*cfgread_handler)(struct passthru_softc *sc, struct pci_devinst *pi, int coff, int bytes, uint32_t *rv); typedef int (*cfgwrite_handler)(struct passthru_softc *sc, From nobody Fri Aug 18 07:41:47 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RRv2h2Bfdz4qrXp; Fri, 18 Aug 2023 07:41:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RRv2h0gP8z3G2c; Fri, 18 Aug 2023 07:41:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692344508; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=DXcT1ky1AAwKgPOSoDpEQKq31hGqMA7uiP8jebZb8Yw=; b=qM/Qt9KMCDc7r/mX6DbN+j8WdFO8b9qVt7rsAlTWC/fdxS5JSK9mpafZKEiQnngWnQBQhI 4QRl2+sTk7LtT3m/MFczTn9QTVHGZ+Y64IfRKE8lQRtwd68tvKsJpFyUo+RFgaRnHTp6yV PwApienxv4EA/j9dVECt6gQTN0aof6ZazaSbBUa9HX4/8xgh2kCR5DMUIkVPic8z57g/UB /olYrDTcOBJDFCakj69NVfplPZ5KYngj1lTzlYPZV+nlnsrGwikKZF2TyNzbz66ZtrkoCE TnLrF3H/fkLQlgZsuLLgrOueBAMjIFyK9UQKSZ9kG8PB0ZpezSPv4S7F+gKJoQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692344508; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=DXcT1ky1AAwKgPOSoDpEQKq31hGqMA7uiP8jebZb8Yw=; b=HkOWWDFlr9qW4FK5X7+dlsLohDUS0w5jSICY5gCn7CseavVINXJu5hRz1ymWL4MSEu/cwS 7G2BFgsJYuVZBTgiqkyglxNcmNd5gwTj2n+952u/oyja9YSvWZ/IdqJw5EgGHT4y7Wiq5B FomJwT7Y/oS8fc8qktQ4Fjlv0PfBuux5DYgT+yIZutQIZ8OIOP9z4xRBColHJh1C8GRzsj beFofZCGAyJve/CPYjMKx0KbYeIYMGyhWxVzxLE8hunQGcWIJQ2N7vzZXQMIYy7S1yEZdr dRAd278iSQPxev4CHMzbRz7sR/jB55lgmZOXS7GqJWmFXRLTOutP5nK/yXSsMQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692344508; a=rsa-sha256; cv=none; b=C0phaawJDG4Br7oEkseeu/6n4qUEWO10Xrtm0tySUApMIkhhgBVx3khrcJU1bcV3gN7cu9 u4HSGD3WrtbD2PkWJQgAfHkZr4rAIB/RxtU14Q1wWI6VBjjSFuRSflng4Ip+T0AaygVKvh 6cJTMO4oLeivuvFAOK+ELjwdTRKpsJ8P/1nMzuw6FClk+sbWoUCsnOa2ZcMqhDADHT7Z3b 2uvMWV+FwafrMbEkuBGLLhCc/ccEwYAmG1i6g8f4R139nMfyjvcVIfNeIbtun3LuFMoOvG e0YrFWqCPVknbmGdgs0GZl0kVcZKBG6l72rtsMI2Q+4quPVwdmXTT/Qzg2mfng== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RRv2g6rfcz174m; Fri, 18 Aug 2023 07:41:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37I7flgd066506; Fri, 18 Aug 2023 07:41:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37I7flI6066501; Fri, 18 Aug 2023 07:41:47 GMT (envelope-from git) Date: Fri, 18 Aug 2023 07:41:47 GMT Message-Id: <202308180741.37I7flI6066501@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Corvin =?utf-8?Q?K=C3=B6hne?= Subject: git: 13a371bcdfdd - stable/13 - bhyve: read out graphics stolen memory address and size List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: corvink X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 13a371bcdfdde22344f01fbbb04e713c27424c32 Auto-Submitted: auto-generated The branch stable/13 has been updated by corvink: URL: https://cgit.FreeBSD.org/src/commit/?id=13a371bcdfdde22344f01fbbb04e713c27424c32 commit 13a371bcdfdde22344f01fbbb04e713c27424c32 Author: Corvin Köhne AuthorDate: 2023-05-11 08:53:15 +0000 Commit: Corvin Köhne CommitDate: 2023-08-18 07:32:07 +0000 bhyve: read out graphics stolen memory address and size This is the first step to emulate the graphics stolen memory register. Note that the graphics stolen memory is somehow confusing. On the one hand the Intel Open Source HD Graphics Programmers' Reference Manual states that it's only GPU accessible. As the CPU can't access the area, the guest shouldn't need it. On the other hand, the Intel GOP driver refuses to work properly, if it's not set to a proper address. Intel itself maps it into the guest by EPT [1]. At the moment, we're not aware of any situation where this EPT mapping is required, so we don't do it yet. Intel also states that the Windows driver for Tiger Lake reads the address of the graphics stolen memory [2]. As the GVT-d code doesn't support Tiger Lake in its first implementation, we can't check how it behaves. We should keep an eye on it. [1] https://github.com/projectacrn/acrn-hypervisor/blob/e28d6fbfdfd556ff1bc3ff330e41d4ddbaa0f897/devicemodel/hw/pci/passthrough.c#L655-L657 [2] https://github.com/projectacrn/acrn-hypervisor/blob/e28d6fbfdfd556ff1bc3ff330e41d4ddbaa0f897/devicemodel/hw/pci/passthrough.c#L626-L629 Reviewed by: markj MFC after: 1 week Sponsored by: Beckhoff Automation GmbH & Co. KG Differential Revision: https://reviews.freebsd.org/D40039 (cherry picked from commit 4a9bf50f408eb9f1acc220dba2b260ec610fd15b) --- usr.sbin/bhyve/pci_gvt-d.c | 73 +++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 72 insertions(+), 1 deletion(-) diff --git a/usr.sbin/bhyve/pci_gvt-d.c b/usr.sbin/bhyve/pci_gvt-d.c index 767b8ee3127f..0be740921c92 100644 --- a/usr.sbin/bhyve/pci_gvt-d.c +++ b/usr.sbin/bhyve/pci_gvt-d.c @@ -6,6 +6,9 @@ */ #include +#include + +#include #include @@ -16,6 +19,8 @@ #define PCI_VENDOR_INTEL 0x8086 +#define GVT_D_MAP_GSM 0 + static int gvt_d_probe(struct pci_devinst *const pi) { @@ -36,12 +41,78 @@ gvt_d_probe(struct pci_devinst *const pi) return (0); } +/* + * Note that the graphics stolen memory is somehow confusing. On the one hand + * the Intel Open Source HD Graphics Programmers' Reference Manual states that + * it's only GPU accessible. As the CPU can't access the area, the guest + * shouldn't need it. On the other hand, the Intel GOP driver refuses to work + * properly, if it's not set to a proper address. + * + * Intel itself maps it into the guest by EPT [1]. At the moment, we're not + * aware of any situation where this EPT mapping is required, so we don't do it + * yet. + * + * Intel also states that the Windows driver for Tiger Lake reads the address of + * the graphics stolen memory [2]. As the GVT-d code doesn't support Tiger Lake + * in its first implementation, we can't check how it behaves. We should keep an + * eye on it. + * + * [1] + * https://github.com/projectacrn/acrn-hypervisor/blob/e28d6fbfdfd556ff1bc3ff330e41d4ddbaa0f897/devicemodel/hw/pci/passthrough.c#L655-L657 + * [2] + * https://github.com/projectacrn/acrn-hypervisor/blob/e28d6fbfdfd556ff1bc3ff330e41d4ddbaa0f897/devicemodel/hw/pci/passthrough.c#L626-L629 + */ static int -gvt_d_init(struct pci_devinst *const pi __unused, nvlist_t *const nvl __unused) +gvt_d_setup_gsm(struct pci_devinst *const pi) { + struct passthru_softc *sc; + struct passthru_mmio_mapping *gsm; + size_t sysctl_len; + int error; + + sc = pi->pi_arg; + + gsm = passthru_get_mmio(sc, GVT_D_MAP_GSM); + if (gsm == NULL) { + warnx("%s: Unable to access gsm", __func__); + return (-1); + } + + sysctl_len = sizeof(gsm->hpa); + error = sysctlbyname("hw.intel_graphics_stolen_base", &gsm->hpa, + &sysctl_len, NULL, 0); + if (error) { + warn("%s: Unable to get graphics stolen memory base", + __func__); + return (-1); + } + sysctl_len = sizeof(gsm->len); + error = sysctlbyname("hw.intel_graphics_stolen_size", &gsm->len, + &sysctl_len, NULL, 0); + if (error) { + warn("%s: Unable to get graphics stolen memory length", + __func__); + return (-1); + } + gsm->hva = NULL; /* unused */ + return (0); } +static int +gvt_d_init(struct pci_devinst *const pi, nvlist_t *const nvl __unused) +{ + int error; + + if ((error = gvt_d_setup_gsm(pi)) != 0) { + warnx("%s: Unable to setup Graphics Stolen Memory", __func__); + goto done; + } + +done: + return (error); +} + static void gvt_d_deinit(struct pci_devinst *const pi __unused) { From nobody Fri Aug 18 07:41:49 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RRv2j3jTsz4qrFc; Fri, 18 Aug 2023 07:41: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RRv2j28Nzz3G7q; Fri, 18 Aug 2023 07:41:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692344509; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/+mkzK61223kZRJvmZqq/HdmSXHVJlhtXHUIe9ZTfRg=; b=GmeLiIxAt2EVQZPsIA2t1al1/gtR+Oxx2NYZYSm6orM5NCqhsX9lcbYurXTZb6mUjhIwc8 1MB0svYoeNw05HEXciFulWlNI3ncA09wY4CGfOmOs7VjT8JWaSLu5nsAv5ViGOciVuAmPT 18rnE3jZuLQ6MFSdJXQQu2cBtgGfvr2GGwhJruQDOloWINdpeXkP5Ufw/cDH0ovGA8AhCM nlshikUrrQCBBU+lD7kdg8mZMUXjsvgRmxBRDkb6vhxVhZL2iYP/h5RVjMIOeAaUWQ4HFm JX+w97pwrFrWaU9VtxFWnd+Ee+kwqLjyBjtvzqdzgDlP9RViR2CpUiw05iVgLw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692344509; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/+mkzK61223kZRJvmZqq/HdmSXHVJlhtXHUIe9ZTfRg=; b=NTHwVOjWkhZHsDs7Jfr4cQI8bHm4c6sc/XU/7h3WN1qAiZ90XTpKtR61FYnVYSrfrUQDxV Kwkirk8j9f/6CZKg4MKV6TqbCX8f3E7A1Y3hNaNs/ftSMPUWSN0asbTBsXX73EzLHSaBLP DoqAR3O6ucoJ2fabN9a8lcwZ5cjq1wKxu5kpXWYpxQSgRZ8Z1Oj3ICthR/guyU8hUiTBCv bpsFMC/7SgBtiAoDliV0EmCC4+djoY9X8G1h9Y3bZO+ftSaULLdYFJbhEqINu9k6v7oVNZ hL8GvINiXQUgFAsl/+cAiQRCeC8pfkWZFqDM0zBmKogoop21Dk1oJkF6lPMx5A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692344509; a=rsa-sha256; cv=none; b=eTiwW69d+BhbMaw1tdA4FkxuI+Wvh6KQPpWWsttG/3Awi4hgi0E6tCc7IfMTc3yBdTRJ6b perhthTRoe70PQpRy9MVSz0qj5YKy46dKnXpfCHCtmI3nJ0GZyBJYXkYvaPrAq45hoQWk9 2KJMdxYhEB1CXsFy08LUGXIHlk6Ws2Ug6iB70HoDiA3/8T2IyV1Iwr8/Waw3/ZjUg2NqOR BPXkb9zq+7zdX+zTZD203ybccTUoS6h6JN1HHpPv+7rlgkpvv6TLk2ftS/dDG93B9Im+lh zzOnYCzHRwaUDsslRCQcA1oJPOk6izF0jtpZ/Y2poSgd01pQkkJx0HLioqDyzw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RRv2j0ybfz16wF; Fri, 18 Aug 2023 07:41:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37I7fnOt066782; Fri, 18 Aug 2023 07:41:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37I7fnmO066779; Fri, 18 Aug 2023 07:41:49 GMT (envelope-from git) Date: Fri, 18 Aug 2023 07:41:49 GMT Message-Id: <202308180741.37I7fnmO066779@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Corvin =?utf-8?Q?K=C3=B6hne?= Subject: git: aa598e677a7c - stable/13 - bhyve: allocate guest memory for graphics stolen memory List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: corvink X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: aa598e677a7c3e6cf8e8524e9e8015df9c28a9f9 Auto-Submitted: auto-generated The branch stable/13 has been updated by corvink: URL: https://cgit.FreeBSD.org/src/commit/?id=aa598e677a7c3e6cf8e8524e9e8015df9c28a9f9 commit aa598e677a7c3e6cf8e8524e9e8015df9c28a9f9 Author: Corvin Köhne AuthorDate: 2023-05-11 09:10:07 +0000 Commit: Corvin Köhne CommitDate: 2023-08-18 07:32:07 +0000 bhyve: allocate guest memory for graphics stolen memory The graphics stolen memory is only GPU accessible. So, we don't have to copy any data to it as the guest will be unable to access it anyway. We just have to allocate and reserve some memory. That's done by adding an E820 entry for the graphics stolen memory. The guest firmware will pick up the E820 and reserve this range. Note that we try to reuse the host address as Intel states that newer Tiger Lake platforms need this [1]. [1] https://github.com/projectacrn/acrn-hypervisor/blob/e28d6fbfdfd556ff1bc3ff330e41d4ddbaa0f897/devicemodel/hw/pci/passthrough.c#L626-L629 Reviewed by: markj MFC after: 1 week Sponsored by: Beckhoff Automation GmbH & Co. KG Differential Revision: https://reviews.freebsd.org/D40059 (cherry picked from commit 1bd361eea28ae74b42d49bfc96b109a7eae9f3d3) --- usr.sbin/bhyve/pci_gvt-d.c | 64 ++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 62 insertions(+), 2 deletions(-) diff --git a/usr.sbin/bhyve/pci_gvt-d.c b/usr.sbin/bhyve/pci_gvt-d.c index 0be740921c92..9c5b0906ec29 100644 --- a/usr.sbin/bhyve/pci_gvt-d.c +++ b/usr.sbin/bhyve/pci_gvt-d.c @@ -8,17 +8,24 @@ #include #include -#include - #include +#include #include +#include "e820.h" #include "pci_gvt-d-opregion.h" #include "pci_passthru.h" +#define KB (1024UL) +#define MB (1024 * KB) +#define GB (1024 * MB) + #define PCI_VENDOR_INTEL 0x8086 +#define PCIM_BDSM_GSM_ALIGNMENT \ + 0x00100000 /* Graphics Stolen Memory is 1 MB aligned */ + #define GVT_D_MAP_GSM 0 static int @@ -41,6 +48,27 @@ gvt_d_probe(struct pci_devinst *const pi) return (0); } +static vm_paddr_t +gvt_d_alloc_mmio_memory(const vm_paddr_t host_address, const vm_paddr_t length, + const vm_paddr_t alignment, const enum e820_memory_type type) +{ + vm_paddr_t address; + + /* Try to reuse host address. */ + address = e820_alloc(host_address, length, E820_ALIGNMENT_NONE, type, + E820_ALLOCATE_SPECIFIC); + if (address != 0) { + return (address); + } + + /* + * We're not able to reuse the host address. Fall back to the highest usable + * address below 4 GB. + */ + return ( + e820_alloc(4 * GB, length, alignment, type, E820_ALLOCATE_HIGHEST)); +} + /* * Note that the graphics stolen memory is somehow confusing. On the one hand * the Intel Open Source HD Graphics Programmers' Reference Manual states that @@ -95,6 +123,38 @@ gvt_d_setup_gsm(struct pci_devinst *const pi) return (-1); } gsm->hva = NULL; /* unused */ + gsm->gva = NULL; /* unused */ + gsm->gpa = gvt_d_alloc_mmio_memory(gsm->hpa, gsm->len, + PCIM_BDSM_GSM_ALIGNMENT, E820_TYPE_RESERVED); + if (gsm->gpa == 0) { + warnx( + "%s: Unable to add Graphics Stolen Memory to E820 table (hpa 0x%lx len 0x%lx)", + __func__, gsm->hpa, gsm->len); + e820_dump_table(); + return (-1); + } + if (gsm->gpa != gsm->hpa) { + /* + * ACRN source code implies that graphics driver for newer Intel + * platforms like Tiger Lake will read the Graphics Stolen Memory + * address from an MMIO register. We have three options to solve this + * issue: + * 1. Patch the value in the MMIO register + * This could have unintended side effects. Without any + * documentation how this register is used by the GPU, don't do + * it. + * 2. Trap the MMIO register + * It's not possible to trap a single MMIO register. We need to + * trap a whole page. Trapping a bunch of MMIO register could + * degrade the performance noticeably. We have to test it. + * 3. Use an 1:1 host to guest mapping + * Maybe not always possible. As far as we know, no supported + * platform requires a 1:1 mapping. For that reason, just log a + * warning. + */ + warnx( + "Warning: Unable to reuse host address of Graphics Stolen Memory. GPU passthrough might not work properly."); + } return (0); } From nobody Fri Aug 18 07:41:50 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RRv2k6zWPz4qrZ8; Fri, 18 Aug 2023 07:41:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RRv2k37Bmz3G3B; Fri, 18 Aug 2023 07:41:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692344510; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ODmjbrFXg+j7arGU2KxCNzzbYP7xKrGi5i/P0kxsmyI=; b=l8btvmPuPLuPU7fCIBWuk99sc9YarsJAV7LyIrh2xIJbQPPyDQEBuWOz/di5Y5H+zE1wL9 xeSzabOS8FB7eYzNF1jftUfXSPkl9Re8lyI5H+QCTe6N8Yn0/JzEoaNYSChI7qCXqdAl/i IYI6ltEBdA1obzAi8vB0tGatbsOEQCTG/OQsGF/JQTKM6EzVsAtkTUiOpPd9pABH8A0Dbf mRdSmKtm+17G1wtyCynWWAFv5lvFKTdkf5BGl7jtozA8BsVanXysHIPudg4daqzR3BowNj 8xy9odeqt4pxzvG66fdAtRQUqGBVFT1MonFoC5P5hNZBBP3P3bg+kkF4WcX0/g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692344510; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ODmjbrFXg+j7arGU2KxCNzzbYP7xKrGi5i/P0kxsmyI=; b=Rr+xF0EFIiahipc0BPiMhQdr7JklnbgBYiZYuEdFMAijNS7qhmP695oymiZvXLu4sc0RwV KO9x8KCpQyJoGW513Qt4gWkieY8OG3wIfSSxGqugSN7rsKkmMa+oQVmdLni3CFH/CQeSA2 8ptbtYKgs4l4k32+cGma5TmyG7kGcY+72JC+U6EQqN7c8y4soFj5ZO/4FSmiGmfTFx5u4C 72IerrCtyKPLn1mvJy9aendmAwAqWrwBmSE85mJ1ZzOF9c1xJKYmMIn7+BDo2094p0jZps rlC1+wIVuSEperptO9I+OFYRXEvU3KWPbxDA/fe7A3xsqYaQyCbHRR3rfsYH8g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692344510; a=rsa-sha256; cv=none; b=wpk4BtRQYF6NmQ2QIQZieD7d1SIWZ/1aXWk1Rfr4fPoSbgQziNud4zqF8FQ4Tc6Y/q3gPf msi8YRIYWynQZOEvYynQezASS/u11hyOFT0Gi2fGz0XQay1McdZFMsLYUa8vUuwrk2IrTk +/GgTKwr85c6wcPWQMq8Hwd9kmqcG/GU1yAOlIIB9cviPz9Mrf7bNQZKZV291feYZjksfN Gdv2OXG5YRgqL6yWt7DsFKapHd5e+zbB7OT/QBUrVtAbnGc/DyYjJBn5F27REQjuzzKveR MnAMiiGf9MBGNImPjIJTGT8DlwLiUYv2NgOF+fdm6aaQCGXUneE8zDLFy8j+2w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RRv2k1zCCz174n; Fri, 18 Aug 2023 07:41:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37I7foTA066830; Fri, 18 Aug 2023 07:41:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37I7fo81066827; Fri, 18 Aug 2023 07:41:50 GMT (envelope-from git) Date: Fri, 18 Aug 2023 07:41:50 GMT Message-Id: <202308180741.37I7fo81066827@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Corvin =?utf-8?Q?K=C3=B6hne?= Subject: git: 6d037b69ee62 - stable/13 - bhyve: emulate graphics stolen memory register List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: corvink X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 6d037b69ee623ffee05864d6f01712c875409be0 Auto-Submitted: auto-generated The branch stable/13 has been updated by corvink: URL: https://cgit.FreeBSD.org/src/commit/?id=6d037b69ee623ffee05864d6f01712c875409be0 commit 6d037b69ee623ffee05864d6f01712c875409be0 Author: Corvin Köhne AuthorDate: 2023-05-11 09:18:56 +0000 Commit: Corvin Köhne CommitDate: 2023-08-18 07:32:07 +0000 bhyve: emulate graphics stolen memory register This register contains a host physical address. This address is meaningless for the guest. We have to emulate it and set it to a valid guest physical address. Reviewed by: markj MFC after: 1 week Sponsored by: Beckhoff Automation GmbH & Co. KG Differential Revision: https://reviews.freebsd.org/D40060 (cherry picked from commit d9fa7c113df254b237e5a573d0567eb686e5fcde) --- usr.sbin/bhyve/pci_gvt-d.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/usr.sbin/bhyve/pci_gvt-d.c b/usr.sbin/bhyve/pci_gvt-d.c index 9c5b0906ec29..3109bc06be82 100644 --- a/usr.sbin/bhyve/pci_gvt-d.c +++ b/usr.sbin/bhyve/pci_gvt-d.c @@ -23,6 +23,8 @@ #define PCI_VENDOR_INTEL 0x8086 +#define PCIR_BDSM 0x5C /* Base of Data Stolen Memory register */ + #define PCIM_BDSM_GSM_ALIGNMENT \ 0x00100000 /* Graphics Stolen Memory is 1 MB aligned */ @@ -96,6 +98,7 @@ gvt_d_setup_gsm(struct pci_devinst *const pi) struct passthru_softc *sc; struct passthru_mmio_mapping *gsm; size_t sysctl_len; + uint32_t bdsm; int error; sc = pi->pi_arg; @@ -156,7 +159,12 @@ gvt_d_setup_gsm(struct pci_devinst *const pi) "Warning: Unable to reuse host address of Graphics Stolen Memory. GPU passthrough might not work properly."); } - return (0); + bdsm = read_config(passthru_get_sel(sc), PCIR_BDSM, 4); + pci_set_cfgdata32(pi, PCIR_BDSM, + gsm->gpa | (bdsm & (PCIM_BDSM_GSM_ALIGNMENT - 1))); + + return (set_pcir_handler(sc, PCIR_BDSM, 4, passthru_cfgread_emulate, + passthru_cfgwrite_emulate)); } static int From nobody Fri Aug 18 07:41:51 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RRv2m1Y7mz4qrLc; Fri, 18 Aug 2023 07:41: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RRv2l40gfz3GMg; Fri, 18 Aug 2023 07:41:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692344511; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1mLJ5QA3CNtmW8X5IBB+lWX2j0pSJdB4jQc+2SQMhX8=; b=X7N6xr7Nrd14qgLP/3jzqikmEqcKmbyBecYeOZpL6F8phk6Ncoq137PP3J6WcYxgghuNs1 UpKIHAjV+Y+Mc+YXAalD+l2GpWQcBwE+NmDVmvgHhaBHHAfbfPeaDT6Mv+glU14SeHbh2x z1zmQkSBGGmhNpIGCLOyQbh6ixcBg4LWBwze+gtj7jStHT89bNxn9psaasVtncFdsViIWf /oiz4zkGi5HqDQg+vf0XaAt1aFqmeaFmZH2UBAa7ofzeDtsLRETZ5pailFMr9VvkDGNR0e MohG6QwKI9dYSyJfTf6oZD//qiA3YWDSQq6vevDpnbIWba9QQvdn7Q4+nfvnzw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692344511; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=1mLJ5QA3CNtmW8X5IBB+lWX2j0pSJdB4jQc+2SQMhX8=; b=uB35uZRLB4X7w3ytd//6tt109ei3zUBCDqH+oTQQ8g/G3LKyyIuiz5GCJGAtx48by+2boT lv0LrIdZQVi4+cphiJYjKmKOrahp//b36fskB1TuUqGXgZPT9fytm4CwEZkyPY2skEvo1n zQIXCc5kc7nvy+zZYSchUnDpCBjFb1/IJZSwIraBBgdGhQ1UxqE8C47AXZOogfMTIXvs4x Tjf0uru5A+5GrWQOqBDB4qz5F//ZmYrDOENPLZhc+m/jgx/84CPThBC0lKVwqRzEZhg7yD 0ISW9ZimJDn1x4CnEORH4vRKFtkxdqd+/c5q5eGmr3wcFjDcKb4/yH/65Li4bQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692344511; a=rsa-sha256; cv=none; b=Eu1tchNMrtpuJWYhaoCO0/HPO5zl1PPYaosQWaC0589tWjcMjLWoXBxMzuONMxqigfyslo gJSdCfY4xl5UqKnwJO+ewjr7mUFwmje6BLyL2ryT4UL5MVDGMO8NNnbLAjVNTLax7iVAY0 HIBEKVWAfN2zpafEPlWXmYfdruxvoOgFTNBaWeDqLiPhIBkR8MqfbPDp0efQTbnfE89VTH 1CN4ErWkmMjmh/ACxzIGusRcE99G9lMy+K2LzI3EZTnQWGkF9yAMavPmr3gS9uZAgIvPHa tGPSBH2V/W/t+SwPxkz+P6uf77PlFVM/Cdj8K24dh9xuS4AQemlcuAPdKqLQog== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RRv2l2mDtz179M; Fri, 18 Aug 2023 07:41:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37I7fpSv066884; Fri, 18 Aug 2023 07:41:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37I7fp9S066881; Fri, 18 Aug 2023 07:41:51 GMT (envelope-from git) Date: Fri, 18 Aug 2023 07:41:51 GMT Message-Id: <202308180741.37I7fp9S066881@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Corvin =?utf-8?Q?K=C3=B6hne?= Subject: git: b260e413b4b7 - stable/13 - bhyve: read OpRegion address and size for GVT-d List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: corvink X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: b260e413b4b7053e4c7a4521e4e9823bb01515be Auto-Submitted: auto-generated The branch stable/13 has been updated by corvink: URL: https://cgit.FreeBSD.org/src/commit/?id=b260e413b4b7053e4c7a4521e4e9823bb01515be commit b260e413b4b7053e4c7a4521e4e9823bb01515be Author: Corvin Köhne AuthorDate: 2023-05-10 11:38:02 +0000 Commit: Corvin Köhne CommitDate: 2023-08-18 07:32:07 +0000 bhyve: read OpRegion address and size for GVT-d The OpRegion provides some configuration bits and ACPI methods used by some Intel drivers. The guest needs access to it. In the first step, we're reading it's address and size. Reviewed by: jhb MFC after: 1 week Sponsored by: Beckhoff Automation GmbH & Co. KG Differential Revision: https://reviews.freebsd.org/D40040 (cherry picked from commit 6952b9d25e18fd3a4bf0d1bb7d6b44ff6edf6737) --- usr.sbin/bhyve/pci_gvt-d.c | 67 +++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 66 insertions(+), 1 deletion(-) diff --git a/usr.sbin/bhyve/pci_gvt-d.c b/usr.sbin/bhyve/pci_gvt-d.c index 3109bc06be82..fd3b48c3e5b7 100644 --- a/usr.sbin/bhyve/pci_gvt-d.c +++ b/usr.sbin/bhyve/pci_gvt-d.c @@ -6,12 +6,16 @@ */ #include +#include #include #include #include #include +#include +#include +#include #include "e820.h" #include "pci_gvt-d-opregion.h" @@ -21,14 +25,20 @@ #define MB (1024 * KB) #define GB (1024 * MB) +#ifndef _PATH_MEM +#define _PATH_MEM "/dev/mem" +#endif + #define PCI_VENDOR_INTEL 0x8086 -#define PCIR_BDSM 0x5C /* Base of Data Stolen Memory register */ +#define PCIR_BDSM 0x5C /* Base of Data Stolen Memory register */ +#define PCIR_ASLS_CTL 0xFC /* Opregion start address register */ #define PCIM_BDSM_GSM_ALIGNMENT \ 0x00100000 /* Graphics Stolen Memory is 1 MB aligned */ #define GVT_D_MAP_GSM 0 +#define GVT_D_MAP_OPREGION 1 static int gvt_d_probe(struct pci_devinst *const pi) @@ -167,6 +177,56 @@ gvt_d_setup_gsm(struct pci_devinst *const pi) passthru_cfgwrite_emulate)); } +static int +gvt_d_setup_opregion(struct pci_devinst *const pi) +{ + struct passthru_softc *sc; + struct passthru_mmio_mapping *opregion; + struct igd_opregion_header *header; + uint64_t asls; + int memfd; + + sc = pi->pi_arg; + + memfd = open(_PATH_MEM, O_RDONLY, 0); + if (memfd < 0) { + warn("%s: Failed to open %s", __func__, _PATH_MEM); + return (-1); + } + + opregion = passthru_get_mmio(sc, GVT_D_MAP_OPREGION); + if (opregion == NULL) { + warnx("%s: Unable to access opregion", __func__); + close(memfd); + return (-1); + } + + asls = read_config(passthru_get_sel(sc), PCIR_ASLS_CTL, 4); + + header = mmap(NULL, sizeof(*header), PROT_READ, MAP_SHARED, memfd, + asls); + if (header == MAP_FAILED) { + warn("%s: Unable to map OpRegion header", __func__); + close(memfd); + return (-1); + } + if (memcmp(header->sign, IGD_OPREGION_HEADER_SIGN, + sizeof(header->sign)) != 0) { + warnx("%s: Invalid OpRegion signature", __func__); + munmap(header, sizeof(*header)); + close(memfd); + return (-1); + } + + opregion->hpa = asls; + opregion->len = header->size * KB; + munmap(header, sizeof(header)); + + close(memfd); + + return (0); +} + static int gvt_d_init(struct pci_devinst *const pi, nvlist_t *const nvl __unused) { @@ -177,6 +237,11 @@ gvt_d_init(struct pci_devinst *const pi, nvlist_t *const nvl __unused) goto done; } + if ((error = gvt_d_setup_opregion(pi)) != 0) { + warnx("%s: Unable to setup OpRegion", __func__); + goto done; + } + done: return (error); } From nobody Fri Aug 18 07:41:52 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RRv2n5NYXz4qrJ5; Fri, 18 Aug 2023 07:41: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RRv2m4tQhz3GN3; Fri, 18 Aug 2023 07:41:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692344512; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=sUnZLy3KcVE+sdeo6K5RDBf3zzbeH64cHXM9lMNnVL4=; b=BGouMFjMGGnvuVZIWnD5/XliNmxP6sKQKwSJzKjeGnBnHiHAES7MCaIPDaBx0XXFm0bWO1 ongB6Ul4Ixwel5G7Qn176cQbSG/SRUjklHCInaXb4ndEjgd4Y/kYoDLWes9/3rm1E2pzxh Uf1aNAZ2+a/JTnTNt/KIOGlSP4IAQqRpUSqght5aLticQJLWrprZxAWiW3x5JldHOw53dp c+KWVqkMm9v3j1tR05F9q1ND2y5jnMX32u4lTI43zSYnH6ShWutqADWbtkoOn26TRKqY1Z LCIXqPSGTv6/5axvpBwwdoarSO7eTRdhoOlcyhWYNR2NL52fJ5BNgtLvvhLeMw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692344512; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=sUnZLy3KcVE+sdeo6K5RDBf3zzbeH64cHXM9lMNnVL4=; b=RonSsoRu0+IOufBh2eyek3udCSvzUIf+gWHkk8I34ULHqCvJv9EUFJQicsCPz4mBiltTYf xt2C5isHL+baNsITeFuud2eK84LoHLnKAvq8cB+ejzsv8FD39IegrjaNN19p3ZTpw5+sYf AY+3qXJHE+3SVOXb6iQva7uL7IxniFodQ+H8VPhjNUBU2dXuP8P3G0hn7v3v5UfRj2xY+8 h+xcN26NgxYKtfyq068sRT+ntEffLAjXjovy+xove/TeB1I+AnsVMUB0e9zmUDQ73HUVRR QwTMa7EEi1D/EI9JhXfZCOB+GcdacP4Y18AFYKh/EcVKpFeFM8tGIE668uvbZA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692344512; a=rsa-sha256; cv=none; b=SFccRgmUCW204S51sz/VAC0IY8fh/em1dEojbtagu1JENt8hML/T5ruY+OOjaCsGRm3Y1e a509q/TQ3POL4exCKrwHFVRZjPvEVSD7I8q4uL8FQWAOnXC2Z1u0FOvxNPtysYxu6NCRAP NP8kxVurYII4WGuvOLYz/x8j+KfYm7ZYiHwkFwf26dYNH4smoWs/Zo3C2nkUYqyzeFgzYM kVJxYQAVk/ICM90bCk58mbTVBiMny4gbrXYq11m9v22Dk6ZcXncQVf7oTI/ATug0fLaz/L fES3Mxix256cntsl2wLtjGW2Spp3MPDtrTxgKaifUhVDTsMwig+2thzZ+q39fw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RRv2m3zXRz16V3; Fri, 18 Aug 2023 07:41:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37I7fqeK066934; Fri, 18 Aug 2023 07:41:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37I7fqi5066931; Fri, 18 Aug 2023 07:41:52 GMT (envelope-from git) Date: Fri, 18 Aug 2023 07:41:52 GMT Message-Id: <202308180741.37I7fqi5066931@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Corvin =?utf-8?Q?K=C3=B6hne?= Subject: git: 04e774846c9d - stable/13 - bhyve: copy OpRegion into guest memory List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: corvink X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 04e774846c9d2e37287a1ddd6e7b0cde5d994ed1 Auto-Submitted: auto-generated The branch stable/13 has been updated by corvink: URL: https://cgit.FreeBSD.org/src/commit/?id=04e774846c9d2e37287a1ddd6e7b0cde5d994ed1 commit 04e774846c9d2e37287a1ddd6e7b0cde5d994ed1 Author: Corvin Köhne AuthorDate: 2023-05-10 11:39:56 +0000 Commit: Corvin Köhne CommitDate: 2023-08-18 07:32:08 +0000 bhyve: copy OpRegion into guest memory This makes the OpRegion accessible by the guest. However, the guest doesn't know the address of the OpRegion. This will be fixed by an upcoming commit. The range of the OpRegion is added to the e820 table. This allows the guest firmware to easily pick up this range and to reserve it properly. Reviewed by: markj MFC after: 1 week Sponsored by: Beckhoff Automation GmbH & Co. KG Differential Revision: https://reviews.freebsd.org/D40041 (cherry picked from commit 1115cdcf7af12fd06ca255b981cb579a7bb7a147) --- usr.sbin/bhyve/pci_gvt-d.c | 44 +++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 43 insertions(+), 1 deletion(-) diff --git a/usr.sbin/bhyve/pci_gvt-d.c b/usr.sbin/bhyve/pci_gvt-d.c index fd3b48c3e5b7..4616bc84d275 100644 --- a/usr.sbin/bhyve/pci_gvt-d.c +++ b/usr.sbin/bhyve/pci_gvt-d.c @@ -222,8 +222,40 @@ gvt_d_setup_opregion(struct pci_devinst *const pi) opregion->len = header->size * KB; munmap(header, sizeof(header)); + opregion->hva = mmap(NULL, opregion->len * KB, PROT_READ, MAP_SHARED, + memfd, opregion->hpa); + if (opregion->hva == MAP_FAILED) { + warn("%s: Unable to map host OpRegion", __func__); + close(memfd); + return (-1); + } close(memfd); + opregion->gpa = gvt_d_alloc_mmio_memory(opregion->hpa, opregion->len, + E820_ALIGNMENT_NONE, E820_TYPE_NVS); + if (opregion->gpa == 0) { + warnx( + "%s: Unable to add OpRegion to E820 table (hpa 0x%lx len 0x%lx)", + __func__, opregion->hpa, opregion->len); + e820_dump_table(); + return (-1); + } + opregion->gva = vm_map_gpa(pi->pi_vmctx, opregion->gpa, opregion->len); + if (opregion->gva == NULL) { + warnx("%s: Unable to map guest OpRegion", __func__); + return (-1); + } + if (opregion->gpa != opregion->hpa) { + /* + * A 1:1 host to guest mapping is not required but this could + * change in the future. + */ + warnx( + "Warning: Unable to reuse host address of OpRegion. GPU passthrough might not work properly."); + } + + memcpy(opregion->gva, opregion->hva, opregion->len); + return (0); } @@ -247,8 +279,18 @@ done: } static void -gvt_d_deinit(struct pci_devinst *const pi __unused) +gvt_d_deinit(struct pci_devinst *const pi) { + struct passthru_softc *sc; + struct passthru_mmio_mapping *opregion; + + sc = pi->pi_arg; + + opregion = passthru_get_mmio(sc, GVT_D_MAP_OPREGION); + + /* HVA is only set, if it's initialized */ + if (opregion->hva) + munmap((void *)opregion->hva, opregion->len); } static struct passthru_dev gvt_d_dev = { From nobody Fri Aug 18 07:41:53 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RRv2p0jcmz4qrFp; Fri, 18 Aug 2023 07:41: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RRv2n5TPGz3GNF; Fri, 18 Aug 2023 07:41:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692344513; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ZDHPP3Hm9Lyads0aGYbxcwv8aT+KrTYTKlCJ0jfkQWU=; b=UxDhUr+DRAilMKXoqRZEl2OPuHDv0sOnXWJZ2a8anqJ+w8pcC1yLAEh+rgFg8/gXS37vtY eloSSnf1QYvlyP9+HQuFXUlpUHRcbQZf81xGnjwSc4Rfw778j3JixYBfrJ0wNL4bAJhNmN pYQpqIBl2+Tq+NonMUGhu76HQeUla+RYuuBz6s6Xh429II/oKK3Y6S/03doI7wFjv8AbrT KvBVsa4ZijeteONPFxBew1UWJ1niR1FGkaJQJPUBeP0EXgKnGiTSyRqXLdEvjcu9ef5baP 6MqHhuE8GejGAw6w+Ot3IGPZvvCmTyehSxXoBAyVwH/meLlbQn1dWyZoIKoq/Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692344513; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ZDHPP3Hm9Lyads0aGYbxcwv8aT+KrTYTKlCJ0jfkQWU=; b=WnVYRMJoWWao4SF48JviFzfPWsAHU8MD5akzE37N/zGnHEOFskDsT4UVMtC6MNdqeenfj/ G7W1MU+LVVNAODQ9sQGmE15vtnk0QmWXny/fC3Xxx0WvEsnadygQ6SB9wlzcgIEfX92Eqf AS/5clnzXvVJFYxn9jXOQCP/GQMpxly43vimqSqrK3UJK3VtxqEz7byzcRIu1/Yj7lnvV9 kwlc8qtab9Ci6iwJsiwIw9BNIVgypEG8+rka9SIwvoUIzbigM+vexG6P6gvQVJI/rcvQ0U JGuDqSusqSH7MX/+yBGBsTn4MmYIoQDYD8oDD1IJGMYctG+yPMBDziR7agC+ww== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692344513; a=rsa-sha256; cv=none; b=h6r10Jo4zkFDWggtDN89XowH6wMB0drFYW7tDRuH4x8aeeEFJD8GivDSFAalNkuq5yHv3S Mi//ei7YP5RcCLdnaFmRuIDBg+sq7lUGsdmPAE3UztXCOP228AR1ZiDWrPzFAx4D2io7sO jzJDbjdm4C2MutqK1FbGNCAPoBhNJ+/Z/Ku5xk4AILeZlGU9zDr8DmWCWVj/DwhwhPCOS8 yrObDkWJmjQQTVlsAdiWAzIVuVDYyA1i6FjNYRjnylzsZzbpcuqCE9aYk2TjJwVwUrc14S mi7iEZHs8Mf4Sk2FFHq/qMyagt2xA5eRgVpXEfn1WjjkbeOqudJ++/+Wn+AZzg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RRv2n4b5lz179W; Fri, 18 Aug 2023 07:41:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37I7frVj066996; Fri, 18 Aug 2023 07:41:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37I7frnQ066993; Fri, 18 Aug 2023 07:41:53 GMT (envelope-from git) Date: Fri, 18 Aug 2023 07:41:53 GMT Message-Id: <202308180741.37I7frnQ066993@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Corvin =?utf-8?Q?K=C3=B6hne?= Subject: git: 50734f2ba36b - stable/13 - bhyve: pass address of OpRegion to the guest List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: corvink X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 50734f2ba36bb79d8472a71e6bd0ebb5399786a8 Auto-Submitted: auto-generated The branch stable/13 has been updated by corvink: URL: https://cgit.FreeBSD.org/src/commit/?id=50734f2ba36bb79d8472a71e6bd0ebb5399786a8 commit 50734f2ba36bb79d8472a71e6bd0ebb5399786a8 Author: Corvin Köhne AuthorDate: 2023-05-10 11:44:28 +0000 Commit: Corvin Köhne CommitDate: 2023-08-18 07:32:08 +0000 bhyve: pass address of OpRegion to the guest Don't allow access to the physical ASLS register. It contains a host address which is meaningless for the guest. Additionally, it allows the guest to safely rewrite this register. This is the last commit required for GVT-d. Nevertheless, it might not work due to missing firmware support. MFC after: 1 week Sponsored by: Beckhoff Automation GmbH & Co. KG Differential Revision: https://reviews.freebsd.org/D26209 (cherry picked from commit 71fb2dcb0023d49fc048e1f7b610ad05bd2efc32) --- usr.sbin/bhyve/pci_gvt-d.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/usr.sbin/bhyve/pci_gvt-d.c b/usr.sbin/bhyve/pci_gvt-d.c index 4616bc84d275..35c7f30dd292 100644 --- a/usr.sbin/bhyve/pci_gvt-d.c +++ b/usr.sbin/bhyve/pci_gvt-d.c @@ -256,7 +256,10 @@ gvt_d_setup_opregion(struct pci_devinst *const pi) memcpy(opregion->gva, opregion->hva, opregion->len); - return (0); + pci_set_cfgdata32(pi, PCIR_ASLS_CTL, opregion->gpa); + + return (set_pcir_handler(sc, PCIR_ASLS_CTL, 4, passthru_cfgread_emulate, + passthru_cfgwrite_emulate)); } static int From nobody Fri Aug 18 07:42:59 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RRv5H6ftDz4qr9j; Fri, 18 Aug 2023 07:44:03 +0000 (UTC) (envelope-from bz@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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RRv5H56Ddz3JgY; Fri, 18 Aug 2023 07:44:03 +0000 (UTC) (envelope-from bz@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692344643; 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=NLRDOVF/PpoGvBBZSatW2nPND8bWn4UwKz5HU+VpDss=; b=Ng6YEIhPvCCA5hAqq0OFi8K8J95ZlLBdM2G8McuayfFPNWk78uXM/1c/3YTxxj1xAYGFab U0vkqMpeIvG3CitUvi5Z+Ewo0ZvDlRn0AgUHyYn/YNC4/bu4D/cGxXmNuF/CN8xiWkEahc Bp4lDw2tKNexuN/O/eMKmTmQtdZuV1Rtw7V1Z2Cq+BLeZhdQeOZqSv5VVwGppXGTOh8k9m bgEj62ymI92lnstbhJL+kDYd/thZ0vzpYB1Ia91zI/qVgrGXSffHEoPv5Gdqeyr13h1lP9 OWV9dQkNpQvrKUGkazf9QTQ/bJC9ZyTOYUuTVDPUgjnqoErYCIgfP7KXhShQyQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692344643; 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=NLRDOVF/PpoGvBBZSatW2nPND8bWn4UwKz5HU+VpDss=; b=BXiLTseogI2eF7A/Wiqso9uw3eHE3jZ9FF037OeAv+wuvrvVvop98AS4icGJv5xKSU1kE8 SxFCu1blTQfydDHTa5hkVemT9bed5PBRBK0RUGFXOAZ/Z80Mw25J2BMS0L1arPHl6Ximyq eX2O02aVNjKncVRwdl4ZDT5h90yu+gH87haiuKHJfO0R5aN+8+E5Zw+4Vo4fyMXIDVSgkd HgqxiJoQjrSgYCBn5HsjTBpdSiDM9nvT7SILCdwtTVQi6+kfpNkNuCfgwoxiZKyAebC30l sorm98yGb4cGCGcHHJHrqJnCT0Q3zh3VCIglBV431jHx0jJAmBpGt2Hx1PPTuA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692344643; a=rsa-sha256; cv=none; b=TbjmkQ1HTUThR7I3bu7pTEvfTrXpEsW0WMWAKND4EMlST9BlKUKzYfI73+UXTDRVLXYOXL haBm7i+/KGUJY/bvV8ykCzIn/S/DD8ZbvuOncniUGRrLGce3r+b5qpTKPpuH6REArJypP0 zVeHoTDEezueoYLnym37DSwVhoDxYppG2HRAYfIJxkpJOfzhhd1aegGK9MESOa5N079VaL RcJRM+6/AksD9rBzheoD12TTmbUuiTyiPnVW4mj3swd9wQjSoT+SxbthUzumZLTE+lKJZN yMPBzQLt3PZdLS501iom9gRw3aOkOLd2Tx8Y9JAJSZUjCnvNVjhScklpO+7ZdQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from mx1.sbone.de (cross.sbone.de [195.201.62.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mx1.sbone.de", Issuer "SBone.DE Root Certificate Authority" (not verified)) (Authenticated sender: bz/mail) by smtp.freebsd.org (Postfix) with ESMTPSA id 4RRv5H2WRRz14py; Fri, 18 Aug 2023 07:44:03 +0000 (UTC) (envelope-from bz@FreeBSD.org) Received: from mail.sbone.de (mail.sbone.de [IPv6:fde9:577b:c1a9:4902:0:7404:2:1025]) (using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.sbone.de (Postfix) with ESMTPS id 48C118D4A15D; Fri, 18 Aug 2023 07:44:01 +0000 (UTC) Received: from content-filter.t4-02.sbone.de (content-filter.t4-02.sbone.de [IPv6:fde9:577b:c1a9:4902:0:7404:2:2742]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mail.sbone.de (Postfix) with ESMTPS id A23FA5C3A832; Fri, 18 Aug 2023 07:44:00 +0000 (UTC) X-Virus-Scanned: amavisd-new at sbone.de Received: from mail.sbone.de ([IPv6:fde9:577b:c1a9:4902:0:7404:2:1025]) by content-filter.t4-02.sbone.de (content-filter.t4-02.sbone.de [IPv6:fde9:577b:c1a9:4902:0:7404:2:2742]) (amavisd-new, port 10024) with ESMTP id uw0evApHhzTP; Fri, 18 Aug 2023 07:43:51 +0000 (UTC) Received: from strong-iwl0.sbone.de (strong-iwl0.sbone.de [IPv6:fde9:577b:c1a9:4902:b66b:fcff:fef3:e3d2]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by mail.sbone.de (Postfix) with ESMTPSA id 960A45C3A831; Fri, 18 Aug 2023 07:42:59 +0000 (UTC) Date: Fri, 18 Aug 2023 07:42:59 +0000 (UTC) From: "Bjoern A. Zeeb" To: Doug Moore , Kyle Evans cc: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: Re: git: b6a61d6836d9 - main - linuxkpi math: fix kassert in math64.h In-Reply-To: <202308180533.37I5XDuk049492@gitrepo.freebsd.org> Message-ID: <727s71sp-oq40-66oo-2q4p-s314r5r33r5n@SerrOFQ.bet> References: <202308180533.37I5XDuk049492@gitrepo.freebsd.org> X-OpenPGP-Key-Id: 0x14003F198FEFA3E77207EE8D2B58B8F83CCF1842 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; format=flowed; charset=US-ASCII On Fri, 18 Aug 2023, Doug Moore wrote: Hi Kyle, Doug, > The branch main has been updated by dougm: > > URL: https://cgit.FreeBSD.org/src/commit/?id=b6a61d6836d90ff2756d804eb981a02b0828f496 > > commit b6a61d6836d90ff2756d804eb981a02b0828f496 > Author: Doug Moore > AuthorDate: 2023-08-18 05:31:03 +0000 > Commit: Doug Moore > CommitDate: 2023-08-18 05:31:03 +0000 > > linuxkpi math: fix kassert in math64.h > > Include in math64.h, so that KASSERT and bool are > defined, to allow compilation to succeed after > b80ea452375f52a3ab7d82a9aef10da0d89985d9 and dabbbebcb0f5... I woke up to the same build error(s) after a rebase last night on my local branch. I haven't had coffee but I am confused. Thanks a lot for fixing and really sorry about that. /bz -- Bjoern A. Zeeb r15:7 From nobody Fri Aug 18 07:53:44 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RRvJT0dDnz4qrv7; Fri, 18 Aug 2023 07:53:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RRvJS4xXJz3L3X; Fri, 18 Aug 2023 07:53:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692345224; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fl66+ET8WlxEbpcGbMnbajPRLcqv6iriU2dFNg/hqOg=; b=bhjIBEasgHcvYRlcoLvAhIQL4oGzcC7YOVAeLkN/Yg3IiZtQ3vsEJmD3Xl6BczrH25a6aM z4I+FnZUZaN6zLtXjpADkeSQyRxFU61WrqqXVoaPtf9unXnP5V5Aw+O3Z6TWDm4/oe5Q88 0lMdKvKO4w4q2Xtowr/XxZ4eyNST/80Viht6Danl3vdrRV3s/ZOo9V+LLfHf/OgxPYFT5Z /lAJMG2G6aDkJi/uIVdCLNap2t6uFU5IM9X+cN3pe9slxBNxSqAIQbchRbQD+PV/4O99yr SOJYKaZtR0LM97bQt/cDcxPUUdXzqs0f22QhcdXtXrfUJS2CRZBUOvD/fRSrYw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692345224; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fl66+ET8WlxEbpcGbMnbajPRLcqv6iriU2dFNg/hqOg=; b=RmIdfEV4v0RnpaTa5T87LTxPpViFMhNWOWnUb+Ye0DsVK+CmmPAzC4IhOuEo/hMn1Zn0ob GtaG4MEtGKoTFqXHprip96XlqljadDGrKptIBV3nqAEy4WJpG7Z5xR11C4kTeE5t8AaWBe Gw9DG7IGGfIT5eXe6plq4Wb+wVyrTLaYmi+OVIiWF0XuYgHnFXyWSArUH4F6wmsjwfmBTa 85ohLnZkLH5zZXvtaIdF1er569ha7ujmlCTn4j7Pz5m/gQoyU2h1XzN1v4ojbk1B8+WgYw LFGbqTPuL6F73jTPLF8AXFjfllEqUUsy1KOvnW/ygiNoo8L0TVvzVBSmzNqjVg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692345224; a=rsa-sha256; cv=none; b=bV3uwraUyfY4BZhIpQCuFDtBQyTbFSr598O0cb+h6yTv8VvvXIblZYOGDBbYUA0XQrNQ5p lsrfq/OYl5roqnY4rMWe9SfOVqNwKBY2ebU1r40kY1VG2WeRRBnHKny/Q0SYZqBGHPUta+ JqY4dZBlbCIy/2EJBBjYPzRIYCRxxqn0hwtvENFUxuS9IilkL7hja1TC5vY7Qg/Sg7Lbrc pI/+VPRJtYJhCqbapcWR+asr5MqtcoUEasGZD3VD2xfOLmGjmpug1xzOILuESJex/BrGhW GUtEpFTpjF+iIoW8Sy0G/GQ7QvA60rb9lhlCVPYTQA129uFpoJyS9ds8ozP38Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RRvJS41Q9z16xP; Fri, 18 Aug 2023 07:53:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37I7riie083761; Fri, 18 Aug 2023 07:53:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37I7ri9i083758; Fri, 18 Aug 2023 07:53:44 GMT (envelope-from git) Date: Fri, 18 Aug 2023 07:53:44 GMT Message-Id: <202308180753.37I7ri9i083758@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Corvin =?utf-8?Q?K=C3=B6hne?= Subject: git: c791a53c8026 - stable/13 - bhyve: add helper to create a bootorder List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: corvink X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: c791a53c8026951051be47cbd608915b6fa41845 Auto-Submitted: auto-generated The branch stable/13 has been updated by corvink: URL: https://cgit.FreeBSD.org/src/commit/?id=c791a53c8026951051be47cbd608915b6fa41845 commit c791a53c8026951051be47cbd608915b6fa41845 Author: Corvin Köhne AuthorDate: 2021-08-16 07:47:53 +0000 Commit: Corvin Köhne CommitDate: 2023-08-18 07:52:10 +0000 bhyve: add helper to create a bootorder Qemu's fwcfg allows to define a bootorder. Therefore, the hypervisor has to create a fwcfg item named bootorder, which has a newline seperated list of boot entries. Qemu's OVMF will pick up the bootorder and applies it. Add the moment, bhyve's OVMF doesn't support a custom bootorder by qemu's fwcfg. However, in the future bhyve will gain support for qemu's OVMF. Additonally, we can port relevant parts from qemu's to bhyve's OVMF implementation. Reviewed by: jhb, markj MFC after: 1 week Sponsored by: Beckhoff Automation GmbH & Co. KG Differential Revision: https://reviews.freebsd.org/D39284 (cherry picked from commit 6632a0a4e3ab68b0e31b612e8aeca14de3fc8159) --- usr.sbin/bhyve/pci_emul.c | 76 +++++++++++++++++++++++++++++++++++++++++++++++ usr.sbin/bhyve/pci_emul.h | 2 ++ 2 files changed, 78 insertions(+) diff --git a/usr.sbin/bhyve/pci_emul.c b/usr.sbin/bhyve/pci_emul.c index f52bf94b7c3d..2f85e453ff17 100644 --- a/usr.sbin/bhyve/pci_emul.c +++ b/usr.sbin/bhyve/pci_emul.c @@ -62,6 +62,7 @@ __FBSDID("$FreeBSD$"); #include "pci_irq.h" #include "pci_lpc.h" #include "pci_passthru.h" +#include "qemu_fwcfg.h" #define CONF1_ADDR_PORT 0x0cf8 #define CONF1_DATA_PORT 0x0cfc @@ -121,6 +122,14 @@ struct pci_bar_allocation { static TAILQ_HEAD(pci_bar_list, pci_bar_allocation) pci_bars = TAILQ_HEAD_INITIALIZER(pci_bars); +struct boot_device { + TAILQ_ENTRY(boot_device) boot_device_chain; + struct pci_devinst *pdi; + int bootindex; +}; +static TAILQ_HEAD(boot_list, boot_device) boot_devices = TAILQ_HEAD_INITIALIZER( + boot_devices); + #define PCI_EMUL_IOBASE 0x2000 #define PCI_EMUL_IOLIMIT 0x10000 @@ -949,6 +958,45 @@ pci_emul_alloc_rom(struct pci_devinst *const pdi, const uint64_t size, return (0); } +int +pci_emul_add_boot_device(struct pci_devinst *pi, int bootindex) +{ + struct boot_device *new_device, *device; + + /* don't permit a negative bootindex */ + if (bootindex < 0) { + errx(4, "Invalid bootindex %d for %s", bootindex, pi->pi_name); + } + + /* alloc new boot device */ + new_device = calloc(1, sizeof(struct boot_device)); + if (new_device == NULL) { + return (ENOMEM); + } + new_device->pdi = pi; + new_device->bootindex = bootindex; + + /* search for boot device with higher boot index */ + TAILQ_FOREACH(device, &boot_devices, boot_device_chain) { + if (device->bootindex == bootindex) { + errx(4, + "Could not set bootindex %d for %s. Bootindex already occupied by %s", + bootindex, pi->pi_name, device->pdi->pi_name); + } else if (device->bootindex > bootindex) { + break; + } + } + + /* add boot device to queue */ + if (device == NULL) { + TAILQ_INSERT_TAIL(&boot_devices, new_device, boot_device_chain); + } else { + TAILQ_INSERT_BEFORE(device, new_device, boot_device_chain); + } + + return (0); +} + #define CAP_START_OFFSET 0x40 static int pci_emul_add_capability(struct pci_devinst *pi, u_char *capdata, int caplen) @@ -1357,6 +1405,27 @@ pci_ecfg_base(void) return (PCI_EMUL_ECFG_BASE); } +static int +init_bootorder(void) +{ + struct boot_device *device; + FILE *fp; + char *bootorder; + size_t bootorder_len; + + if (TAILQ_EMPTY(&boot_devices)) + return (0); + + fp = open_memstream(&bootorder, &bootorder_len); + TAILQ_FOREACH(device, &boot_devices, boot_device_chain) { + fprintf(fp, "/pci@i0cf8/pci@%d,%d\n", + device->pdi->pi_slot, device->pdi->pi_func); + } + fclose(fp); + + return (qemu_fwcfg_add_file("bootorder", bootorder_len, bootorder)); +} + #define BUSIO_ROUNDUP 32 #define BUSMEM32_ROUNDUP (1024 * 1024) #define BUSMEM64_ROUNDUP (512 * 1024 * 1024) @@ -1386,6 +1455,8 @@ init_pci(struct vmctx *ctx) pci_emul_membase64 = roundup2(pci_emul_membase64, PCI_EMUL_MEMSIZE64); pci_emul_memlim64 = pci_emul_membase64 + PCI_EMUL_MEMSIZE64; + TAILQ_INIT(&boot_devices); + for (bus = 0; bus < MAXBUSES; bus++) { snprintf(node_name, sizeof(node_name), "pci.%d", bus); nvl = find_config_node(node_name); @@ -1493,6 +1564,11 @@ init_pci(struct vmctx *ctx) } lpc_pirq_routed(); + if ((error = init_bootorder()) != 0) { + warnx("%s: Unable to init bootorder", __func__); + return (error); + } + /* * The guest physical memory map looks like the following: * [0, lowmem) guest system memory diff --git a/usr.sbin/bhyve/pci_emul.h b/usr.sbin/bhyve/pci_emul.h index ce14f5e34889..2eb2e3a4e280 100644 --- a/usr.sbin/bhyve/pci_emul.h +++ b/usr.sbin/bhyve/pci_emul.h @@ -234,6 +234,8 @@ int pci_emul_alloc_bar(struct pci_devinst *pdi, int idx, enum pcibar_type type, uint64_t size); int pci_emul_alloc_rom(struct pci_devinst *const pdi, const uint64_t size, void **const addr); +int pci_emul_add_boot_device(struct pci_devinst *const pi, + const int bootindex); int pci_emul_add_msicap(struct pci_devinst *pi, int msgnum); int pci_emul_add_pciecap(struct pci_devinst *pi, int pcie_device_type); void pci_emul_capwrite(struct pci_devinst *pi, int offset, int bytes, From nobody Fri Aug 18 07:53:45 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RRvJV4D3kz4qrvC; Fri, 18 Aug 2023 07:53: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RRvJT68LKz3L5n; Fri, 18 Aug 2023 07:53:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692345225; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Z0bQxW15LyhH8BatU4BaA3TfQKU5kQilUFdsx79YUBk=; b=WSB5esJOLoFbay6c75NeeS/FbZPQ8Pzk5K+UfWdS1n6A2G5qP+6XIZGmSCPVVPaW7SO+oL zDuAcLybTJnpWTOootKB9T4RAgfRWWPMFsfajRQD+vZNlVPnEuqrnaJUVpe8PAzJnrPzqv aCrokSXkvDFc3XyaZtikl0l4mJLSKCa6z5vzrrjEHL7f+fxXmykcVOWaZI3RiYNJmmGXYT gkwQbF+Seu7atIKljpvBs1m8r965o8SG1rASq7+miPMlhaLo0tVycKJYA0bd2xnKk5PUSL CanX219wNUDu9l1mwBoZ3n1/Wvt16k0N+MCGxC05PloW05bVtCuCGGNU00LCYA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692345225; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Z0bQxW15LyhH8BatU4BaA3TfQKU5kQilUFdsx79YUBk=; b=CHwAXZshSDqowIB4R8hZAYV9vTjy8ZDDsGp764Cc9BwqZ0zCX0ALiafQVuB51jAC0rGu8n 1pwRdjXW2R4X3aCW/6hvlnQPxLd9Piydnq31PwPSocz9s3ClP5HdAlaHR6ee4mrjZsyxtL wBnKEWpBLTkWXQVJA4KFpB+ZqDGoPzrqGIUf31Txlkxx7B0EvU0thIOVJuRVkuWXzqKrPq N2gvGV20U2s85OtlCcIksMh+CYG80DY/FmSeoNURkNEr0AGCPzlZv0rUCcnoEadHkY3TBm uKNJ/pab6HmfcPbbJGQ36PKOy5bAHLtk08ylDLZPA/by7V664bvhTJdRYMg8Fg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692345225; a=rsa-sha256; cv=none; b=ypIo5k+DTLPQAdvMSMMeMcLq+U8PZ3HQIcqEpVz8s8kA7s3xzpT24ScyLuv4hJsB35vTWy WB945uA8y5AOnaDzXWFr47aqRiXNiHRYKfK5W2ASO/rPmX63h3nZehpZDSsCFGH/Fg8AcW Ab7xJBhsIxjUvjF/mFwQ514fvkBymq0yS8dx6yJQ7X2jsnujrcjrWgP+IOXOyhlMhSWrYf 2v+j72PIHoIrJN623N/m6VIP+wd1cL6QaVec/Co8e9b1F9MvVXRcxwHnOESPJVeSrDlR2M AvW22vOCuHnxmbiDdzmtLkCGsuNuEh0Y3mZ1OWg6Lo1J5vg5Q/fw1nx6Q5xAIw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RRvJT4w6Xz17Sr; Fri, 18 Aug 2023 07:53:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37I7rjnk083812; Fri, 18 Aug 2023 07:53:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37I7rjaX083809; Fri, 18 Aug 2023 07:53:45 GMT (envelope-from git) Date: Fri, 18 Aug 2023 07:53:45 GMT Message-Id: <202308180753.37I7rjaX083809@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Corvin =?utf-8?Q?K=C3=B6hne?= Subject: git: b02e0f964028 - stable/13 - bhyve: add bootindex option for several devices List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: corvink X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: b02e0f96402830405c0812dc26b7492d487f795b Auto-Submitted: auto-generated The branch stable/13 has been updated by corvink: URL: https://cgit.FreeBSD.org/src/commit/?id=b02e0f96402830405c0812dc26b7492d487f795b commit b02e0f96402830405c0812dc26b7492d487f795b Author: Corvin Köhne AuthorDate: 2021-08-16 07:50:15 +0000 Commit: Corvin Köhne CommitDate: 2023-08-18 07:52:10 +0000 bhyve: add bootindex option for several devices The bootindex option creates an entry in the "bootorder" fwcfg file. This file can be picked up by the guest firmware to determine the bootorder. Nevertheless, it's not guaranteed that the guest firmware uses the bootorder. At the moment, our OVMF ignores the bootorder. This will change in the future. If guest firmware supports the "bootorder" fwcfg file and no device uses the bootindex option, the boot order is determined by the firmware itself. If one or more devices specify a bootindex, the first bootable device with the lowest bootindex will be booted. It's not garanteed that devices without a bootindex will be recognized as bootable from the firmware in that case. Reviewed by: jhb MFC after: 1 week Sponsored by: Beckhoff Automation GmbH & Co. KG Differential Revision: https://reviews.freebsd.org/D39285 (cherry picked from commit 480bef9481f0c44b19ac4b2adb09f6c3191acd41) --- usr.sbin/bhyve/bhyve.8 | 18 ++++++++++++++++++ usr.sbin/bhyve/block_if.c | 21 ++++++++++++++++++++- usr.sbin/bhyve/block_if.h | 2 ++ usr.sbin/bhyve/pci_ahci.c | 7 +++++++ usr.sbin/bhyve/pci_nvme.c | 8 ++++++++ usr.sbin/bhyve/pci_virtio_block.c | 5 +++++ usr.sbin/bhyve/pci_virtio_scsi.c | 9 +++++++++ 7 files changed, 69 insertions(+), 1 deletion(-) diff --git a/usr.sbin/bhyve/bhyve.8 b/usr.sbin/bhyve/bhyve.8 index b764807c7980..819d2bb0ef81 100644 --- a/usr.sbin/bhyve/bhyve.8 +++ b/usr.sbin/bhyve/bhyve.8 @@ -482,6 +482,12 @@ if not explicitly specified. Disable emulation of guest trim requests via .Dv DIOCGDELETE requests. +.It Li bootindex= Ns Ar index +Add the device to the bootorder at +.Ar index . +A fwcfg file is used to specify the bootorder. +The guest firmware may ignore or doesn't support this fwcfg file. +In that case, this feature doesn't work as expected. .El .Pp SCSI device backends: @@ -499,6 +505,12 @@ are: .It Cm iid= Ns Ar IID Initiator ID to use when sending requests to specified CTL port. The default value is 0. +.It Li bootindex= Ns Ar index +Add the device to the bootorder at +.Ar index . +A fwcfg file is used to specify the bootorder. +The guest firmware may ignore or doesn't support this fwcfg file. +In that case, this feature doesn't work as expected. .El .Pp 9P device backends: @@ -596,6 +608,12 @@ Add .Ar romfile as option ROM to the PCI device. The ROM will be loaded by firmware and should be capable of initializing the device. +.It Li bootindex= Ns Ar index +Add the device to the bootorder at +.Ar index . +A fwcfg file is used to specify the bootorder. +The guest firmware may ignore or doesn't support this fwcfg file. +In that case, this feature doesn't work as expected. .El .Pp Guest memory must be wired using the diff --git a/usr.sbin/bhyve/block_if.c b/usr.sbin/bhyve/block_if.c index 187a5ac55e09..8846c6032539 100644 --- a/usr.sbin/bhyve/block_if.c +++ b/usr.sbin/bhyve/block_if.c @@ -122,6 +122,7 @@ struct blockif_ctxt { TAILQ_HEAD(, blockif_elem) bc_pendq; TAILQ_HEAD(, blockif_elem) bc_busyq; struct blockif_elem bc_reqs[BLOCKIF_MAXREQ]; + int bc_bootindex; }; static pthread_once_t blockif_once = PTHREAD_ONCE_INIT; @@ -453,12 +454,22 @@ blockif_legacy_config(nvlist_t *nvl, const char *opts) return (pci_parse_legacy_config(nvl, cp + 1)); } +int +blockif_add_boot_device(struct pci_devinst *const pi, + struct blockif_ctxt *const bc) +{ + if (bc->bc_bootindex < 0) + return (0); + + return (pci_emul_add_boot_device(pi, bc->bc_bootindex)); +} + struct blockif_ctxt * blockif_open(nvlist_t *nvl, const char *ident) { char tname[MAXCOMLEN + 1]; char name[MAXPATHLEN]; - const char *path, *pssval, *ssval; + const char *path, *pssval, *ssval, *bootindex_val; char *cp; struct blockif_ctxt *bc; struct stat sbuf; @@ -467,6 +478,7 @@ blockif_open(nvlist_t *nvl, const char *ident) int extra, fd, i, sectsz; int ro, candelete, geom, ssopt, pssopt; int nodelete; + int bootindex; #ifndef WITHOUT_CAPSICUM cap_rights_t rights; @@ -480,6 +492,7 @@ blockif_open(nvlist_t *nvl, const char *ident) ssopt = 0; ro = 0; nodelete = 0; + bootindex = -1; if (get_config_bool_node_default(nvl, "nocache", false)) extra |= O_DIRECT; @@ -512,6 +525,11 @@ blockif_open(nvlist_t *nvl, const char *ident) } } + bootindex_val = get_config_value_node(nvl, "bootindex"); + if (bootindex_val != NULL) { + bootindex = atoi(bootindex_val); + } + path = get_config_value_node(nvl, "path"); if (path == NULL) { EPRINTLN("Missing \"path\" for block device."); @@ -628,6 +646,7 @@ blockif_open(nvlist_t *nvl, const char *ident) TAILQ_INIT(&bc->bc_freeq); TAILQ_INIT(&bc->bc_pendq); TAILQ_INIT(&bc->bc_busyq); + bc->bc_bootindex = bootindex; for (i = 0; i < BLOCKIF_MAXREQ; i++) { bc->bc_reqs[i].be_status = BST_FREE; TAILQ_INSERT_HEAD(&bc->bc_freeq, &bc->bc_reqs[i], be_link); diff --git a/usr.sbin/bhyve/block_if.h b/usr.sbin/bhyve/block_if.h index b36d0c367890..52ebd8634b8e 100644 --- a/usr.sbin/bhyve/block_if.h +++ b/usr.sbin/bhyve/block_if.h @@ -62,11 +62,13 @@ struct blockif_req { struct iovec br_iov[BLOCKIF_IOV_MAX]; }; +struct pci_devinst; struct blockif_ctxt; typedef void blockif_resize_cb(struct blockif_ctxt *, void *, size_t); int blockif_legacy_config(nvlist_t *nvl, const char *opts); +int blockif_add_boot_device(struct pci_devinst *const pi, struct blockif_ctxt *const bc); struct blockif_ctxt *blockif_open(nvlist_t *nvl, const char *ident); int blockif_register_resize_callback(struct blockif_ctxt *bc, blockif_resize_cb *cb, void *cb_arg); diff --git a/usr.sbin/bhyve/pci_ahci.c b/usr.sbin/bhyve/pci_ahci.c index a263eae6ad49..90fcf2449b9d 100644 --- a/usr.sbin/bhyve/pci_ahci.c +++ b/usr.sbin/bhyve/pci_ahci.c @@ -2476,6 +2476,13 @@ pci_ahci_init(struct pci_devinst *pi, nvlist_t *nvl) ret = 1; goto open_fail; } + + ret = blockif_add_boot_device(pi, bctxt); + if (ret) { + sc->ports = p; + goto open_fail; + } + sc->port[p].bctx = bctxt; sc->port[p].pr_sc = sc; sc->port[p].port = p; diff --git a/usr.sbin/bhyve/pci_nvme.c b/usr.sbin/bhyve/pci_nvme.c index 4ff5243262fa..b446bc266716 100644 --- a/usr.sbin/bhyve/pci_nvme.c +++ b/usr.sbin/bhyve/pci_nvme.c @@ -3211,6 +3211,14 @@ pci_nvme_parse_config(struct pci_nvme_softc *sc, nvlist_t *nvl) sc->dataset_management = NVME_DATASET_MANAGEMENT_DISABLE; } + value = get_config_value_node(nvl, "bootindex"); + if (value != NULL) { + if (pci_emul_add_boot_device(sc->nsc_pi, atoi(value))) { + EPRINTLN("Invalid bootindex %d", atoi(value)); + return (-1); + } + } + value = get_config_value_node(nvl, "ram"); if (value != NULL) { uint64_t sz = strtoull(value, NULL, 10); diff --git a/usr.sbin/bhyve/pci_virtio_block.c b/usr.sbin/bhyve/pci_virtio_block.c index 9fd6db41dba8..c8ec62a66793 100644 --- a/usr.sbin/bhyve/pci_virtio_block.c +++ b/usr.sbin/bhyve/pci_virtio_block.c @@ -471,6 +471,11 @@ pci_vtblk_init(struct pci_devinst *pi, nvlist_t *nvl) return (1); } + if (blockif_add_boot_device(pi, bctxt)) { + perror("Invalid boot device"); + return (1); + } + size = blockif_size(bctxt); sectsz = blockif_sectsz(bctxt); blockif_psectsz(bctxt, &sts, &sto); diff --git a/usr.sbin/bhyve/pci_virtio_scsi.c b/usr.sbin/bhyve/pci_virtio_scsi.c index f5728c5c53c2..d9ad1382f0c5 100644 --- a/usr.sbin/bhyve/pci_virtio_scsi.c +++ b/usr.sbin/bhyve/pci_virtio_scsi.c @@ -707,6 +707,15 @@ pci_vtscsi_init(struct pci_devinst *pi, nvlist_t *nvl) if (value != NULL) sc->vss_iid = strtoul(value, NULL, 10); + value = get_config_value_node(nvl, "bootindex"); + if (value != NULL) { + if (pci_emul_add_boot_device(pi, atoi(value))) { + EPRINTLN("Invalid bootindex %d", atoi(value)); + free(sc); + return (-1); + } + } + devname = get_config_value_node(nvl, "dev"); if (devname == NULL) devname = "/dev/cam/ctl"; From nobody Fri Aug 18 10:12:21 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RRyNP5tjlz4qJ0S; Fri, 18 Aug 2023 10:12:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RRyNP5hBDz3cZ9; Fri, 18 Aug 2023 10:12:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692353541; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=T1NLYSVLfWkFKNsppXeKTG1IWwLQjzKsajtr82FPKVM=; b=FsevdZUCcFuDKXj99o4arG1Idbuc83Nb5DbWlHsPC9TrdImaTv+w54w+3I0G1zgC5uxCf3 Od9Jj+YqqPAh1ftl/vAmvwo/pkZ5Elwk/wdr2BGZdernGiV2OXYrI9/oMVrI/whv9F8sLA /bIeACK9syG/O40SIBPa6S/q+hhJryJLdmVOWhGAmmWP0nb5f5fh/K9H281Ar9w6kkcqje GSilLiDEuK0l7bIkytvU86RGFD4gOTD9b4Qvhix/pAhG6P3HJQr+9Ujji7D4g40fW56MAl 147Zl+ngzdG1yDBoL6NAzOOKbIdBfO6ei4nQ/KKJUaXw2CXhqPo2w0J2Hnl3KA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692353541; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=T1NLYSVLfWkFKNsppXeKTG1IWwLQjzKsajtr82FPKVM=; b=o6yDjT5O5GZ8T/h1XTzDz4//64hEuFvskrmDT5jHM/dzoRweOsB06tXod2SmmIT60EC3JT xs388dZJGyWdfajoyj5Sl8Jm8mIuuwOI8EBeuCnhUdMYNJZ9U5ArZRV/qg/LbK8knT1rg+ duE4vPsBPJp5tBT+7Zsjq0X8ytfnGjvLAXtfQzAGlt22JgWQMJCS4NeZJURMY3GcNXWJHr ojaFYe6gu+D/al75G0yjAqWe7hwJ6OPZ++3HA+lc+8QeQsyN7PBzc+iT8amv1jgIjomFvg KygPA6hcGhKUxvpNdCV+WlxiBwcDeJI33R4pdE5/3HDRY7dEz+0wPb+z97YJ3A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692353541; a=rsa-sha256; cv=none; b=EloNymI1gPROyS5TfYk83lKC0rR1dXoYhR8KuQ2REBgy4fyQvxJKewTZHhm0vQWfHw6Unx W4rHncl4USXJRYCe5TMyvkGMkNKuy/q3/kGApCH5On0Za5/faL1Zt7TkwoMyagdomCKD3v l9VLIcFWnnPEs5b8Z38OD+83ttJ6Ip/Tn3pEpWamaHcsA9rSmFQR6y5kYoVdFR/mJiK8Mu dC2oHExXp2LxCh68pq6cCBrUNMK6eJyDdtK/P4CpFQeqkM5i4gMpFQ42mRhb1glQC7p29x thqLF5vxtnoChY4oTjojw0Lu0lUzLX18iG7FqQAfSC2MLsTbJ0BXCDJhh/YvdA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RRyNP4mVCz1BQ1; Fri, 18 Aug 2023 10:12:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37IACL15016884; Fri, 18 Aug 2023 10:12:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37IACLug016881; Fri, 18 Aug 2023 10:12:21 GMT (envelope-from git) Date: Fri, 18 Aug 2023 10:12:21 GMT Message-Id: <202308181012.37IACLug016881@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dmitry Chagin Subject: git: 3460fab5fced - main - linux(4): Remove sys/cdefs.h inclusion where it's not needed due to 685dc743 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dchagin X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3460fab5fced39c7ea597cc7de0ebc3e4c88989a Auto-Submitted: auto-generated The branch main has been updated by dchagin: URL: https://cgit.FreeBSD.org/src/commit/?id=3460fab5fced39c7ea597cc7de0ebc3e4c88989a commit 3460fab5fced39c7ea597cc7de0ebc3e4c88989a Author: Dmitry Chagin AuthorDate: 2023-08-18 10:12:02 +0000 Commit: Dmitry Chagin CommitDate: 2023-08-18 10:12:02 +0000 linux(4): Remove sys/cdefs.h inclusion where it's not needed due to 685dc743 --- sys/amd64/linux/linux_dummy_machdep.c | 1 - sys/amd64/linux/linux_genassym.c | 1 - sys/amd64/linux/linux_machdep.c | 1 - sys/amd64/linux/linux_sysvec.c | 1 - sys/amd64/linux/linux_vdso_gtod.c | 1 - sys/amd64/linux32/linux32_dummy_machdep.c | 1 - sys/amd64/linux32/linux32_genassym.c | 1 - sys/amd64/linux32/linux32_machdep.c | 1 - sys/amd64/linux32/linux32_sysvec.c | 1 - sys/amd64/linux32/linux32_vdso_gtod.c | 1 - sys/arm64/linux/linux_dummy_machdep.c | 1 - sys/arm64/linux/linux_machdep.c | 1 - sys/arm64/linux/linux_sysvec.c | 1 - sys/arm64/linux/linux_vdso_gtod.c | 1 - sys/compat/linux/linux.c | 1 - sys/compat/linux/linux_common.c | 1 - sys/compat/linux/linux_dummy.c | 1 - sys/compat/linux/linux_elf.c | 1 - sys/compat/linux/linux_elf32.c | 1 - sys/compat/linux/linux_elf64.c | 1 - sys/compat/linux/linux_emul.c | 1 - sys/compat/linux/linux_errno.c | 1 - sys/compat/linux/linux_event.c | 1 - sys/compat/linux/linux_file.c | 1 - sys/compat/linux/linux_fork.c | 1 - sys/compat/linux/linux_futex.c | 1 - sys/compat/linux/linux_getcwd.c | 1 - sys/compat/linux/linux_ioctl.c | 1 - sys/compat/linux/linux_ipc.c | 1 - sys/compat/linux/linux_mib.c | 1 - sys/compat/linux/linux_misc.c | 1 - sys/compat/linux/linux_mmap.c | 1 - sys/compat/linux/linux_netlink.c | 1 - sys/compat/linux/linux_ptrace.c | 1 - sys/compat/linux/linux_rseq.c | 1 - sys/compat/linux/linux_signal.c | 1 - sys/compat/linux/linux_socket.c | 1 - sys/compat/linux/linux_stats.c | 1 - sys/compat/linux/linux_sysctl.c | 1 - sys/compat/linux/linux_timer.c | 1 - sys/compat/linux/linux_uid16.c | 1 - sys/compat/linux/linux_util.c | 1 - sys/compat/linux/linux_vdso.c | 1 - sys/compat/linux/linux_xattr.c | 1 - sys/i386/linux/imgact_linux.c | 1 - sys/i386/linux/linux_copyout.c | 1 - sys/i386/linux/linux_dummy_machdep.c | 1 - sys/i386/linux/linux_genassym.c | 1 - sys/i386/linux/linux_machdep.c | 1 - sys/i386/linux/linux_ptrace_machdep.c | 1 - sys/i386/linux/linux_sysvec.c | 1 - sys/i386/linux/linux_vdso_gtod.c | 1 - 52 files changed, 52 deletions(-) diff --git a/sys/amd64/linux/linux_dummy_machdep.c b/sys/amd64/linux/linux_dummy_machdep.c index b3a4d330f416..4737386cb7f7 100644 --- a/sys/amd64/linux/linux_dummy_machdep.c +++ b/sys/amd64/linux/linux_dummy_machdep.c @@ -25,7 +25,6 @@ * SUCH DAMAGE. */ -#include #include #include #include diff --git a/sys/amd64/linux/linux_genassym.c b/sys/amd64/linux/linux_genassym.c index 5cb5f06093eb..61526cd144b2 100644 --- a/sys/amd64/linux/linux_genassym.c +++ b/sys/amd64/linux/linux_genassym.c @@ -1,4 +1,3 @@ -#include #include #include #include diff --git a/sys/amd64/linux/linux_machdep.c b/sys/amd64/linux/linux_machdep.c index 54dbad76d6d2..2d2c5bb55ac8 100644 --- a/sys/amd64/linux/linux_machdep.c +++ b/sys/amd64/linux/linux_machdep.c @@ -29,7 +29,6 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include #include #include #include diff --git a/sys/amd64/linux/linux_sysvec.c b/sys/amd64/linux/linux_sysvec.c index 3bf74b8aaa96..55eb34b6d329 100644 --- a/sys/amd64/linux/linux_sysvec.c +++ b/sys/amd64/linux/linux_sysvec.c @@ -31,7 +31,6 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include #define __ELF_WORD_SIZE 64 #include diff --git a/sys/amd64/linux/linux_vdso_gtod.c b/sys/amd64/linux/linux_vdso_gtod.c index 25f56c121c6b..e2b5ebbec5ff 100644 --- a/sys/amd64/linux/linux_vdso_gtod.c +++ b/sys/amd64/linux/linux_vdso_gtod.c @@ -25,7 +25,6 @@ * SUCH DAMAGE. */ -#include #include #include #include diff --git a/sys/amd64/linux32/linux32_dummy_machdep.c b/sys/amd64/linux32/linux32_dummy_machdep.c index 8bfdcf6f6ba8..c2206c81c528 100644 --- a/sys/amd64/linux32/linux32_dummy_machdep.c +++ b/sys/amd64/linux32/linux32_dummy_machdep.c @@ -26,7 +26,6 @@ * SUCH DAMAGE. */ -#include #include #include #include diff --git a/sys/amd64/linux32/linux32_genassym.c b/sys/amd64/linux32/linux32_genassym.c index c6080c6f8de3..df3f8ef7b471 100644 --- a/sys/amd64/linux32/linux32_genassym.c +++ b/sys/amd64/linux32/linux32_genassym.c @@ -1,4 +1,3 @@ -#include #include #include #include diff --git a/sys/amd64/linux32/linux32_machdep.c b/sys/amd64/linux32/linux32_machdep.c index b0c313deff8e..2598384aada5 100644 --- a/sys/amd64/linux32/linux32_machdep.c +++ b/sys/amd64/linux32/linux32_machdep.c @@ -30,7 +30,6 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include #include #include #include diff --git a/sys/amd64/linux32/linux32_sysvec.c b/sys/amd64/linux32/linux32_sysvec.c index d1c671399d1d..f2a379a66860 100644 --- a/sys/amd64/linux32/linux32_sysvec.c +++ b/sys/amd64/linux32/linux32_sysvec.c @@ -32,7 +32,6 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include #ifndef COMPAT_FREEBSD32 #error "Unable to compile Linux-emulator due to missing COMPAT_FREEBSD32 option!" #endif diff --git a/sys/amd64/linux32/linux32_vdso_gtod.c b/sys/amd64/linux32/linux32_vdso_gtod.c index 3552f37bae8e..62e8dc3d3caf 100644 --- a/sys/amd64/linux32/linux32_vdso_gtod.c +++ b/sys/amd64/linux32/linux32_vdso_gtod.c @@ -25,7 +25,6 @@ * SUCH DAMAGE. */ -#include #include #include #include diff --git a/sys/arm64/linux/linux_dummy_machdep.c b/sys/arm64/linux/linux_dummy_machdep.c index ce2f9d6d9a7a..d38cea2ff1a4 100644 --- a/sys/arm64/linux/linux_dummy_machdep.c +++ b/sys/arm64/linux/linux_dummy_machdep.c @@ -25,7 +25,6 @@ * SUCH DAMAGE. */ -#include #include #include #include diff --git a/sys/arm64/linux/linux_machdep.c b/sys/arm64/linux/linux_machdep.c index e5f9643894ca..9c9d56ca9949 100644 --- a/sys/arm64/linux/linux_machdep.c +++ b/sys/arm64/linux/linux_machdep.c @@ -26,7 +26,6 @@ * SUCH DAMAGE. */ -#include #include #include #include diff --git a/sys/arm64/linux/linux_sysvec.c b/sys/arm64/linux/linux_sysvec.c index 77c6b9583a15..885ac4657380 100644 --- a/sys/arm64/linux/linux_sysvec.c +++ b/sys/arm64/linux/linux_sysvec.c @@ -26,7 +26,6 @@ * SUCH DAMAGE. */ -#include #define __ELF_WORD_SIZE 64 #include diff --git a/sys/arm64/linux/linux_vdso_gtod.c b/sys/arm64/linux/linux_vdso_gtod.c index eef6022dbae3..94a3c948d332 100644 --- a/sys/arm64/linux/linux_vdso_gtod.c +++ b/sys/arm64/linux/linux_vdso_gtod.c @@ -26,7 +26,6 @@ * SUCH DAMAGE. */ -#include #include #include #include diff --git a/sys/compat/linux/linux.c b/sys/compat/linux/linux.c index 2021dbf5b52c..569f9ffe1617 100644 --- a/sys/compat/linux/linux.c +++ b/sys/compat/linux/linux.c @@ -23,7 +23,6 @@ * SUCH DAMAGE. */ -#include #include "opt_inet6.h" #include diff --git a/sys/compat/linux/linux_common.c b/sys/compat/linux/linux_common.c index 67e37e158933..e22e29ff2b24 100644 --- a/sys/compat/linux/linux_common.c +++ b/sys/compat/linux/linux_common.c @@ -24,7 +24,6 @@ * SUCH DAMAGE. */ -#include #include #include #include diff --git a/sys/compat/linux/linux_dummy.c b/sys/compat/linux/linux_dummy.c index 4529e39977ba..4fdab6daab48 100644 --- a/sys/compat/linux/linux_dummy.c +++ b/sys/compat/linux/linux_dummy.c @@ -25,7 +25,6 @@ * SUCH DAMAGE. */ -#include #include #include #include diff --git a/sys/compat/linux/linux_elf.c b/sys/compat/linux/linux_elf.c index c6c8fdcfdb30..c9eb6aea8373 100644 --- a/sys/compat/linux/linux_elf.c +++ b/sys/compat/linux/linux_elf.c @@ -37,7 +37,6 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include #include #include #include diff --git a/sys/compat/linux/linux_elf32.c b/sys/compat/linux/linux_elf32.c index 59ecdd7510d7..6bd4b141af85 100644 --- a/sys/compat/linux/linux_elf32.c +++ b/sys/compat/linux/linux_elf32.c @@ -31,6 +31,5 @@ * SUCH DAMAGE. */ -#include #define __ELF_WORD_SIZE 32 #include diff --git a/sys/compat/linux/linux_elf64.c b/sys/compat/linux/linux_elf64.c index bc992b86a2f6..397bcf741fae 100644 --- a/sys/compat/linux/linux_elf64.c +++ b/sys/compat/linux/linux_elf64.c @@ -31,6 +31,5 @@ * SUCH DAMAGE. */ -#include #define __ELF_WORD_SIZE 64 #include diff --git a/sys/compat/linux/linux_emul.c b/sys/compat/linux/linux_emul.c index 731d3f1b340d..e5ab51802468 100644 --- a/sys/compat/linux/linux_emul.c +++ b/sys/compat/linux/linux_emul.c @@ -28,7 +28,6 @@ * SUCH DAMAGE. */ -#include #include #include #include diff --git a/sys/compat/linux/linux_errno.c b/sys/compat/linux/linux_errno.c index 9b1fe162e8a8..f04f694e5bec 100644 --- a/sys/compat/linux/linux_errno.c +++ b/sys/compat/linux/linux_errno.c @@ -1,5 +1,4 @@ -#include #include #include #include diff --git a/sys/compat/linux/linux_event.c b/sys/compat/linux/linux_event.c index 220bd969a7a1..a7db8516e5f0 100644 --- a/sys/compat/linux/linux_event.c +++ b/sys/compat/linux/linux_event.c @@ -26,7 +26,6 @@ * SUCH DAMAGE. */ -#include #include #include #include diff --git a/sys/compat/linux/linux_file.c b/sys/compat/linux/linux_file.c index 1c4246e1d2f2..62094697e107 100644 --- a/sys/compat/linux/linux_file.c +++ b/sys/compat/linux/linux_file.c @@ -26,7 +26,6 @@ * SUCH DAMAGE. */ -#include #include #include #include diff --git a/sys/compat/linux/linux_fork.c b/sys/compat/linux/linux_fork.c index 54eef6ac99fe..4ce3bc192b4e 100644 --- a/sys/compat/linux/linux_fork.c +++ b/sys/compat/linux/linux_fork.c @@ -28,7 +28,6 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include #include #include #include diff --git a/sys/compat/linux/linux_futex.c b/sys/compat/linux/linux_futex.c index a22ffce0c28a..ab2760859e16 100644 --- a/sys/compat/linux/linux_futex.c +++ b/sys/compat/linux/linux_futex.c @@ -26,7 +26,6 @@ * SUCH DAMAGE. */ -#include #include #include #include diff --git a/sys/compat/linux/linux_getcwd.c b/sys/compat/linux/linux_getcwd.c index aae711813896..e11b47aff178 100644 --- a/sys/compat/linux/linux_getcwd.c +++ b/sys/compat/linux/linux_getcwd.c @@ -35,7 +35,6 @@ * POSSIBILITY OF SUCH DAMAGE. */ -#include #include #include #include diff --git a/sys/compat/linux/linux_ioctl.c b/sys/compat/linux/linux_ioctl.c index 413d761520d3..d0bc8708ebf0 100644 --- a/sys/compat/linux/linux_ioctl.c +++ b/sys/compat/linux/linux_ioctl.c @@ -26,7 +26,6 @@ * SUCH DAMAGE. */ -#include #include #include #include diff --git a/sys/compat/linux/linux_ipc.c b/sys/compat/linux/linux_ipc.c index 0e4893a9749c..5b6a28b20774 100644 --- a/sys/compat/linux/linux_ipc.c +++ b/sys/compat/linux/linux_ipc.c @@ -26,7 +26,6 @@ * SUCH DAMAGE. */ -#include #include #include #include diff --git a/sys/compat/linux/linux_mib.c b/sys/compat/linux/linux_mib.c index c6325ce81d63..9e1c4ed9df57 100644 --- a/sys/compat/linux/linux_mib.c +++ b/sys/compat/linux/linux_mib.c @@ -26,7 +26,6 @@ * SUCH DAMAGE. */ -#include #include #include #include diff --git a/sys/compat/linux/linux_misc.c b/sys/compat/linux/linux_misc.c index 75da0cd3b0be..5e692fea1ea7 100644 --- a/sys/compat/linux/linux_misc.c +++ b/sys/compat/linux/linux_misc.c @@ -29,7 +29,6 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include #include #include #include diff --git a/sys/compat/linux/linux_mmap.c b/sys/compat/linux/linux_mmap.c index 0bb5a261c11e..223ff1733acb 100644 --- a/sys/compat/linux/linux_mmap.c +++ b/sys/compat/linux/linux_mmap.c @@ -29,7 +29,6 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include #include #include #include diff --git a/sys/compat/linux/linux_netlink.c b/sys/compat/linux/linux_netlink.c index e6f387592125..a6846035c22e 100644 --- a/sys/compat/linux/linux_netlink.c +++ b/sys/compat/linux/linux_netlink.c @@ -25,7 +25,6 @@ * SUCH DAMAGE. */ -#include #include "opt_inet.h" #include "opt_inet6.h" #include "opt_netlink.h" diff --git a/sys/compat/linux/linux_ptrace.c b/sys/compat/linux/linux_ptrace.c index 10f18b970108..421760eab2a9 100644 --- a/sys/compat/linux/linux_ptrace.c +++ b/sys/compat/linux/linux_ptrace.c @@ -29,7 +29,6 @@ * SUCH DAMAGE. */ -#include #include #include #include diff --git a/sys/compat/linux/linux_rseq.c b/sys/compat/linux/linux_rseq.c index 05fd0f340de0..e8de17318d60 100644 --- a/sys/compat/linux/linux_rseq.c +++ b/sys/compat/linux/linux_rseq.c @@ -25,7 +25,6 @@ * SUCH DAMAGE. */ -#include #include #include diff --git a/sys/compat/linux/linux_signal.c b/sys/compat/linux/linux_signal.c index 73571d7f67c0..5b4f9c2adc6a 100644 --- a/sys/compat/linux/linux_signal.c +++ b/sys/compat/linux/linux_signal.c @@ -26,7 +26,6 @@ * SUCH DAMAGE. */ -#include #include "opt_ktrace.h" #include diff --git a/sys/compat/linux/linux_socket.c b/sys/compat/linux/linux_socket.c index eaccfab76eee..6c7cf12cf42e 100644 --- a/sys/compat/linux/linux_socket.c +++ b/sys/compat/linux/linux_socket.c @@ -26,7 +26,6 @@ * SUCH DAMAGE. */ -#include #include "opt_inet6.h" #include diff --git a/sys/compat/linux/linux_stats.c b/sys/compat/linux/linux_stats.c index 4621bdf986df..6c032cc569f8 100644 --- a/sys/compat/linux/linux_stats.c +++ b/sys/compat/linux/linux_stats.c @@ -26,7 +26,6 @@ * SUCH DAMAGE. */ -#include #include "opt_ktrace.h" #include diff --git a/sys/compat/linux/linux_sysctl.c b/sys/compat/linux/linux_sysctl.c index 6753941505b8..65c64a7ba563 100644 --- a/sys/compat/linux/linux_sysctl.c +++ b/sys/compat/linux/linux_sysctl.c @@ -26,7 +26,6 @@ * SUCH DAMAGE. */ -#include #include #include #include diff --git a/sys/compat/linux/linux_timer.c b/sys/compat/linux/linux_timer.c index 66fd309a9485..2188006ec38f 100644 --- a/sys/compat/linux/linux_timer.c +++ b/sys/compat/linux/linux_timer.c @@ -28,7 +28,6 @@ * SUCH DAMAGE. */ -#include #include #include #include diff --git a/sys/compat/linux/linux_uid16.c b/sys/compat/linux/linux_uid16.c index aa7fc628c734..a0c9f1c39198 100644 --- a/sys/compat/linux/linux_uid16.c +++ b/sys/compat/linux/linux_uid16.c @@ -26,7 +26,6 @@ * SUCH DAMAGE. */ -#include #include #include #include diff --git a/sys/compat/linux/linux_util.c b/sys/compat/linux/linux_util.c index 07198d1eb369..ad6b6fda644e 100644 --- a/sys/compat/linux/linux_util.c +++ b/sys/compat/linux/linux_util.c @@ -31,7 +31,6 @@ * from: svr4_util.c,v 1.5 1995/01/22 23:44:50 christos Exp */ -#include #include #include #include diff --git a/sys/compat/linux/linux_vdso.c b/sys/compat/linux/linux_vdso.c index 949fb660a2ff..a415a92783de 100644 --- a/sys/compat/linux/linux_vdso.c +++ b/sys/compat/linux/linux_vdso.c @@ -25,7 +25,6 @@ * SUCH DAMAGE. */ -#include #if defined(__i386__) || (defined(__amd64__) && defined(COMPAT_LINUX32)) #define __ELF_WORD_SIZE 32 #else diff --git a/sys/compat/linux/linux_xattr.c b/sys/compat/linux/linux_xattr.c index 2058033104f6..b54a0d2f89ad 100644 --- a/sys/compat/linux/linux_xattr.c +++ b/sys/compat/linux/linux_xattr.c @@ -25,7 +25,6 @@ * SUCH DAMAGE. */ -#include #include #include #include diff --git a/sys/i386/linux/imgact_linux.c b/sys/i386/linux/imgact_linux.c index 828fcb891f32..63bf89784f84 100644 --- a/sys/i386/linux/imgact_linux.c +++ b/sys/i386/linux/imgact_linux.c @@ -29,7 +29,6 @@ * SUCH DAMAGE. */ -#include #include #include #include diff --git a/sys/i386/linux/linux_copyout.c b/sys/i386/linux/linux_copyout.c index c55b39328f79..58fde98a77b6 100644 --- a/sys/i386/linux/linux_copyout.c +++ b/sys/i386/linux/linux_copyout.c @@ -28,7 +28,6 @@ * SUCH DAMAGE. */ -#include #include #include #include diff --git a/sys/i386/linux/linux_dummy_machdep.c b/sys/i386/linux/linux_dummy_machdep.c index dd8c67a72033..0a168bd46ccb 100644 --- a/sys/i386/linux/linux_dummy_machdep.c +++ b/sys/i386/linux/linux_dummy_machdep.c @@ -26,7 +26,6 @@ * SUCH DAMAGE. */ -#include #include #include #include diff --git a/sys/i386/linux/linux_genassym.c b/sys/i386/linux/linux_genassym.c index 0703072697c3..5863b658b4f9 100644 --- a/sys/i386/linux/linux_genassym.c +++ b/sys/i386/linux/linux_genassym.c @@ -1,4 +1,3 @@ -#include #include #include #include diff --git a/sys/i386/linux/linux_machdep.c b/sys/i386/linux/linux_machdep.c index 4cdee604a7fa..8dbcbcd2609e 100644 --- a/sys/i386/linux/linux_machdep.c +++ b/sys/i386/linux/linux_machdep.c @@ -26,7 +26,6 @@ * SUCH DAMAGE. */ -#include #include "opt_posix.h" #include diff --git a/sys/i386/linux/linux_ptrace_machdep.c b/sys/i386/linux/linux_ptrace_machdep.c index 405d0062f731..9b20b721eaa9 100644 --- a/sys/i386/linux/linux_ptrace_machdep.c +++ b/sys/i386/linux/linux_ptrace_machdep.c @@ -26,7 +26,6 @@ * SUCH DAMAGE. */ -#include #include "opt_cpu.h" #include diff --git a/sys/i386/linux/linux_sysvec.c b/sys/i386/linux/linux_sysvec.c index dc59c44c4da9..fe3e3f743620 100644 --- a/sys/i386/linux/linux_sysvec.c +++ b/sys/i386/linux/linux_sysvec.c @@ -26,7 +26,6 @@ * SUCH DAMAGE. */ -#include #define __ELF_WORD_SIZE 32 #include diff --git a/sys/i386/linux/linux_vdso_gtod.c b/sys/i386/linux/linux_vdso_gtod.c index d889adb23808..2147dbd3a0f8 100644 --- a/sys/i386/linux/linux_vdso_gtod.c +++ b/sys/i386/linux/linux_vdso_gtod.c @@ -25,7 +25,6 @@ * SUCH DAMAGE. */ -#include #include #include #include From nobody Fri Aug 18 10:12:22 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RRyNR0fn0z4qJ3L; Fri, 18 Aug 2023 10:12: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RRyNQ6p1xz3cZY; Fri, 18 Aug 2023 10:12:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692353543; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=wGMlEBkytsdMpRH13B2+cSNR6ypySuYzQafAh+dvTi8=; b=LPvjuLtiKzZvHcw4Q3+PQk5prhmTbmvcgzEMUk7LLU6V6W2IlCteptUMN2LW9kHgz2kRew gO3uDutlhKUG3M9T8Y1qSBWLu36nDguTmR/bvj6mkgPEcPXVSh2ZwR9STQzVofqd94QFX6 HL2Xa+RzsgpHexnrm5dZSL6VDkvMFY2SL2fjm41PlRUYUNZpvJcEPFKiMa/wgo2nmUt1DU z8+6h8GwdpxHaK2TqHfEw9bY+KcELsV+xJu/XrUiWkrnFJGaDGx5+jCVM95sYNUBEJT7/R Wq7IKi+wNnhqTugAj+UE9Vmz3E9xh00Ohrd4OdEK9fwpw6KpVQrT9QqfN66zeA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692353543; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=wGMlEBkytsdMpRH13B2+cSNR6ypySuYzQafAh+dvTi8=; b=MFoL3nd6LwDw/FD/CrfmDgCvafnjEZk4nQNbeMt66Ir2TcCnTZpJUAY0JepT0mX3nW3Dx9 fhKRukVz84Y3H/M8u6VS3lTRvW3Tq3qA3spgnBovINAOn97upUkbbIc5MCQ3/kG3jHUkAS td6QQC4cq90C+Xl9DDb5exCEKtyRrHXEfbd7c9a4D5E7+3DKFwO6/E/y8LylofUboBv/VF /2qi5z2aG7MIYHd4e3udQyi+7kaxHBxHWvBufCRA7WLl6UE53EnvxUkZriprYBMaKZE5qK b+YP2tv8Me1WYYAdHPy4B3VyzTun/1i6OIy40rlN9ZpCq9ytJ6DSxiPdeq8Tug== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692353543; a=rsa-sha256; cv=none; b=ZuZDIKWxgOusE5CjjL539YxDMTgw7acz48JgkF0TTPpjjOb1gjtjQnDkMG7SfWYQxEp/VX viLX6fn3lObRm3v7s2ZSXfsizhraQgQFiBcoQbcbdMitiazKgJm7REFVXuNijlPybieDtg jcCNsZ/uYt1LGDaJ3sW82Si6WqRZoWvR+gk9ee472POEgsQR67imMCDFNr9kPrYogeNNCp wrgWChwCk0onSPTRetrg1gHXx5zsgCtgAKepi+dIPu745IajPbwPY9ZvRToVAV2i3XxHuG XZuXIZCpfCsUG+51JYVnQ66IfOrBYMoOuSxruaBfeYSgsFAztCBitT/4IDuovw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RRyNQ5lYYz1BNx; Fri, 18 Aug 2023 10:12:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37IACM9V016932; Fri, 18 Aug 2023 10:12:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37IACMDZ016929; Fri, 18 Aug 2023 10:12:22 GMT (envelope-from git) Date: Fri, 18 Aug 2023 10:12:22 GMT Message-Id: <202308181012.37IACMDZ016929@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dmitry Chagin Subject: git: ce8e645a4a8e - main - linux(4): Follow style(9), include sys/systm.h after sys/param.h List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dchagin X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ce8e645a4a8ec36fa58f8c1ec8c703165d499d36 Auto-Submitted: auto-generated The branch main has been updated by dchagin: URL: https://cgit.FreeBSD.org/src/commit/?id=ce8e645a4a8ec36fa58f8c1ec8c703165d499d36 commit ce8e645a4a8ec36fa58f8c1ec8c703165d499d36 Author: Dmitry Chagin AuthorDate: 2023-08-18 10:12:02 +0000 Commit: Dmitry Chagin CommitDate: 2023-08-18 10:12:02 +0000 linux(4): Follow style(9), include sys/systm.h after sys/param.h --- sys/i386/linux/linux_genassym.c | 2 +- sys/i386/linux/linux_ptrace_machdep.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/i386/linux/linux_genassym.c b/sys/i386/linux/linux_genassym.c index 5863b658b4f9..f5505c8a91cc 100644 --- a/sys/i386/linux/linux_genassym.c +++ b/sys/i386/linux/linux_genassym.c @@ -1,6 +1,6 @@ #include -#include #include +#include #include #include diff --git a/sys/i386/linux/linux_ptrace_machdep.c b/sys/i386/linux/linux_ptrace_machdep.c index 9b20b721eaa9..a815b42ca024 100644 --- a/sys/i386/linux/linux_ptrace_machdep.c +++ b/sys/i386/linux/linux_ptrace_machdep.c @@ -29,12 +29,12 @@ #include "opt_cpu.h" #include +#include #include #include #include #include #include -#include #include #include From nobody Fri Aug 18 10:12:23 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RRyNS1wDzz4qJ5D; Fri, 18 Aug 2023 10:12:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RRyNS0x9Nz3cpG; Fri, 18 Aug 2023 10:12:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692353544; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0FzmF1PfsQ/qTAUBgWblysPw1Sv7Y14TLb5LT/GAtRE=; b=T0LNHcWtlc4R3zYXZuja3UJ/E+1vd/Iu3rxLTtGlH1SwSer2illr/eLA+ExAr49pIIslM2 zp8QgFreQOLTDhb1REf0t8T77kX0jkvq0JDI4gUQHrhr+ZbvyqyjkCwECav8i2CePWBS6E iHebB5vjpsxceuDZfLQ2gvd+wEKjzSsBPHagHLRa3JHobHgWFD5peLEgtpqytBf7PA89uH iPbkLqdJYI+gzsl92nA9qwmlWPbkiXh8uhMBtUzQOLxtz+25wpmSZUa4tBpltzac4xL6zg 9v3P5PNAA8zpg14kyXQFEYb9PZYRZTN4v6/IbOP5pikcRmKrIIGR0jd+CBunzg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692353544; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0FzmF1PfsQ/qTAUBgWblysPw1Sv7Y14TLb5LT/GAtRE=; b=d4tmMeBnAdjmZOzmHVJxElUxtWy5DxqPGqvDKjyGewzFrGTekeRrHwljf67zWcw2vIq1jf vkiL7wMQlOpB+KA7GvSoijUPjHU+J0kwlueaQYiulR8CucHVWiue/xRyucX7EvYxdGt/Pn FPfuJy5i/dlAQSuXimVH9Edre+kIzKXLBSJ08FgU+flv6jjwx0vEaZ1Y3fva6+lpwjaNG3 vHCkLvMMKVmrFsZPO/paapRBZYXFFs3HyhY65JrqYntszQKPspTOs68IHPGDi+e6CYPf+W CXZIRxKi87CRc1jS6NzNBQBBvJwe3kI2G+yFNK9Qn0lJ/41oOOUDFnh4bDQWeA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692353544; a=rsa-sha256; cv=none; b=YyR27CW1NKpZ2efd5YY53BTNjM1RZTxeKG+aLHjmssQpR7AX0Oh4XQRPCNOVYr/xux5Chi 1kmQqV2KeqQNnTxVA/cYSoDXimpX93lrEF2GfMhkswJ46ALSieucVU7Q0mVmKspAAGr2C6 cUz0kagez1V+C2uRFG0fb25MUsb+u5HY0jHaAb0B8XIqX8x5asWD5Hia6Nk2zWdgKhzaX4 tSKR/djHO8JX8CSWRYMY2n9/apjiJRXXN1n1eGQgrDiFZhktfItQe+Wldc4R57vEjD2gSQ qjyGzCpxji6l5J2vVeeoNzLylbiIRs2L7Vbff8+RWf6p7AcA5HFHzdchrEBA0A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RRyNR6ptHz1BQ2; Fri, 18 Aug 2023 10:12:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37IACNmZ016998; Fri, 18 Aug 2023 10:12:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37IACNol016995; Fri, 18 Aug 2023 10:12:23 GMT (envelope-from git) Date: Fri, 18 Aug 2023 10:12:23 GMT Message-Id: <202308181012.37IACNol016995@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dmitry Chagin Subject: git: 88362a00863a - main - linsysfs(5): Remove sys/cdefs.h inclusion where it's not needed due to 685dc743 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dchagin X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 88362a00863a1c8369fab1cf63ad0e673403f7d0 Auto-Submitted: auto-generated The branch main has been updated by dchagin: URL: https://cgit.FreeBSD.org/src/commit/?id=88362a00863a1c8369fab1cf63ad0e673403f7d0 commit 88362a00863a1c8369fab1cf63ad0e673403f7d0 Author: Dmitry Chagin AuthorDate: 2023-08-18 10:12:02 +0000 Commit: Dmitry Chagin CommitDate: 2023-08-18 10:12:02 +0000 linsysfs(5): Remove sys/cdefs.h inclusion where it's not needed due to 685dc743 --- sys/compat/linsysfs/linsysfs.c | 1 - sys/compat/linsysfs/linsysfs_net.c | 1 - 2 files changed, 2 deletions(-) diff --git a/sys/compat/linsysfs/linsysfs.c b/sys/compat/linsysfs/linsysfs.c index 9f730c6627de..7f70221b420d 100644 --- a/sys/compat/linsysfs/linsysfs.c +++ b/sys/compat/linsysfs/linsysfs.c @@ -26,7 +26,6 @@ * SUCH DAMAGE. */ -#include #include #include #include diff --git a/sys/compat/linsysfs/linsysfs_net.c b/sys/compat/linsysfs/linsysfs_net.c index 6ca653d93407..73602b0132a4 100644 --- a/sys/compat/linsysfs/linsysfs_net.c +++ b/sys/compat/linsysfs/linsysfs_net.c @@ -25,7 +25,6 @@ * SUCH DAMAGE. */ -#include #include #include #include From nobody Fri Aug 18 10:12:25 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RRyNV0q7Cz4qHyM; Fri, 18 Aug 2023 10:12: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RRyNT1yGjz3cXj; Fri, 18 Aug 2023 10:12:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692353545; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ugtcItZ2Am9wfdhyywN/oGPsvBvlygPFohTPBYIlIu4=; b=gNLOTxHpn8/gprodNmOFYGDBkfsg6TeZEfpzcph4OZgufHzzUot0L8W2fRsW/LSZM9gTA3 +/QaRIbWk9Z1XyZL6UTmSenXffbywsL0/PnavtH+l90EJtn0bfSnrqhxN0B/botgYPOaZJ jpVgDaCmpifgPqrEh6zg0TQtY+Zs6ziionxVnyrgwImF9LWRz42diA4YfIMSgBkswT7hii AAuL0m3f4wU+yNip0dsFEH7g9FbE6qDI0Ipyj2YJP6vvZkQVvk7EwC31A/obpRZ3K36Wtg YE49zTyZv2e36gf8IZqXd8edMfQ8IJlMy2Z2Nv06U5NrIIml0sbt568tHaPj5g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692353545; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=ugtcItZ2Am9wfdhyywN/oGPsvBvlygPFohTPBYIlIu4=; b=tJPsBDyG6J/aVbBgfNPprFDcPPt689VjahtQjWwdaW0qZjv0Ek3itzHOnuCIwIk5+HAZjs FNF59DAOv/ns9Zhn9QZV6N33oHCgjUCf69yDnIZ5wzAQgHzMD2FfmznKaJvmQqKjHnyEzE ukQyhlTdCz90RKNSr92+Zz9AZFf89zNw6qifKqTejosLKxQk+T++S10G0YX8mIYXvPxPob 9RNj1wfnBrKDXf/Xwes70u8cylxfYkUX8Y8ypM9ZDm311dOJIEnkjuatis2NiD4n8WX2K1 z7gccN6e4EjAiGkaVBZ5+7yHp9Ovuf6Mf1DFQGav4Ggo4Vsquscws+AHHKqKWQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692353545; a=rsa-sha256; cv=none; b=gZEo4qq6QKjMT/+djSDesME15ZxCJ/S+yVtHdbu+KH2bMJ/hLcIOElAOcr0NO30M3newZL 7JZoDkY3DzF+LKRjQSAAFPTC7qY85YMAtOsluVv4j6DzkKEGUjX/ihj2uVbps2isMml/n0 uFE6G8omkeuOe0AldIYKoknQg/ZjB5lAvzVe3wBDqOIYCM/Z6/ibOiWQ+IbOtU9YyID2Mq CBi1+mEQxNrcC1pxzKvlfrZ8hSL+/RlwaoQY+yU8jaXzO8zRxewgjSa8vl/0DGjGtWjxud zLSp+DbvRVbhshA+dYZwfG2hCi0INSh4dK7euSk2m+WB2R0IhWhGHgoky2PUeg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RRyNT0kQSz1Bgc; Fri, 18 Aug 2023 10:12:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37IACPiZ017067; Fri, 18 Aug 2023 10:12:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37IACPqo017064; Fri, 18 Aug 2023 10:12:25 GMT (envelope-from git) Date: Fri, 18 Aug 2023 10:12:25 GMT Message-Id: <202308181012.37IACPqo017064@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dmitry Chagin Subject: git: cb1fab08e956 - main - linprocfs(5): Remove sys/cdefs.h inclusion where it's not needed due to 685dc743 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dchagin X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: cb1fab08e956ee369d62ce66898198805c652836 Auto-Submitted: auto-generated The branch main has been updated by dchagin: URL: https://cgit.FreeBSD.org/src/commit/?id=cb1fab08e956ee369d62ce66898198805c652836 commit cb1fab08e956ee369d62ce66898198805c652836 Author: Dmitry Chagin AuthorDate: 2023-08-18 10:12:02 +0000 Commit: Dmitry Chagin CommitDate: 2023-08-18 10:12:02 +0000 linprocfs(5): Remove sys/cdefs.h inclusion where it's not needed due to 685dc743 --- sys/compat/linprocfs/linprocfs.c | 1 - 1 file changed, 1 deletion(-) diff --git a/sys/compat/linprocfs/linprocfs.c b/sys/compat/linprocfs/linprocfs.c index 856e5aca07d6..cc628d29247a 100644 --- a/sys/compat/linprocfs/linprocfs.c +++ b/sys/compat/linprocfs/linprocfs.c @@ -43,7 +43,6 @@ #include "opt_inet.h" -#include #include #include #include From nobody Fri Aug 18 10:12:26 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RRyNW1lYZz4qHvQ; Fri, 18 Aug 2023 10:12: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RRyNV2cx8z3cVb; Fri, 18 Aug 2023 10:12:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692353546; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4X0L60RYxFEI9bbUXwIg59Mkh5igu89jdl3QSdRcBgI=; b=Yf/OOkbwvxSpZXk4bG+Fumnq7NqAPEhXC59g0wY8/ToyNK1Ofz7IRulx1+L8RzLYZEu10r 0XLbg9KvOV+2JPgtxD/RvvbBMHTZcbnA2I/Ato/4N3jsYR58GPRdcuCVm0uKjbzE9lKyKK sh5Iakcj84lX2mCzbMvVm386h35DjeTthPqIAscKrWR0AenTFqW6KH68R1LY+pBDl1kuEK 61IhfMkIak/GSIEnrUzbvMhNXsALHsKxl0FNufxBQTXliAgu6xI0qo+hgFDfgRHCnrhNvY CPHFc5ZXXcYCM6Mtbl/gS3f+NI59/1lKc+EcSVg+c00sS/b/DcM5rBb/E0EMTw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692353546; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4X0L60RYxFEI9bbUXwIg59Mkh5igu89jdl3QSdRcBgI=; b=hE0h0Uz4l25dKcrlGTqWZK7ddbOQE9z4gCi0AIFWACu/BC3dW5YGduEH/IUBGzfck+osJJ hX6s9bFa4s4zZ5xxqsSbcwvAxZFUe3Pe6psQWAlow9ZfjtZBv19yoevzd4ZTi6hq5hQdH3 l9GUlFQQuJY1nobfPvQw23BJwP//P8w7l3+Xzs8GbVep+4rk7va7uIPW5znluEFiaZWIhf a58Q+a7HpKVO3cOGEx7AlnxhB6Daqw/zITAI2SQUpNwg43bAXUy2oT5XQTA0nFIriTIGqI jFvqUGgU1C8dn9NZGjKMezIpelsf72RKeDIvUdjZ5VHfC4jwGX6AbL1UNgOdGA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692353546; a=rsa-sha256; cv=none; b=LBqOoStiJlgwpWNDFog95XBo740pBpDenMm+YqaaGG9fIxtYXp8otQcCaYtpVY4uO9VM7b rpMtDKOn8BN4fQYzJfwdAtvsr8VnaPyb4znUxugiproIAPbvOmlq0BiZSIv8D+6OMPAzgF V1rbRB/LESruR9laOuNIL4f0FCrpvx8bjQs7WCjQYpSc9CvUkQO70T/S19vvd7qFZUYUK0 L12zrmAeL1g/LbLMuhfrOG4RoK2fpkRMcI7P4Istl3GqYagXlV0wvQMfVfoaardh9ZEM6n GbZj64MmPurY/LXuMClNEj1D/SKZKx7Z9CbCS2G54eBVv/zId4xqhBKhl/Bycg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RRyNV1jnnz1BWp; Fri, 18 Aug 2023 10:12:26 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37IACQXX017112; Fri, 18 Aug 2023 10:12:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37IACQVW017109; Fri, 18 Aug 2023 10:12:26 GMT (envelope-from git) Date: Fri, 18 Aug 2023 10:12:26 GMT Message-Id: <202308181012.37IACQVW017109@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dmitry Chagin Subject: git: 7bbdcdc9b7ff - main - linprocfs(5): Follow style(9), sort includes List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dchagin X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 7bbdcdc9b7ff8d9cc708fd935eee1dd3963b3b37 Auto-Submitted: auto-generated The branch main has been updated by dchagin: URL: https://cgit.FreeBSD.org/src/commit/?id=7bbdcdc9b7ff8d9cc708fd935eee1dd3963b3b37 commit 7bbdcdc9b7ff8d9cc708fd935eee1dd3963b3b37 Author: Dmitry Chagin AuthorDate: 2023-08-18 10:12:02 +0000 Commit: Dmitry Chagin CommitDate: 2023-08-18 10:12:02 +0000 linprocfs(5): Follow style(9), sort includes --- sys/compat/linprocfs/linprocfs.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/compat/linprocfs/linprocfs.c b/sys/compat/linprocfs/linprocfs.c index cc628d29247a..0e668b0edde6 100644 --- a/sys/compat/linprocfs/linprocfs.c +++ b/sys/compat/linprocfs/linprocfs.c @@ -44,7 +44,7 @@ #include "opt_inet.h" #include -#include +#include #include #include #include @@ -61,6 +61,7 @@ #include #include #include +#include #include #include #include @@ -71,7 +72,6 @@ #include #include #include -#include #include #include #include From nobody Fri Aug 18 10:40:55 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RRz1N117Dz4qKmG; Fri, 18 Aug 2023 10:40: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RRz1N0RbYz4Dbk; Fri, 18 Aug 2023 10:40:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692355256; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=R3bQn9enO4YEPL+oTGb6cLoU6vReT8OVMxIA6a+PUOw=; b=PHINzXtibaeL0vMzzOuJI4/hTbXiKUBtMa0g7Y+obheH0VW8niWFMQ1C97B5zQgQIOiLD+ EMssQ3z69MCu5SlPz9nzhwGdeTphApI0nXlmY1tntcd1my8OMYMOYdDiFqn+uA3esFqG/3 3eOeKzPf75VdDgUQmwBJiFleT0pcu6M3BEpFftcrZOv+IySlded9DFjKonpnf5vjgBEilF PlsENy3MK9yVrTMJdSV31+ykEC0u2V52uNcgouOEbD4exMBZ7K7e98tgJ791RcaKGXaZHH Z9Vz4KZkI4GsQbe/HAc5Q7LtaSK4jHjL0QRITayPZiilg3f+IQmAJbZAJPqduQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692355256; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=R3bQn9enO4YEPL+oTGb6cLoU6vReT8OVMxIA6a+PUOw=; b=GSOxzlEsO/WgoPSjJ5yvQaZsyZqtRCAH4tb0CV7ISjUvSkVfXwk0T5d86fT1jLBra+OfJW PVgwPLspWD0mrI+dhLj1yUrQNjvKEOnJq4jVoRJUPvrbuXyD3bIoWCwXgpRPAx8lxLuqih 2i3v9thYVOOFHWhkFp40t8AXXFMuJjnhJihn3pbwM6ZcJ/EzyJ5kS0Urvm7IMi+Ekt8W/n Gcw0uDjJFlrz85DNW6UzPX2J2taLEK/y9OyWStrKCPinoMm5tSe5D2OLB18UTa/1XquUuX xO0nO5+2+9VdtABy5lZFCxLTmGwL8A5qLcUDYnFAE6cOQiLTJJ8ZxLrw/AzEEw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692355256; a=rsa-sha256; cv=none; b=NqQmOmGfN3eVVVebXAzyOUWwPAth8fg0YCRlG/h+u80TOVDF6fXoBtxF4bzkv+lNwTocVi 9XB9xZoVtom7+s3iZwg+0lE80xBSCIY4b2hedXfom1F4M++et+r+vrqE1zpi9X3M84OHrx 28pnp2Ptd0XaOJJ1SJMxMo9ULhKNZSSSHn/bVFGvTGPOvzB4pgWT3MQhoIaOOaTO2oQt6A OvZNPkwnL4BPvoF49RJnI/cdgxWOcRJ0tkzLaENp2/tCiqp5M+LVVZ3SdCc8V2JhTzfdlQ m1/l3h1lePNBGsXDjmPh+09iNluXrNfWqL1hVxTuZDbAV5TzfqK3owehbZoOnA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RRz1M6cKpz1C8n; Fri, 18 Aug 2023 10:40:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37IAetT4060858; Fri, 18 Aug 2023 10:40:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37IAetMR060855; Fri, 18 Aug 2023 10:40:55 GMT (envelope-from git) Date: Fri, 18 Aug 2023 10:40:55 GMT Message-Id: <202308181040.37IAetMR060855@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dmitry Salychev Subject: git: 2a9021898c4e - main - sff: Add SFP driver (fdt-based draft) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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/main X-Git-Reftype: branch X-Git-Commit: 2a9021898c4ee2154787da862c238cfeccd655df Auto-Submitted: auto-generated The branch main has been updated by dsl: URL: https://cgit.FreeBSD.org/src/commit/?id=2a9021898c4ee2154787da862c238cfeccd655df commit 2a9021898c4ee2154787da862c238cfeccd655df Author: Dmitry Salychev AuthorDate: 2023-08-18 09:17:31 +0000 Commit: Dmitry Salychev CommitDate: 2023-08-18 10:40:11 +0000 sff: Add SFP driver (fdt-based draft) This basic version of the driver obtains properties of the "sff,sfp" compatible devices and implements a simple interface to provide an I2C bus device for the rest of the drivers (e.g. to implement SIOCGI2C). Both of the interface and driver are subjects for a further generalization to be used in case of non-FDT and non-arm64 platforms. Reviewed by: bz, manu Approved by: bz (mentor) MFC after: 3 weeks Differential Revision: https://reviews.freebsd.org/D41440 --- sys/arm64/conf/std.nxp | 3 + sys/conf/files | 2 + sys/dev/sff/sff_if.m | 35 +++++++++++ sys/dev/sff/sfp_fdt.c | 155 +++++++++++++++++++++++++++++++++++++++++++++++ sys/modules/Makefile | 2 + sys/modules/sff/Makefile | 13 ++++ 6 files changed, 210 insertions(+) diff --git a/sys/arm64/conf/std.nxp b/sys/arm64/conf/std.nxp index 5b2e2b52d4e6..b4552fadaff4 100644 --- a/sys/arm64/conf/std.nxp +++ b/sys/arm64/conf/std.nxp @@ -25,6 +25,9 @@ device sdhci device dpaa2 # Data Path Acceleration Architecture (2nd Gen) device enetc # QorIQ LS1028A NIC +# SFF/SFP +device sff # Small Form Factor Transceivers + options FDT device acpi diff --git a/sys/conf/files b/sys/conf/files index 0db5887e6a75..b5cd85cba0e4 100644 --- a/sys/conf/files +++ b/sys/conf/files @@ -3044,6 +3044,8 @@ dev/sdhci/sdhci_pci.c optional sdhci pci dev/sdio/sdio_if.m optional mmccam dev/sdio/sdio_subr.c optional mmccam dev/sdio/sdiob.c optional mmccam +dev/sff/sff_if.m optional sff +dev/sff/sfp_fdt.c optional sff fdt dev/sge/if_sge.c optional sge pci dev/siis/siis.c optional siis pci dev/sis/if_sis.c optional sis pci diff --git a/sys/dev/sff/sff_if.m b/sys/dev/sff/sff_if.m new file mode 100644 index 000000000000..823e557992c2 --- /dev/null +++ b/sys/dev/sff/sff_if.m @@ -0,0 +1,35 @@ +#- +# SPDX-License-Identifier: BSD-2-Clause +# +# Copyright © 2023 Dmitry Salychev +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# 1. Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# 2. Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in the +# documentation and/or other materials provided with the distribution. +# +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND +# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +# ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE +# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS +# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) +# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY +# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF +# SUCH DAMAGE. +# + +#include + +INTERFACE sff; + +METHOD int get_i2c_bus { + device_t dev; + device_t *i2c_bus; +}; diff --git a/sys/dev/sff/sfp_fdt.c b/sys/dev/sff/sfp_fdt.c new file mode 100644 index 000000000000..7430282ede70 --- /dev/null +++ b/sys/dev/sff/sfp_fdt.c @@ -0,0 +1,155 @@ +/*- + * SPDX-License-Identifier: BSD-2-Clause + * + * Copyright © 2023 Dmitry Salychev + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + */ + +/* + * Small Form Factor (SFF) Committee Pluggable (SFP) Transceiver (FDT-based). + */ + +#include +#include +#include +#include + +#include +#include +#include + +#include "sff_if.h" + +struct sfp_fdt_softc { + phandle_t ofw_node; + phandle_t i2c_bus; + + phandle_t mod_def; + phandle_t los; + phandle_t tx_fault; + phandle_t tx_disable; + phandle_t rx_rate; + phandle_t tx_rate; + uint32_t max_power; /* in mW */ +}; + +static int +sfp_fdt_probe(device_t dev) +{ + phandle_t node; + ssize_t s; + + node = ofw_bus_get_node(dev); + if (!ofw_bus_node_is_compatible(node, "sff,sfp")) + return (ENXIO); + + s = device_get_property(dev, "i2c-bus", &node, sizeof(node), + DEVICE_PROP_HANDLE); + if (s == -1) { + device_printf(dev, "%s: '%s' has no 'i2c-bus' property, s %zd\n", + __func__, ofw_bus_get_name(dev), s); + return (ENXIO); + } + + device_set_desc(dev, "Small Form-factor Pluggable Transceiver"); + return (BUS_PROBE_DEFAULT); +} + +static int +sfp_fdt_attach(device_t dev) +{ + struct sfp_fdt_softc *sc; + ssize_t s; + int error; + + sc = device_get_softc(dev); + sc->ofw_node = ofw_bus_get_node(dev); + + s = device_get_property(dev, "i2c-bus", &sc->i2c_bus, + sizeof(sc->i2c_bus), DEVICE_PROP_HANDLE); + if (s == -1) { + device_printf(dev, "%s: cannot find 'i2c-bus' property: %zd\n", + __func__, s); + return (ENXIO); + } + + /* Optional properties */ + (void)device_get_property(dev, "mod-def0-gpios", &sc->mod_def, + sizeof(sc->mod_def), DEVICE_PROP_HANDLE); + (void)device_get_property(dev, "los-gpios", &sc->los, sizeof(sc->los), + DEVICE_PROP_HANDLE); + (void)device_get_property(dev, "tx-fault-gpios", &sc->tx_fault, + sizeof(sc->tx_fault), DEVICE_PROP_HANDLE); + (void)device_get_property(dev, "tx-disable-gpios", &sc->tx_disable, + sizeof(sc->tx_disable), DEVICE_PROP_HANDLE); + (void)device_get_property(dev, "rate-select0-gpios", &sc->rx_rate, + sizeof(sc->rx_rate), DEVICE_PROP_HANDLE); + (void)device_get_property(dev, "rate-select1-gpios", &sc->tx_rate, + sizeof(sc->tx_rate), DEVICE_PROP_HANDLE); + (void)device_get_property(dev, "maximum-power-milliwatt", &sc->max_power, + sizeof(sc->max_power), DEVICE_PROP_UINT32); + + error = OF_device_register_xref(OF_xref_from_node(sc->ofw_node), dev); + if (error != 0) + device_printf(dev, "%s: failed to register xref %#x\n", + __func__, OF_xref_from_node(sc->ofw_node)); + + return (error); +} + +static int +sfp_fdt_get_i2c_bus(device_t dev, device_t *i2c_bus) +{ + struct sfp_fdt_softc *sc; + device_t xdev; + + KASSERT(i2c_bus != NULL, ("%s: i2c_bus is NULL", __func__)); + + sc = device_get_softc(dev); + xdev = OF_device_from_xref(OF_xref_from_node(sc->i2c_bus)); + if (xdev == NULL) + return (ENXIO); + + *i2c_bus = xdev; + return (0); +} + +static device_method_t sfp_fdt_methods[] = { + /* Device interface */ + DEVMETHOD(device_probe, sfp_fdt_probe), + DEVMETHOD(device_attach, sfp_fdt_attach), + DEVMETHOD(device_detach, bus_generic_detach), + + /* SFF */ + DEVMETHOD(sff_get_i2c_bus, sfp_fdt_get_i2c_bus), + + DEVMETHOD_END +}; + +DEFINE_CLASS_0(sfp_fdt, sfp_fdt_driver, sfp_fdt_methods, + sizeof(struct sfp_fdt_softc)); + +EARLY_DRIVER_MODULE(sfp_fdt, simplebus, sfp_fdt_driver, 0, 0, + BUS_PASS_SUPPORTDEV); +EARLY_DRIVER_MODULE(sfp_fdt, ofwbus, sfp_fdt_driver, 0, 0, + BUS_PASS_SUPPORTDEV); diff --git a/sys/modules/Makefile b/sys/modules/Makefile index 201cfbcca725..4b98c7ed6e0d 100644 --- a/sys/modules/Makefile +++ b/sys/modules/Makefile @@ -355,6 +355,7 @@ SUBDIR= \ ${_sdhci_fdt} \ sdhci_pci \ sdio \ + ${_sff} \ sem \ send \ ${_sfxge} \ @@ -678,6 +679,7 @@ _cxgb= cxgb .if ${MACHINE_CPUARCH} == "aarch64" _armv8crypto= armv8crypto _dpaa2= dpaa2 +_sff= sff _em= em _hyperv= hyperv diff --git a/sys/modules/sff/Makefile b/sys/modules/sff/Makefile new file mode 100644 index 000000000000..96832070de63 --- /dev/null +++ b/sys/modules/sff/Makefile @@ -0,0 +1,13 @@ +.PATH: ${SRCTOP}/sys/dev/sff + +KMOD= sff + +SRCS+= sff_if.c sff_if.h +SRCS+= bus_if.h device_if.h + +.if !empty(OPT_FDT) +SRCS+= sfp_fdt.c \ + ofw_bus_if.h +.endif + +.include From nobody Fri Aug 18 12:40:13 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RS1g14GQlz4qT0X; Fri, 18 Aug 2023 12:40:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RS1g11yNgz4N81; Fri, 18 Aug 2023 12:40:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692362413; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/D81kOTt3MVJzxB0LUvEaqOleexI1ASsstJomVVmwJU=; b=Lp9cwlUUQSjXNMpnvi123lqODhI5IyFL3fe+Rp8Ai+76cFi5OQfgm0ZoW+vVG2v91ZFZCn OXUVAC+SR36TJyK6U1gWZt1vVnZ252BZ9dK9f4xPc82eOOS+eU78+n9egtgJODq5gI0tM3 MJTYBcWyAB62OAr9qqY/gWsWl7LTxrqdkjCFawOp52dU7dOv0kRE/KlWtg2ZjvcfIENYq/ 21I7PBvll/jxQTGM1MgiGz1vGKFvBUoKUI9sBqV0tDM3lGdE8yYb0wt+sQT7SgzztIh4ss yjGSLG6KAN1LyZEft29b17P4DLxXFZ2vO+D2z2mmU0GllNdAFJElsF9gK7vjHQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692362413; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=/D81kOTt3MVJzxB0LUvEaqOleexI1ASsstJomVVmwJU=; b=rjj98mO2xpGWft5vKymWxREn93qrKJQklTParyRcjzHjwZ1g9wW2iuls+9rrAf5nxNhKpk OZZi6pova/pU2ncPnFWiRfsuOOlvBZrG2+uejIbxy99W9H2G7cO6s1uLp8rcN0AvfqDY4g 6LRMAsfHUGXgkCDIuPUcpkEUV+J11N9xzdCXRGbpzSwBMJX4ltP4JKIp5gozQ9kpksH/tY a9YVde4opObvulyjC667zBsTXlM/eDBjXuH/1OMzMduch1WIC44DyGTGwWplsX3lHm3sLB 37W9BPUH6RlsdpdiX1O7xkFO9Oh31y4JinlP/VGLqGkdMGKaWGUbEYJUrZ09mw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692362413; a=rsa-sha256; cv=none; b=kFSzEJxY2d1/m1EVHvDoB1+gUpMNRHzkeHjGUN0/P5alqOfajwTiIFyMp5KKNxj0lhZsH1 ut0YDoEeKIy6X/cDSEoxf7B8U3Tq3MabyXpGeVjRj7UV8k5zv44EofbxVXMa9EAFgSPPR4 LYAK3PbLsl/tPXgzQ4CDmo0GF/GwL+SmFCxOAGacFHOLfZew62vrD3KaPS7E7BclnIyUUy +79N+gl4O+sBIJ8zklFlmPfKQdSfCxfA/WFq5/eRhn/MM0Hyz/yPVpgtfXKhJe4zfKTHV9 YU+EcWekwS40/M22FOIrG/SIFKnr0bGkZZCbLvAts/Ha+5WZThUKwk1Lrd8gOA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RS1g10vsTz1M6; Fri, 18 Aug 2023 12:40:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37ICeDQe056750; Fri, 18 Aug 2023 12:40:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37ICeD9T056740; Fri, 18 Aug 2023 12:40:13 GMT (envelope-from git) Date: Fri, 18 Aug 2023 12:40:13 GMT Message-Id: <202308181240.37ICeD9T056740@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mike Karels Subject: git: 4aead44fa14f - stable/13 - md driver compat32: fix structure padding for arm, powerpc List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: karels X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 4aead44fa14fd089b8e3eeb48c24c2c14aea8f93 Auto-Submitted: auto-generated The branch stable/13 has been updated by karels: URL: https://cgit.FreeBSD.org/src/commit/?id=4aead44fa14fd089b8e3eeb48c24c2c14aea8f93 commit 4aead44fa14fd089b8e3eeb48c24c2c14aea8f93 Author: Mike Karels AuthorDate: 2023-08-08 14:09:03 +0000 Commit: Mike Karels CommitDate: 2023-08-18 12:39:55 +0000 md driver compat32: fix structure padding for arm, powerpc Because the 32-bit md_ioctl structure contains 64-bit members, arm and powerpc add padding to a multiple of 8. i386 doesn't do this. The md_ioctl32 definition was correct for amd64/i386 without padding, but wrong for arm64 and powerpc64. Make __packed__ conditional on __amd64__, and test for the expected size on non-amd64. Note that mdconfig is used in the ATF test suite. Note, I verified the structure size for powerpc, but was unable to test. Reviewed by: jrtc27 Differential Revision: https://reviews.freebsd.org/D41339 Discussed with: jhibbits (cherry picked from commit 58a46cfd751ac726ddca8544bf73a290b0154a57) --- sys/dev/md/md.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/sys/dev/md/md.c b/sys/dev/md/md.c index 52d64d6721cd..6878eb387fda 100644 --- a/sys/dev/md/md.c +++ b/sys/dev/md/md.c @@ -146,8 +146,16 @@ struct md_ioctl32 { int md_fwsectors; uint32_t md_label; int md_pad[MDNPAD]; -} __attribute__((__packed__)); +} +#ifdef __amd64__ +__attribute__((__packed__)) +#endif +; +#ifndef __amd64__ +CTASSERT((sizeof(struct md_ioctl32)) == 440); +#else CTASSERT((sizeof(struct md_ioctl32)) == 436); +#endif #define MDIOCATTACH_32 _IOC_NEWTYPE(MDIOCATTACH, struct md_ioctl32) #define MDIOCDETACH_32 _IOC_NEWTYPE(MDIOCDETACH, struct md_ioctl32) From nobody Fri Aug 18 12:41:17 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RS1hF62Gdz4qSmc; Fri, 18 Aug 2023 12:41: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RS1hF5TTwz4Ncv; Fri, 18 Aug 2023 12:41:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692362477; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=FfUoGNuvkozaCESijGNDbZVu//s89Y1bGSuIOthw+To=; b=JV7iNXDMewWyNhwYYrlkVefI/rYrmnGuBPKhtK8zbgE278ecbxXqSbm4D8h5zk5GKrBy6z WLviH63QwBWBOwXPulSqfI54DbEAqhReA74OmkazM+fy24hcFcR3SmHjV34bESpv9TLI28 QMMthPjNRKNbWVnlKdM/6jOsKBfxfQGgPJD6Jrjr2kjqDT7YM1gL2dL8Yedx6oLhsEFQA/ iFaMb1Hgpvnhhj8L77sbwN17i2uEYPNyGVKHWgj8FY72WHf6ENG/kXASNhIvf50K5S+A7l tElNSeU2Sv7E0FSkM8b2MSF3N4tP5LGM95OgEMxoJPh1ab/sh/8o6/YsfFbpGA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692362477; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=FfUoGNuvkozaCESijGNDbZVu//s89Y1bGSuIOthw+To=; b=Cj2EZxz1q2C+sW4s5dW2limaItu/eju2qh1nvDGCsYCj2wq3sf7A39fspKQJdN3sI0kYkT tTujfngYlQ63I71DFYF75ctLguYyalxqYcB96uPjWrRTCmpTJN4pvPIrL1qvgYFa8qKd9j 0zje9fR1ZqJfluQQXbAFR6yptHW64LV+XID/LyA6UCMJPbC/BpFOfh7qyvirGy2kGmZ+jv v5QE3RRhf/Ja28cFlVhDbTup4VnBUz+CITJvHCotIS3GCbTdQv7wBGu7K1qUhfEWV+CZrk /sLtul83hrNdFc2HvNSWbsCHLywTNNAZ9sLbdL8kmiNqus+Xcw9fh6iIyxuNJQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692362477; a=rsa-sha256; cv=none; b=NLj6CYG9eEwb8N1kh8ry3x95gk778zluD80n7TT3b91/keAinZ7oMi50XAENe0Y2ihNzU0 x2nWcu6li+OyBaL1z+AUm5KbS1bWN+o01jk/k1u/CLF9+nCfAhAS1BPzjlOrACA40hUvn3 rd/rx1geMlTS1XxmR7HVmgsshHX4AqpndRuHHgvINgFzwCb3oLUB/TapL2xu9i1UqBKt4A auyighhspr6J+Ye+Q0JU+1SRuB1bdlprHJ+6ovwX0XyEhZDduL9ytnGKegWTWtHKXu3wZu E4nWex+c7PwrftTChU8EtemznrR5jt7GHV3AB7yQEfJGpAL0Eb3rEt2S3NlbqQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RS1hF4XD0z1qX; Fri, 18 Aug 2023 12:41:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37ICfHr8064250; Fri, 18 Aug 2023 12:41:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37ICfHtX064247; Fri, 18 Aug 2023 12:41:17 GMT (envelope-from git) Date: Fri, 18 Aug 2023 12:41:17 GMT Message-Id: <202308181241.37ICfHtX064247@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mike Karels Subject: git: 55b79ced0048 - stable/12 - md driver compat32: fix structure padding for arm, powerpc List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: karels X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: 55b79ced0048e9015053ccfd96cf7f38be49ecbf Auto-Submitted: auto-generated The branch stable/12 has been updated by karels: URL: https://cgit.FreeBSD.org/src/commit/?id=55b79ced0048e9015053ccfd96cf7f38be49ecbf commit 55b79ced0048e9015053ccfd96cf7f38be49ecbf Author: Mike Karels AuthorDate: 2023-08-08 14:09:03 +0000 Commit: Mike Karels CommitDate: 2023-08-18 12:41:06 +0000 md driver compat32: fix structure padding for arm, powerpc Because the 32-bit md_ioctl structure contains 64-bit members, arm and powerpc add padding to a multiple of 8. i386 doesn't do this. The md_ioctl32 definition was correct for amd64/i386 without padding, but wrong for arm64 and powerpc64. Make __packed__ conditional on __amd64__, and test for the expected size on non-amd64. Note that mdconfig is used in the ATF test suite. Note, I verified the structure size for powerpc, but was unable to test. Reviewed by: jrtc27 Differential Revision: https://reviews.freebsd.org/D41339 Discussed with: jhibbits (cherry picked from commit 58a46cfd751ac726ddca8544bf73a290b0154a57) --- sys/dev/md/md.c | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/sys/dev/md/md.c b/sys/dev/md/md.c index 641dff4f45d3..73e3bf578019 100644 --- a/sys/dev/md/md.c +++ b/sys/dev/md/md.c @@ -145,8 +145,16 @@ struct md_ioctl32 { int md_fwsectors; uint32_t md_label; int md_pad[MDNPAD]; -} __attribute__((__packed__)); +} +#ifdef __amd64__ +__attribute__((__packed__)) +#endif +; +#ifndef __amd64__ +CTASSERT((sizeof(struct md_ioctl32)) == 440); +#else CTASSERT((sizeof(struct md_ioctl32)) == 436); +#endif #define MDIOCATTACH_32 _IOC_NEWTYPE(MDIOCATTACH, struct md_ioctl32) #define MDIOCDETACH_32 _IOC_NEWTYPE(MDIOCDETACH, struct md_ioctl32) From nobody Fri Aug 18 12:44:04 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RS1lS2BhNz4qT6Z; Fri, 18 Aug 2023 12:44: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RS1lS1f6gz4PM1; Fri, 18 Aug 2023 12:44:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692362644; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=SmAL8rbqLbeBAwzsr5CYesoopwvjQTEuqPNL9ji9XJk=; b=jdR7sfQay0E9VJHO6fwv6amc5jgCTV06/e4krii29vh2xGvLQe5X6JCj1wngCEeQRJKj1R +RTM3CXnnwG/4knYSsbvGs1wNY9rC611H2yAnWdPhAOJmgWvR+QbUy86q8VyQxL8Ee6rCR 5XOQ9EvHXYj4Auatr9a6NeZjoFdV/zSZJvF0YfYUhyHIME+cXonXzTUSy3u5wX4mBcG2Ga wW9DdbzHGI3kcL1e1aVs480jSp+CYXuw0ECqiuVx/F82sTnKvxeehs9oMX/cSswRVAXYBY 71Jsc1ds1w2/mwx6RDH52GmobKmzroi9khYj1vU5S/PwLx+5KC911hwEYmMG4A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692362644; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=SmAL8rbqLbeBAwzsr5CYesoopwvjQTEuqPNL9ji9XJk=; b=dR01s7VR9UrPs9JC9zumWtFZ9Vfv0KyjGgUm/peo2ozHhtCNosVXhc4fBs7Fk1Q/vwMX0G bii0RtcmTO2bVPLUJN8hd6TuL+aFNfQN+peHAVWadbCv9FlL+zgT1hML3+pXtTmF90M/sw AI0AVI2fUsrOgSVw0PhqTPWhyiNydgfE9C+c5nCW/c8ms/kipVuRudjC+MOF+geq5GT2UR 1IldAcsVp0YKzHpArzlgrsI/aKUnpkWpw1FqwCFwZDkrN1VNArwP9FM5JRVDYHk8jctodE EbiS/O/tRzJap4E7m68Fwfbv2ahHLHrv7XBdvV0FojTX5ddMriefjg1gnKMUug== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692362644; a=rsa-sha256; cv=none; b=b579bi+RqrRXPmYfQZaW+uVgd3DzakSkw/+36xNXKzU2m96HM9sq39etbtUAjBgDoyXHrq cVQN/UuoxGUKBTMFECZlardOo5ipWZZuqhfvPmVe1NUgB8TZtgNID0RmK8tLvKESMdqRbp 8f/Gf210jYR4wG/BaUnYLUelMqKqetF9PtAG/EGn3uJWrw0jTE1Ds1Mz3uN2rD4y15Eo/Z avf1xN1N9zosl58fMKH1d+gXGWlk9DBeFbVd5y8M/JhT99HKiLUqW2M8B657eVQuGTunoz Y9j9DjICeuiw74mMIfteJeEm+M9xXyYSdQJ4VD5yRuSJuGibKZQ9MMvpeFjAuw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RS1lS0jLnz21r; Fri, 18 Aug 2023 12:44:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37ICi4e6067337; Fri, 18 Aug 2023 12:44:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37ICi4AR067333; Fri, 18 Aug 2023 12:44:04 GMT (envelope-from git) Date: Fri, 18 Aug 2023 12:44:04 GMT Message-Id: <202308181244.37ICi4AR067333@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: c718009884b3 - main - vm_map.c: plug several more places which might modify entry->offset List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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/main X-Git-Reftype: branch X-Git-Commit: c718009884b3d65528deaff24712cbf98e3be656 Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=c718009884b3d65528deaff24712cbf98e3be656 commit c718009884b3d65528deaff24712cbf98e3be656 Author: Konstantin Belousov AuthorDate: 2023-08-15 19:05:33 +0000 Commit: Konstantin Belousov CommitDate: 2023-08-18 12:43:35 +0000 vm_map.c: plug several more places which might modify entry->offset for the GUARD entries protecting stacks gaps. syzkaller: https://syzkaller.appspot.com/bug?extid=c325d6a75e4fd0a68714 Reviewed by: dougm, markj (previous version) Tested by: pho (previous version) Sponsored by: The FreeBSD Foundation MFC after: 1 week Differential revision: https://reviews.freebsd.org/D41475 --- sys/vm/vm_map.c | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/sys/vm/vm_map.c b/sys/vm/vm_map.c index 252b58ad2924..f609d1fd68d7 100644 --- a/sys/vm/vm_map.c +++ b/sys/vm/vm_map.c @@ -1413,7 +1413,9 @@ vm_map_entry_link(vm_map_t map, vm_map_entry_t entry) KASSERT(entry->end < root->end, ("%s: clip_start not within entry", __func__)); vm_map_splay_findprev(root, &llist); - root->offset += entry->end - root->start; + if ((root->eflags & (MAP_ENTRY_STACK_GAP_DN | + MAP_ENTRY_STACK_GAP_UP)) == 0) + root->offset += entry->end - root->start; root->start = entry->end; max_free_left = vm_map_splay_merge_pred(header, entry, llist); max_free_right = root->max_free = vm_size_max( @@ -1429,7 +1431,9 @@ vm_map_entry_link(vm_map_t map, vm_map_entry_t entry) KASSERT(entry->end == root->end, ("%s: clip_start not within entry", __func__)); vm_map_splay_findnext(root, &rlist); - entry->offset += entry->start - root->start; + if ((entry->eflags & (MAP_ENTRY_STACK_GAP_DN | + MAP_ENTRY_STACK_GAP_UP)) == 0) + entry->offset += entry->start - root->start; root->end = entry->start; max_free_left = root->max_free = vm_size_max( vm_map_splay_merge_left(header, root, llist), @@ -1463,6 +1467,8 @@ vm_map_entry_unlink(vm_map_t map, vm_map_entry_t entry, vm_map_splay_findnext(root, &rlist); if (op == UNLINK_MERGE_NEXT) { rlist->start = root->start; + MPASS((rlist->eflags & (MAP_ENTRY_STACK_GAP_DN | + MAP_ENTRY_STACK_GAP_UP) == 0); rlist->offset = root->offset; } if (llist != header) { @@ -3103,7 +3109,8 @@ vm_map_madvise( entry = vm_map_entry_succ(entry)) { vm_offset_t useEnd, useStart; - if ((entry->eflags & MAP_ENTRY_IS_SUB_MAP) != 0) + if ((entry->eflags & (MAP_ENTRY_IS_SUB_MAP | + MAP_ENTRY_GUARD)) != 0) continue; /* From nobody Fri Aug 18 12:58:48 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RS24T1frPz4qVKN; Fri, 18 Aug 2023 12:58: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RS24T0txqz4S3h; Fri, 18 Aug 2023 12:58:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692363529; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Frtlofbt6rLGsaHs9gkdBj1zBc6FKcZPXMm89y7GMVk=; b=JAGjhiAVg33X6Ln4P51g2Gk7a2TT6rpN9kKisPn+IWEBlRKfBBCJifeu2/uEAcSYkPqShb JR2eBhGb2nVU+tNV/L7Hp6Edr4LQZwNx6j9+ZZkcIaQh1/7IZOWpZaytvLRKXGr31rIwtu 9hHLVIoxEjLHp8Xy7/+UZR1pZZ+YcwW0+XRIhwlwhgUBhTLS76ebk0oMDjioHz342JVY5V Wl1Su50sRFflHsoAGj0mU509SXGo4i+KqMuFndkKl9kTocTn0nKcrg0inlH6vHQxNEN377 oGkS5ndAAYny/8Q9qEtIaHlF6TI6IuyxHJkiAaIo2p0Hm/GDWKL/quforim4ag== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692363529; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Frtlofbt6rLGsaHs9gkdBj1zBc6FKcZPXMm89y7GMVk=; b=CtxmUvCYXUXNe8grVd8Fokp9ffR2fg2aAjTmZqxUgvsol0HMHpeBwB2I+NkKycTQhIqXBJ sBt0cmmg30EYYrSklcdOG83Vs+HDpgHJZeA4VQI/i20/jyopaNESER9Ql2Zgw5RrmKdvYp BvPlodEBkcL3K1bK7sqnEUEbU2068DbPGpVffGWN65FNdLERdSgg861Z9vPbFr1aAjnkry iUNjZThpw1NndgtGPVPdJv7mzTqNn16A69yIszOIC6Ri09mfV/QQhbzIpxA7DtgAxMzLJo sbeWA6/TSyiNIgTJrJJ41KgIjar9+baSvwJf671H1CSP0QRnkbBIf7+j5+etcA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692363529; a=rsa-sha256; cv=none; b=JfYFgo8nn1RUVadP0RBMywSkDsUqS3fy1GxbBMOtquJkNQJY6f9NOqNOwk2mA1h80zXSyj BNg15Je0boEcjLs1LrmGYwUpiOMjdJ+/RtjjtYWbOQSHUnCKsCyoITuJRIz1M2PGk7XoZ0 hzW0NJJnm0BxHRT0pQbB0Mvkbo9XmXJDf6+fXEaojjnpN5lfQ1UZPKMCSf9gd7bUnfvnom feuRKdnloSrx3rUzLj3KxjRbUENY9k7bi5CtUXV0XapHORvSXlnuJ3ruXuHOXV6FZlI0zV CMvqcY66qu27+VjrqmcXRurD5uwZV35/453PSzzBGVK+Vd1DIPraKCWZv5Y3Kg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RS24S73C0z2hn; Fri, 18 Aug 2023 12:58:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37ICwmnN084733; Fri, 18 Aug 2023 12:58:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37ICwmsq084730; Fri, 18 Aug 2023 12:58:48 GMT (envelope-from git) Date: Fri, 18 Aug 2023 12:58:48 GMT Message-Id: <202308181258.37ICwmsq084730@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dmitry Chagin Subject: git: 2be88e2cca2c - main - linux(4): Follow style(9), don't include both sys/param.h and sys/types.h List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dchagin X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2be88e2cca2c9aa3d68f04347de6c1ef31b16cf0 Auto-Submitted: auto-generated The branch main has been updated by dchagin: URL: https://cgit.FreeBSD.org/src/commit/?id=2be88e2cca2c9aa3d68f04347de6c1ef31b16cf0 commit 2be88e2cca2c9aa3d68f04347de6c1ef31b16cf0 Author: Dmitry Chagin AuthorDate: 2023-08-18 12:58:32 +0000 Commit: Dmitry Chagin CommitDate: 2023-08-18 12:58:32 +0000 linux(4): Follow style(9), don't include both sys/param.h and sys/types.h --- sys/compat/linux/linux_util.c | 1 - 1 file changed, 1 deletion(-) diff --git a/sys/compat/linux/linux_util.c b/sys/compat/linux/linux_util.c index ad6b6fda644e..020eb57ea68e 100644 --- a/sys/compat/linux/linux_util.c +++ b/sys/compat/linux/linux_util.c @@ -32,7 +32,6 @@ */ #include -#include #include #include #include From nobody Fri Aug 18 12:58:50 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RS24V2L53z4qV1T; Fri, 18 Aug 2023 12:58: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RS24V1rLvz4SC1; Fri, 18 Aug 2023 12:58:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692363530; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5dKY09XEKI0O4LjhWBZynMSoCCRJE1IcXHiDUCZzsgA=; b=Z+z956FmXJVuESlT6V9lA1KGNi7EANr/jQ2PjwOS8CpCkGmfU+euCaJkW+UPHlbt3z2ZNE U/2uES+odG3qYUcEiwc0e/FvS1N/6M+LEQ9kyVm0XGJ2LPnBUD7q4Pyi/UT6f/L/4ETHni Ogv1S5xRidAamzWnvgudmUpYIbMEAqo5IMJNmItQguq67m+uzntzX8Jjn/oS8ZqaeZfVZP l8tpyml24oXIuKYrNd0iK4CCttfMzhRhA9LLxcJtBJR+/UjcAevdPko1K1ZgrzWIMTO/kV PeRmL9LAjpFPITeYb5H9wEnFDSgXys03LpJGfZx57JWPs7IIZ7NIUIDmnHLDpQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692363530; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5dKY09XEKI0O4LjhWBZynMSoCCRJE1IcXHiDUCZzsgA=; b=w2u8BUtowG++oNYVpBamVK5UcoBW4m+X9pwPzajs3nDGXJGFpI2MzfOA3Ya5ok90IzAr0j vFGYc/STchxyfGfxhcYzSGQ6+33qOWUMpca4ioPhZI+e6LXFncsNfo66XVt1cgg1U5yQxv kz5Sf0CwqZu3QMcMRCVcvM6HT9rbmv6UZ4dOQ3Cmmtm8c/k6bod57cJ/vSCHXsSQNsB53x 9WiptLMu2AfHmvMIMUN5oxIhhsd/l7FOTTO5MjGPimS3KA3o7hVPnFqNz9XR2gowdOKg8L SE/LvI0TnAEh1eJiMYNnk2fBsfNwSiSF6KiTAYr24h+6PRA1hXocp7mL8P4mXg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692363530; a=rsa-sha256; cv=none; b=HLhyOK6Er1qOnkdhfkVjiXyoP7OUIot3M+mosvQpr7Frkk18W5q0ZVp45shP+ALG5LXUus o2yBXPc63AwRhAYYGZUoVYNqjLgp7RDnAaa4uMreqYLWfwmUVgD/Mz3GVzdxOs82puJKcD MOXvQkftwuTDmxGYXXd4oqNVGm25NPle3oNiWOTENA0gWl2+zp01SWQQtxiKkHi7BafRfV GK2nyAVgZ/uSXKyqOVo4chnKu2BZby9AOoEvzNyacZysx2ZOyRKs28HzhKDSnLJtVgwxN3 i5grMYZi6RynvbOEs61glGpqxqpGPdyAH9bvc4gWCs1j7uM6uwWz1gfXxvuAmQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RS24V0wchz22Z; Fri, 18 Aug 2023 12:58:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37ICwoOf084784; Fri, 18 Aug 2023 12:58:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37ICwoKi084781; Fri, 18 Aug 2023 12:58:50 GMT (envelope-from git) Date: Fri, 18 Aug 2023 12:58:50 GMT Message-Id: <202308181258.37ICwoKi084781@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dmitry Chagin Subject: git: 110be11ac991 - main - linux(4): Remove include of sys/types.h from linux_vdso.h List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dchagin X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 110be11ac9913fb5f26b1456359d25b5740dd615 Auto-Submitted: auto-generated The branch main has been updated by dchagin: URL: https://cgit.FreeBSD.org/src/commit/?id=110be11ac9913fb5f26b1456359d25b5740dd615 commit 110be11ac9913fb5f26b1456359d25b5740dd615 Author: Dmitry Chagin AuthorDate: 2023-08-18 12:58:32 +0000 Commit: Dmitry Chagin CommitDate: 2023-08-18 12:58:32 +0000 linux(4): Remove include of sys/types.h from linux_vdso.h Due to sys/param.h includes sys/types.h and the fact that the sys/param.h is included everywhere where linux_vdso.h is needed. --- sys/compat/linux/linux_vdso.h | 2 -- 1 file changed, 2 deletions(-) diff --git a/sys/compat/linux/linux_vdso.h b/sys/compat/linux/linux_vdso.h index afd994b6c4fc..e7f45f38c662 100644 --- a/sys/compat/linux/linux_vdso.h +++ b/sys/compat/linux/linux_vdso.h @@ -28,8 +28,6 @@ #ifndef _LINUX_VDSO_H_ #define _LINUX_VDSO_H_ -#include - struct linux_vdso_sym { SLIST_ENTRY(linux_vdso_sym) sym; uint32_t size; From nobody Fri Aug 18 12:58:51 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RS24X1Wn8z4qVHf; Fri, 18 Aug 2023 12:58:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RS24W356Rz4SDw; Fri, 18 Aug 2023 12:58:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692363531; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=s+/xaLS7jic8cClRa0xFxrai0+50FNrGvhdtLAzAeSw=; b=uzBnJe4a8P0XPOwjGbzdWSPUcCSjlnxMX7UYPF70AMIuJ7Nj516lXze8XLKE4hBOpqvuLH KlwvkWDqZiT5WNvaY8LR1DVlv097PZJKIo6fQth4m2kYcTpasB1BQFxK3KATD/eqoYAHgO 5Zc7B/NKXwTSAQ3UBkP68f6kKt5FloZw/35WfVL3WdzE6hc2W0zc6/ji4BwpqiOK9wMiUp 12JVnGWeAFaXKrDpzHX+OVrEOhV+BwcCIqtqTonk4wwrjhMWfWofbusApnANb0HpBn+kA9 HYhfE6W5SnNR5peeSeeAZv1ho2OtoG90T/3SwwFmVp4NjriyXSzC1s1TOUtQIg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692363531; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=s+/xaLS7jic8cClRa0xFxrai0+50FNrGvhdtLAzAeSw=; b=XXmof/CHQc/0ESJrG376gAE9XU+4zrAUS0TLmcbR9SRX2pHDd2E7d+IGaZG6rK+r24Hwzi Q7EzOyAwHgIjBAw5IoTUSZg0XQftexNkYKrWddoVmIHLZiNlGC1OlC6E4Cae8N8YOvvZlg JU6WvJgfj2KIuRTX26MCKidK7gsIeMZ/YUGSq54b0b4vhmp83QCU/5QPdY9nLEoset+cpo 0xnkgZFUeZ0oJ6T4etclvWl5eoSdVViJYbsExrro4R+EtGHQXqu0JLjJIm7Pg7eM5Ec5kZ IP/n6FAO9oKfcGPJ1qRHHP34WAf+18iNsdokEZDAJoAA4RqrH+rtihIA+c9mhg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692363531; a=rsa-sha256; cv=none; b=tDPPRP9hGjlKNnh81sDudAnsSaZiF19qyJraovEzZqYtRw5+ylZ79d4nuZFZV1lsvofu/F 1qDx1bgehRJKzCZ9Lgfp02Ecl3SGcxcK3wxY+Sjjl60gqiIyL/Gbqu+13wyYrv+vyi7P7r dbrZfNUbknRgC6H1zNd9oWSA2V+JdItFNTLoQiQEQbEmtGT1I+DQbaQE5NYhggq1fPYa+j emvC/QD2u8fmKLDfJoB9PrbD/+ng/PjVLtEsEwZF9AAq1Wisky3pW3d/mBJyHt/XszWcHQ B6UG5WFlq3p0UT0+rZtkzYZ8yvQJYpl3v9zZo3dye/EsemvsUw+gA+iVJOJODg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RS24W1ysJz22b; Fri, 18 Aug 2023 12:58:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37ICwpKR084840; Fri, 18 Aug 2023 12:58:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37ICwpOR084837; Fri, 18 Aug 2023 12:58:51 GMT (envelope-from git) Date: Fri, 18 Aug 2023 12:58:51 GMT Message-Id: <202308181258.37ICwpOR084837@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dmitry Chagin Subject: git: 0541653520fc - main - linux(4): Remove sys/cdefs.h inclusion under x86/linux due to 685dc743 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dchagin X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0541653520fc122ef01595d405f0633bd129947d Auto-Submitted: auto-generated The branch main has been updated by dchagin: URL: https://cgit.FreeBSD.org/src/commit/?id=0541653520fc122ef01595d405f0633bd129947d commit 0541653520fc122ef01595d405f0633bd129947d Author: Dmitry Chagin AuthorDate: 2023-08-18 12:58:32 +0000 Commit: Dmitry Chagin CommitDate: 2023-08-18 12:58:32 +0000 linux(4): Remove sys/cdefs.h inclusion under x86/linux due to 685dc743 --- sys/x86/linux/linux_dummy_x86.c | 1 - sys/x86/linux/linux_vdso_selector_x86.c | 1 - sys/x86/linux/linux_x86.c | 1 - 3 files changed, 3 deletions(-) diff --git a/sys/x86/linux/linux_dummy_x86.c b/sys/x86/linux/linux_dummy_x86.c index 30a5c4cde7ea..ae1d23e811e7 100644 --- a/sys/x86/linux/linux_dummy_x86.c +++ b/sys/x86/linux/linux_dummy_x86.c @@ -25,7 +25,6 @@ * SUCH DAMAGE. */ -#include #include #include #include diff --git a/sys/x86/linux/linux_vdso_selector_x86.c b/sys/x86/linux/linux_vdso_selector_x86.c index 5d06e5d833b7..3a8d75965a40 100644 --- a/sys/x86/linux/linux_vdso_selector_x86.c +++ b/sys/x86/linux/linux_vdso_selector_x86.c @@ -28,7 +28,6 @@ * SUCH DAMAGE. */ -#include #include #include #include diff --git a/sys/x86/linux/linux_x86.c b/sys/x86/linux/linux_x86.c index 20cd207fdc04..2a810c7e7a1e 100644 --- a/sys/x86/linux/linux_x86.c +++ b/sys/x86/linux/linux_x86.c @@ -26,7 +26,6 @@ * SUCH DAMAGE. */ -#include #include #include #include From nobody Fri Aug 18 13:05:41 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RS2DQ0ft2z4qVf6; Fri, 18 Aug 2023 13:05:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RS2DQ0BHlz4TL7; Fri, 18 Aug 2023 13:05:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692363942; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=aClGHp0e/gl0V4SqMK7hRSoNFaQt3zd9WLMpD3ycUt4=; b=rqTTgQNi8h2wfRb1Grhh4odlXoFEvpn+zEB5wmeH/TaFQirjagiOG251pYwALtiDBTKIEa yz1de4S40tW2QBtjadICph+txqBXEbz2LnH6ece91aTPfm6eJD4eUATp7B/avCjedviiIf z4jOPo5ajfCqS3wMo2lmhWUZZCwb/paK+tqQ5L7PyPyN916o8uTg0VNS+0+xXTP+tO67k6 jLdPQP90d1ItP8v8mI3fpKDPQThlPfgnTfz4v0f9zBhSJj+KpAC2gU/3fSRZ16pQ6npFvz QxTE8daLHyzhsEi9D1hWcMNxX5kf/vUX7EKDe9GrhWSi9avkWnHm1SuK5xvV9g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692363942; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=aClGHp0e/gl0V4SqMK7hRSoNFaQt3zd9WLMpD3ycUt4=; b=yoz/8VkO8lOs6y1m1zB/AOAE8owXp4oUd6teegIWrepM8i2/aj7orn4eNwt95VXJeh+AjN UX0H/7S2904O0//baERs3dcbMe64tT+sYwUljPso4fcDOBgBzQe8mNSkqqwPGPYTooSYOD 5GTIgSxEgJvFAjWOPJF7M32zcKxlCdgEwTuKy5vG1+6+ELPsWvze1yQCEx0PImXXYcpuYV QoEtc7iWhuDhhDFdrUUHMwVR38msntbSVVvO9X8wHnaW331AOjacSjKckLzNJwcnGbR3he 0X758S0IrcShPkAtZs5dB8lygy+zxQTaTvc359AST/PSYlFMVfRKYCm5HD8Tdw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692363942; a=rsa-sha256; cv=none; b=G+b1Dsjw9kRtMCX9iCAmunLSKjOhos5uz6LHALuEZiqgD6vVqDq9CQuRoXySqQrtaRXK+Z YS0f2JrfW+02/DiGhLNjejd5YsGeSu72h+PVyst+4OwGJsZInopKKhwjbQcRakuAACOigN loBj9oaXutj7PXwd6mgJzr/R+/D8V5vEEugeC9eOD0IVSkZw9XuvlaOo2J5uI7lRJ9+q1f Q5RMvYMFfUoBH1xhtIjxdkQnYslMArhfyXUoAC2+7fhFpkuR2hZVIXiz4lWQwJlU49XZ70 UbzwejEUb3LJVvo2n/P/qCeMsWPeOkbMXiir6m+IddzfmxXKKPiFuFZvitA1uA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RS2DP6F9cz2Yx; Fri, 18 Aug 2023 13:05:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37ID5fbU001825; Fri, 18 Aug 2023 13:05:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37ID5f5F001822; Fri, 18 Aug 2023 13:05:41 GMT (envelope-from git) Date: Fri, 18 Aug 2023 13:05:41 GMT Message-Id: <202308181305.37ID5f5F001822@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Michael Tuexen Subject: git: fb259f62bbf7 - main - sctp: unbreak congestion control dtrace support List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: tuexen X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: fb259f62bbf75e9aa64eab13e20e075ec25465ed Auto-Submitted: auto-generated The branch main has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=fb259f62bbf75e9aa64eab13e20e075ec25465ed commit fb259f62bbf75e9aa64eab13e20e075ec25465ed Author: Michael Tuexen AuthorDate: 2023-08-18 13:01:35 +0000 Commit: Michael Tuexen CommitDate: 2023-08-18 13:01:35 +0000 sctp: unbreak congestion control dtrace support Fix a typo and improve consistency of handling variables only used when compiling with dtrace support. MFC after: 1 week --- sys/netinet/sctp_cc_functions.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/sys/netinet/sctp_cc_functions.c b/sys/netinet/sctp_cc_functions.c index 1e515a9d69e3..adcce72060f2 100644 --- a/sys/netinet/sctp_cc_functions.c +++ b/sys/netinet/sctp_cc_functions.c @@ -52,7 +52,7 @@ #define SHIFT_MPTCP_MULTI_Z 16 #define SHIFT_MPTCP_MULTI 8 -#ifdef KDTRACE_HOOOKS +#ifdef KDTRACE_HOOKS #define __dtrace #else #define __dtrace __unused @@ -1403,11 +1403,7 @@ static void sctp_set_rtcc_initial_cc_param(struct sctp_tcb *stcb, struct sctp_nets *net) { -#ifdef KDTRACE_HOOOKS - uint64_t vtag, probepoint; -#else - uint64_t vtag __unused, probepoint __unused; -#endif + uint64_t vtag __dtrace, probepoint __dtrace; sctp_set_initial_cc_param(stcb, net); stcb->asoc.use_precise_time = 1; From nobody Fri Aug 18 13:08:30 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RS2Hg0JhWz4qVgy; Fri, 18 Aug 2023 13:08: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RS2Hf2lNGz4VFk; Fri, 18 Aug 2023 13:08:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692364110; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=lOJpXJqwfCB6IEuAIZAel43Iz0bJsUgQoGRd5BTGrUA=; b=CowX4zRMsLDRz4z3+86riS0+UhEDByVyHOYJdT6lht4vFkFJE0ogwRTDf4C/UVvou8hXlM sIwwxd4eaPts1CIJUuz+dyNHgRYTie2atj6uCYdZFeaUY9e3VwHDjh7doyQpJQ4+fOfd/M BAoaRMj2WRlfcSKJvDGyO0ZtXNubS12Iq3XjwDI0EIZ7+SwKAqiWtzqrO4D+6EoX96Q4N/ bF2c+39814ZcY+oSVgap4QoAnavdBboeFFgLe+HGC605WyEWQRjdaZ1rHas9CDq4zLPgDC ginpz2iNU7pXDRxvKiG2aArumdFYgAM3a4slTHFaVpE91xsbg/XIIxQplmTReA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692364110; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=lOJpXJqwfCB6IEuAIZAel43Iz0bJsUgQoGRd5BTGrUA=; b=SVGrn9cilllpDLV0Wp58oF7JofHsRK+VWS7cMTbgucrgs/qeIc2SV1mJmNvSXYBUCNQIEI D/CgjDfLLjQWpRSyiQNzhw5XUvfAXIYz4KEoHbaY5pihcP0EjQnP94AwL4ZhryrEYkQqh/ 1oYD4BSX83IclKuTqDtalAiVrHQtW1Em0vhzgAhFKX8AZZLtFf6CpmLUO0c8uy4mPn60H/ I+RHrUSy4LpcBenjG16GTuU60J0pn1GiwIoBL/AGiSKl65CZErZ5xNbUlSNrVq6cwxlK+J 76AswmgGQP8rnRECn+A2UpT5HGomJc0LDo+GT8AKIKKk83G5BfXW4ZwfxDEpmA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692364110; a=rsa-sha256; cv=none; b=L7TXkv6ba6zweQR1FVWR3WOTktAZtJnoJHilbSgKuVxS4v1aCeOxNYV/z/SoStI1ATrpth pwUVnj9etZ6OWyd208uHPO1lUOjr9vN6L2aIMob+9GisNhqDS5W9kool6T6vFLq83RKXp+ VFZZx8FoD8At9gtOf2vdZrfj1RhXK8zaoN0PoX+Rpani6/8gwO6l+011qKtpa5XUr3J3ZG gYjaf/shGxDYMhc6iQ/UEUElfp0K3psjM1NvYX35/6lymMmYZZqo7UQnljw8NF+wZEIbiU yeO1Kyg4YXA2HTsX021+uTlTZJnL5ZN+elwvRSpceKKqcK/wOTorXQ+2/uXkig== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RS2Hf1gmCz23D; Fri, 18 Aug 2023 13:08:30 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37ID8UEU002362; Fri, 18 Aug 2023 13:08:30 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37ID8Uv7002359; Fri, 18 Aug 2023 13:08:30 GMT (envelope-from git) Date: Fri, 18 Aug 2023 13:08:30 GMT Message-Id: <202308181308.37ID8Uv7002359@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Michael Tuexen Subject: git: e416c8192302 - main - sctp: whitespace change to improve consistency List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: tuexen X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e416c8192302bf289bc775af398c0962a6cad9f0 Auto-Submitted: auto-generated The branch main has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=e416c8192302bf289bc775af398c0962a6cad9f0 commit e416c8192302bf289bc775af398c0962a6cad9f0 Author: Michael Tuexen AuthorDate: 2023-08-18 13:06:23 +0000 Commit: Michael Tuexen CommitDate: 2023-08-18 13:06:23 +0000 sctp: whitespace change to improve consistency MFC after: 1 week --- sys/netinet/sctp_cc_functions.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/netinet/sctp_cc_functions.c b/sys/netinet/sctp_cc_functions.c index adcce72060f2..89eb9f0dac70 100644 --- a/sys/netinet/sctp_cc_functions.c +++ b/sys/netinet/sctp_cc_functions.c @@ -55,7 +55,7 @@ #ifdef KDTRACE_HOOKS #define __dtrace #else -#define __dtrace __unused +#define __dtrace __unused #endif static void From nobody Fri Aug 18 13:16:40 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RS2TJ0Xgkz4qWXp; Fri, 18 Aug 2023 13:16:52 +0000 (UTC) (envelope-from tuexen@freebsd.org) Received: from drew.franken.de (drew.ipv6.franken.de [IPv6:2001:638:a02:a001:20e:cff:fe4a:feaa]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "*.franken.de", Issuer "Sectigo RSA Domain Validation Secure Server CA" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RS2TH3kBlz4VwM; Fri, 18 Aug 2023 13:16:51 +0000 (UTC) (envelope-from tuexen@freebsd.org) Authentication-Results: mx1.freebsd.org; none Received: from smtpclient.apple (unknown [IPv6:2a02:8109:1140:c3d:70f9:430b:3c08:cd93]) (Authenticated sender: micmac) by mail-n.franken.de (Postfix) with ESMTPSA id E7C1475C1C93E; Fri, 18 Aug 2023 15:16:40 +0200 (CEST) Content-Type: text/plain; charset=us-ascii List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org Mime-Version: 1.0 (Mac OS X Mail 16.0 \(3731.700.6\)) Subject: Re: git: c718009884b3 - main - vm_map.c: plug several more places which might modify entry->offset From: tuexen@freebsd.org In-Reply-To: <202308181244.37ICi4AR067333@gitrepo.freebsd.org> Date: Fri, 18 Aug 2023 15:16:40 +0200 Cc: "src-committers@freebsd.org" , "dev-commits-src-all@freebsd.org" , "dev-commits-src-main@freebsd.org" Content-Transfer-Encoding: quoted-printable Message-Id: <9F89FB07-6B8A-4028-8667-171CBCFA33B2@freebsd.org> References: <202308181244.37ICi4AR067333@gitrepo.freebsd.org> To: Konstantin Belousov X-Mailer: Apple Mail (2.3731.700.6) X-Spam-Status: No, score=-2.9 required=5.0 tests=ALL_TRUSTED,BAYES_00 autolearn=disabled version=3.4.1 X-Spam-Checker-Version: SpamAssassin 3.4.1 (2015-04-28) on mail-n.franken.de X-Rspamd-Queue-Id: 4RS2TH3kBlz4VwM X-Spamd-Bar: ---- 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:680, ipnet:2001:638::/32, country:DE] > On 18. Aug 2023, at 14:44, Konstantin Belousov = wrote: >=20 > The branch main has been updated by kib: >=20 > URL: = https://cgit.FreeBSD.org/src/commit/?id=3Dc718009884b3d65528deaff24712cbf9= 8e3be656 >=20 > commit c718009884b3d65528deaff24712cbf98e3be656 > Author: Konstantin Belousov > AuthorDate: 2023-08-15 19:05:33 +0000 > Commit: Konstantin Belousov > CommitDate: 2023-08-18 12:43:35 +0000 >=20 > vm_map.c: plug several more places which might modify entry->offset >=20 > for the GUARD entries protecting stacks gaps. >=20 > syzkaller: = https://syzkaller.appspot.com/bug?extid=3Dc325d6a75e4fd0a68714 > Reviewed by: dougm, markj (previous version) > Tested by: pho (previous version) > Sponsored by: The FreeBSD Foundation > MFC after: 1 week > Differential revision: https://reviews.freebsd.org/D41475 > --- > sys/vm/vm_map.c | 13 ++++++++++--- > 1 file changed, 10 insertions(+), 3 deletions(-) >=20 > diff --git a/sys/vm/vm_map.c b/sys/vm/vm_map.c > index 252b58ad2924..f609d1fd68d7 100644 > --- a/sys/vm/vm_map.c > +++ b/sys/vm/vm_map.c > @@ -1413,7 +1413,9 @@ vm_map_entry_link(vm_map_t map, vm_map_entry_t = entry) > KASSERT(entry->end < root->end, > ("%s: clip_start not within entry", __func__)); > vm_map_splay_findprev(root, &llist); > - root->offset +=3D entry->end - root->start; > + if ((root->eflags & (MAP_ENTRY_STACK_GAP_DN | > + MAP_ENTRY_STACK_GAP_UP)) =3D=3D 0) > + root->offset +=3D entry->end - root->start; > root->start =3D entry->end; > max_free_left =3D vm_map_splay_merge_pred(header, entry, llist); > max_free_right =3D root->max_free =3D vm_size_max( > @@ -1429,7 +1431,9 @@ vm_map_entry_link(vm_map_t map, vm_map_entry_t = entry) > KASSERT(entry->end =3D=3D root->end, > ("%s: clip_start not within entry", __func__)); > vm_map_splay_findnext(root, &rlist); > - entry->offset +=3D entry->start - root->start; > + if ((entry->eflags & (MAP_ENTRY_STACK_GAP_DN | > + MAP_ENTRY_STACK_GAP_UP)) =3D=3D 0) > + entry->offset +=3D entry->start - root->start; > root->end =3D entry->start; > max_free_left =3D root->max_free =3D vm_size_max( > vm_map_splay_merge_left(header, root, llist), > @@ -1463,6 +1467,8 @@ vm_map_entry_unlink(vm_map_t map, vm_map_entry_t = entry, > vm_map_splay_findnext(root, &rlist); > if (op =3D=3D UNLINK_MERGE_NEXT) { > rlist->start =3D root->start; > + MPASS((rlist->eflags & (MAP_ENTRY_STACK_GAP_DN | > + MAP_ENTRY_STACK_GAP_UP) =3D=3D 0); This breaks compilation. I guess it should be + MPASS((rlist->eflags & (MAP_ENTRY_STACK_GAP_DN | + MAP_ENTRY_STACK_GAP_UP)) =3D=3D 0); Best regards Michael > rlist->offset =3D root->offset; > } > if (llist !=3D header) { > @@ -3103,7 +3109,8 @@ vm_map_madvise( > entry =3D vm_map_entry_succ(entry)) { > vm_offset_t useEnd, useStart; >=20 > - if ((entry->eflags & MAP_ENTRY_IS_SUB_MAP) !=3D 0) > + if ((entry->eflags & (MAP_ENTRY_IS_SUB_MAP | > + MAP_ENTRY_GUARD)) !=3D 0) > continue; >=20 > /* From nobody Fri Aug 18 13:28:04 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RS2kF0YhMz4qXQl; Fri, 18 Aug 2023 13:28: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RS2kF0Fz5z4WtS; Fri, 18 Aug 2023 13:28:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692365285; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=IVx2a8KetpTPnqIF8fORTJWdSQR5yhwna4QVpud/NnE=; b=xmtz1t7SaNFrCxCUqR4W5XTwDYa7TRamGlRo+GxmtFM0EBvA9JYGtDWIWJd9JpMdZ6RO59 XJlvzzZy3aSorzwJ10rzpbJveLO0NKiZ89Yd8uOxlhW4sa3m1hQTmIY0JefCJbks/s6YZl QQa/QQ3g+ks/vQiUHYyEOaxVUuXOSU+Boda25z68bBN9uSDpjQUNda0ZyjDWO0B9Z5mqpk fJ4caISVUc3f26oeN4T50ShmPKA3CZNL2R3KpQCGOs0sSzkqyBLGgaxaf7VAfNpy1/C4dh z8neXO427ZoquYO2Za9Thw6VIRkQnsbrveiW4RY/ChDaeS3AC4n5fTkElwIirw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692365285; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=IVx2a8KetpTPnqIF8fORTJWdSQR5yhwna4QVpud/NnE=; b=oMMV8oqTcVV9zSY9Mo6ssXhB2FfBcJ2xD96dt6tH2zQti5PF8cdl61khxX2gq1bO5q4kF6 ZQEPoRrkxGjO+FahFHK7fUNCVDauvz4knFDFYm3vUNbKLzpPNRL+gJxVyF3euX3PG6UvKR F5VYpzMHN6siTrG8KNjgIVbeAA0WIp0hh8mrbID2+213UTvePc313zLfX+8sbkFR5sURiQ zbDXIaktK2KSwQrlDiuCM99E9l9BV91vvls1BgSBmeWPOplJ2BZT8BwtAspDtQ0v4AzzaC jy4ckL5+dVFSVxOcQjZAyzOwoupx5Iki89U6ZWJ/cqeKi9v9TgQPmLtlLfiXsQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692365285; a=rsa-sha256; cv=none; b=WHlPitq4OQHDHskhNgLnx9dKvjH8fho577dkq7L8Sq/PU0vfy3gnHv2hbZRQ9WLcsSvxlc 9aXh4MT2U0wvXB/1euSzNIg2HoPDcqSVlpQ7cj+A/nqyzS96v4GBM7xfv7Wt7c15Uh92Sw uzOGD56eIBWICOJprhm52sM0FCE+1dy5v2PVOEKYXeDui/uJgjspJ5o7b81LdjKTqU94lD zqZpVWnyGy/4xbpu73tYb17eozsyI1u8Fib3pRAk7X9kphr8pWJSObvUGQdbYfUo5yjfbt wULG2DiprtDrJXyP/z1O212r4aCtEWc5gus2+rU19GqC88Dw33/lQoeoBzKjhg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RS2kD6QRrz3QX; Fri, 18 Aug 2023 13:28:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37IDS4Q0035118; Fri, 18 Aug 2023 13:28:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37IDS4gt035115; Fri, 18 Aug 2023 13:28:04 GMT (envelope-from git) Date: Fri, 18 Aug 2023 13:28:04 GMT Message-Id: <202308181328.37IDS4gt035115@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Michael Tuexen Subject: git: c3179e6660e1 - main - sctp: cleanup cdefs.h include List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: tuexen X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c3179e6660e1365111b89cb6c05c3a4c47375e73 Auto-Submitted: auto-generated The branch main has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=c3179e6660e1365111b89cb6c05c3a4c47375e73 commit c3179e6660e1365111b89cb6c05c3a4c47375e73 Author: Michael Tuexen AuthorDate: 2023-08-18 13:25:34 +0000 Commit: Michael Tuexen CommitDate: 2023-08-18 13:25:34 +0000 sctp: cleanup cdefs.h include --- sys/netinet/sctp.h | 2 +- sys/netinet/sctp_asconf.c | 1 - sys/netinet/sctp_asconf.h | 1 - sys/netinet/sctp_auth.c | 1 - sys/netinet/sctp_auth.h | 1 - sys/netinet/sctp_bsd_addr.c | 1 - sys/netinet/sctp_bsd_addr.h | 1 - sys/netinet/sctp_cc_functions.c | 1 - sys/netinet/sctp_constants.h | 1 - sys/netinet/sctp_crc32.h | 1 - sys/netinet/sctp_header.h | 1 - sys/netinet/sctp_indata.c | 1 - sys/netinet/sctp_indata.h | 1 - sys/netinet/sctp_input.c | 1 - sys/netinet/sctp_input.h | 1 - sys/netinet/sctp_kdtrace.h | 1 - sys/netinet/sctp_lock_bsd.h | 1 - sys/netinet/sctp_os.h | 1 - sys/netinet/sctp_os_bsd.h | 6 ++---- sys/netinet/sctp_output.c | 1 - sys/netinet/sctp_output.h | 1 - sys/netinet/sctp_pcb.c | 1 - sys/netinet/sctp_pcb.h | 1 - sys/netinet/sctp_peeloff.c | 1 - sys/netinet/sctp_peeloff.h | 1 - sys/netinet/sctp_ss_functions.c | 2 +- sys/netinet/sctp_structs.h | 1 - sys/netinet/sctp_sysctl.c | 1 - sys/netinet/sctp_sysctl.h | 1 - sys/netinet/sctp_timer.c | 1 - sys/netinet/sctp_timer.h | 1 - sys/netinet/sctp_uio.h | 1 - sys/netinet/sctp_usrreq.c | 1 - sys/netinet/sctp_var.h | 1 - sys/netinet/sctputil.c | 1 - sys/netinet/sctputil.h | 1 - sys/netinet6/sctp6_usrreq.c | 1 - sys/netinet6/sctp6_var.h | 1 - 38 files changed, 4 insertions(+), 41 deletions(-) diff --git a/sys/netinet/sctp.h b/sys/netinet/sctp.h index 11240bf22317..e8ee0f941c45 100644 --- a/sys/netinet/sctp.h +++ b/sys/netinet/sctp.h @@ -32,10 +32,10 @@ * THE POSSIBILITY OF SUCH DAMAGE. */ -#include #ifndef _NETINET_SCTP_H_ #define _NETINET_SCTP_H_ +#include #include #define SCTP_PACKED __attribute__((packed)) diff --git a/sys/netinet/sctp_asconf.c b/sys/netinet/sctp_asconf.c index 436638e594c7..3a30b0ba3740 100644 --- a/sys/netinet/sctp_asconf.c +++ b/sys/netinet/sctp_asconf.c @@ -32,7 +32,6 @@ * THE POSSIBILITY OF SUCH DAMAGE. */ -#include #include #include #include diff --git a/sys/netinet/sctp_asconf.h b/sys/netinet/sctp_asconf.h index 4d04e8466d75..ab24ea1683bf 100644 --- a/sys/netinet/sctp_asconf.h +++ b/sys/netinet/sctp_asconf.h @@ -32,7 +32,6 @@ * THE POSSIBILITY OF SUCH DAMAGE. */ -#include #ifndef _NETINET_SCTP_ASCONF_H_ #define _NETINET_SCTP_ASCONF_H_ diff --git a/sys/netinet/sctp_auth.c b/sys/netinet/sctp_auth.c index a1d25a588daa..67f0d26fa0d5 100644 --- a/sys/netinet/sctp_auth.c +++ b/sys/netinet/sctp_auth.c @@ -32,7 +32,6 @@ * THE POSSIBILITY OF SUCH DAMAGE. */ -#include #include #include #include diff --git a/sys/netinet/sctp_auth.h b/sys/netinet/sctp_auth.h index 45deaabf4059..8bfdbaa6d4f6 100644 --- a/sys/netinet/sctp_auth.h +++ b/sys/netinet/sctp_auth.h @@ -32,7 +32,6 @@ * THE POSSIBILITY OF SUCH DAMAGE. */ -#include #ifndef _NETINET_SCTP_AUTH_H_ #define _NETINET_SCTP_AUTH_H_ diff --git a/sys/netinet/sctp_bsd_addr.c b/sys/netinet/sctp_bsd_addr.c index 9f36e0dd020e..a91b0dde5967 100644 --- a/sys/netinet/sctp_bsd_addr.c +++ b/sys/netinet/sctp_bsd_addr.c @@ -32,7 +32,6 @@ * THE POSSIBILITY OF SUCH DAMAGE. */ -#include #include #include #include diff --git a/sys/netinet/sctp_bsd_addr.h b/sys/netinet/sctp_bsd_addr.h index 8100ba5225ee..5c66db8a7fcb 100644 --- a/sys/netinet/sctp_bsd_addr.h +++ b/sys/netinet/sctp_bsd_addr.h @@ -32,7 +32,6 @@ * THE POSSIBILITY OF SUCH DAMAGE. */ -#include #ifndef _NETINET_SCTP_BSD_ADDR_H_ #define _NETINET_SCTP_BSD_ADDR_H_ diff --git a/sys/netinet/sctp_cc_functions.c b/sys/netinet/sctp_cc_functions.c index 89eb9f0dac70..1a252da31b27 100644 --- a/sys/netinet/sctp_cc_functions.c +++ b/sys/netinet/sctp_cc_functions.c @@ -32,7 +32,6 @@ * THE POSSIBILITY OF SUCH DAMAGE. */ -#include #include #include #include diff --git a/sys/netinet/sctp_constants.h b/sys/netinet/sctp_constants.h index c3db6f733a53..881db9dd87cc 100644 --- a/sys/netinet/sctp_constants.h +++ b/sys/netinet/sctp_constants.h @@ -32,7 +32,6 @@ * THE POSSIBILITY OF SUCH DAMAGE. */ -#include #ifndef _NETINET_SCTP_CONSTANTS_H_ #define _NETINET_SCTP_CONSTANTS_H_ diff --git a/sys/netinet/sctp_crc32.h b/sys/netinet/sctp_crc32.h index 48a7d3269da5..a8c901249fcb 100644 --- a/sys/netinet/sctp_crc32.h +++ b/sys/netinet/sctp_crc32.h @@ -32,7 +32,6 @@ * THE POSSIBILITY OF SUCH DAMAGE. */ -#include #ifndef _NETINET_SCTP_CRC32_H_ #define _NETINET_SCTP_CRC32_H_ diff --git a/sys/netinet/sctp_header.h b/sys/netinet/sctp_header.h index a55974a50f22..9696c4e954ba 100644 --- a/sys/netinet/sctp_header.h +++ b/sys/netinet/sctp_header.h @@ -32,7 +32,6 @@ * THE POSSIBILITY OF SUCH DAMAGE. */ -#include #ifndef _NETINET_SCTP_HEADER_H_ #define _NETINET_SCTP_HEADER_H_ diff --git a/sys/netinet/sctp_indata.c b/sys/netinet/sctp_indata.c index 25819af0bdb2..f7f0e3fdfe7f 100644 --- a/sys/netinet/sctp_indata.c +++ b/sys/netinet/sctp_indata.c @@ -32,7 +32,6 @@ * THE POSSIBILITY OF SUCH DAMAGE. */ -#include #include #include #include diff --git a/sys/netinet/sctp_indata.h b/sys/netinet/sctp_indata.h index 9b2721c6adce..061b65c90bd4 100644 --- a/sys/netinet/sctp_indata.h +++ b/sys/netinet/sctp_indata.h @@ -32,7 +32,6 @@ * THE POSSIBILITY OF SUCH DAMAGE. */ -#include #ifndef _NETINET_SCTP_INDATA_H_ #define _NETINET_SCTP_INDATA_H_ diff --git a/sys/netinet/sctp_input.c b/sys/netinet/sctp_input.c index 278ad974ca77..81b011b7e78a 100644 --- a/sys/netinet/sctp_input.c +++ b/sys/netinet/sctp_input.c @@ -32,7 +32,6 @@ * THE POSSIBILITY OF SUCH DAMAGE. */ -#include #include #include #include diff --git a/sys/netinet/sctp_input.h b/sys/netinet/sctp_input.h index b2ea94ef067e..cd736166ac7e 100644 --- a/sys/netinet/sctp_input.h +++ b/sys/netinet/sctp_input.h @@ -32,7 +32,6 @@ * THE POSSIBILITY OF SUCH DAMAGE. */ -#include #ifndef _NETINET_SCTP_INPUT_H_ #define _NETINET_SCTP_INPUT_H_ diff --git a/sys/netinet/sctp_kdtrace.h b/sys/netinet/sctp_kdtrace.h index b86a689802b3..0f9b6a9e3826 100644 --- a/sys/netinet/sctp_kdtrace.h +++ b/sys/netinet/sctp_kdtrace.h @@ -31,7 +31,6 @@ * THE POSSIBILITY OF SUCH DAMAGE. */ -#include #ifndef _NETINET_SCTP_KDTRACE_H_ #define _NETINET_SCTP_KDTRACE_H_ diff --git a/sys/netinet/sctp_lock_bsd.h b/sys/netinet/sctp_lock_bsd.h index 4e9197917a9e..ec66be0cf371 100644 --- a/sys/netinet/sctp_lock_bsd.h +++ b/sys/netinet/sctp_lock_bsd.h @@ -32,7 +32,6 @@ * THE POSSIBILITY OF SUCH DAMAGE. */ -#include #ifndef _NETINET_SCTP_LOCK_BSD_H_ #define _NETINET_SCTP_LOCK_BSD_H_ diff --git a/sys/netinet/sctp_os.h b/sys/netinet/sctp_os.h index 48ce05239402..42f000dc8d55 100644 --- a/sys/netinet/sctp_os.h +++ b/sys/netinet/sctp_os.h @@ -32,7 +32,6 @@ * THE POSSIBILITY OF SUCH DAMAGE. */ -#include #ifndef _NETINET_SCTP_OS_H_ #define _NETINET_SCTP_OS_H_ diff --git a/sys/netinet/sctp_os_bsd.h b/sys/netinet/sctp_os_bsd.h index 77c7b33b544b..7bc0d20b9360 100644 --- a/sys/netinet/sctp_os_bsd.h +++ b/sys/netinet/sctp_os_bsd.h @@ -32,12 +32,10 @@ * THE POSSIBILITY OF SUCH DAMAGE. */ -#include #ifndef _NETINET_SCTP_OS_BSD_H_ #define _NETINET_SCTP_OS_BSD_H_ -/* - * includes - */ + +#include #include "opt_inet6.h" #include "opt_inet.h" #include "opt_sctp.h" diff --git a/sys/netinet/sctp_output.c b/sys/netinet/sctp_output.c index eca44840e48d..d7742222a3bf 100644 --- a/sys/netinet/sctp_output.c +++ b/sys/netinet/sctp_output.c @@ -32,7 +32,6 @@ * THE POSSIBILITY OF SUCH DAMAGE. */ -#include #include #include #include diff --git a/sys/netinet/sctp_output.h b/sys/netinet/sctp_output.h index d522812c59db..1a1d17221b02 100644 --- a/sys/netinet/sctp_output.h +++ b/sys/netinet/sctp_output.h @@ -32,7 +32,6 @@ * THE POSSIBILITY OF SUCH DAMAGE. */ -#include #ifndef _NETINET_SCTP_OUTPUT_H_ #define _NETINET_SCTP_OUTPUT_H_ diff --git a/sys/netinet/sctp_pcb.c b/sys/netinet/sctp_pcb.c index e88392c1515f..ac47b6aa1bfc 100644 --- a/sys/netinet/sctp_pcb.c +++ b/sys/netinet/sctp_pcb.c @@ -32,7 +32,6 @@ * THE POSSIBILITY OF SUCH DAMAGE. */ -#include #include #include #include diff --git a/sys/netinet/sctp_pcb.h b/sys/netinet/sctp_pcb.h index 0a18d457e3c0..e57e13654073 100644 --- a/sys/netinet/sctp_pcb.h +++ b/sys/netinet/sctp_pcb.h @@ -32,7 +32,6 @@ * THE POSSIBILITY OF SUCH DAMAGE. */ -#include #ifndef _NETINET_SCTP_PCB_H_ #define _NETINET_SCTP_PCB_H_ diff --git a/sys/netinet/sctp_peeloff.c b/sys/netinet/sctp_peeloff.c index ff92bd4d5d88..b122ab50e74e 100644 --- a/sys/netinet/sctp_peeloff.c +++ b/sys/netinet/sctp_peeloff.c @@ -32,7 +32,6 @@ * THE POSSIBILITY OF SUCH DAMAGE. */ -#include #include #include #include diff --git a/sys/netinet/sctp_peeloff.h b/sys/netinet/sctp_peeloff.h index 8be10d00e5de..675369af0fa8 100644 --- a/sys/netinet/sctp_peeloff.h +++ b/sys/netinet/sctp_peeloff.h @@ -32,7 +32,6 @@ * THE POSSIBILITY OF SUCH DAMAGE. */ -#include #ifndef _NETINET_SCTP_PEELOFF_H_ #define _NETINET_SCTP_PEELOFF_H_ #if defined(_KERNEL) diff --git a/sys/netinet/sctp_ss_functions.c b/sys/netinet/sctp_ss_functions.c index 896a55c6fbc5..1d7b16a6b482 100644 --- a/sys/netinet/sctp_ss_functions.c +++ b/sys/netinet/sctp_ss_functions.c @@ -28,7 +28,7 @@ * THE POSSIBILITY OF SUCH DAMAGE. */ -#include +#include #include /* diff --git a/sys/netinet/sctp_structs.h b/sys/netinet/sctp_structs.h index cc9275831fec..278afb2cc554 100644 --- a/sys/netinet/sctp_structs.h +++ b/sys/netinet/sctp_structs.h @@ -32,7 +32,6 @@ * THE POSSIBILITY OF SUCH DAMAGE. */ -#include #ifndef _NETINET_SCTP_STRUCTS_H_ #define _NETINET_SCTP_STRUCTS_H_ diff --git a/sys/netinet/sctp_sysctl.c b/sys/netinet/sctp_sysctl.c index 3a8211f4011f..851ed408092b 100644 --- a/sys/netinet/sctp_sysctl.c +++ b/sys/netinet/sctp_sysctl.c @@ -32,7 +32,6 @@ * THE POSSIBILITY OF SUCH DAMAGE. */ -#include #include #include #include diff --git a/sys/netinet/sctp_sysctl.h b/sys/netinet/sctp_sysctl.h index fa9c6480919d..46c015b0b854 100644 --- a/sys/netinet/sctp_sysctl.h +++ b/sys/netinet/sctp_sysctl.h @@ -32,7 +32,6 @@ * THE POSSIBILITY OF SUCH DAMAGE. */ -#include #ifndef _NETINET_SCTP_SYSCTL_H_ #define _NETINET_SCTP_SYSCTL_H_ diff --git a/sys/netinet/sctp_timer.c b/sys/netinet/sctp_timer.c index 3cf3baec7ad3..ef5eb8b89a5d 100644 --- a/sys/netinet/sctp_timer.c +++ b/sys/netinet/sctp_timer.c @@ -32,7 +32,6 @@ * THE POSSIBILITY OF SUCH DAMAGE. */ -#include #define _IP_VHL #include #include diff --git a/sys/netinet/sctp_timer.h b/sys/netinet/sctp_timer.h index 846e99fc59e2..f6f99d903d9f 100644 --- a/sys/netinet/sctp_timer.h +++ b/sys/netinet/sctp_timer.h @@ -32,7 +32,6 @@ * THE POSSIBILITY OF SUCH DAMAGE. */ -#include #ifndef _NETINET_SCTP_TIMER_H_ #define _NETINET_SCTP_TIMER_H_ diff --git a/sys/netinet/sctp_uio.h b/sys/netinet/sctp_uio.h index 4bd9aa154fed..b27d8013f8ca 100644 --- a/sys/netinet/sctp_uio.h +++ b/sys/netinet/sctp_uio.h @@ -32,7 +32,6 @@ * THE POSSIBILITY OF SUCH DAMAGE. */ -#include #ifndef _NETINET_SCTP_UIO_H_ #define _NETINET_SCTP_UIO_H_ diff --git a/sys/netinet/sctp_usrreq.c b/sys/netinet/sctp_usrreq.c index 4e53f3b99ac7..52b4faf48574 100644 --- a/sys/netinet/sctp_usrreq.c +++ b/sys/netinet/sctp_usrreq.c @@ -32,7 +32,6 @@ * THE POSSIBILITY OF SUCH DAMAGE. */ -#include #include #include #include diff --git a/sys/netinet/sctp_var.h b/sys/netinet/sctp_var.h index f76f902f1697..3a649a1860e2 100644 --- a/sys/netinet/sctp_var.h +++ b/sys/netinet/sctp_var.h @@ -32,7 +32,6 @@ * THE POSSIBILITY OF SUCH DAMAGE. */ -#include #ifndef _NETINET_SCTP_VAR_H_ #define _NETINET_SCTP_VAR_H_ diff --git a/sys/netinet/sctputil.c b/sys/netinet/sctputil.c index eddbb7d5a98e..2f021c22165e 100644 --- a/sys/netinet/sctputil.c +++ b/sys/netinet/sctputil.c @@ -32,7 +32,6 @@ * THE POSSIBILITY OF SUCH DAMAGE. */ -#include #include #include #include diff --git a/sys/netinet/sctputil.h b/sys/netinet/sctputil.h index f0f6d6bccfc7..c649611d5004 100644 --- a/sys/netinet/sctputil.h +++ b/sys/netinet/sctputil.h @@ -32,7 +32,6 @@ * THE POSSIBILITY OF SUCH DAMAGE. */ -#include #ifndef _NETINET_SCTP_UTIL_H_ #define _NETINET_SCTP_UTIL_H_ diff --git a/sys/netinet6/sctp6_usrreq.c b/sys/netinet6/sctp6_usrreq.c index 930bdca5afb4..6c36e4899906 100644 --- a/sys/netinet6/sctp6_usrreq.c +++ b/sys/netinet6/sctp6_usrreq.c @@ -32,7 +32,6 @@ * THE POSSIBILITY OF SUCH DAMAGE. */ -#include #include #ifdef INET6 #include diff --git a/sys/netinet6/sctp6_var.h b/sys/netinet6/sctp6_var.h index 3c5d95fc3c13..5ed70a24b3f0 100644 --- a/sys/netinet6/sctp6_var.h +++ b/sys/netinet6/sctp6_var.h @@ -32,7 +32,6 @@ * THE POSSIBILITY OF SUCH DAMAGE. */ -#include #ifndef _NETINET6_SCTP6_VAR_H_ #define _NETINET6_SCTP6_VAR_H_ From nobody Fri Aug 18 13:37:21 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RS2wx3j4vz4qXhl; Fri, 18 Aug 2023 13:37:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RS2wx2kF6z4YHt; Fri, 18 Aug 2023 13:37:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692365841; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zb6aXkM8L87qcexZ03moakYkFzqv2kn4lt6HE2ZlAIg=; b=lMc17+5cJUbGGLLn3+QGm+UIQQRxtOlXxIK8bGUqFDRvAKHBaUE1exLQZNqfnKEBrzcAzv fjc4MmRwJ8YT6uVFF6GQCWlrMcPBgYxXfOjsqRXE0HfkDSvHbXaLhRK7KYz61f2X42bwH8 MTDVwrN9QH48qB/tdZfvzHjLMCyVcqnDUrhJFapYJnU0Ib3nlbt4phaW1sO+F1kpzSk9Xu 1ZIP86qDpRMeybCYoPs7sZJMDNEG+pn41+8VfqmiB88NYhtOpk3f8o/7n/5MMDsj7M+BC5 eKx4dKR015hS12IJE73+JYF+pkNHwTmeOzCDmvl1SAaQ05IeYdy5RLbjczPJTg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692365841; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=zb6aXkM8L87qcexZ03moakYkFzqv2kn4lt6HE2ZlAIg=; b=i2R1KqZYj4IrjwoDwweH6dTU7FdCgj/8cf2tjRtbBmyUF2V8AnGmzSXSWL6CcpmIPcTNdz AWkMp4cvE4EGr2G1bEVrjt2hIhNlXQ0KjMTOb7Hxiqqu7KKoU1gErXh+UujwdLwztbh2/U TPlBDBhAB87U0mLZdOAKUbRoKDks7dQLWOKPPSUY7EHk3cJARMCiKAb+/Pgl9DKSLRC5bw QCGQv+phqAIs/zZ/R2fyNtiIHHuhyy07tlNam9gipJwD54ik+4F7icg69/GusvfUeBxjII 00wQACq1kkNuGYmXH7ILFUfk56hdhhRa5fWtX+ceVWXtfVNvBT0p0c/Unro7Cw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692365841; a=rsa-sha256; cv=none; b=yzEz8rIxjQvA2nnmY5rUN2gVg0PGPyN51s6KoUmVc0xGqHaI/fta6J2TI4MwtGVS1zyRUj NRYzhaDSIbIagdPbC6wIBMZ2AS/lVBe6UZeVXEvUTGCwV8WC9aJI9NTq0dS/T2EpRlZs/D eFAHLLVLWaAWgCG7kd5IbXcWNKzQ6utJnO9d0SpM4/1p3RQhTMKtO5+a+xB0e5+lR2fszH jroS6byLhMIC+ij5Y/i0IqPvVjCoys4TGyjQtP3KCXYOaj9dPAJjjUdyy1K7q3fSJWTw1O Oq6svplUgpOXOn36ROJWyNE7xujKISdshgBXekbtid2kySd99RZ+A8Ozul1YAA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RS2wx1p61z3fH; Fri, 18 Aug 2023 13:37:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37IDbLjQ051869; Fri, 18 Aug 2023 13:37:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37IDbLUh051866; Fri, 18 Aug 2023 13:37:21 GMT (envelope-from git) Date: Fri, 18 Aug 2023 13:37:21 GMT Message-Id: <202308181337.37IDbLUh051866@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: 5f452214f276 - main - vm_map.c: fix syntax List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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/main X-Git-Reftype: branch X-Git-Commit: 5f452214f2761b422b1a385865fe4c20265b09fe Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=5f452214f2761b422b1a385865fe4c20265b09fe commit 5f452214f2761b422b1a385865fe4c20265b09fe Author: Konstantin Belousov AuthorDate: 2023-08-18 13:35:25 +0000 Commit: Konstantin Belousov CommitDate: 2023-08-18 13:37:16 +0000 vm_map.c: fix syntax Fixes: c718009884b3d65528deaff24712cbf98e3be656 Sponsored by: The FreeBSD Foundation MFC after: 1 week --- sys/vm/vm_map.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/vm/vm_map.c b/sys/vm/vm_map.c index f609d1fd68d7..97b96a46e4b2 100644 --- a/sys/vm/vm_map.c +++ b/sys/vm/vm_map.c @@ -1468,7 +1468,7 @@ vm_map_entry_unlink(vm_map_t map, vm_map_entry_t entry, if (op == UNLINK_MERGE_NEXT) { rlist->start = root->start; MPASS((rlist->eflags & (MAP_ENTRY_STACK_GAP_DN | - MAP_ENTRY_STACK_GAP_UP) == 0); + MAP_ENTRY_STACK_GAP_UP)) == 0); rlist->offset = root->offset; } if (llist != header) { From nobody Fri Aug 18 13:37:22 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RS2wy4Kdkz4qXsk; Fri, 18 Aug 2023 13:37:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RS2wy3vlGz4YlG; Fri, 18 Aug 2023 13:37:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692365842; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MLklvWrObjGRBavmiCmPstXRfEsv6c7XS6Wa1f9r1cc=; b=ZHdeyr9h4YSCmoByVnt+BK16btvoTy1wTZlW+V6NQYoyqZJQYTWoY7MAYxM9Kn8Gb8FktM C+NVEXRzcnijlJuVzKR8AaLjuHWxtma92bPEcn+TUyUvjfdu73oiKKwSq70iu9X7/l5ql2 S+v1n5Gdy8jo3JtG+j0vQ8wmUK2Q/EtAb20EbfX0tDWn7WgV9mSo/WVB08O5Q3mRIgooUw YwpG+4bnyUyoX30AOnXBanq6yJAB/6+9lvAXeS3bzLNUDKDZeuhGAFu0EutN4j4nikzYXw rcwUCMaejZdjhsxZCp+AN8YOGreyFBgtpr/qUMpgVc0Wk01QtBtMuE/TTb5K2g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692365842; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=MLklvWrObjGRBavmiCmPstXRfEsv6c7XS6Wa1f9r1cc=; b=IboyEMzjc1ZWsd9h4GO87558oPlwaSsNZ0Y6oBIKGmQm4hCtHWdWfSPwSZCEm6TgpY6tkb botQ1W1ythygwgO0Eeorxr6Dx+B3chJu+PpDR88uKTdSw2vOzRQNQTzlomlWvvDaiVH1ZS pRI4x9izsQ+A5mjWdnNCRGQ4Sa5U/7CXS2NAXolJEozDX5laJ06U8TQAHYdvIL7Il3YFvm YD8BnUhUYrzr/KjmDMmI/AtfMr5SDphix/Ac5SzoFF7DQM4AG2uB5+OtU8HVG7pPpun0hR HvrY1DXC6qXu+26oBo+pHEKKnW330Par+BhXxhitJmMIOqeQG9n2VXXE+p2FWQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692365842; a=rsa-sha256; cv=none; b=nroD6JnCZIRh+YpYzSTSULD4/Qxn5BjLw++xQlUr3b9aO27KyCwyj4uzEVZGsgDyc1RfLp 78x6WuhJODcWmOAl9bSqYNZHncEcC8CvbsQ+TP6FWNIzj5oFT/YzpUizHRX+xs0Vl49ABz Me4/FkrEiK+VkgERehlmrQXhW+6P+s+LQlPa9bGxaBRhdroQd99dcx285qDbQLjzhJJQbg q2DOQa05QgpRTwcwmwaFyRSHlXdJHCOomO9cPqKltn/eZ+gKPpFfS+UoFZeit/0VjIjpvc lO55hZpUALpkcS9B/3PHk2ieT9y0IkEpHdvDMdHYWEzZyjom0sQF2qucVkrBog== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RS2wy2k4Jz3fJ; Fri, 18 Aug 2023 13:37:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37IDbMMp051915; Fri, 18 Aug 2023 13:37:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37IDbMwl051912; Fri, 18 Aug 2023 13:37:22 GMT (envelope-from git) Date: Fri, 18 Aug 2023 13:37:22 GMT Message-Id: <202308181337.37IDbMwl051912@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: 1384a0b940e8 - main - kern/subr_unit.c: fix non-debug build List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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/main X-Git-Reftype: branch X-Git-Commit: 1384a0b940e87876d36d50ad58581c24dc642714 Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=1384a0b940e87876d36d50ad58581c24dc642714 commit 1384a0b940e87876d36d50ad58581c24dc642714 Author: Konstantin Belousov AuthorDate: 2023-08-18 13:36:06 +0000 Commit: Konstantin Belousov CommitDate: 2023-08-18 13:37:16 +0000 kern/subr_unit.c: fix non-debug build Sponsored by: The FreeBSD Foundation MFC after: 1 week --- sys/kern/subr_unit.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/kern/subr_unit.c b/sys/kern/subr_unit.c index 3d45a0c1c5cb..7a23f216d98e 100644 --- a/sys/kern/subr_unit.c +++ b/sys/kern/subr_unit.c @@ -353,7 +353,7 @@ check_unrhdr(struct unrhdr *uh, int line) struct unr *up; struct unrb *ub; int w; - u_int y, z; + u_int y __diagused, z __diagused; y = uh->first; z = 0; From nobody Fri Aug 18 13:40:17 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RS30K6d8Mz4qXt7; Fri, 18 Aug 2023 13:40: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RS30K5qkxz4ZQt; Fri, 18 Aug 2023 13:40:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692366017; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XRxsX1PDyYx4sKBVIECYxeRRzRzmYvRiAUeIXLArRFY=; b=luM42KWoZ+6bPGEt1OPkFkhnVao2TL7bWO1cet/dMzuItZfX3T+GgikSEjiwrNfyO3Xdn7 e0aNjz61QhKf0snrwMR/h3RclIBrw6PT0Wh4vQo306rZWkjUmBocgNgna+A7pI2o+vojGg qmtSGnzztkz5QiPfz9ZVcT9daxx8cSqEJhJKFtWRiJPJvTR55sQi2GyVsyp/GQSw9Vj+xM +pduFFWsiBVUWn4jijMU993zWoPGiPGPRRedZoht1KRc+KGIxnrNRTYF5rGD5xbx58VbCr 7ebzArJSHbN4vfwI9fNOm1AYW7mbANAMCEq93dzjXXH3OOZiLI+SvA6mn7nnVw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692366017; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XRxsX1PDyYx4sKBVIECYxeRRzRzmYvRiAUeIXLArRFY=; b=KRCBdoiaqBVmOC/QEhz84TkbEXhcKGo41yKw3GLbDux6arG5IGkrp8sMSmZS27GgOdA6Sh wHecJOaibmVXtG5PDcdRIk4Rb7ZFL3iMDGf3Uj1FhJk6YmEgF/ZBpiFaNDOE/F4ISD9Qhe qXTfnsLEx4qatR1ebGPh0ojziJigfBVpwrb099SrsR5I++tZxSGcD6jOcIKQoYw5/MAl5P q6NXuQ0EnsKd0xD5Xwuu4G3XzWYf+UU8EM8u0cu5Z6WVw9rYVyY1uIhojUYAUCJWdhCVFM QcI4jUHI40Ux8QvXRXnE8ROCK1KBVZIKMcAP6IQQgkNrtT0B89fePR806YIEZQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692366017; a=rsa-sha256; cv=none; b=xkvmNIndnTTlPRMdD8L52/+v7p6NHs0E8+FmmC6hVBRBsjqe/WffR0FcmZ2zakBDxg44PE er133fZ+wNTswpjxxzipFhKA+LE+fVyo/f+UKj3JGvFgMqGRyWS509qnQdbxS/2U+Sw1Ua Ii6/0o2lPyobLY38E04ExJ+I6ioMMDl7/vd9v0OWe7lpIGZgOJ8HjSO0h/k6bXu7lv/XHj YkHjwfPxcXyn+jQu5oEHdJ1OMYoTkUDmgVb/M4RueXrqpdLWa0wN2sAK6dAoVFftexPHrN NBOEnAXnmdN3EvGFPvYWmz40sU1L2Tae0Wh8JJJwokUKQil+eVqvZM9uOaz84A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RS30K4rf1z3TT; Fri, 18 Aug 2023 13:40:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37IDeH3i061000; Fri, 18 Aug 2023 13:40:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37IDeHhg060995; Fri, 18 Aug 2023 13:40:17 GMT (envelope-from git) Date: Fri, 18 Aug 2023 13:40:17 GMT Message-Id: <202308181340.37IDeHhg060995@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: 431884325075 - main - std.nodebug: remove DIAGNOSTIC from debug configs List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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/main X-Git-Reftype: branch X-Git-Commit: 431884325075e3532235002fd7e5228b40f16b19 Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=431884325075e3532235002fd7e5228b40f16b19 commit 431884325075e3532235002fd7e5228b40f16b19 Author: Konstantin Belousov AuthorDate: 2023-08-18 13:39:22 +0000 Commit: Konstantin Belousov CommitDate: 2023-08-18 13:39:22 +0000 std.nodebug: remove DIAGNOSTIC from debug configs Sponsored by: The FreeBSD Foundation MFC after: 1 week --- sys/conf/std.nodebug | 1 + 1 file changed, 1 insertion(+) diff --git a/sys/conf/std.nodebug b/sys/conf/std.nodebug index 6495bc0203ad..38eb77c8d3a7 100644 --- a/sys/conf/std.nodebug +++ b/sys/conf/std.nodebug @@ -4,6 +4,7 @@ nooptions INVARIANTS nooptions INVARIANT_SUPPORT +nooptions DIAGNOSTIC nooptions WITNESS nooptions WITNESS_SKIPSPIN nooptions DEBUG_VFS_LOCKS From nobody Fri Aug 18 14:11:45 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RS3hf0D22z4qZhD; Fri, 18 Aug 2023 14:11: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RS3hd6nC1z4c6R; Fri, 18 Aug 2023 14:11:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692367906; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=hI/fjUofkn6+coWGW9JxF2/1WjqroyR0i/DwD+jvs0w=; b=Uv8nSFKbEhtcjxtnumxxJdB7bWZYGx+EMgdnAMZ8Dz74+23UlA49+g1z0pQssTP9kFaWIf vuxFqDfjJoKxifsfyQ6dZsJnyM0mSByPuMZlMRvwps34yi3X8Jd58rwcJHZ3ZuwiA3ubfn LrEYaOdf1fsWVZuUJlmOFQKXD1nkuQEvkFQIWRUdbDtSykEqnc8SZRLU79ZWr6kGESGcjM Y/KmYwCxTFwaJsAD40bNpDHBF4pPR46FBJOlZdIY5gAajDnNzc4ZJKbDasTZMLTuCCQ1qA AP8DVIHQVHcY2G9twSzuwkMXhBAPfYeyE6zmj2SDXbGnS6x3v+LC6cHy9Qyzxg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692367905; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=hI/fjUofkn6+coWGW9JxF2/1WjqroyR0i/DwD+jvs0w=; b=cGH7BUV/1lDupFiR5xDQrS8U6kCayTLFWEhRkPmTBENpbzVJZuVOIrhT91rx2ZCVGaB6BK R4b+cSBs52Rrx9MI08j+XY/44TaZ62l9s3tSqFGVAwUoOtRtHPBJCUUV4xWqf7YY3OHsL7 S7y9SKC7ciT7jfEXV3osUWQwN5GaDCWzsGj396XdIgTRbWP9B7ZYSbrpcQ07pM2fCZR3qN 71MH95Dm35kRImenx5FJEA9Ac4MluOE3PKDY427CDPY/Yz+K4T9+QTPl+Q++C1CHh0kZkt Rv6NyhthMUmOC2/hgdzDL0Y/pJeNx83xscQByNWvI+pYqTllT687GimAw3KDrg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692367906; a=rsa-sha256; cv=none; b=FdClEUxPPvlXLdrsm6akTcIU95jYUuZHLbc5k+3/6Ak3ZpUzqbKh6AU6bo+c0aepOnL70e 6bHnmHvphKjQWuVLFwbeXccpxOSbDtvrRMKyyeIEDH/i2I6l63iooanXsGQLfr9KVqrN7S liy0plEm9bhX2JyYEr5pjKZpDsgV1LWu6yG0Dp6cruw4js0USL5VUxGP7PQsKTHA8IvGF2 jJIgtH8kqse9qfN7YQVwUQrBF+sEGu077emw2gTFKX8e1QCLRSH2Y96nQoSiM0O5kb+SiO DQP/S7HOMKWhq6gnm891sGt1eK0hWjmIOLNfdDt4rkJHvq7xFFfex+KRFIvOng== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RS3hd5s7rz3m3; Fri, 18 Aug 2023 14:11:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37IEBjqW015447; Fri, 18 Aug 2023 14:11:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37IEBjdS015444; Fri, 18 Aug 2023 14:11:45 GMT (envelope-from git) Date: Fri, 18 Aug 2023 14:11:45 GMT Message-Id: <202308181411.37IEBjdS015444@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Doug Rabson Subject: git: ab3a78287800 - stable/13 - pkgbase: move libcom_err from kerberos to kerberos-lib List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dfr X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: ab3a78287800f3f8ade899f4c1b6303c7d496117 Auto-Submitted: auto-generated The branch stable/13 has been updated by dfr: URL: https://cgit.FreeBSD.org/src/commit/?id=ab3a78287800f3f8ade899f4c1b6303c7d496117 commit ab3a78287800f3f8ade899f4c1b6303c7d496117 Author: Doug Rabson AuthorDate: 2023-08-09 07:42:16 +0000 Commit: Doug Rabson CommitDate: 2023-08-18 14:10:23 +0000 pkgbase: move libcom_err from kerberos to kerberos-lib This makes it possible to install kerberos-lib (which is used by common utilities such as curl) without pulling in the rest of kerberos. MFC after: 1 week (cherry picked from commit 54cfeb848468b8086fd046bdb94a0ed30f6dec15) --- lib/libcom_err/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/libcom_err/Makefile b/lib/libcom_err/Makefile index 4bb69614453e..fcc060a615fb 100644 --- a/lib/libcom_err/Makefile +++ b/lib/libcom_err/Makefile @@ -1,6 +1,6 @@ # $FreeBSD$ -PACKAGE= kerberos +PACKAGE= kerberos-lib LIB= com_err SRCS= com_err.c error.c From nobody Fri Aug 18 14:33:41 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RS49x6yWhz4qbvY; Fri, 18 Aug 2023 14:33: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RS49x6SdTz4fRf; Fri, 18 Aug 2023 14:33:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692369221; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=IxhDkq7JxPMrCBApYKQDXMAIrmE54yJT3GXGoEX70yI=; b=gGRfPlaP3rd1JJrl30cRcOlarKYc5qCdsyU8ZPBQUjnbzapxeaq+98fm12DOc35FHqjeh8 o5YFm1a3mBJnEREJFfojDr7du4uw87I3jq+t3rNf3yClUkEjqzfywiKX7bcu7Xjocp9ubq V1jpc8+7EWdQ8jlNtVZmzgZ1/P9YHM5+oAjbuwCsQWUJw7E2EM5CscUSfgG+RmCRwro+CH ICR71n75hVWNs6ua41z3xNtsYRAzwYysS7z6vIhOMxbMC+EhBi+CgZiNfK5ctiNGfpNOKx wN8n7IgDMrzigRXM0FR4CftkcckyfGqadGRDtAPdmDMsXBljobdtRiLRCCAUPQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692369221; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=IxhDkq7JxPMrCBApYKQDXMAIrmE54yJT3GXGoEX70yI=; b=mUpu/l7QLWBn9hW3MOJMKp9qXHF05nLo+Siphlv8C6YUXAdAbdNmI4Zaw79kOAER9Ydhnv dc+GQRQg7JScDfwxLIy85v3bBHmpTnEUjhPH3KW96TJgqW5uNpjsaN7aVdsFBn+ZA8QrlI MxhktQtateELZshfYs/sLUW8UcV+ATgkTIuQWNC3MRoiX/nM8JBTldg2GLx3fHZe7ieWGV 9nSp0aK3B5VM1bNzG08j8htbgqz66hqJIa3PZ7MydFCxwi2VIY4mQuVztFiEQ1YPLM0T8e y2Js3ETtfqR9us6lAWj8cHQBBvHMOKfYcezz86JiENbwZToJsdGbD3pgEi7P6g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692369221; a=rsa-sha256; cv=none; b=Ni6EoauheBuqDnmXV2qSRNzSN5gQlGmq/iBMGvU241iytLO/AyOKcV+/YT60XIzqySVyvZ XsJ1KTbMKi2USYEv0jAMTlK0yL14SQNuurkrBZ4dDkdC9fRdlYD7eElhDtfDm6Bf+Kuskw qX6wZDSjaJG3yZQ0DZKGlPFxeJzz9NbWxVAhGLXFOgQdqWIO8g6DN07ktz2QvramUFRUIh T7GOUAnPbIai67z+6HNGKgoaTH/A2yDQarfeKblcqTp/XFaUB6IRZ6yCrLhC13QnSX/8nd 85W40ELC9aqgOhjnQabW3SRh/HDZu0BJ3LRY6JiOLadELfPv5pSh8P2w1+DAFg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RS49x5XbWz4sd; Fri, 18 Aug 2023 14:33:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37IEXfBw050810; Fri, 18 Aug 2023 14:33:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37IEXffs050807; Fri, 18 Aug 2023 14:33:41 GMT (envelope-from git) Date: Fri, 18 Aug 2023 14:33:41 GMT Message-Id: <202308181433.37IEXffs050807@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Marius Strobl Subject: git: ae6d49635894 - main - sym(4): Add __diagused to nseg of getbaddrcb() List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: marius X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ae6d4963589418f2116ddc8cabcf93dd2f4bbf3b Auto-Submitted: auto-generated The branch main has been updated by marius: URL: https://cgit.FreeBSD.org/src/commit/?id=ae6d4963589418f2116ddc8cabcf93dd2f4bbf3b commit ae6d4963589418f2116ddc8cabcf93dd2f4bbf3b Author: Marius Strobl AuthorDate: 2023-08-18 14:29:10 +0000 Commit: Marius Strobl CommitDate: 2023-08-18 14:33:27 +0000 sym(4): Add __diagused to nseg of getbaddrcb() The parameter is only used when compiling with INVARIANTS. --- sys/dev/sym/sym_hipd.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sys/dev/sym/sym_hipd.c b/sys/dev/sym/sym_hipd.c index c8cdcacc3f81..fa65d544e17d 100644 --- a/sys/dev/sym/sym_hipd.c +++ b/sys/dev/sym/sym_hipd.c @@ -569,7 +569,8 @@ static void sym_mfree(void *ptr, int size, char *name) * BUS handle. A reverse table (hashed) is maintained for virtual * to BUS address translation. */ -static void getbaddrcb(void *arg, bus_dma_segment_t *segs, int nseg, int error) +static void getbaddrcb(void *arg, bus_dma_segment_t *segs, int nseg __diagused, + int error) { bus_addr_t *baddr; From nobody Fri Aug 18 14:43:45 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RS4Pd2gVvz4qcSK; Fri, 18 Aug 2023 14:43:49 +0000 (UTC) (envelope-from cy.schubert@cschubert.com) Received: from omta002.cacentral1.a.cloudfilter.net (omta002.cacentral1.a.cloudfilter.net [3.97.99.33]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "Client", Issuer "CA" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RS4Pc6xhwz3C8l; Fri, 18 Aug 2023 14:43:48 +0000 (UTC) (envelope-from cy.schubert@cschubert.com) Authentication-Results: mx1.freebsd.org; none Received: from shw-obgw-4003a.ext.cloudfilter.net ([10.228.9.183]) by cmsmtp with ESMTP id WvgCq1Dgo6NwhX0hXqbtKU; Fri, 18 Aug 2023 14:43:47 +0000 Received: from spqr.komquats.com ([70.66.152.170]) by cmsmtp with ESMTPA id X0hWqKvrCcyvuX0hXqVDAt; Fri, 18 Aug 2023 14:43:47 +0000 X-Authority-Analysis: v=2.4 cv=VbHkgXl9 c=1 sm=1 tr=0 ts=64df83a3 a=y8EK/9tc/U6QY+pUhnbtgQ==:117 a=y8EK/9tc/U6QY+pUhnbtgQ==:17 a=kj9zAlcOel0A:10 a=UttIx32zK-AA:10 a=6I5d2MoRAAAA:8 a=YxBL1-UpAAAA:8 a=EkcXrb_YAAAA:8 a=617RHsMD4DaJYWY19r0A:9 a=CjuIK1q_8ugA:10 a=IjZwj45LgO3ly-622nXo:22 a=Ia-lj3WSrqcvXOmTRaiG:22 a=LK5xJRSDVpKd5WXXoEvA:22 Received: from slippy.cwsent.com (slippy [10.1.1.91]) by spqr.komquats.com (Postfix) with ESMTP id C9B78D09; Fri, 18 Aug 2023 07:43:45 -0700 (PDT) Received: by slippy.cwsent.com (Postfix, from userid 1000) id 9998F2EF; Fri, 18 Aug 2023 07:43:45 -0700 (PDT) X-Mailer: exmh version 2.9.0 11/07/2018 with nmh-1.8+dev Reply-to: Cy Schubert From: Cy Schubert X-os: FreeBSD X-Sender: cy@cwsent.com X-URL: http://www.cschubert.com/ To: Konstantin Belousov cc: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: Re: git: 1384a0b940e8 - main - kern/subr_unit.c: fix non-debug build In-reply-to: <202308181337.37IDbMwl051912@gitrepo.freebsd.org> References: <202308181337.37IDbMwl051912@gitrepo.freebsd.org> Comments: In-reply-to Konstantin Belousov message dated "Fri, 18 Aug 2023 13:37:22 +0000." List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Date: Fri, 18 Aug 2023 07:43:45 -0700 Message-Id: <20230818144345.9998F2EF@slippy.cwsent.com> X-CMAE-Envelope: MS4xfC8J1VI5DuP3lgAXh/F2l9kMnXFl+3m36NZO10gwh/drY0m4p7byHT7SI3jXtFexRZ3s5QA0daqoWdYbNzzEYek+5p05WP0/1ZzYhXGR5tR7o39J46di iJIagjPL0cMW2rz13URcnw184CEHQKCpljV/TlLzX/DcbeOp1UpsZFHJrdwddMUAuIoiIir+/S+fUw0KLwpT+vDqzvq9YkmGFUmfXumFd+Qbk1MPBdN4GWTL JawawdiImqeJSgWEm3arke2avgKEBVzYajv7zKrzZjWeFARYi6zXgjEZ4nq8rAB6IetA3l+Sd2+HM6Pus9C3Rypjxk2XecP+2voK8Wptp3g= X-Rspamd-Queue-Id: 4RS4Pc6xhwz3C8l X-Spamd-Bar: ---- 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:16509, ipnet:3.96.0.0/15, country:US] In message <202308181337.37IDbMwl051912@gitrepo.freebsd.org>, Konstantin Belous ov writes: > The branch main has been updated by kib: > > URL: https://cgit.FreeBSD.org/src/commit/?id=1384a0b940e87876d36d50ad58581c24 > dc642714 > > commit 1384a0b940e87876d36d50ad58581c24dc642714 > Author: Konstantin Belousov > AuthorDate: 2023-08-18 13:36:06 +0000 > Commit: Konstantin Belousov > CommitDate: 2023-08-18 13:37:16 +0000 > > kern/subr_unit.c: fix non-debug build > > Sponsored by: The FreeBSD Foundation > MFC after: 1 week > --- > sys/kern/subr_unit.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/sys/kern/subr_unit.c b/sys/kern/subr_unit.c > index 3d45a0c1c5cb..7a23f216d98e 100644 > --- a/sys/kern/subr_unit.c > +++ b/sys/kern/subr_unit.c > @@ -353,7 +353,7 @@ check_unrhdr(struct unrhdr *uh, int line) > struct unr *up; > struct unrb *ub; > int w; > - u_int y, z; > + u_int y __diagused, z __diagused; It still doesn't like it. /opt/src/git-src/sys/kern/subr_unit.c:356:9: error: expected ';' at end of declaration u_int y __diagused, z __diagused; ^ ; > > y = uh->first; > z = 0; > -- Cheers, Cy Schubert FreeBSD UNIX: Web: https://FreeBSD.org NTP: Web: https://nwtime.org e^(i*pi)+1=0 From nobody Fri Aug 18 14:57:29 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RS4jh4pQnz4qdXv; Fri, 18 Aug 2023 14:57:44 +0000 (UTC) (envelope-from kostikbel@gmail.com) Received: from kib.kiev.ua (kib.kiev.ua [IPv6:2001:470:d5e7:1::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) by mx1.freebsd.org (Postfix) with ESMTPS id 4RS4jg5ZM9z3CrC; Fri, 18 Aug 2023 14:57:43 +0000 (UTC) (envelope-from kostikbel@gmail.com) Authentication-Results: mx1.freebsd.org; none Received: from tom.home (kib@localhost [127.0.0.1]) by kib.kiev.ua (8.17.1/8.17.1) with ESMTPS id 37IEvTpk073052 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NO); Fri, 18 Aug 2023 17:57:32 +0300 (EEST) (envelope-from kostikbel@gmail.com) DKIM-Filter: OpenDKIM Filter v2.10.3 kib.kiev.ua 37IEvTpk073052 Received: (from kostik@localhost) by tom.home (8.17.1/8.17.1/Submit) id 37IEvTXH073051; Fri, 18 Aug 2023 17:57:29 +0300 (EEST) (envelope-from kostikbel@gmail.com) X-Authentication-Warning: tom.home: kostik set sender to kostikbel@gmail.com using -f Date: Fri, 18 Aug 2023 17:57:29 +0300 From: Konstantin Belousov To: Cy Schubert Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: 1384a0b940e8 - main - kern/subr_unit.c: fix non-debug build Message-ID: References: <202308181337.37IDbMwl051912@gitrepo.freebsd.org> <20230818144345.9998F2EF@slippy.cwsent.com> List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20230818144345.9998F2EF@slippy.cwsent.com> X-Spam-Status: No, score=-1.0 required=5.0 tests=ALL_TRUSTED,BAYES_00, DKIM_ADSP_CUSTOM_MED,FORGED_GMAIL_RCVD,FREEMAIL_FROM, NML_ADSP_CUSTOM_MED autolearn=no autolearn_force=no version=4.0.0 X-Spam-Checker-Version: SpamAssassin 4.0.0 (2022-12-14) on tom.home X-Rspamd-Queue-Id: 4RS4jg5ZM9z3CrC X-Spamd-Bar: ---- 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:6939, ipnet:2001:470::/32, country:US] On Fri, Aug 18, 2023 at 07:43:45AM -0700, Cy Schubert wrote: > In message <202308181337.37IDbMwl051912@gitrepo.freebsd.org>, Konstantin > Belous > ov writes: > > The branch main has been updated by kib: > > > > URL: https://cgit.FreeBSD.org/src/commit/?id=1384a0b940e87876d36d50ad58581c24 > > dc642714 > > > > commit 1384a0b940e87876d36d50ad58581c24dc642714 > > Author: Konstantin Belousov > > AuthorDate: 2023-08-18 13:36:06 +0000 > > Commit: Konstantin Belousov > > CommitDate: 2023-08-18 13:37:16 +0000 > > > > kern/subr_unit.c: fix non-debug build > > > > Sponsored by: The FreeBSD Foundation > > MFC after: 1 week > > --- > > sys/kern/subr_unit.c | 2 +- > > 1 file changed, 1 insertion(+), 1 deletion(-) > > > > diff --git a/sys/kern/subr_unit.c b/sys/kern/subr_unit.c > > index 3d45a0c1c5cb..7a23f216d98e 100644 > > --- a/sys/kern/subr_unit.c > > +++ b/sys/kern/subr_unit.c > > @@ -353,7 +353,7 @@ check_unrhdr(struct unrhdr *uh, int line) > > struct unr *up; > > struct unrb *ub; > > int w; > > - u_int y, z; > > + u_int y __diagused, z __diagused; > > It still doesn't like it. How do you build it? Is it kernel? If yes, which kernel config? > > > /opt/src/git-src/sys/kern/subr_unit.c:356:9: error: expected ';' at end of > declaration > u_int y __diagused, z __diagused; > ^ > ; > > > > > y = uh->first; > > z = 0; > > > > > -- > Cheers, > Cy Schubert > FreeBSD UNIX: Web: https://FreeBSD.org > NTP: Web: https://nwtime.org > > e^(i*pi)+1=0 > > > From nobody Fri Aug 18 15:39:54 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RS5fQ0XwWz4qhLS; Fri, 18 Aug 2023 15:39:58 +0000 (UTC) (envelope-from cy.schubert@cschubert.com) Received: from omta002.cacentral1.a.cloudfilter.net (omta002.cacentral1.a.cloudfilter.net [3.97.99.33]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "Client", Issuer "CA" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RS5fP6wRLz3Ggt; Fri, 18 Aug 2023 15:39:57 +0000 (UTC) (envelope-from cy.schubert@cschubert.com) Authentication-Results: mx1.freebsd.org; none Received: from shw-obgw-4001a.ext.cloudfilter.net ([10.228.9.142]) by cmsmtp with ESMTP id WysRq1Kxt6NwhX1Ztqc4xf; Fri, 18 Aug 2023 15:39:57 +0000 Received: from spqr.komquats.com ([70.66.152.170]) by cmsmtp with ESMTPA id X1ZrqNC5tHFsOX1ZsqujJb; Fri, 18 Aug 2023 15:39:57 +0000 X-Authority-Analysis: v=2.4 cv=XZqaca15 c=1 sm=1 tr=0 ts=64df90cd a=y8EK/9tc/U6QY+pUhnbtgQ==:117 a=y8EK/9tc/U6QY+pUhnbtgQ==:17 a=kj9zAlcOel0A:10 a=UttIx32zK-AA:10 a=6I5d2MoRAAAA:8 a=YxBL1-UpAAAA:8 a=EkcXrb_YAAAA:8 a=r-HGUgrYWZ_Vcz6z9EoA:9 a=CjuIK1q_8ugA:10 a=IjZwj45LgO3ly-622nXo:22 a=Ia-lj3WSrqcvXOmTRaiG:22 a=LK5xJRSDVpKd5WXXoEvA:22 Received: from slippy.cwsent.com (slippy [10.1.1.91]) by spqr.komquats.com (Postfix) with ESMTP id 59E09D2D; Fri, 18 Aug 2023 08:39:55 -0700 (PDT) Received: by slippy.cwsent.com (Postfix, from userid 1000) id 143512F3; Fri, 18 Aug 2023 08:39:55 -0700 (PDT) X-Mailer: exmh version 2.9.0 11/07/2018 with nmh-1.8+dev Reply-to: Cy Schubert From: Cy Schubert X-os: FreeBSD X-Sender: cy@cwsent.com X-URL: http://www.cschubert.com/ To: Konstantin Belousov cc: Cy Schubert , src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: 1384a0b940e8 - main - kern/subr_unit.c: fix non-debug build In-reply-to: References: <202308181337.37IDbMwl051912@gitrepo.freebsd.org> <20230818144345.9998F2EF@slippy.cwsent.com> Comments: In-reply-to Konstantin Belousov message dated "Fri, 18 Aug 2023 17:57:29 +0300." List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Date: Fri, 18 Aug 2023 08:39:54 -0700 Message-Id: <20230818153955.143512F3@slippy.cwsent.com> X-CMAE-Envelope: MS4xfM0oaFNXM44gTzTcNgEP8dP3gIREMbKJ2uK0eX3BronzXmpil8g217rQiVJgU3jtvwEKhD35KDYHG9YRXLELGueYo+0HNpRqtJDNakvh9ZdKItV5vvX6 VyeviVlUltxAMRzSzzpljoJ7A7ylrPAbEGqg9elAg2ykPA2L7KW7gWFxuZaV3AiDv+qAmVmjottLzxd3KsgUG2ZTAPgujmXSZEGt5Ufbm36QwPv8z3h5Abpx z3GtM6BNy5V31APDuhaleXXiKquVm4q5pPc5YCBSFY0Zh8IrFlyrOKCuha9+L/aguCo9qhkDWAXQmHaQ7knN6f1gM4G6QwnAu/SPn8OotKs= X-Rspamd-Queue-Id: 4RS5fP6wRLz3Ggt X-Spamd-Bar: ---- 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:16509, ipnet:3.96.0.0/15, country:US] In message , Konstantin Belousov writes: > On Fri, Aug 18, 2023 at 07:43:45AM -0700, Cy Schubert wrote: > > In message <202308181337.37IDbMwl051912@gitrepo.freebsd.org>, Konstantin > > Belous > > ov writes: > > > The branch main has been updated by kib: > > > > > > URL: https://cgit.FreeBSD.org/src/commit/?id=1384a0b940e87876d36d50ad5858 > 1c24 > > > dc642714 > > > > > > commit 1384a0b940e87876d36d50ad58581c24dc642714 > > > Author: Konstantin Belousov > > > AuthorDate: 2023-08-18 13:36:06 +0000 > > > Commit: Konstantin Belousov > > > CommitDate: 2023-08-18 13:37:16 +0000 > > > > > > kern/subr_unit.c: fix non-debug build > > > > > > Sponsored by: The FreeBSD Foundation > > > MFC after: 1 week > > > --- > > > sys/kern/subr_unit.c | 2 +- > > > 1 file changed, 1 insertion(+), 1 deletion(-) > > > > > > diff --git a/sys/kern/subr_unit.c b/sys/kern/subr_unit.c > > > index 3d45a0c1c5cb..7a23f216d98e 100644 > > > --- a/sys/kern/subr_unit.c > > > +++ b/sys/kern/subr_unit.c > > > @@ -353,7 +353,7 @@ check_unrhdr(struct unrhdr *uh, int line) > > > struct unr *up; > > > struct unrb *ub; > > > int w; > > > - u_int y, z; > > > + u_int y __diagused, z __diagused; > > > > It still doesn't like it. > How do you build it? > Is it kernel? If yes, which kernel config? It's not in kernel. It's in tests. ===> tests/sys/kern (all) (cd /opt/src/git-src/tests/sys/kern && DEPENDFILE=.depend.coredump_phnum_he lper NO_SUBDIR=1 make -f /opt/src/git-src/tests/sys/kern/Makefile _RECURSING_PROGS=t PROG=coredump_phnum_helper ) (cd /opt/src/git-src/tests/sys/kern && DEPENDFILE=.depend.pdeathsig_helper NO_SUBDIR=1 make -f /opt/src/git-src/tests/sys/kern/Makefile _RECURSING_PROGS=t PROG=pdeathsig_helper ) (cd /opt/src/git-src/tests/sys/kern && DEPENDFILE=.depend.sendfile_helper NO_SUBDIR=1 make -f /opt/src/git-src/tests/sys/kern/Makefile _RECURSING_PROGS=t PROG=sendfile_helper ) (cd /opt/src/git-src/tests/sys/kern && DEPENDFILE=.depend.subr_unit_test NO_SUBDIR=1 make -f /opt/src/git-src/tests/sys/kern/Makefile _RECURSING_PROGS=t PROG=subr_unit_test ) rm -f .depend.subr_unit_test echo subr_unit_test.full: /export/obj/opt/src/git-src/amd64.amd64/tmp/usr/li b/libc.a >> .depend.subr_unit_test cc -target x86_64-unknown-freebsd14.0 --sysroot=/export/obj/opt/src/git-src/ amd64.amd64/tmp -B/export/obj/opt/src/git-src/amd64.amd64/tmp/usr/bin -O2 -pipe -pipe -fno-common -fPIE -g -gz=zlib -MD -MF.depend.subr_unit_test.s ubr_unit.o -MTsubr_unit.o -std=gnu99 -Wno-format-zero-length -fstack-protector-strong -Wsystem-headers -Werror -Wall -Wno-format-y2k -W -Wno-unused-parameter -Wstrict-prototypes -Wmissing-prototypes -Wpointer-arith -Wno-uninitialized -Wno-pointer-sign -Wdate-time -Wno-empty-body -Wno-string-plus-int -Wno-unused-const-variable -Wno-error=unused-but-set-parameter -Wno-tautological-compare -Wno-unused-value -Wno-parentheses-equality -Wno-unused-function -Wno-enum-conversion -Wno-unused-local-typedef -Wno-address-of-packed-member -Qunused-arguments -Wno-missing-prototypes -c /opt/src/git-src/sys/kern/su br_unit.c -o subr_unit.o /opt/src/git-src/sys/kern/subr_unit.c:356:9: error: expected ';' at end of declaration u_int y __diagused, z __diagused; ^ ; /opt/src/git-src/sys/kern/subr_unit.c:359:2: error: use of undeclared identifier 'z' z = 0; ^ /opt/src/git-src/sys/kern/subr_unit.c:361:3: error: use of undeclared identifier 'z' z++; ^ /opt/src/git-src/sys/kern/subr_unit.c:367:4: error: use of undeclared identifier 'z' z++; ^ /opt/src/git-src/sys/kern/subr_unit.c:377:11: error: use of undeclared identifier 'z' KASSERT (z == uh->alloc, ^ /opt/src/git-src/sys/kern/subr_unit.c:379:17: error: use of undeclared identifier 'z' uh->alloc, z, line)); ^ 6 errors generated. *** Error code 1 Stop. make[6]: stopped in /opt/src/git-src/tests/sys/kern *** Error code 1 Stop. make[5]: stopped in /opt/src/git-src/tests/sys/kern *** Error code 1 Stop. make[4]: stopped in /opt/src/git-src/tests/sys *** Error code 1 Stop. make[3]: stopped in /opt/src/git-src/tests *** Error code 1 Stop. make[2]: stopped in /opt/src/git-src 277.70 real 126.62 user 65.55 sys *** Error code 1 Stop. make[1]: stopped in /opt/src/git-src *** Error code 1 Stop. make: stopped in /opt/src/git-src -- Cheers, Cy Schubert FreeBSD UNIX: Web: https://FreeBSD.org NTP: Web: https://nwtime.org e^(i*pi)+1=0 From nobody Fri Aug 18 15:42:16 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RS5j52GNpz4qhFF; Fri, 18 Aug 2023 15:42: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RS5j51clXz3HMq; Fri, 18 Aug 2023 15:42:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692373337; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+3sWDiKdqsHkqmNOlSBPRc2trijc+yFLxUHLNNVXVrc=; b=ou5XWSZNdZK6AKLyzhjocgSk0KRjO8MSibSXDe6PVXU8/uA3zxWmcmzLSV8uEJNl00pd4s WYeIr2QeV+9/8SksPXnYAfE65nvzX3sqpvdUTYZDSA1TwaUDrRPICYLfOxgw+2gcEmXJt/ 1QA+6PKRff1fJf9hRt27+JZjijmJpHBkMfwAduDUSVJlmhTkvGsoI/GD99D2OxxeOxXVSg Uv/kJxE17JfcUhpjft92JPFT7qsNNTDyh59KUkHdT3ldVt3rIcJi/O76QVsWKGsufdPhZ0 x8MiXIqqUIXHu85AqC/fAmfbrdYiVQXuqoDTpqDes/x4fln4t/6juBWZ8j0t3w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692373337; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+3sWDiKdqsHkqmNOlSBPRc2trijc+yFLxUHLNNVXVrc=; b=HiqSPh/e16TgGLCyB1p4TLDUhe6TCou2RhFiASH+In55OTKhuZOzZgQkyemmWiwdEiSvZK LqanPfnZdLDDaDCkXGPLlonSnndiqUpHk94EI4HdOt9SHWFOSOg2XRx9O77HwsVmVG28Bl Ftk7nME25uF63lkTQ2i42HoDwVW9KyiL3acKH5ibzkvM9crB/mJZsKd7H99gAxM/uTV/Zo TKhkMto4ZmIX80hvFp7uo6kTGe/2YFsnkFrvZufM4i4bq9wWyR8Od8y9sbdE4mu1fV9gUd E85PWce0lGssx3D5ffyYq1NNiTzboPnhoZgaxZPabXkCvtzckyZWTSYki6hKnQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692373337; a=rsa-sha256; cv=none; b=lMYv3oNnlkUPFQ40eHW0LPON8JUlDscUjADR6cfW5y4HkyRgBtAH+48MtfP5ZgYa5jQp++ U6qB0DwKFl+8e6g3yovQWTLegNmWL/eH24C6zucj3nQektkD7IiXn0ksGjxctVKqTa8iOf d7URagKk8rbyV4DTfjTKghUv44dgOu7tBJ1Orgr1BCnTf1lAnsRszUTwfpQeCJHw/BFLby NjALRGhcUMWuMYhTG4TK2H5tn9bj5zvzaT9Gk6B2DeYSESvKO9tRHm6WSGwn2DFnw8qmdz 6Wu5F9EzB1LLavVBKc22VRv6pqvfX+Mr4ut6V6lMnT5svMmzM/szExL08C4gdA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RS5j50gvQz5yT; Fri, 18 Aug 2023 15:42:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37IFgH2t066329; Fri, 18 Aug 2023 15:42:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37IFgGMt066326; Fri, 18 Aug 2023 15:42:16 GMT (envelope-from git) Date: Fri, 18 Aug 2023 15:42:16 GMT Message-Id: <202308181542.37IFgGMt066326@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: 7c35f64b635e - stable/13 - ldns: Upgrade to 1.8.3. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: des X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 7c35f64b635e954b3391937fa5cfc72b6165b605 Auto-Submitted: auto-generated The branch stable/13 has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=7c35f64b635e954b3391937fa5cfc72b6165b605 commit 7c35f64b635e954b3391937fa5cfc72b6165b605 Author: Dag-Erling Smørgrav AuthorDate: 2023-05-24 15:50:18 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2023-08-18 15:29:28 +0000 ldns: Upgrade to 1.8.3. Merge commit 'cf3e3d5bd0a1fae39c74c7db5a4e8b10732d0766' Reviewed by: emaste Differential Revision: https://reviews.freebsd.org/D40226 (cherry picked from commit 5afab0e5e56fe90a378fb57249600e7924e1cab2) ldns: Remove a set but unused variable. Reviewed by: des Differential Revision: https://reviews.freebsd.org/D40695 (cherry picked from commit 2e1665ff345498c3f99ffd07b6e90669172d2df2) --- contrib/ldns/Changelog | 195 +- contrib/ldns/Makefile.in | 622 +- contrib/ldns/README | 5 +- contrib/ldns/README-Travis.md | 274 + contrib/ldns/aclocal.m4 | 4 +- contrib/ldns/acx_nlnetlabs.m4 | 126 +- contrib/ldns/ax_pkg_swig.m4 | 14 +- contrib/ldns/ax_python_devel.m4 | 39 +- contrib/ldns/buffer.c | 2 +- contrib/ldns/config.guess | 1646 ++-- contrib/ldns/config.sub | 2649 +++--- contrib/ldns/configure | 9584 ++++++++++++-------- contrib/ldns/configure.ac | 256 +- contrib/ldns/dane.c | 65 +- contrib/ldns/dname.c | 2 +- contrib/ldns/dnssec.c | 91 +- contrib/ldns/dnssec_sign.c | 318 +- contrib/ldns/dnssec_verify.c | 208 +- contrib/ldns/dnssec_zone.c | 850 +- contrib/ldns/drill/ChangeLog.22-nov-2005 | 6 +- contrib/ldns/drill/Makefile.in | 119 - contrib/ldns/drill/chasetrace.c | 4 +- contrib/ldns/drill/config.h | 294 - contrib/ldns/drill/config.h.in | 293 - contrib/ldns/drill/configure | 6714 -------------- contrib/ldns/drill/configure.ac | 276 - contrib/ldns/drill/dnssec.c | 16 +- contrib/ldns/drill/drill.1.in | 13 +- contrib/ldns/drill/drill.c | 221 +- contrib/ldns/drill/drill.h | 1 - contrib/ldns/drill/error.c | 2 +- contrib/ldns/drill/securetrace.c | 56 +- contrib/ldns/duration.c | 143 +- contrib/ldns/edns.c | 436 + contrib/ldns/error.c | 31 +- contrib/ldns/freebsd-configure.sh | 9 +- contrib/ldns/host2str.c | 1247 ++- contrib/ldns/host2wire.c | 63 +- contrib/ldns/install-sh | 181 +- contrib/ldns/keys.c | 253 +- contrib/ldns/ldns/buffer.h | 31 + contrib/ldns/ldns/common.h | 3 + contrib/ldns/ldns/common.h.in | 3 + contrib/ldns/ldns/config.h | 209 +- contrib/ldns/ldns/config.h.in | 199 +- contrib/ldns/ldns/dane.h | 4 +- contrib/ldns/ldns/dname.h | 2 +- contrib/ldns/ldns/dnssec.h | 52 +- contrib/ldns/ldns/dnssec_sign.h | 16 +- contrib/ldns/ldns/dnssec_verify.h | 6 +- contrib/ldns/ldns/dnssec_zone.h | 14 +- contrib/ldns/ldns/edns.h | 272 + contrib/ldns/ldns/error.h | 14 +- contrib/ldns/ldns/host2str.h | 38 +- contrib/ldns/ldns/host2wire.h | 15 +- contrib/ldns/ldns/internal.h | 14 + contrib/ldns/ldns/keys.h | 60 +- contrib/ldns/ldns/ldns.h | 1 + contrib/ldns/ldns/net.h | 63 +- contrib/ldns/ldns/net.h.in | 63 +- contrib/ldns/ldns/packet.h | 49 +- contrib/ldns/ldns/parse.h | 38 +- contrib/ldns/ldns/radix.h | 4 +- contrib/ldns/ldns/rbtree.h | 2 +- contrib/ldns/ldns/rdata.h | 28 +- contrib/ldns/ldns/resolver.h | 6 +- contrib/ldns/ldns/rr.h | 21 +- contrib/ldns/ldns/rr_functions.h | 4 +- contrib/ldns/ldns/sha1.h | 9 +- contrib/ldns/ldns/sha2.h | 27 +- contrib/ldns/ldns/str2host.h | 90 +- contrib/ldns/ldns/update.h | 2 +- contrib/ldns/ldns/util.h | 13 +- contrib/ldns/ldns/util.h.in | 9 +- contrib/ldns/ldns/wire2host.h | 8 +- contrib/ldns/ldns/zone.h | 6 +- contrib/ldns/{libdns.doxygen => libdns.doxygen.in} | 415 +- contrib/ldns/ltmain.sh | 219 +- contrib/ldns/m4/ax_config_feature.m4 | 6 +- contrib/ldns/m4/ax_have_poll.m4 | 4 +- contrib/ldns/m4/libtool.m4 | 31 +- contrib/ldns/makewin.sh | 263 + contrib/ldns/net.c | 108 +- contrib/ldns/packaging/fedora/ldns.spec | 4 +- contrib/ldns/packaging/ldns-config.in | 17 +- contrib/ldns/packet.c | 114 +- contrib/ldns/parse.c | 97 +- contrib/ldns/radix.c | 5 +- contrib/ldns/rbtree.c | 2 +- contrib/ldns/rdata.c | 8 +- contrib/ldns/resolver.c | 22 +- contrib/ldns/rr.c | 200 +- contrib/ldns/rr_functions.c | 8 +- contrib/ldns/sha1.c | 3 +- contrib/ldns/sha2.c | 21 +- contrib/ldns/str2host.c | 901 +- contrib/ldns/tsig.c | 16 +- contrib/ldns/util.c | 34 +- contrib/ldns/wire2host.c | 10 +- contrib/ldns/zone.c | 77 +- lib/libldns/Makefile | 11 +- usr.bin/drill/Makefile | 4 +- 102 files changed, 15589 insertions(+), 15734 deletions(-) diff --git a/contrib/ldns/Changelog b/contrib/ldns/Changelog index 0bd3658e767d..aba41c88c5c8 100644 --- a/contrib/ldns/Changelog +++ b/contrib/ldns/Changelog @@ -1,3 +1,166 @@ +1.8.3 2022-08-15 + * bugfix #183: Assertion failure with OPT record without rdata. + This caused packet creation with only a DO bit (for DNSSEC OK) + to crash. Thanks Anand Buddhdev and others for reporting this + so quickly. + * Fix for syntax error in pyldns + +1.8.2 2022-08-12 + * bugfix #147: Allow for tabs in whitespace before quoted rdata + fields. Thanks Felipe Gasper + * bugfix #149: Add some missing [out] annotations to doxygen + parameters. Thanks aldot. + * Fix build error on Solaris 10 with inet_ntop redeclaration error. + * Fix -U flag with ldns-signzone. Thanks Ulrich and Jonathan + * Enable compile of SVCB and HTTPS support by default. + * bugfix #179: Free line memory even if zone file parsing fails + Thanks Claudius Zingerli + * bugfix #166: Grow buffer when writing chars and fixed size + strings when converting to presentation format, preventing + potential assersion errors. + * bugfix #46: Print network errors when secure tracing. + Thanks reedjc + * EDNS0 Option handling and conversion into presentation format. + * bugfix #145: ldns-verify-zone should not call occluded records + glue. Thanks Habbie + +1.8.1 2021-12-03 + * bugfix #146: ldns-1.7.1 had soname 3.0, so ldns-1.8.x soname + needs to larger. Thanks Leah Neukirchen & Felipe Gasper + * Undo PR#123 fix ldns.pc installation when building out-of-source + Thanks Axel Xu + +1.8.0 2021-11-26 + * bugfix #38: Print "line" before line number when printing + zone parse errors. Thanks Petr Å paÄek. + * bugfix: Revert unused variables in ldns-config removal patch. + * bugfix #50: heap Out-of-bound Read vulnerability in + rr_frm_str_internal reported by pokerfacett. + * bugfix #51: Heap Out-of-bound Read vulnerability in + ldns_nsec3_salt_data reported by pokerfacett. + * Fix memory leak in examples/ldns-testns handle_tcp routine. + * Detect fixed time memory compare for openssl 0.9.8. + * Fix compile warning by variable initialisation for older gcc. + * Fix #92: ldns-testns.c:429:15: error: 'fork' is unavailable: not + available on tvOS. + * Fix for #93: fix packaging/libldns.pc Makefile rule. + * ZONEMD support in ldns-signzone and ldns-verify-zone + * ldns-testns can answer several queries over one tcp connection, + if they arrive within 100msec of each other. + * Fix so that ldns-testns does not leak sockets if the read fails. + * SVCB and HTTPS draft rrtypes. + Enable with --enable-rrtype-svcb-https. + * bugfix #117: Assertion failure with DNSSEC validating of + non existence of RR types at the root. Thanks ZjYwMj + * Set NSEC(3) ttls to the minimum of the MINIMUM field of the SOA + record and the TTL of the SOA itself. draft-ietf-dnsop-nsec-ttl + * bugfix #119: Let example tools read longer RR's than + LDNS_MAX_LINELEN + * Add SVCPARAMS to python ldns_rdf_type2str function. + * PR #134 Miscellaneous spelling fixes. Thanks jsoref! + * Fix that ldns-read-zone and ldns_zone_new_frm_fp_l properly return + the $INCLUDE not implemented error. + * Fix that ldns-read-zone and ldns_zone_new_frm_fp_l count the line + number for an empty line after a comment. + * Fix #135: Fix compile with OpenSSL-3.0.0-beta2. + * PR #107: Added ldns_pkt2buffer_wire_compress() to make dname + compression optional when converting packets to wire format. + Thanks Eli Lindsey + * Option to ldns-keygen to create symlinks with known names + (i.e. without the key id) to the created files. + Thanks Andreas Schulze + * Fix #121: Correct handling of centimetres by LOC parser. + Thanks Felipe Gasper + * PR #126: Link with libldns.la in Makefile.in. + Thanks orbea + * PR #127: Added option -Q to drill to give short answer. + Thanks niknah + * PR #133: Update m4 files for python modules. + Thanks Petr Menšík + * Bufix CAA value fields may be empty: Thanks Robert Mortimer + * PR #108: Fix for ldns-compare-zones net detecting when first zone + has a RRset that shrinks from two to one RRs, or grows from one + to two RRs. Thanks Emilio Caballero + * Fix #131: Drill sig chasing breaks with gcc-11 and + strict-aliasing. Thanks Stanislav Levin + * Fix #130: Unless $TLL is defined, ttl defaults to the last + explicitly stated value. Thanks Benno + * Fix #48: Missing UNSIGNED legend with drill. Thanks reedjc + * Fix #143: EVP_PKEY_base_id became a macro with OpenSSL > 3.0 + Thanks Daniel J. Luke + * Let ldns-signzone warn for high NSEC3 iteration counts. + Thanks Andreas Schulze + +1.7.1 2019-07-26 + * bugfix: Manage verification paths for OpenSSL >= 1.1.0 + Thanks Marco Davids + * bugfix #4106: find the SDK on MacOS X <= 10.6 + Thanks Bill Cole + * bugfix #4155: ldns-config contains never used variables + Thanks Petr Menšík + * bugfix #4221: drill -x crashes with malformed IPv4 address + Thanks Oleksandr Tymoshenko + * bugfix #3437: CDS & CDNSKEY RRsets should be signed with the KSK + Thanks Tony Finch + * bugfix #1566, #1568, #1569, #1570: Potential NULL Dereferences + Thanks Bill Parker + * bugfix #1260: Anticipate strchr returning NULL on unfound char + Thanks Stephan Zeisberg + * bugfix #1257: Free after reallocing to 0 size (CVE-2017-1000232) + Thanks Stephan Zeisberg + * bugfix #1256: Check parse limit before t increment (CVE-2017-1000231) + Thanks Stephan Zeisberg + * bugfix #1245: Only one signature per RRset needs to be valid with + ldns-verify-zone. Thanks Emil Natan. + * ldns-notify can use all supported hash algorithms with -y. + * bugfix #1209: make install ldns.pc file + Thanks Oleksandr Natalenko + * bugfix #1218: Only chase DS if signer is parent of owner. + Thanks Emil Natan + * bugfix #617: Retry WKS service and protocol names lower case. + Thanks Siali Yan + * Spelling errors in binaries and man pages + Thanks Andreas Schulze + * removed duplicate condition in ldns_udp_send_query. + * ldns_wire2pkt: fix null pointer dereference if pkt allocation fails + and fix memory leak with more EDNS sections + Thanks Jan Vcelak + * bugfix #1399: ldns_pkt2wire() Python binding is broken. + Thanks James Raftery + * ED25519 and ED448 support. Default is to autodetect support in + OpenSSL. Disable with --disable-ed25519 and --disable-ed448. + * ldns-notify: can have IPv6 address as argument. + * Fix time sensitive TSIG compare vulnerability. + * Fix that ldns-testns ignores sigpipe. + * Fix that ldns-notify sets the query RR as question RR, this + removes the wrong TTL and 0 rdata from the packet printout. + * Allow -T flag to be used together with drill -x + * Python bindings compile with swig 4.0 + Thanks Jitka Plesníková + * bugfix #4248: drill -DT fails for CNAME domain + Thanks Thom Wiggers + * bugfix #4214: Various fixes and leaks found by coverity. + Thanks Petr Menšík + * Feature #3394: An -I option to ldns-notify to specify a source + IP address to send to notify from. Thanks Geert Hendrickx + * Bugfix #279: New API functions ldns_udp_connect2, + ldns_tcp_connect2, ldns_udp_bgsend2 and ldns_tcp_bgsend2, + that return -1 on failure and allow socket number 0 + to be returned too. Thanks Joerg Sonnenberger + * Bugfix #1447: More verbose reporting of chasing problems with + ldns-verify-zone. Thanks Stephane Guedon + * OpenSSL engine support with ldns-signzone. + See also https://penzin.net/ldns-signzone/ + Many thanks Vadim Penzin. + * Various improvements found with shellcheck. + Thanks Jeffrey Walton + * PR #36 Update manpage of ldns-notify to mention algorithm + support with TSIG. Thanks Anand Buddhdev + * Compile warnings with signed char input to to_lower() + and is_digit() with NetBSD. Thanks HÃ¥vard Eidnes + * Missing Makefile.PL in DNS-LDNS perl module contribution. + Thanks Jaap Akkerhuis + 1.7.0 2016-12-20 * Fix lookup of relative names in ldns_resolver_search. * bugfix #548: Double free for answers > 4096 in ldns_resolver_send_pkt @@ -98,7 +261,7 @@ Thanks William King * Use OpenSSL DANE functions for verification (unless explicitly disabled with --disable-dane-ta-usage). - * Bumb .so version + * Bump .so version * Include OPENPGPKEY RR type by default * rdata processing for SMIMEA RR type * Fix crash in displaying TLSA RR's. @@ -168,7 +331,7 @@ * bugfix #505: Manpage and usage output fixes (Thanks Tomas Hozza) * Adjust ldns_sha1() so that the input data is not modified (Thanks Marc Buijsman) - * Messages to stderr are now off by default and can be reenabled with + * Messages to stderr are now off by default and can be re-enabled with the --enable-stderr-msgs configure option. 1.6.16 2012-11-13 @@ -197,7 +360,7 @@ in sync. * Let ldns_pkt_push_rr now return false on (memory) errors. * Make buffer_export comply to documentation and fix buffer2str - * Various improvements and fixes of pyldns from Katel Slany + * Various improvements and fixes of pyldns from Karel Slany now documented in their own Changelog. * bugfix: Make ldns_resolver_pop_nameserver clear the array when there was only one. @@ -236,7 +399,7 @@ * bugfix #433: Allocate rdf using ldns_rdf_new in ldns_dname_label * bugfix #432: Use LDNS_MALLOC & LDNS_FREE i.s.o. malloc & free * bugfix #431: Added error message for LDNS_STATUS_INVALID_B32_EXT - * bugfix #427: Explicitely link ssl with the programs that use it. + * bugfix #427: Explicitly link ssl with the programs that use it. * Fix reading \DDD: Error on values that are outside range (>255). * bugfix #429: fix doxyparse.pl fails on NetBSD because specified path to perl. @@ -300,7 +463,7 @@ * Update of libdns.vim (thanks Miek Gieben) * Added the ldnsx Python module to our contrib section, which adds even more pythonisticism to the usage of ldns with Python. (Many thanks - to Christpher Olah and Paul Wouters) + to Christopher Olah and Paul Wouters) The ldnsx module is automatically installed when --with-pyldns is used with configuring, but may explicitly be excluded with the --without-pyldnsx option to configure. @@ -328,7 +491,7 @@ * bugfix #380: Minimizing effect of discrepancies in sizeof(bool) at build time and when used. * bugfix #383: Fix detection of empty nonterminals of multiple labels. - * Fixed the ommission of rrsets in nsec(3)s and rrsigs to all occluded + * Fixed the omission of rrsets in nsec(3)s and rrsigs to all occluded names (in stead of just the ones that contain glue only) and all occluded records on the delegation points (in stead of just the glue). * Clarify the operation of ldns_dnssec_mark_glue and the usage of @@ -511,7 +674,7 @@ * --enable-gost : use the GOST algorithm (experimental). * Added some missing options to drill manpage * Some fixes to --without-ssl option - * Fixed quote parsing withing strings + * Fixed quote parsing within strings * Bitmask fix in EDNS handling * Fixed non-fqdn domain name completion for rdata field domain names of length 1 @@ -618,7 +781,7 @@ from Shane Kerr, bug id 188) * zone.c memory leaks on error and allocation checks fixed (patch from Shane Kerr, bug id 189) - * ldns-zplit output and error messages fixed (patch from Shane Kerr, + * ldns-zsplit output and error messages fixed (patch from Shane Kerr, bug id 190) * Fixed potential buffer overflow in ldns_str2rdf_dname * Signing code no longer signs delegation NS rrsets @@ -647,7 +810,7 @@ * DLV RR type added * TCP fallback system has been improved * HMAC-SHA256 TSIG support has been added. - * TTLS are now correcly set in NSEC(3) records when signing zones + * TTLS are now correctly set in NSEC(3) records when signing zones EXAMPLE TOOLS: * New example: ldns-revoke to revoke DNSKEYs according to RFC5011 @@ -722,7 +885,7 @@ 28 Nov 2007 1.2.2: * Added support for HMAC-MD5 keys in generator * Added a new example tool (written by Ondrej Sury): ldns-compare-zones - * ldns-keygen now checks key sizes for rfc conformancy + * ldns-keygen now checks key sizes for rfc conformance * ldns-signzone outputs SSL error if present * Fixed manpages (thanks to Ondrej Sury) * Fixed Makefile for -j @@ -800,7 +963,7 @@ * -r was killed in favor of -o
which allows for a header bits setting (and maybe more in the future) - * DNSSEC is never automaticaly set, even when you query + * DNSSEC is never automatically set, even when you query for DNSKEY/RRSIG or DS. * Implement a crude RTT check, it now distinguishes between reachable and unreachable. @@ -812,7 +975,7 @@ * ldns-dpa was added to the examples - this is the Dns Packet Analyzer tool. * ldnsd - as very, very simple nameserver impl. - * ldns-zsplit - split zones for parrallel signing + * ldns-zsplit - split zones for parallel signing * ldns-zcat - cat split zones back together * ldns-keyfetcher - Fetches DNSKEY records with a few (non-strong, non-DNSSEC) anti-spoofing techniques. @@ -831,7 +994,7 @@ API: Changed: * renamed ldns/dns.h to ldns/ldns.h - * ldns_rr_new_frm_str() is extented with an extra variable which + * ldns_rr_new_frm_str() is extended with an extra variable which in common use may be NULL. This trickles through to: o ldns_rr_new_frm_fp o ldns_rr_new_frm_fp_l @@ -872,7 +1035,7 @@ * char *_when was removed from the ldns_pkt structure 18 Oct 2005: 1.0.0: ldns-team - * Commited a patch from HÃ¥kan Olsson + * Committed a patch from HÃ¥kan Olsson * Added UPDATE support (Jakob Schlyter and HÃ¥kan Olsson) * License change: ldns is now BSD licensed * ldns now depends on SSL @@ -905,7 +1068,7 @@ 13 Jun 2005: 0.65: ldns-team * Repository is online at: http://www.nlnetlabs.nl/ldns/svn/ - * Apply reference copying throuhgout ldns, except in 2 + * Apply reference copying throughout ldns, except in 2 places in the ldns_resolver structure (._domain and ._nameservers) * Usual array of bugfixes @@ -914,7 +1077,7 @@ 23 May 2005: 0.60: ldns-team * Removed config.h from the header installed files - (you're not supposed to include that in a libary) + (you're not supposed to include that in a library) * Further tweaking - DNSSEC signing/verification works - Assorted bug fixes and tweaks (memory management) diff --git a/contrib/ldns/Makefile.in b/contrib/ldns/Makefile.in index 04f683bf1197..57957d0844d3 100644 --- a/contrib/ldns/Makefile.in +++ b/contrib/ldns/Makefile.in @@ -40,15 +40,29 @@ edit = sed \ # override $U variable which is used by autotools for deansification (for # K&R C compilers), but causes problems if $U is defined in the env). U= + +# set all of the tools due to cross-compiles. libtool uses most of them. +# https://www.gnu.org/software/make/manual/html_node/Implicit-Variables.html CC = @CC@ +CXX = @CXX@ +CPP = @CPP@ +LD = @LD@ +AS = @AS@ +AR = @AR@ +RANLIB = @RANLIB@ +STRIP = @STRIP@ + +# Unbound project specific flags CFLAGS = @CFLAGS@ CPPFLAGS = -I. -I$(srcdir) @CPPFLAGS@ @DEFS@ -DLDNS_TRUST_ANCHOR_FILE="\"$(LDNS_TRUST_ANCHOR_FILE)\"" +ARFLAGS = @ARFLAGS@ LDFLAGS = @LDFLAGS@ + LIBS = @LIBS@ LIBOBJDIR = compat/ LIBOBJS = @LIBOBJS@ PYTHON_CPPFLAGS = @PYTHON_CPPFLAGS@ -PYTHON_LDFLAGS = @PYTHON_LDFLAGS@ +PYTHON_LIBS = @PYTHON_LIBS@ PYTHON_X_CFLAGS = @PYTHON_X_CFLAGS@ LIBSSL_CPPFLAGS = @LIBSSL_CPPFLAGS@ LIBSSL_LDFLAGS = @LIBSSL_LDFLAGS@ @@ -72,15 +86,15 @@ LINTFLAGS += -D"__BEGIN_DECLS=" -D"__ssize_t=ssize_t" -D"__intptr_t=intptr LINTFLAGS += -D"_RuneLocale=int" DEPFLAG = @DEPFLAG@ -INSTALL = $(srcdir)/install-sh +INSTALL = $(srcdir)/install-sh LIBLOBJS = $(LIBOBJS:.o=.lo) -LDNS_LOBJS = buffer.lo dane.lo dname.lo dnssec.lo dnssec_sign.lo dnssec_verify.lo dnssec_zone.lo duration.lo error.lo higher.lo host2str.lo host2wire.lo keys.lo net.lo packet.lo parse.lo radix.lo rbtree.lo rdata.lo resolver.lo rr.lo rr_functions.lo sha1.lo sha2.lo str2host.lo tsig.lo update.lo util.lo wire2host.lo zone.lo +LDNS_LOBJS = buffer.lo dane.lo dname.lo dnssec.lo dnssec_sign.lo dnssec_verify.lo dnssec_zone.lo duration.lo error.lo higher.lo host2str.lo host2wire.lo keys.lo net.lo packet.lo parse.lo radix.lo rbtree.lo rdata.lo resolver.lo rr.lo rr_functions.lo sha1.lo sha2.lo str2host.lo tsig.lo update.lo util.lo wire2host.lo zone.lo edns.lo LDNS_LOBJS_EX = ^linktest\.c$$ LDNS_ALL_LOBJS = $(LDNS_LOBJS) $(LIBLOBJS) LIB = libldns.la -LDNS_HEADERS = buffer.h dane.h dname.h dnssec.h dnssec_sign.h dnssec_verify.h dnssec_zone.h duration.h error.h higher.h host2str.h host2wire.h keys.h ldns.h packet.h parse.h radix.h rbtree.h rdata.h resolver.h rr_functions.h rr.h sha1.h sha2.h str2host.h tsig.h update.h wire2host.h zone.h +LDNS_HEADERS = buffer.h dane.h dname.h dnssec.h dnssec_sign.h dnssec_verify.h dnssec_zone.h duration.h error.h higher.h host2str.h host2wire.h keys.h ldns.h packet.h parse.h radix.h rbtree.h rdata.h resolver.h rr_functions.h rr.h sha1.h sha2.h str2host.h tsig.h update.h wire2host.h zone.h edns.h LDNS_HEADERS_EX = ^config\.h|common\.h|util\.h|net\.h$$ LDNS_HEADERS_GEN= common.h util.h net.h @@ -89,8 +103,8 @@ PYLDNS_I_FILES = $(pywrapdir)/file_py3.i $(pywrapdir)/ldns_buffer.i $(pywrapdir) DRILL_LOBJS = drill/chasetrace.lo drill/dnssec.lo drill/drill.lo drill/drill_util.lo drill/error.lo drill/root.lo drill/securetrace.lo drill/work.lo EXAMPLE_LOBJS = examples/ldns-chaos.lo examples/ldns-compare-zones.lo examples/ldns-dane.lo examples/ldnsd.lo examples/ldns-dpa.lo examples/ldns-gen-zone.lo examples/ldns-key2ds.lo examples/ldns-keyfetcher.lo examples/ldns-keygen.lo examples/ldns-mx.lo examples/ldns-notify.lo examples/ldns-nsec3-hash.lo examples/ldns-read-zone.lo examples/ldns-resolver.lo examples/ldns-revoke.lo examples/ldns-rrsig.lo examples/ldns-signzone.lo examples/ldns-test-edns.lo examples/ldns-testns.lo examples/ldns-testpkts.lo examples/ldns-update.lo examples/ldns-verify-zone.lo examples/ldns-version.lo examples/ldns-walk.lo examples/ldns-zcat.lo examples/ldns-zsplit.lo -EXAMPLE_PROGS = examples/ldns-chaos examples/ldns-compare-zones examples/ldnsd examples/ldns-gen-zone examples/ldns-key2ds examples/ldns-keyfetcher examples/ldns-keygen examples/ldns-mx examples/ldns-notify examples/ldns-read-zone examples/ldns-resolver examples/ldns-rrsig examples/ldns-test-edns examples/ldns-update examples/ldns-version examples/ldns-walk examples/ldns-zcat examples/ldns-zsplit -EX_PROGS_BASENM = ldns-chaos ldns-compare-zones ldns-dane ldnsd ldns-dpa ldns-gen-zone ldns-key2ds ldns-keyfetcher ldns-keygen ldns-mx ldns-notify ldns-nsec3-hash ldns-read-zone ldns-resolver ldns-revoke ldns-rrsig ldns-signzone ldns-test-edns ldns-testns ldns-testpkts ldns-update ldns-verify-zone ldns-version ldns-walk ldns-zcat ldns-zsplit +EXAMPLE_PROGS = examples/ldns-chaos examples/ldns-compare-zones examples/ldnsd examples/ldns-gen-zone examples/ldns-key2ds examples/ldns-keyfetcher examples/ldns-keygen examples/ldns-mx examples/ldns-notify examples/ldns-read-zone examples/ldns-resolver examples/ldns-rrsig examples/ldns-test-edns examples/ldns-update examples/ldns-version examples/ldns-walk examples/ldns-zcat examples/ldns-zsplit +EX_PROGS_BASENM = ldns-chaos ldns-compare-zones ldns-dane ldnsd ldns-dpa ldns-gen-zone ldns-key2ds ldns-keyfetcher ldns-keygen ldns-mx ldns-notify ldns-nsec3-hash ldns-read-zone ldns-resolver ldns-revoke ldns-rrsig ldns-signzone ldns-test-edns ldns-testns ldns-testpkts ldns-update ldns-verify-zone ldns-version ldns-walk ldns-zcat ldns-zsplit EXAMPLE_PROGS_EX= ^examples/ldns-testpkts\.c|examples/ldns-testns\.c|examples/ldns-dane\.c|examples/ldns-dpa\.c|examples/ldns-nsec3-hash\.c|examples/ldns-revoke\.c|examples/ldns-signzone\.c|examples/ldns-verify-zone\.c$$ TESTNS = examples/ldns-testns TESTNS_LOBJS = examples/ldns-testns.lo examples/ldns-testpkts.lo @@ -118,6 +132,10 @@ all: setup-builddir lib linktest manpages @P5_DNS_LDNS@ @PYLDNS@ @DRILL@ @EXAMPL .c.lo: $(COMP_LIB) $(LIBSSL_CPPFLAGS) -c $< -o $@ +# Need libtool compile +.c.o: + $(COMP_LIB) $(LIBSSL_CPPFLAGS) -c $< -o $@ + $(LDNS_LOBJS) $(LIBLOBJS) $(DRILL_LOBJS) $(EXAMPLE_LOBJS): $(COMP_LIB) $(LIBSSL_CPPFLAGS) -c $(srcdir)/$(@:.lo=.c) -o $@ @@ -130,14 +148,16 @@ setup-builddir: @if test ! -d include ; then $(INSTALL) -d include; fi @if test ! -h include/ldns ; then ln -s ../ldns include/ldns || echo "include/ldns exists"; fi +# builddir/ is used by 60-compile-builddir putdown-builddir: rm -f include/ldns lib config.h test ! -d include || rmdir include || : if test -d examples -a ! -f examples/README; then rmdir examples || : ; fi if test -d drill -a ! -f drill/README ; then rmdir drill || : ; fi if test -d compat -a ! -f compat/malloc.c; then rmdir compat || : ; fi + rm -rf builddir/ -drill: no-drill-config-h drill/drill drill/drill.1 +drill: setup-builddir no-drill-config-h drill/drill drill/drill.1 no-drill-config-h: @if test -e $(srcdir)/drill/config.h -o -e drill/config.h ; \ then echo "A config.h was detected in the drill subdirectory." ; \ @@ -147,8 +167,8 @@ no-drill-config-h: exit -1 ; \ fi -drill/drill: $(DRILL_LOBJS) $(LIB) - $(LINK_EXE) $(DRILL_LOBJS) $(LIBS) $(LIBSSL_LIBS) -lldns -o drill/drill +drill/drill: $(DRILL_LOBJS) $(LIB) $(LIBLOBJS) + $(LINK_EXE) $(DRILL_LOBJS) $(LIBLOBJS) $(LIB) $(LIBSSL_LIBS) $(LIBS) -o drill/drill drill/drill.1: $(srcdir)/drill/drill.1.in $(edit) $(srcdir)/drill/drill.1.in > drill/drill.1 @@ -168,7 +188,7 @@ uninstall-drill: clean-drill: $(LIBTOOL) --mode clean rm -f $(DRILL_LOBJS) drill/drill drill/drill.1 -examples: no-examples-config-h $(EXAMPLE_PROGS) $(TESTNS) $(LDNS_DPA) $(LDNS_DANE) $(EX_SSL_PROGS) examples/ldns-dane.1 examples/ldns-verify-zone.1 +examples: setup-builddir no-examples-config-h $(LIB) $(EXAMPLE_PROGS) $(TESTNS) $(LDNS_DPA) $(LDNS_DANE) $(EX_SSL_PROGS) examples/ldns-dane.1 examples/ldns-verify-zone.1 no-examples-config-h: @if test -e $(srcdir)/examples/config.h -o -e examples/config.h ; \ then echo "A config.h was detected in the examples subdirectory." ; \ @@ -178,22 +198,25 @@ no-examples-config-h: exit -1 ; \ fi +# Need LIBSSL_LIBS $(EXAMPLE_PROGS): - $(LINK_EXE) $@.lo $(LIBS) -lldns -o $@ + $(LINK_EXE) $@.lo $(LIBLOBJS) $(LIB) $(LIBSSL_LIBS) $(LIBS) -o $@ +# Need LIBSSL_LIBS $(TESTNS): - $(LINK_EXE) $(TESTNS_LOBJS) $(LIBS) -lldns -o $(TESTNS) + $(LINK_EXE) $(TESTNS_LOBJS) $(LIBLOBJS) $(LIB) $(LIBSSL_LIBS) $(LIBS) -o $(TESTNS) +# Need LIBSSL_LIBS $(LDNS_DPA): - $(LINK_EXE) $(LDNS_DPA_LOBJS) $(LIBS) $(LIBPCAP_LIBS) -lldns \ + $(LINK_EXE) $(LDNS_DPA_LOBJS) $(LIBLOBJS) $(LIB) $(LIBPCAP_LIBS) $(LIBSSL_LIBS) $(LIBS) \ -o $(LDNS_DPA) $(LDNS_DANE): - $(LINK_EXE) $(LDNS_DANE_LOBJS) $(LIBS) $(LIBSSL_SSL_LIBS) -lldns \ + $(LINK_EXE) $(LDNS_DANE_LOBJS) $(LIBLOBJS) $(LIB) $(LIBSSL_SSL_LIBS) $(LIBS) \ -o $(LDNS_DANE) $(EX_SSL_PROGS): - $(LINK_EXE) $@.lo $(LIBS) $(LIBSSL_LIBS) -lldns -o $@ + $(LINK_EXE) $@.lo $(LIBLOBJS) $(LIB) $(LIBSSL_LIBS) $(LIBS) -o $@ examples/ldns-dane.1: $(srcdir)/examples/ldns-dane.1.in $(edit) $(srcdir)/examples/ldns-dane.1.in > examples/ldns-dane.1 @@ -221,14 +244,14 @@ uninstall-examples: test ! -d $(DESTDIR)$(bindir) || rmdir -p $(DESTDIR)$(bindir) || : ; clean-examples: - $(LIBTOOL) --mode clean rm -f $(EXAMPLE_PROGS) + $(LIBTOOL) --mode clean rm -f $(EXAMPLE_PROGS) $(LIBTOOL) --mode clean rm -f $(TESTNS) $(LDNS_DPA) $(LDNS_DANE) $(EX_SSL_PROGS) $(LIBTOOL) --mode clean rm -f $(EXAMPLE_LOBJS) $(LIBTOOL) --mode clean rm -f examples/ldns-dane.1 examples/ldns-verify-zone.1 linktest: $(srcdir)/linktest.c libldns.la $(COMP_LIB) $(LIBSSL_CPPFLAGS) -c $(srcdir)/linktest.c -o linktest.lo - $(LINK_EXE) linktest.lo $(LIBS) $(LIBSSL_LIBS) -lldns -o linktest + $(LINK_EXE) linktest.lo $(LIB) $(LIBSSL_LIBS) $(LIBS) -o linktest lib: libldns.la @@ -243,7 +266,7 @@ libldns.la-export-all: $(LDNS_ALL_LOBJS) mancheck: sh -c 'find . -name \*.\[13\] -exec troff -z {} \;' 2>&1 | sed "s/^\.\///" | sed "s/\(:[0\-9]\+:\)/\1 warning:/g" -doxygen: manpages +doxygen: @if test ! -e doc/header.html ; then \ $(INSTALL) -c -m 644 $(srcdir)/doc/header.html doc/ ; \ fi ; @@ -252,14 +275,29 @@ doxygen: manpages doc: manpages $(doxygen) @$(INSTALL) -d doc -manpages: $(srcdir)/doc/function_manpages - @$(INSTALL) -d doc - @cat $(srcdir)/ldns/*.h \ - | $(srcdir)/doc/doxyparse.pl \ - -m $(srcdir)/doc/function_manpages \ - | grep -v ^doxygen | grep -v ^cat > doc/ldns_manpages +manpages: $(srcdir)/doc/function_manpages + @$(INSTALL) -d doc/man/man3 + @if [ -f $(srcdir)/doc/man/man3/ldns_rr.3 ] ; \ + then \ + if test -d ldns ; then \ + echo "is builddir srcdir" > ldns/YES ; \ + if [ ! -f $(srcdir)/ldns/YES ]; then \ + echo "Copying manpages..."; \ + for m in $(srcdir)/doc/man/man3/*.3 ; \ + do \ + $(INSTALL) -c -C -m 444 $${m} doc/man/man3/ ; \ + done; \ + fi ;\ + rm -f ldns/YES; \ + fi; \ + else \ + echo "Generating manpages..."; \ + cat $(srcdir)/ldns/*.h \ + | $(srcdir)/doc/doxyparse.pl -m $(srcdir)/doc/function_manpages \ + | grep -v ^doxygen | grep -v ^cat > doc/ldns_manpages; \ + fi -manpage-create-errors: $(srcdir)/doc/function_manpages +manpage-create-errors: $(srcdir)/doc/function_manpages @$(INSTALL) -d doc @cat $(srcdir)/ldns/*.h \ | $(srcdir)/doc/doxyparse.pl -e \ @@ -276,7 +314,7 @@ manpage-errors: echo doc/man/man3/$${m}.3: manpage-has-bad-whatis-entry; \ fi; \ done || echo "WARNING!: Cannot detect manpage errors on `uname`" - + pyldns: _ldns.la $(pywrapdir)/ldns_wrapper.c: $(PYLDNS_I_FILES) ldns/config.h @@ -285,8 +323,8 @@ $(pywrapdir)/ldns_wrapper.c: $(PYLDNS_I_FILES) ldns/config.h ldns_wrapper.lo: $(pywrapdir)/ldns_wrapper.c ldns/config.h $(COMP_LIB) -I./include/ldns $(LIBSSL_CPPFLAGS) $(PYTHON_CPPFLAGS) $(PYTHON_X_CFLAGS) -c $(pywrapdir)/ldns_wrapper.c -o $@ -_ldns.la: ldns_wrapper.lo libldns.la - $(LIBTOOL) --tag=CC --mode=link $(CC) $(CFLAGS) $(PYTHON_CFLAGS) $(LDFLAGS) $(PYTHON_LDFLAGS) -module -version-info $(version_info) -no-undefined -o $@ ldns_wrapper.lo -rpath $(python_site) -L. -L.libs -lldns $(LIBS) +_ldns.la: ldns_wrapper.lo libldns.la + $(LIBTOOL) --tag=CC --mode=link $(CC) $(CFLAGS) $(PYTHON_CFLAGS) $(LDFLAGS) -module -version-info $(version_info) -no-undefined -o $@ ldns_wrapper.lo -rpath $(python_site) -L. -L.libs $(LIB) $(PYTHON_LIBS) $(LIBS) $(p5_dns_ldns_dir)/Makefile: $(p5_dns_ldns_dir)/Makefile.PL BUILDDIR=`pwd`; cd $(p5_dns_ldns_dir); LD_LIBRARY_PATH="$$BUILDDIR/.libs:$$LD_LIBRARY_PATH" DYLD_LIBRARY_PATH="$$BUILDDIR/.libs:$$DYLD_LIBRARY_PATH" $(PERL) Makefile.PL LIBS="-L$$BUILDDIR/.libs -lldns" INC="-I$$BUILDDIR" @@ -308,9 +346,9 @@ clean-p5-dns-ldns: $(p5_dns_ldns_dir)/Makefile test-p5-dns-ldns: $(p5_dns_ldns_dir)/Makefile cd $(p5_dns_ldns_dir); $(MAKE) test -install: install-h install-lib @INSTALL_CONFIG@ install-manpages $(pyldns_inst) $(pyldnsx_inst) @INSTALL_P5_DNS_LDNS@ @INSTALL_DRILL@ @INSTALL_EXAMPLES@ +install: install-h install-lib install-pc @INSTALL_CONFIG@ install-manpages $(pyldns_inst) $(pyldnsx_inst) @INSTALL_P5_DNS_LDNS@ @INSTALL_DRILL@ @INSTALL_EXAMPLES@ -uninstall: uninstall-manpages @UNINSTALL_CONFIG@ uninstall-h uninstall-lib $(pyldns_uninst) $(pyldnsx_uninst) @UNINSTALL_P5_DNS_LDNS@ @UNINSTALL_DRILL@ @UNINSTALL_EXAMPLES@ +uninstall: uninstall-manpages @UNINSTALL_CONFIG@ uninstall-h uninstall-lib uninstall-pc $(pyldns_uninst) $(pyldnsx_uninst) @UNINSTALL_P5_DNS_LDNS@ @UNINSTALL_DRILL@ @UNINSTALL_EXAMPLES@ destclean: uninstall @@ -355,12 +393,22 @@ uninstall-h: test ! -d $(DESTDIR)$(includedir)/ldns || rmdir -p $(DESTDIR)$(includedir)/ldns || echo "ok, dir already gone" exit 0 +packaging/libldns.pc: $(srcdir)/packaging/libldns.pc.in + ./config.status --file=$@ + +install-pc: packaging/libldns.pc + $(INSTALL) -m 644 packaging/libldns.pc $(DESTDIR)$(libdir)/pkgconfig/ldns.pc + +uninstall-pc: + $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/pkgconfig/ldns.pc + test ! -d $(DESTDIR)$(libdir)/pkgconfig || rmdir -p $(DESTDIR)$(libdir)/pkgconfig || echo "ok, dir already gone" + install-lib: lib $(INSTALL) -m 755 -d $(DESTDIR)$(libdir) $(LIBTOOL) --mode=install cp libldns.la $(DESTDIR)$(libdir) $(LIBTOOL) --mode=finish $(DESTDIR)$(libdir) -uninstall-lib: +uninstall-lib: $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/libldns.la test ! -d $(DESTDIR)$(libdir) || rmdir -p $(DESTDIR)$(libdir) || echo "ok, dir already gone" @@ -370,7 +418,7 @@ install-pyldns: @PYLDNS@ $(LIBTOOL) --mode=install cp _ldns.la $(DESTDIR)$(python_site) $(LIBTOOL) --mode=finish $(DESTDIR)$(python_site) -uninstall-pyldns: +uninstall-pyldns: rm -f $(DESTDIR)$(python_site)/ldns/* test ! -d $(DESTDIR)$(python_site)/ldns || rmdir $(DESTDIR)$(python_site)/ldns || echo "ok, dir already gone" @@ -425,7 +473,7 @@ docclean: rm -f doc/ldns_manpages distclean: realclean - rm -fr autom4te.cache + rm -fr autom4te.cache rm -f config.guess config.sub configure ltmain.sh ldns/config.h.in ## No need for changes here @@ -457,8 +505,8 @@ allclean: test-clean clean test-clean: tpkg -b test clean -test: @TEST_P5_DNS_LDNS@ - if test -x "`which bash`"; then bash test/test_all.sh; else sh test/test_all.sh; fi +test: examples drill @TEST_P5_DNS_LDNS@ + ./test/test_all.sh # Recreate symbols file, only needed when API changes @@ -538,129 +586,137 @@ depend: buffer.lo buffer.o: $(srcdir)/buffer.c ldns/config.h $(srcdir)/ldns/ldns.h ldns/util.h ldns/common.h \ $(srcdir)/ldns/buffer.h $(srcdir)/ldns/error.h $(srcdir)/ldns/dane.h $(srcdir)/ldns/rdata.h $(srcdir)/ldns/rr.h \ - $(srcdir)/ldns/dname.h $(srcdir)/ldns/dnssec.h $(srcdir)/ldns/packet.h $(srcdir)/ldns/keys.h $(srcdir)/ldns/zone.h \ - $(srcdir)/ldns/resolver.h $(srcdir)/ldns/tsig.h $(srcdir)/ldns/dnssec_zone.h $(srcdir)/ldns/rbtree.h \ + $(srcdir)/ldns/dname.h $(srcdir)/ldns/dnssec.h $(srcdir)/ldns/packet.h $(srcdir)/ldns/edns.h $(srcdir)/ldns/keys.h \ + $(srcdir)/ldns/zone.h $(srcdir)/ldns/resolver.h $(srcdir)/ldns/tsig.h $(srcdir)/ldns/dnssec_zone.h $(srcdir)/ldns/rbtree.h \ $(srcdir)/ldns/host2str.h $(srcdir)/ldns/dnssec_verify.h $(srcdir)/ldns/dnssec_sign.h $(srcdir)/ldns/duration.h \ $(srcdir)/ldns/higher.h $(srcdir)/ldns/host2wire.h ldns/net.h $(srcdir)/ldns/str2host.h $(srcdir)/ldns/update.h \ $(srcdir)/ldns/wire2host.h $(srcdir)/ldns/rr_functions.h $(srcdir)/ldns/parse.h $(srcdir)/ldns/radix.h \ $(srcdir)/ldns/sha1.h $(srcdir)/ldns/sha2.h dane.lo dane.o: $(srcdir)/dane.c ldns/config.h $(srcdir)/ldns/ldns.h ldns/util.h ldns/common.h \ $(srcdir)/ldns/buffer.h $(srcdir)/ldns/error.h $(srcdir)/ldns/dane.h $(srcdir)/ldns/rdata.h $(srcdir)/ldns/rr.h \ - $(srcdir)/ldns/dname.h $(srcdir)/ldns/dnssec.h $(srcdir)/ldns/packet.h $(srcdir)/ldns/keys.h $(srcdir)/ldns/zone.h \ - $(srcdir)/ldns/resolver.h $(srcdir)/ldns/tsig.h $(srcdir)/ldns/dnssec_zone.h $(srcdir)/ldns/rbtree.h \ + $(srcdir)/ldns/dname.h $(srcdir)/ldns/dnssec.h $(srcdir)/ldns/packet.h $(srcdir)/ldns/edns.h $(srcdir)/ldns/keys.h \ + $(srcdir)/ldns/zone.h $(srcdir)/ldns/resolver.h $(srcdir)/ldns/tsig.h $(srcdir)/ldns/dnssec_zone.h $(srcdir)/ldns/rbtree.h \ $(srcdir)/ldns/host2str.h $(srcdir)/ldns/dnssec_verify.h $(srcdir)/ldns/dnssec_sign.h $(srcdir)/ldns/duration.h \ $(srcdir)/ldns/higher.h $(srcdir)/ldns/host2wire.h ldns/net.h $(srcdir)/ldns/str2host.h $(srcdir)/ldns/update.h \ $(srcdir)/ldns/wire2host.h $(srcdir)/ldns/rr_functions.h $(srcdir)/ldns/parse.h $(srcdir)/ldns/radix.h \ $(srcdir)/ldns/sha1.h $(srcdir)/ldns/sha2.h dname.lo dname.o: $(srcdir)/dname.c ldns/config.h $(srcdir)/ldns/ldns.h ldns/util.h ldns/common.h \ $(srcdir)/ldns/buffer.h $(srcdir)/ldns/error.h $(srcdir)/ldns/dane.h $(srcdir)/ldns/rdata.h $(srcdir)/ldns/rr.h \ - $(srcdir)/ldns/dname.h $(srcdir)/ldns/dnssec.h $(srcdir)/ldns/packet.h $(srcdir)/ldns/keys.h $(srcdir)/ldns/zone.h \ - $(srcdir)/ldns/resolver.h $(srcdir)/ldns/tsig.h $(srcdir)/ldns/dnssec_zone.h $(srcdir)/ldns/rbtree.h \ + $(srcdir)/ldns/dname.h $(srcdir)/ldns/dnssec.h $(srcdir)/ldns/packet.h $(srcdir)/ldns/edns.h $(srcdir)/ldns/keys.h \ + $(srcdir)/ldns/zone.h $(srcdir)/ldns/resolver.h $(srcdir)/ldns/tsig.h $(srcdir)/ldns/dnssec_zone.h $(srcdir)/ldns/rbtree.h \ $(srcdir)/ldns/host2str.h $(srcdir)/ldns/dnssec_verify.h $(srcdir)/ldns/dnssec_sign.h $(srcdir)/ldns/duration.h \ $(srcdir)/ldns/higher.h $(srcdir)/ldns/host2wire.h ldns/net.h $(srcdir)/ldns/str2host.h $(srcdir)/ldns/update.h \ $(srcdir)/ldns/wire2host.h $(srcdir)/ldns/rr_functions.h $(srcdir)/ldns/parse.h $(srcdir)/ldns/radix.h \ $(srcdir)/ldns/sha1.h $(srcdir)/ldns/sha2.h dnssec.lo dnssec.o: $(srcdir)/dnssec.c ldns/config.h $(srcdir)/ldns/ldns.h ldns/util.h ldns/common.h \ $(srcdir)/ldns/buffer.h $(srcdir)/ldns/error.h $(srcdir)/ldns/dane.h $(srcdir)/ldns/rdata.h $(srcdir)/ldns/rr.h \ - $(srcdir)/ldns/dname.h $(srcdir)/ldns/dnssec.h $(srcdir)/ldns/packet.h $(srcdir)/ldns/keys.h $(srcdir)/ldns/zone.h \ - $(srcdir)/ldns/resolver.h $(srcdir)/ldns/tsig.h $(srcdir)/ldns/dnssec_zone.h $(srcdir)/ldns/rbtree.h \ + $(srcdir)/ldns/dname.h $(srcdir)/ldns/dnssec.h $(srcdir)/ldns/packet.h $(srcdir)/ldns/edns.h $(srcdir)/ldns/keys.h \ + $(srcdir)/ldns/zone.h $(srcdir)/ldns/resolver.h $(srcdir)/ldns/tsig.h $(srcdir)/ldns/dnssec_zone.h $(srcdir)/ldns/rbtree.h \ $(srcdir)/ldns/host2str.h $(srcdir)/ldns/dnssec_verify.h $(srcdir)/ldns/dnssec_sign.h $(srcdir)/ldns/duration.h \ $(srcdir)/ldns/higher.h $(srcdir)/ldns/host2wire.h ldns/net.h $(srcdir)/ldns/str2host.h $(srcdir)/ldns/update.h \ $(srcdir)/ldns/wire2host.h $(srcdir)/ldns/rr_functions.h $(srcdir)/ldns/parse.h $(srcdir)/ldns/radix.h \ $(srcdir)/ldns/sha1.h $(srcdir)/ldns/sha2.h dnssec_sign.lo dnssec_sign.o: $(srcdir)/dnssec_sign.c ldns/config.h $(srcdir)/ldns/ldns.h ldns/util.h \ ldns/common.h $(srcdir)/ldns/buffer.h $(srcdir)/ldns/error.h $(srcdir)/ldns/dane.h $(srcdir)/ldns/rdata.h \ - $(srcdir)/ldns/rr.h $(srcdir)/ldns/dname.h $(srcdir)/ldns/dnssec.h $(srcdir)/ldns/packet.h $(srcdir)/ldns/keys.h \ - $(srcdir)/ldns/zone.h $(srcdir)/ldns/resolver.h $(srcdir)/ldns/tsig.h $(srcdir)/ldns/dnssec_zone.h $(srcdir)/ldns/rbtree.h \ - $(srcdir)/ldns/host2str.h $(srcdir)/ldns/dnssec_verify.h $(srcdir)/ldns/dnssec_sign.h $(srcdir)/ldns/duration.h \ - $(srcdir)/ldns/higher.h $(srcdir)/ldns/host2wire.h ldns/net.h $(srcdir)/ldns/str2host.h $(srcdir)/ldns/update.h \ - $(srcdir)/ldns/wire2host.h $(srcdir)/ldns/rr_functions.h $(srcdir)/ldns/parse.h $(srcdir)/ldns/radix.h \ - $(srcdir)/ldns/sha1.h $(srcdir)/ldns/sha2.h + $(srcdir)/ldns/rr.h $(srcdir)/ldns/dname.h $(srcdir)/ldns/dnssec.h $(srcdir)/ldns/packet.h $(srcdir)/ldns/edns.h \ + $(srcdir)/ldns/keys.h $(srcdir)/ldns/zone.h $(srcdir)/ldns/resolver.h $(srcdir)/ldns/tsig.h $(srcdir)/ldns/dnssec_zone.h \ + $(srcdir)/ldns/rbtree.h $(srcdir)/ldns/host2str.h $(srcdir)/ldns/dnssec_verify.h $(srcdir)/ldns/dnssec_sign.h \ + $(srcdir)/ldns/duration.h $(srcdir)/ldns/higher.h $(srcdir)/ldns/host2wire.h ldns/net.h \ + $(srcdir)/ldns/str2host.h $(srcdir)/ldns/update.h $(srcdir)/ldns/wire2host.h $(srcdir)/ldns/rr_functions.h \ + $(srcdir)/ldns/parse.h $(srcdir)/ldns/radix.h $(srcdir)/ldns/sha1.h $(srcdir)/ldns/sha2.h dnssec_verify.lo dnssec_verify.o: $(srcdir)/dnssec_verify.c ldns/config.h $(srcdir)/ldns/ldns.h ldns/util.h \ ldns/common.h $(srcdir)/ldns/buffer.h $(srcdir)/ldns/error.h $(srcdir)/ldns/dane.h $(srcdir)/ldns/rdata.h \ - $(srcdir)/ldns/rr.h $(srcdir)/ldns/dname.h $(srcdir)/ldns/dnssec.h $(srcdir)/ldns/packet.h $(srcdir)/ldns/keys.h \ - $(srcdir)/ldns/zone.h $(srcdir)/ldns/resolver.h $(srcdir)/ldns/tsig.h $(srcdir)/ldns/dnssec_zone.h $(srcdir)/ldns/rbtree.h \ - $(srcdir)/ldns/host2str.h $(srcdir)/ldns/dnssec_verify.h $(srcdir)/ldns/dnssec_sign.h $(srcdir)/ldns/duration.h \ - $(srcdir)/ldns/higher.h $(srcdir)/ldns/host2wire.h ldns/net.h $(srcdir)/ldns/str2host.h $(srcdir)/ldns/update.h \ - $(srcdir)/ldns/wire2host.h $(srcdir)/ldns/rr_functions.h $(srcdir)/ldns/parse.h $(srcdir)/ldns/radix.h \ - $(srcdir)/ldns/sha1.h $(srcdir)/ldns/sha2.h + $(srcdir)/ldns/rr.h $(srcdir)/ldns/dname.h $(srcdir)/ldns/dnssec.h $(srcdir)/ldns/packet.h $(srcdir)/ldns/edns.h \ + $(srcdir)/ldns/keys.h $(srcdir)/ldns/zone.h $(srcdir)/ldns/resolver.h $(srcdir)/ldns/tsig.h $(srcdir)/ldns/dnssec_zone.h \ + $(srcdir)/ldns/rbtree.h $(srcdir)/ldns/host2str.h $(srcdir)/ldns/dnssec_verify.h $(srcdir)/ldns/dnssec_sign.h \ + $(srcdir)/ldns/duration.h $(srcdir)/ldns/higher.h $(srcdir)/ldns/host2wire.h ldns/net.h \ + $(srcdir)/ldns/str2host.h $(srcdir)/ldns/update.h $(srcdir)/ldns/wire2host.h $(srcdir)/ldns/rr_functions.h \ + $(srcdir)/ldns/parse.h $(srcdir)/ldns/radix.h $(srcdir)/ldns/sha1.h $(srcdir)/ldns/sha2.h dnssec_zone.lo dnssec_zone.o: $(srcdir)/dnssec_zone.c ldns/config.h $(srcdir)/ldns/ldns.h ldns/util.h \ ldns/common.h $(srcdir)/ldns/buffer.h $(srcdir)/ldns/error.h $(srcdir)/ldns/dane.h $(srcdir)/ldns/rdata.h \ - $(srcdir)/ldns/rr.h $(srcdir)/ldns/dname.h $(srcdir)/ldns/dnssec.h $(srcdir)/ldns/packet.h $(srcdir)/ldns/keys.h \ - $(srcdir)/ldns/zone.h $(srcdir)/ldns/resolver.h $(srcdir)/ldns/tsig.h $(srcdir)/ldns/dnssec_zone.h $(srcdir)/ldns/rbtree.h \ + $(srcdir)/ldns/rr.h $(srcdir)/ldns/dname.h $(srcdir)/ldns/dnssec.h $(srcdir)/ldns/packet.h $(srcdir)/ldns/edns.h \ + $(srcdir)/ldns/keys.h $(srcdir)/ldns/zone.h $(srcdir)/ldns/resolver.h $(srcdir)/ldns/tsig.h $(srcdir)/ldns/dnssec_zone.h \ + $(srcdir)/ldns/rbtree.h $(srcdir)/ldns/host2str.h $(srcdir)/ldns/dnssec_verify.h $(srcdir)/ldns/dnssec_sign.h \ + $(srcdir)/ldns/duration.h $(srcdir)/ldns/higher.h $(srcdir)/ldns/host2wire.h ldns/net.h \ + $(srcdir)/ldns/str2host.h $(srcdir)/ldns/update.h $(srcdir)/ldns/wire2host.h $(srcdir)/ldns/rr_functions.h \ + $(srcdir)/ldns/parse.h $(srcdir)/ldns/radix.h $(srcdir)/ldns/sha1.h $(srcdir)/ldns/sha2.h +duration.lo duration.o: $(srcdir)/duration.c ldns/config.h $(srcdir)/ldns/duration.h +edns.lo edns.o: $(srcdir)/edns.c $(srcdir)/ldns/ldns.h ldns/util.h ldns/common.h $(srcdir)/ldns/buffer.h \ + $(srcdir)/ldns/error.h $(srcdir)/ldns/dane.h $(srcdir)/ldns/rdata.h $(srcdir)/ldns/rr.h $(srcdir)/ldns/dname.h \ + $(srcdir)/ldns/dnssec.h $(srcdir)/ldns/packet.h $(srcdir)/ldns/edns.h $(srcdir)/ldns/keys.h $(srcdir)/ldns/zone.h \ + $(srcdir)/ldns/resolver.h $(srcdir)/ldns/tsig.h $(srcdir)/ldns/dnssec_zone.h $(srcdir)/ldns/rbtree.h \ $(srcdir)/ldns/host2str.h $(srcdir)/ldns/dnssec_verify.h $(srcdir)/ldns/dnssec_sign.h $(srcdir)/ldns/duration.h \ $(srcdir)/ldns/higher.h $(srcdir)/ldns/host2wire.h ldns/net.h $(srcdir)/ldns/str2host.h $(srcdir)/ldns/update.h \ $(srcdir)/ldns/wire2host.h $(srcdir)/ldns/rr_functions.h $(srcdir)/ldns/parse.h $(srcdir)/ldns/radix.h \ $(srcdir)/ldns/sha1.h $(srcdir)/ldns/sha2.h -duration.lo duration.o: $(srcdir)/duration.c ldns/config.h $(srcdir)/ldns/duration.h error.lo error.o: $(srcdir)/error.c ldns/config.h $(srcdir)/ldns/ldns.h ldns/util.h ldns/common.h \ $(srcdir)/ldns/buffer.h $(srcdir)/ldns/error.h $(srcdir)/ldns/dane.h $(srcdir)/ldns/rdata.h $(srcdir)/ldns/rr.h \ - $(srcdir)/ldns/dname.h $(srcdir)/ldns/dnssec.h $(srcdir)/ldns/packet.h $(srcdir)/ldns/keys.h $(srcdir)/ldns/zone.h \ - $(srcdir)/ldns/resolver.h $(srcdir)/ldns/tsig.h $(srcdir)/ldns/dnssec_zone.h $(srcdir)/ldns/rbtree.h \ + $(srcdir)/ldns/dname.h $(srcdir)/ldns/dnssec.h $(srcdir)/ldns/packet.h $(srcdir)/ldns/edns.h $(srcdir)/ldns/keys.h \ + $(srcdir)/ldns/zone.h $(srcdir)/ldns/resolver.h $(srcdir)/ldns/tsig.h $(srcdir)/ldns/dnssec_zone.h $(srcdir)/ldns/rbtree.h \ $(srcdir)/ldns/host2str.h $(srcdir)/ldns/dnssec_verify.h $(srcdir)/ldns/dnssec_sign.h $(srcdir)/ldns/duration.h \ $(srcdir)/ldns/higher.h $(srcdir)/ldns/host2wire.h ldns/net.h $(srcdir)/ldns/str2host.h $(srcdir)/ldns/update.h \ $(srcdir)/ldns/wire2host.h $(srcdir)/ldns/rr_functions.h $(srcdir)/ldns/parse.h $(srcdir)/ldns/radix.h \ $(srcdir)/ldns/sha1.h $(srcdir)/ldns/sha2.h higher.lo higher.o: $(srcdir)/higher.c ldns/config.h $(srcdir)/ldns/ldns.h ldns/util.h ldns/common.h \ $(srcdir)/ldns/buffer.h $(srcdir)/ldns/error.h $(srcdir)/ldns/dane.h $(srcdir)/ldns/rdata.h $(srcdir)/ldns/rr.h \ - $(srcdir)/ldns/dname.h $(srcdir)/ldns/dnssec.h $(srcdir)/ldns/packet.h $(srcdir)/ldns/keys.h $(srcdir)/ldns/zone.h \ - $(srcdir)/ldns/resolver.h $(srcdir)/ldns/tsig.h $(srcdir)/ldns/dnssec_zone.h $(srcdir)/ldns/rbtree.h \ + $(srcdir)/ldns/dname.h $(srcdir)/ldns/dnssec.h $(srcdir)/ldns/packet.h $(srcdir)/ldns/edns.h $(srcdir)/ldns/keys.h \ + $(srcdir)/ldns/zone.h $(srcdir)/ldns/resolver.h $(srcdir)/ldns/tsig.h $(srcdir)/ldns/dnssec_zone.h $(srcdir)/ldns/rbtree.h \ $(srcdir)/ldns/host2str.h $(srcdir)/ldns/dnssec_verify.h $(srcdir)/ldns/dnssec_sign.h $(srcdir)/ldns/duration.h \ $(srcdir)/ldns/higher.h $(srcdir)/ldns/host2wire.h ldns/net.h $(srcdir)/ldns/str2host.h $(srcdir)/ldns/update.h \ $(srcdir)/ldns/wire2host.h $(srcdir)/ldns/rr_functions.h $(srcdir)/ldns/parse.h $(srcdir)/ldns/radix.h \ $(srcdir)/ldns/sha1.h $(srcdir)/ldns/sha2.h host2str.lo host2str.o: $(srcdir)/host2str.c ldns/config.h $(srcdir)/ldns/ldns.h ldns/util.h \ ldns/common.h $(srcdir)/ldns/buffer.h $(srcdir)/ldns/error.h $(srcdir)/ldns/dane.h $(srcdir)/ldns/rdata.h \ - $(srcdir)/ldns/rr.h $(srcdir)/ldns/dname.h $(srcdir)/ldns/dnssec.h $(srcdir)/ldns/packet.h $(srcdir)/ldns/keys.h \ - $(srcdir)/ldns/zone.h $(srcdir)/ldns/resolver.h $(srcdir)/ldns/tsig.h $(srcdir)/ldns/dnssec_zone.h $(srcdir)/ldns/rbtree.h \ - $(srcdir)/ldns/host2str.h $(srcdir)/ldns/dnssec_verify.h $(srcdir)/ldns/dnssec_sign.h $(srcdir)/ldns/duration.h \ - $(srcdir)/ldns/higher.h $(srcdir)/ldns/host2wire.h ldns/net.h $(srcdir)/ldns/str2host.h $(srcdir)/ldns/update.h \ - $(srcdir)/ldns/wire2host.h $(srcdir)/ldns/rr_functions.h $(srcdir)/ldns/parse.h $(srcdir)/ldns/radix.h \ - $(srcdir)/ldns/sha1.h $(srcdir)/ldns/sha2.h + $(srcdir)/ldns/rr.h $(srcdir)/ldns/dname.h $(srcdir)/ldns/dnssec.h $(srcdir)/ldns/packet.h $(srcdir)/ldns/edns.h \ + $(srcdir)/ldns/keys.h $(srcdir)/ldns/zone.h $(srcdir)/ldns/resolver.h $(srcdir)/ldns/tsig.h $(srcdir)/ldns/dnssec_zone.h \ + $(srcdir)/ldns/rbtree.h $(srcdir)/ldns/host2str.h $(srcdir)/ldns/dnssec_verify.h $(srcdir)/ldns/dnssec_sign.h \ + $(srcdir)/ldns/duration.h $(srcdir)/ldns/higher.h $(srcdir)/ldns/host2wire.h ldns/net.h \ + $(srcdir)/ldns/str2host.h $(srcdir)/ldns/update.h $(srcdir)/ldns/wire2host.h $(srcdir)/ldns/rr_functions.h \ + $(srcdir)/ldns/parse.h $(srcdir)/ldns/radix.h $(srcdir)/ldns/sha1.h $(srcdir)/ldns/sha2.h host2wire.lo host2wire.o: $(srcdir)/host2wire.c ldns/config.h $(srcdir)/ldns/ldns.h ldns/util.h \ ldns/common.h $(srcdir)/ldns/buffer.h $(srcdir)/ldns/error.h $(srcdir)/ldns/dane.h $(srcdir)/ldns/rdata.h \ - $(srcdir)/ldns/rr.h $(srcdir)/ldns/dname.h $(srcdir)/ldns/dnssec.h $(srcdir)/ldns/packet.h $(srcdir)/ldns/keys.h \ - $(srcdir)/ldns/zone.h $(srcdir)/ldns/resolver.h $(srcdir)/ldns/tsig.h $(srcdir)/ldns/dnssec_zone.h $(srcdir)/ldns/rbtree.h \ - $(srcdir)/ldns/host2str.h $(srcdir)/ldns/dnssec_verify.h $(srcdir)/ldns/dnssec_sign.h $(srcdir)/ldns/duration.h \ - $(srcdir)/ldns/higher.h $(srcdir)/ldns/host2wire.h ldns/net.h $(srcdir)/ldns/str2host.h $(srcdir)/ldns/update.h \ - $(srcdir)/ldns/wire2host.h $(srcdir)/ldns/rr_functions.h $(srcdir)/ldns/parse.h $(srcdir)/ldns/radix.h \ - $(srcdir)/ldns/sha1.h $(srcdir)/ldns/sha2.h + $(srcdir)/ldns/rr.h $(srcdir)/ldns/dname.h $(srcdir)/ldns/dnssec.h $(srcdir)/ldns/packet.h $(srcdir)/ldns/edns.h \ + $(srcdir)/ldns/keys.h $(srcdir)/ldns/zone.h $(srcdir)/ldns/resolver.h $(srcdir)/ldns/tsig.h $(srcdir)/ldns/dnssec_zone.h \ + $(srcdir)/ldns/rbtree.h $(srcdir)/ldns/host2str.h $(srcdir)/ldns/dnssec_verify.h $(srcdir)/ldns/dnssec_sign.h \ + $(srcdir)/ldns/duration.h $(srcdir)/ldns/higher.h $(srcdir)/ldns/host2wire.h ldns/net.h \ + $(srcdir)/ldns/str2host.h $(srcdir)/ldns/update.h $(srcdir)/ldns/wire2host.h $(srcdir)/ldns/rr_functions.h \ + $(srcdir)/ldns/parse.h $(srcdir)/ldns/radix.h $(srcdir)/ldns/sha1.h $(srcdir)/ldns/sha2.h keys.lo keys.o: $(srcdir)/keys.c ldns/config.h $(srcdir)/ldns/ldns.h ldns/util.h ldns/common.h \ $(srcdir)/ldns/buffer.h $(srcdir)/ldns/error.h $(srcdir)/ldns/dane.h $(srcdir)/ldns/rdata.h $(srcdir)/ldns/rr.h \ - $(srcdir)/ldns/dname.h $(srcdir)/ldns/dnssec.h $(srcdir)/ldns/packet.h $(srcdir)/ldns/keys.h $(srcdir)/ldns/zone.h \ - $(srcdir)/ldns/resolver.h $(srcdir)/ldns/tsig.h $(srcdir)/ldns/dnssec_zone.h $(srcdir)/ldns/rbtree.h \ + $(srcdir)/ldns/dname.h $(srcdir)/ldns/dnssec.h $(srcdir)/ldns/packet.h $(srcdir)/ldns/edns.h $(srcdir)/ldns/keys.h \ + $(srcdir)/ldns/zone.h $(srcdir)/ldns/resolver.h $(srcdir)/ldns/tsig.h $(srcdir)/ldns/dnssec_zone.h $(srcdir)/ldns/rbtree.h \ $(srcdir)/ldns/host2str.h $(srcdir)/ldns/dnssec_verify.h $(srcdir)/ldns/dnssec_sign.h $(srcdir)/ldns/duration.h \ $(srcdir)/ldns/higher.h $(srcdir)/ldns/host2wire.h ldns/net.h $(srcdir)/ldns/str2host.h $(srcdir)/ldns/update.h \ $(srcdir)/ldns/wire2host.h $(srcdir)/ldns/rr_functions.h $(srcdir)/ldns/parse.h $(srcdir)/ldns/radix.h \ $(srcdir)/ldns/sha1.h $(srcdir)/ldns/sha2.h linktest.lo linktest.o: $(srcdir)/linktest.c ldns/config.h $(srcdir)/ldns/ldns.h ldns/util.h \ ldns/common.h $(srcdir)/ldns/buffer.h $(srcdir)/ldns/error.h $(srcdir)/ldns/dane.h $(srcdir)/ldns/rdata.h \ - $(srcdir)/ldns/rr.h $(srcdir)/ldns/dname.h $(srcdir)/ldns/dnssec.h $(srcdir)/ldns/packet.h $(srcdir)/ldns/keys.h \ - $(srcdir)/ldns/zone.h $(srcdir)/ldns/resolver.h $(srcdir)/ldns/tsig.h $(srcdir)/ldns/dnssec_zone.h $(srcdir)/ldns/rbtree.h \ - $(srcdir)/ldns/host2str.h $(srcdir)/ldns/dnssec_verify.h $(srcdir)/ldns/dnssec_sign.h $(srcdir)/ldns/duration.h \ - $(srcdir)/ldns/higher.h $(srcdir)/ldns/host2wire.h ldns/net.h $(srcdir)/ldns/str2host.h $(srcdir)/ldns/update.h \ - $(srcdir)/ldns/wire2host.h $(srcdir)/ldns/rr_functions.h $(srcdir)/ldns/parse.h $(srcdir)/ldns/radix.h \ - $(srcdir)/ldns/sha1.h $(srcdir)/ldns/sha2.h + $(srcdir)/ldns/rr.h $(srcdir)/ldns/dname.h $(srcdir)/ldns/dnssec.h $(srcdir)/ldns/packet.h $(srcdir)/ldns/edns.h \ + $(srcdir)/ldns/keys.h $(srcdir)/ldns/zone.h $(srcdir)/ldns/resolver.h $(srcdir)/ldns/tsig.h $(srcdir)/ldns/dnssec_zone.h \ + $(srcdir)/ldns/rbtree.h $(srcdir)/ldns/host2str.h $(srcdir)/ldns/dnssec_verify.h $(srcdir)/ldns/dnssec_sign.h \ + $(srcdir)/ldns/duration.h $(srcdir)/ldns/higher.h $(srcdir)/ldns/host2wire.h ldns/net.h \ + $(srcdir)/ldns/str2host.h $(srcdir)/ldns/update.h $(srcdir)/ldns/wire2host.h $(srcdir)/ldns/rr_functions.h \ + $(srcdir)/ldns/parse.h $(srcdir)/ldns/radix.h $(srcdir)/ldns/sha1.h $(srcdir)/ldns/sha2.h net.lo net.o: $(srcdir)/net.c ldns/config.h $(srcdir)/ldns/ldns.h ldns/util.h ldns/common.h \ $(srcdir)/ldns/buffer.h $(srcdir)/ldns/error.h $(srcdir)/ldns/dane.h $(srcdir)/ldns/rdata.h $(srcdir)/ldns/rr.h \ - $(srcdir)/ldns/dname.h $(srcdir)/ldns/dnssec.h $(srcdir)/ldns/packet.h $(srcdir)/ldns/keys.h $(srcdir)/ldns/zone.h \ - $(srcdir)/ldns/resolver.h $(srcdir)/ldns/tsig.h $(srcdir)/ldns/dnssec_zone.h $(srcdir)/ldns/rbtree.h \ + $(srcdir)/ldns/dname.h $(srcdir)/ldns/dnssec.h $(srcdir)/ldns/packet.h $(srcdir)/ldns/edns.h $(srcdir)/ldns/keys.h \ + $(srcdir)/ldns/zone.h $(srcdir)/ldns/resolver.h $(srcdir)/ldns/tsig.h $(srcdir)/ldns/dnssec_zone.h $(srcdir)/ldns/rbtree.h \ $(srcdir)/ldns/host2str.h $(srcdir)/ldns/dnssec_verify.h $(srcdir)/ldns/dnssec_sign.h $(srcdir)/ldns/duration.h \ $(srcdir)/ldns/higher.h $(srcdir)/ldns/host2wire.h ldns/net.h $(srcdir)/ldns/str2host.h $(srcdir)/ldns/update.h \ $(srcdir)/ldns/wire2host.h $(srcdir)/ldns/rr_functions.h $(srcdir)/ldns/parse.h $(srcdir)/ldns/radix.h \ $(srcdir)/ldns/sha1.h $(srcdir)/ldns/sha2.h packet.lo packet.o: $(srcdir)/packet.c ldns/config.h $(srcdir)/ldns/ldns.h ldns/util.h ldns/common.h \ $(srcdir)/ldns/buffer.h $(srcdir)/ldns/error.h $(srcdir)/ldns/dane.h $(srcdir)/ldns/rdata.h $(srcdir)/ldns/rr.h \ - $(srcdir)/ldns/dname.h $(srcdir)/ldns/dnssec.h $(srcdir)/ldns/packet.h $(srcdir)/ldns/keys.h $(srcdir)/ldns/zone.h \ - $(srcdir)/ldns/resolver.h $(srcdir)/ldns/tsig.h $(srcdir)/ldns/dnssec_zone.h $(srcdir)/ldns/rbtree.h \ + $(srcdir)/ldns/dname.h $(srcdir)/ldns/dnssec.h $(srcdir)/ldns/packet.h $(srcdir)/ldns/edns.h $(srcdir)/ldns/keys.h \ + $(srcdir)/ldns/zone.h $(srcdir)/ldns/resolver.h $(srcdir)/ldns/tsig.h $(srcdir)/ldns/dnssec_zone.h $(srcdir)/ldns/rbtree.h \ $(srcdir)/ldns/host2str.h $(srcdir)/ldns/dnssec_verify.h $(srcdir)/ldns/dnssec_sign.h $(srcdir)/ldns/duration.h \ $(srcdir)/ldns/higher.h $(srcdir)/ldns/host2wire.h ldns/net.h $(srcdir)/ldns/str2host.h $(srcdir)/ldns/update.h \ $(srcdir)/ldns/wire2host.h $(srcdir)/ldns/rr_functions.h $(srcdir)/ldns/parse.h $(srcdir)/ldns/radix.h \ $(srcdir)/ldns/sha1.h $(srcdir)/ldns/sha2.h parse.lo parse.o: $(srcdir)/parse.c ldns/config.h $(srcdir)/ldns/ldns.h ldns/util.h ldns/common.h \ $(srcdir)/ldns/buffer.h $(srcdir)/ldns/error.h $(srcdir)/ldns/dane.h $(srcdir)/ldns/rdata.h $(srcdir)/ldns/rr.h \ - $(srcdir)/ldns/dname.h $(srcdir)/ldns/dnssec.h $(srcdir)/ldns/packet.h $(srcdir)/ldns/keys.h $(srcdir)/ldns/zone.h \ - $(srcdir)/ldns/resolver.h $(srcdir)/ldns/tsig.h $(srcdir)/ldns/dnssec_zone.h $(srcdir)/ldns/rbtree.h \ + $(srcdir)/ldns/dname.h $(srcdir)/ldns/dnssec.h $(srcdir)/ldns/packet.h $(srcdir)/ldns/edns.h $(srcdir)/ldns/keys.h \ + $(srcdir)/ldns/zone.h $(srcdir)/ldns/resolver.h $(srcdir)/ldns/tsig.h $(srcdir)/ldns/dnssec_zone.h $(srcdir)/ldns/rbtree.h \ $(srcdir)/ldns/host2str.h $(srcdir)/ldns/dnssec_verify.h $(srcdir)/ldns/dnssec_sign.h $(srcdir)/ldns/duration.h \ $(srcdir)/ldns/higher.h $(srcdir)/ldns/host2wire.h ldns/net.h $(srcdir)/ldns/str2host.h $(srcdir)/ldns/update.h \ $(srcdir)/ldns/wire2host.h $(srcdir)/ldns/rr_functions.h $(srcdir)/ldns/parse.h $(srcdir)/ldns/radix.h \ @@ -670,40 +726,40 @@ radix.lo radix.o: $(srcdir)/radix.c ldns/config.h $(srcdir)/ldns/radix.h $(srcdi rbtree.lo rbtree.o: $(srcdir)/rbtree.c ldns/config.h $(srcdir)/ldns/rbtree.h ldns/util.h ldns/common.h rdata.lo rdata.o: $(srcdir)/rdata.c ldns/config.h $(srcdir)/ldns/ldns.h ldns/util.h ldns/common.h \ $(srcdir)/ldns/buffer.h $(srcdir)/ldns/error.h $(srcdir)/ldns/dane.h $(srcdir)/ldns/rdata.h $(srcdir)/ldns/rr.h \ - $(srcdir)/ldns/dname.h $(srcdir)/ldns/dnssec.h $(srcdir)/ldns/packet.h $(srcdir)/ldns/keys.h $(srcdir)/ldns/zone.h \ - $(srcdir)/ldns/resolver.h $(srcdir)/ldns/tsig.h $(srcdir)/ldns/dnssec_zone.h $(srcdir)/ldns/rbtree.h \ + $(srcdir)/ldns/dname.h $(srcdir)/ldns/dnssec.h $(srcdir)/ldns/packet.h $(srcdir)/ldns/edns.h $(srcdir)/ldns/keys.h \ + $(srcdir)/ldns/zone.h $(srcdir)/ldns/resolver.h $(srcdir)/ldns/tsig.h $(srcdir)/ldns/dnssec_zone.h $(srcdir)/ldns/rbtree.h \ $(srcdir)/ldns/host2str.h $(srcdir)/ldns/dnssec_verify.h $(srcdir)/ldns/dnssec_sign.h $(srcdir)/ldns/duration.h \ $(srcdir)/ldns/higher.h $(srcdir)/ldns/host2wire.h ldns/net.h $(srcdir)/ldns/str2host.h $(srcdir)/ldns/update.h \ $(srcdir)/ldns/wire2host.h $(srcdir)/ldns/rr_functions.h $(srcdir)/ldns/parse.h $(srcdir)/ldns/radix.h \ $(srcdir)/ldns/sha1.h $(srcdir)/ldns/sha2.h resolver.lo resolver.o: $(srcdir)/resolver.c ldns/config.h $(srcdir)/ldns/ldns.h ldns/util.h \ ldns/common.h $(srcdir)/ldns/buffer.h $(srcdir)/ldns/error.h $(srcdir)/ldns/dane.h $(srcdir)/ldns/rdata.h \ - $(srcdir)/ldns/rr.h $(srcdir)/ldns/dname.h $(srcdir)/ldns/dnssec.h $(srcdir)/ldns/packet.h $(srcdir)/ldns/keys.h \ - $(srcdir)/ldns/zone.h $(srcdir)/ldns/resolver.h $(srcdir)/ldns/tsig.h $(srcdir)/ldns/dnssec_zone.h $(srcdir)/ldns/rbtree.h \ - $(srcdir)/ldns/host2str.h $(srcdir)/ldns/dnssec_verify.h $(srcdir)/ldns/dnssec_sign.h $(srcdir)/ldns/duration.h \ - $(srcdir)/ldns/higher.h $(srcdir)/ldns/host2wire.h ldns/net.h $(srcdir)/ldns/str2host.h $(srcdir)/ldns/update.h \ - $(srcdir)/ldns/wire2host.h $(srcdir)/ldns/rr_functions.h $(srcdir)/ldns/parse.h $(srcdir)/ldns/radix.h \ - $(srcdir)/ldns/sha1.h $(srcdir)/ldns/sha2.h + $(srcdir)/ldns/rr.h $(srcdir)/ldns/dname.h $(srcdir)/ldns/dnssec.h $(srcdir)/ldns/packet.h $(srcdir)/ldns/edns.h \ + $(srcdir)/ldns/keys.h $(srcdir)/ldns/zone.h $(srcdir)/ldns/resolver.h $(srcdir)/ldns/tsig.h $(srcdir)/ldns/dnssec_zone.h \ + $(srcdir)/ldns/rbtree.h $(srcdir)/ldns/host2str.h $(srcdir)/ldns/dnssec_verify.h $(srcdir)/ldns/dnssec_sign.h \ + $(srcdir)/ldns/duration.h $(srcdir)/ldns/higher.h $(srcdir)/ldns/host2wire.h ldns/net.h \ + $(srcdir)/ldns/str2host.h $(srcdir)/ldns/update.h $(srcdir)/ldns/wire2host.h $(srcdir)/ldns/rr_functions.h \ + $(srcdir)/ldns/parse.h $(srcdir)/ldns/radix.h $(srcdir)/ldns/sha1.h $(srcdir)/ldns/sha2.h rr.lo rr.o: $(srcdir)/rr.c ldns/config.h $(srcdir)/ldns/ldns.h ldns/util.h ldns/common.h \ $(srcdir)/ldns/buffer.h $(srcdir)/ldns/error.h $(srcdir)/ldns/dane.h $(srcdir)/ldns/rdata.h $(srcdir)/ldns/rr.h \ - $(srcdir)/ldns/dname.h $(srcdir)/ldns/dnssec.h $(srcdir)/ldns/packet.h $(srcdir)/ldns/keys.h $(srcdir)/ldns/zone.h \ - $(srcdir)/ldns/resolver.h $(srcdir)/ldns/tsig.h $(srcdir)/ldns/dnssec_zone.h $(srcdir)/ldns/rbtree.h \ + $(srcdir)/ldns/dname.h $(srcdir)/ldns/dnssec.h $(srcdir)/ldns/packet.h $(srcdir)/ldns/edns.h $(srcdir)/ldns/keys.h \ + $(srcdir)/ldns/zone.h $(srcdir)/ldns/resolver.h $(srcdir)/ldns/tsig.h $(srcdir)/ldns/dnssec_zone.h $(srcdir)/ldns/rbtree.h \ $(srcdir)/ldns/host2str.h $(srcdir)/ldns/dnssec_verify.h $(srcdir)/ldns/dnssec_sign.h $(srcdir)/ldns/duration.h \ $(srcdir)/ldns/higher.h $(srcdir)/ldns/host2wire.h ldns/net.h $(srcdir)/ldns/str2host.h $(srcdir)/ldns/update.h \ $(srcdir)/ldns/wire2host.h $(srcdir)/ldns/rr_functions.h $(srcdir)/ldns/parse.h $(srcdir)/ldns/radix.h \ $(srcdir)/ldns/sha1.h $(srcdir)/ldns/sha2.h rr_functions.lo rr_functions.o: $(srcdir)/rr_functions.c ldns/config.h $(srcdir)/ldns/ldns.h ldns/util.h \ ldns/common.h $(srcdir)/ldns/buffer.h $(srcdir)/ldns/error.h $(srcdir)/ldns/dane.h $(srcdir)/ldns/rdata.h \ - $(srcdir)/ldns/rr.h $(srcdir)/ldns/dname.h $(srcdir)/ldns/dnssec.h $(srcdir)/ldns/packet.h $(srcdir)/ldns/keys.h \ - $(srcdir)/ldns/zone.h $(srcdir)/ldns/resolver.h $(srcdir)/ldns/tsig.h $(srcdir)/ldns/dnssec_zone.h $(srcdir)/ldns/rbtree.h \ - $(srcdir)/ldns/host2str.h $(srcdir)/ldns/dnssec_verify.h $(srcdir)/ldns/dnssec_sign.h $(srcdir)/ldns/duration.h \ - $(srcdir)/ldns/higher.h $(srcdir)/ldns/host2wire.h ldns/net.h $(srcdir)/ldns/str2host.h $(srcdir)/ldns/update.h \ - $(srcdir)/ldns/wire2host.h $(srcdir)/ldns/rr_functions.h $(srcdir)/ldns/parse.h $(srcdir)/ldns/radix.h \ - $(srcdir)/ldns/sha1.h $(srcdir)/ldns/sha2.h + $(srcdir)/ldns/rr.h $(srcdir)/ldns/dname.h $(srcdir)/ldns/dnssec.h $(srcdir)/ldns/packet.h $(srcdir)/ldns/edns.h \ + $(srcdir)/ldns/keys.h $(srcdir)/ldns/zone.h $(srcdir)/ldns/resolver.h $(srcdir)/ldns/tsig.h $(srcdir)/ldns/dnssec_zone.h \ + $(srcdir)/ldns/rbtree.h $(srcdir)/ldns/host2str.h $(srcdir)/ldns/dnssec_verify.h $(srcdir)/ldns/dnssec_sign.h \ + $(srcdir)/ldns/duration.h $(srcdir)/ldns/higher.h $(srcdir)/ldns/host2wire.h ldns/net.h \ + $(srcdir)/ldns/str2host.h $(srcdir)/ldns/update.h $(srcdir)/ldns/wire2host.h $(srcdir)/ldns/rr_functions.h \ + $(srcdir)/ldns/parse.h $(srcdir)/ldns/radix.h $(srcdir)/ldns/sha1.h $(srcdir)/ldns/sha2.h sha1.lo sha1.o: $(srcdir)/sha1.c ldns/config.h $(srcdir)/ldns/ldns.h ldns/util.h ldns/common.h \ $(srcdir)/ldns/buffer.h $(srcdir)/ldns/error.h $(srcdir)/ldns/dane.h $(srcdir)/ldns/rdata.h $(srcdir)/ldns/rr.h \ - $(srcdir)/ldns/dname.h $(srcdir)/ldns/dnssec.h $(srcdir)/ldns/packet.h $(srcdir)/ldns/keys.h $(srcdir)/ldns/zone.h \ - $(srcdir)/ldns/resolver.h $(srcdir)/ldns/tsig.h $(srcdir)/ldns/dnssec_zone.h $(srcdir)/ldns/rbtree.h \ + $(srcdir)/ldns/dname.h $(srcdir)/ldns/dnssec.h $(srcdir)/ldns/packet.h $(srcdir)/ldns/edns.h $(srcdir)/ldns/keys.h \ + $(srcdir)/ldns/zone.h $(srcdir)/ldns/resolver.h $(srcdir)/ldns/tsig.h $(srcdir)/ldns/dnssec_zone.h $(srcdir)/ldns/rbtree.h \ $(srcdir)/ldns/host2str.h $(srcdir)/ldns/dnssec_verify.h $(srcdir)/ldns/dnssec_sign.h $(srcdir)/ldns/duration.h \ $(srcdir)/ldns/higher.h $(srcdir)/ldns/host2wire.h ldns/net.h $(srcdir)/ldns/str2host.h $(srcdir)/ldns/update.h \ *** 44979 LINES SKIPPED *** From nobody Fri Aug 18 15:47:05 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RS5pq2JlWz4qhjj; Fri, 18 Aug 2023 15:47:15 +0000 (UTC) (envelope-from kostikbel@gmail.com) Received: from kib.kiev.ua (kib.kiev.ua [IPv6:2001:470:d5e7:1::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) by mx1.freebsd.org (Postfix) with ESMTPS id 4RS5pq0SjLz3HZ3; Fri, 18 Aug 2023 15:47:14 +0000 (UTC) (envelope-from kostikbel@gmail.com) Authentication-Results: mx1.freebsd.org; none Received: from tom.home (kib@localhost [127.0.0.1]) by kib.kiev.ua (8.17.1/8.17.1) with ESMTPS id 37IFl52o085299 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NO); Fri, 18 Aug 2023 18:47:08 +0300 (EEST) (envelope-from kostikbel@gmail.com) DKIM-Filter: OpenDKIM Filter v2.10.3 kib.kiev.ua 37IFl52o085299 Received: (from kostik@localhost) by tom.home (8.17.1/8.17.1/Submit) id 37IFl5iM085298; Fri, 18 Aug 2023 18:47:05 +0300 (EEST) (envelope-from kostikbel@gmail.com) X-Authentication-Warning: tom.home: kostik set sender to kostikbel@gmail.com using -f Date: Fri, 18 Aug 2023 18:47:05 +0300 From: Konstantin Belousov To: Cy Schubert Cc: src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: 1384a0b940e8 - main - kern/subr_unit.c: fix non-debug build Message-ID: References: <202308181337.37IDbMwl051912@gitrepo.freebsd.org> <20230818144345.9998F2EF@slippy.cwsent.com> <20230818153955.143512F3@slippy.cwsent.com> List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20230818153955.143512F3@slippy.cwsent.com> X-Spam-Status: No, score=-1.0 required=5.0 tests=ALL_TRUSTED,BAYES_00, DKIM_ADSP_CUSTOM_MED,FORGED_GMAIL_RCVD,FREEMAIL_FROM, NML_ADSP_CUSTOM_MED autolearn=no autolearn_force=no version=4.0.0 X-Spam-Checker-Version: SpamAssassin 4.0.0 (2022-12-14) on tom.home X-Rspamd-Queue-Id: 4RS5pq0SjLz3HZ3 X-Spamd-Bar: ---- 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:6939, ipnet:2001:470::/32, country:US] On Fri, Aug 18, 2023 at 08:39:54AM -0700, Cy Schubert wrote: > In message , Konstantin Belousov writes: > > On Fri, Aug 18, 2023 at 07:43:45AM -0700, Cy Schubert wrote: > > > In message <202308181337.37IDbMwl051912@gitrepo.freebsd.org>, Konstantin > > > Belous > > > ov writes: > > > > The branch main has been updated by kib: > > > > > > > > URL: https://cgit.FreeBSD.org/src/commit/?id=1384a0b940e87876d36d50ad5858 > > 1c24 > > > > dc642714 > > > > > > > > commit 1384a0b940e87876d36d50ad58581c24dc642714 > > > > Author: Konstantin Belousov > > > > AuthorDate: 2023-08-18 13:36:06 +0000 > > > > Commit: Konstantin Belousov > > > > CommitDate: 2023-08-18 13:37:16 +0000 > > > > > > > > kern/subr_unit.c: fix non-debug build > > > > > > > > Sponsored by: The FreeBSD Foundation > > > > MFC after: 1 week > > > > --- > > > > sys/kern/subr_unit.c | 2 +- > > > > 1 file changed, 1 insertion(+), 1 deletion(-) > > > > > > > > diff --git a/sys/kern/subr_unit.c b/sys/kern/subr_unit.c > > > > index 3d45a0c1c5cb..7a23f216d98e 100644 > > > > --- a/sys/kern/subr_unit.c > > > > +++ b/sys/kern/subr_unit.c > > > > @@ -353,7 +353,7 @@ check_unrhdr(struct unrhdr *uh, int line) > > > > struct unr *up; > > > > struct unrb *ub; > > > > int w; > > > > - u_int y, z; > > > > + u_int y __diagused, z __diagused; > > > > > > It still doesn't like it. > > How do you build it? > > Is it kernel? If yes, which kernel config? > > It's not in kernel. It's in tests. I see. Could you quickly check if this patch is enough? I just started buildworld. commit 5e2dee9953a68344bdf1090b672bd9b04ae8f09f Author: Konstantin Belousov Date: Fri Aug 18 18:42:59 2023 +0300 subr_unit.c: another attempt to fix the build Sponsored by: The FreeBSD Foundation MFC after: 1 week diff --git a/sys/kern/subr_unit.c b/sys/kern/subr_unit.c index 7a23f216d98e..6826678104d6 100644 --- a/sys/kern/subr_unit.c +++ b/sys/kern/subr_unit.c @@ -340,6 +340,10 @@ free_iter_unr(void *handle) } #if defined(DIAGNOSTIC) || !defined(_KERNEL) +#ifndef __diagused +#define __diagused +#endif + /* * Consistency check function. * From nobody Fri Aug 18 16:02:44 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RS68l5vlVz4qjwJ; Fri, 18 Aug 2023 16:02:47 +0000 (UTC) (envelope-from cy.schubert@cschubert.com) Received: from omta002.cacentral1.a.cloudfilter.net (omta002.cacentral1.a.cloudfilter.net [3.97.99.33]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "Client", Issuer "CA" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RS68l54c8z3KX0; Fri, 18 Aug 2023 16:02:47 +0000 (UTC) (envelope-from cy.schubert@cschubert.com) Authentication-Results: mx1.freebsd.org; none Received: from shw-obgw-4003a.ext.cloudfilter.net ([10.228.9.183]) by cmsmtp with ESMTP id X1N8q1U3A6NwhX1vzqc9XU; Fri, 18 Aug 2023 16:02:47 +0000 Received: from spqr.komquats.com ([70.66.152.170]) by cmsmtp with ESMTPA id X1vxqLGq8cyvuX1vyqVO0T; Fri, 18 Aug 2023 16:02:47 +0000 X-Authority-Analysis: v=2.4 cv=VbHkgXl9 c=1 sm=1 tr=0 ts=64df9627 a=y8EK/9tc/U6QY+pUhnbtgQ==:117 a=y8EK/9tc/U6QY+pUhnbtgQ==:17 a=kj9zAlcOel0A:10 a=UttIx32zK-AA:10 a=6I5d2MoRAAAA:8 a=YxBL1-UpAAAA:8 a=EkcXrb_YAAAA:8 a=gm5jsK0lSVYyjfQOp7EA:9 a=CjuIK1q_8ugA:10 a=IjZwj45LgO3ly-622nXo:22 a=Ia-lj3WSrqcvXOmTRaiG:22 a=LK5xJRSDVpKd5WXXoEvA:22 Received: from slippy.cwsent.com (slippy [10.1.1.91]) by spqr.komquats.com (Postfix) with ESMTP id 04E2DDA4; Fri, 18 Aug 2023 09:02:44 -0700 (PDT) Received: by slippy.cwsent.com (Postfix, from userid 1000) id DA239368; Fri, 18 Aug 2023 09:02:44 -0700 (PDT) X-Mailer: exmh version 2.9.0 11/07/2018 with nmh-1.8+dev Reply-to: Cy Schubert From: Cy Schubert X-os: FreeBSD X-Sender: cy@cwsent.com X-URL: http://www.cschubert.com/ To: Konstantin Belousov cc: Cy Schubert , src-committers@freebsd.org, dev-commits-src-all@freebsd.org, dev-commits-src-main@freebsd.org Subject: Re: git: 1384a0b940e8 - main - kern/subr_unit.c: fix non-debug build In-reply-to: References: <202308181337.37IDbMwl051912@gitrepo.freebsd.org> <20230818144345.9998F2EF@slippy.cwsent.com> <20230818153955.143512F3@slippy.cwsent.com> Comments: In-reply-to Konstantin Belousov message dated "Fri, 18 Aug 2023 18:47:05 +0300." List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Date: Fri, 18 Aug 2023 09:02:44 -0700 Message-Id: <20230818160244.DA239368@slippy.cwsent.com> X-CMAE-Envelope: MS4xfEzt/bJRcm9guNeko8rZ21gCAXDSnHCN+cPPZHYMxqU91vqSITFhpZS8Y79Ffxc5t+eIyNY/eKPClEBINXmS1aH3LSDVkrmWHz3B9KtLWRo24EvKXhr6 UVNO+qNZ+PK4npIq2FTpf23clYqDMI7KDArBZgGOJSnlkQwuTOaopy33iIRZzAWQcfXtABXSGX4jNmnHv76E6NGS2UJXGG1/GVcOfxo192InQ58yvT1K155W w9nqM6SlgLd0P2gALvesk4Ms6Y56Y/0Ijzg9ume6vqE+R4snNNKefc/GzZIexp7v+mmhY7u+h/5P0qddn5CpcufR6yCA6NSbg7g3iqsrJ/Y= X-Rspamd-Queue-Id: 4RS68l54c8z3KX0 X-Spamd-Bar: ---- 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:16509, ipnet:3.96.0.0/15, country:US] In message , Konstantin Belousov writes: > On Fri, Aug 18, 2023 at 08:39:54AM -0700, Cy Schubert wrote: > > In message , Konstantin Belousov writes: > > > On Fri, Aug 18, 2023 at 07:43:45AM -0700, Cy Schubert wrote: > > > > In message <202308181337.37IDbMwl051912@gitrepo.freebsd.org>, Konstanti > n > > > > Belous > > > > ov writes: > > > > > The branch main has been updated by kib: > > > > > > > > > > URL: https://cgit.FreeBSD.org/src/commit/?id=1384a0b940e87876d36d50ad > 5858 > > > 1c24 > > > > > dc642714 > > > > > > > > > > commit 1384a0b940e87876d36d50ad58581c24dc642714 > > > > > Author: Konstantin Belousov > > > > > AuthorDate: 2023-08-18 13:36:06 +0000 > > > > > Commit: Konstantin Belousov > > > > > CommitDate: 2023-08-18 13:37:16 +0000 > > > > > > > > > > kern/subr_unit.c: fix non-debug build > > > > > > > > > > Sponsored by: The FreeBSD Foundation > > > > > MFC after: 1 week > > > > > --- > > > > > sys/kern/subr_unit.c | 2 +- > > > > > 1 file changed, 1 insertion(+), 1 deletion(-) > > > > > > > > > > diff --git a/sys/kern/subr_unit.c b/sys/kern/subr_unit.c > > > > > index 3d45a0c1c5cb..7a23f216d98e 100644 > > > > > --- a/sys/kern/subr_unit.c > > > > > +++ b/sys/kern/subr_unit.c > > > > > @@ -353,7 +353,7 @@ check_unrhdr(struct unrhdr *uh, int line) > > > > > struct unr *up; > > > > > struct unrb *ub; > > > > > int w; > > > > > - u_int y, z; > > > > > + u_int y __diagused, z __diagused; > > > > > > > > It still doesn't like it. > > > How do you build it? > > > Is it kernel? If yes, which kernel config? > > > > It's not in kernel. It's in tests. > > I see. Could you quickly check if this patch is enough? > I just started buildworld. > > commit 5e2dee9953a68344bdf1090b672bd9b04ae8f09f > Author: Konstantin Belousov > Date: Fri Aug 18 18:42:59 2023 +0300 > > subr_unit.c: another attempt to fix the build > > Sponsored by: The FreeBSD Foundation > MFC after: 1 week > > diff --git a/sys/kern/subr_unit.c b/sys/kern/subr_unit.c > index 7a23f216d98e..6826678104d6 100644 > --- a/sys/kern/subr_unit.c > +++ b/sys/kern/subr_unit.c > @@ -340,6 +340,10 @@ free_iter_unr(void *handle) > } > > #if defined(DIAGNOSTIC) || !defined(_KERNEL) > +#ifndef __diagused > +#define __diagused > +#endif > + > /* > * Consistency check function. > * Yup. That fixes it. Thanks. -- Cheers, Cy Schubert FreeBSD UNIX: Web: https://FreeBSD.org NTP: Web: https://nwtime.org e^(i*pi)+1=0 From nobody Fri Aug 18 16:09:19 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RS6JX6Z1bz4qk8V for ; Fri, 18 Aug 2023 16:09:32 +0000 (UTC) (envelope-from jrtc27@jrtc27.com) Received: from mail-wm1-f44.google.com (mail-wm1-f44.google.com [209.85.128.44]) (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 "GTS CA 1D4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RS6JX4kHbz3LyY for ; Fri, 18 Aug 2023 16:09:32 +0000 (UTC) (envelope-from jrtc27@jrtc27.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-wm1-f44.google.com with SMTP id 5b1f17b1804b1-3fe2048c910so10634055e9.1 for ; Fri, 18 Aug 2023 09:09:32 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1692374971; x=1692979771; 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=85Yn/TysttxXOF5B7xuU5+rYhInpRwb7bqG8scTuk6c=; b=OGJMHC7Kx3qdGwpgXeN4S9/WlTzoildqqBM3e9/AAt13JGHgtBWDv1RWgqMtTt3Iqg /RjEoF0Ma4hCqSJnd82r2YmF3V1vo+Ddb044SVHZPOhFB8qyZEQ7TZR5QFAsnXbRZxZo Xq54HdfrMLHzFFs8SjCxLOeAW2c9a6QYLcYJw9qri31otLdR+F+IgADLu+ThJdZ0ISVo /aCI8AYVzouBM6DYCSSWTMfrQihQ6erO7IkGeRO+LkGJGsqM0FvqZ1tI7DbbVDEJq/x/ DjQtz0wV+y7vmDknslfmzKPvkRKy638oT31KuzRMxJUzqI7/ow05TyS2zSFVpBK42BzT 6nDQ== X-Gm-Message-State: AOJu0YyKSAWIz9XtNUg7BXs4ubzL0hSR6/ixDA8vn07r7R36+Vh9vM8s XV5OswdmclrWK84fZ4TlfgEU41RX6l6iYttpZek= X-Google-Smtp-Source: AGHT+IFBkQzbR3DxyCwu3tvQaiiYlvwpELJr1Kag8btwe02iyhptY5OhKo+J7kWnOfEeXJJA+A8PCA== X-Received: by 2002:a5d:68c3:0:b0:317:49a2:1f89 with SMTP id p3-20020a5d68c3000000b0031749a21f89mr2278320wrw.1.1692374970738; Fri, 18 Aug 2023 09:09:30 -0700 (PDT) Received: from smtpclient.apple ([131.111.5.246]) by smtp.gmail.com with ESMTPSA id t24-20020a7bc3d8000000b003fe195cecb3sm922690wmj.38.2023.08.18.09.09.30 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 18 Aug 2023 09:09:30 -0700 (PDT) Content-Type: text/plain; charset=utf-8 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org Mime-Version: 1.0 (Mac OS X Mail 16.0 \(3731.600.7\)) Subject: Re: git: 2a9021898c4e - main - sff: Add SFP driver (fdt-based draft) From: Jessica Clarke In-Reply-To: <202308181040.37IAetMR060855@gitrepo.freebsd.org> Date: Fri, 18 Aug 2023 17:09:19 +0100 Cc: "src-committers@freebsd.org" , "dev-commits-src-all@freebsd.org" , "dev-commits-src-main@freebsd.org" Content-Transfer-Encoding: quoted-printable Message-Id: <7DD26452-7D0C-45BA-AA01-825B1073FEC6@freebsd.org> References: <202308181040.37IAetMR060855@gitrepo.freebsd.org> To: Dmitry Salychev X-Mailer: Apple Mail (2.3731.600.7) X-Rspamd-Queue-Id: 4RS6JX4kHbz3LyY X-Spamd-Bar: ---- 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] On 18 Aug 2023, at 11:40, Dmitry Salychev wrote: >=20 > The branch main has been updated by dsl: >=20 > URL: = https://cgit.FreeBSD.org/src/commit/?id=3D2a9021898c4ee2154787da862c238cfe= ccd655df >=20 > commit 2a9021898c4ee2154787da862c238cfeccd655df > Author: Dmitry Salychev > AuthorDate: 2023-08-18 09:17:31 +0000 > Commit: Dmitry Salychev > CommitDate: 2023-08-18 10:40:11 +0000 >=20 > sff: Add SFP driver (fdt-based draft) >=20 > This basic version of the driver obtains properties of the = "sff,sfp" > compatible devices and implements a simple interface to provide an = I2C > bus device for the rest of the drivers (e.g. to implement = SIOCGI2C). >=20 > Both of the interface and driver are subjects for a further > generalization to be used in case of non-FDT and non-arm64 = platforms. >=20 > Reviewed by: bz, manu > Approved by: bz (mentor) > MFC after: 3 weeks > Differential Revision: https://reviews.freebsd.org/D41440 > --- > sys/arm64/conf/std.nxp | 3 + > sys/conf/files | 2 + > sys/dev/sff/sff_if.m | 35 +++++++++++ > sys/dev/sff/sfp_fdt.c | 155 = +++++++++++++++++++++++++++++++++++++++++++++++ > sys/modules/Makefile | 2 + > sys/modules/sff/Makefile | 13 ++++ > 6 files changed, 210 insertions(+) >=20 > diff --git a/sys/arm64/conf/std.nxp b/sys/arm64/conf/std.nxp > index 5b2e2b52d4e6..b4552fadaff4 100644 > --- a/sys/arm64/conf/std.nxp > +++ b/sys/arm64/conf/std.nxp > @@ -25,6 +25,9 @@ device sdhci > device dpaa2 # Data Path Acceleration Architecture (2nd Gen) > device enetc # QorIQ LS1028A NIC >=20 > +# SFF/SFP > +device sff # Small Form Factor Transceivers > + > options FDT > device acpi >=20 > diff --git a/sys/conf/files b/sys/conf/files > index 0db5887e6a75..b5cd85cba0e4 100644 > --- a/sys/conf/files > +++ b/sys/conf/files > @@ -3044,6 +3044,8 @@ dev/sdhci/sdhci_pci.c optional sdhci pci > dev/sdio/sdio_if.m optional mmccam > dev/sdio/sdio_subr.c optional mmccam > dev/sdio/sdiob.c optional mmccam > +dev/sff/sff_if.m optional sff > +dev/sff/sfp_fdt.c optional sff fdt > dev/sge/if_sge.c optional sge pci > dev/siis/siis.c optional siis pci > dev/sis/if_sis.c optional sis pci > diff --git a/sys/dev/sff/sff_if.m b/sys/dev/sff/sff_if.m > new file mode 100644 > index 000000000000..823e557992c2 > --- /dev/null > +++ b/sys/dev/sff/sff_if.m > @@ -0,0 +1,35 @@ > +#- > +# SPDX-License-Identifier: BSD-2-Clause > +# > +# Copyright =C2=A9 2023 Dmitry Salychev > +# > +# Redistribution and use in source and binary forms, with or without > +# modification, are permitted provided that the following conditions > +# are met: > +# 1. Redistributions of source code must retain the above copyright > +# notice, this list of conditions and the following disclaimer. > +# 2. Redistributions in binary form must reproduce the above = copyright > +# notice, this list of conditions and the following disclaimer in = the > +# documentation and/or other materials provided with the = distribution. > +# > +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' = AND > +# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, = THE > +# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR = PURPOSE > +# ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE = LIABLE > +# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR = CONSEQUENTIAL > +# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE = GOODS > +# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS = INTERRUPTION) > +# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, = STRICT > +# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN = ANY WAY > +# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY = OF > +# SUCH DAMAGE. > +# > + > +#include > + > +INTERFACE sff; > + > +METHOD int get_i2c_bus { > + device_t dev; > + device_t *i2c_bus; > +}; > diff --git a/sys/dev/sff/sfp_fdt.c b/sys/dev/sff/sfp_fdt.c > new file mode 100644 > index 000000000000..7430282ede70 > --- /dev/null > +++ b/sys/dev/sff/sfp_fdt.c > @@ -0,0 +1,155 @@ > +/*- > + * SPDX-License-Identifier: BSD-2-Clause > + * > + * Copyright =C2=A9 2023 Dmitry Salychev > + * > + * Redistribution and use in source and binary forms, with or without > + * modification, are permitted provided that the following conditions > + * are met: > + * 1. Redistributions of source code must retain the above copyright > + * notice, this list of conditions and the following disclaimer. > + * 2. Redistributions in binary form must reproduce the above = copyright > + * notice, this list of conditions and the following disclaimer in = the > + * documentation and/or other materials provided with the = distribution. > + * > + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' = AND > + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, = THE > + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR = PURPOSE > + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE = LIABLE > + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR = CONSEQUENTIAL > + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE = GOODS > + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS = INTERRUPTION) > + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN = CONTRACT, STRICT > + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN = ANY WAY > + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE = POSSIBILITY OF > + * SUCH DAMAGE. > + */ > + > +/* > + * Small Form Factor (SFF) Committee Pluggable (SFP) Transceiver = (FDT-based). > + */ > + > +#include > +#include > +#include > +#include > + > +#include > +#include > +#include > + > +#include "sff_if.h" > + > +struct sfp_fdt_softc { > + phandle_t ofw_node; > + phandle_t i2c_bus; > + > + phandle_t mod_def; > + phandle_t los; > + phandle_t tx_fault; > + phandle_t tx_disable; > + phandle_t rx_rate; > + phandle_t tx_rate; These names sound like they should be numbers, not handles to GPIOs. > + uint32_t max_power; /* in mW */ > +}; > + > +static int > +sfp_fdt_probe(device_t dev) > +{ > + phandle_t node; > + ssize_t s; > + > + node =3D ofw_bus_get_node(dev); > + if (!ofw_bus_node_is_compatible(node, "sff,sfp")) > + return (ENXIO); > + > + s =3D device_get_property(dev, "i2c-bus", &node, sizeof(node), > + DEVICE_PROP_HANDLE); > + if (s =3D=3D -1) { > + device_printf(dev, "%s: '%s' has no 'i2c-bus' property, s %zd\n", > + __func__, ofw_bus_get_name(dev), s); What=E2=80=99s the point of printing s when it=E2=80=99s known to be -1? > + return (ENXIO); > + } > + > + device_set_desc(dev, "Small Form-factor Pluggable Transceiver"); > + return (BUS_PROBE_DEFAULT); > +} > + > +static int > +sfp_fdt_attach(device_t dev) > +{ > + struct sfp_fdt_softc *sc; > + ssize_t s; > + int error; > + > + sc =3D device_get_softc(dev); > + sc->ofw_node =3D ofw_bus_get_node(dev); > + > + s =3D device_get_property(dev, "i2c-bus", &sc->i2c_bus, > + sizeof(sc->i2c_bus), DEVICE_PROP_HANDLE); > + if (s =3D=3D -1) { > + device_printf(dev, "%s: cannot find 'i2c-bus' property: %zd\n", > + __func__, s); Ditto. > + return (ENXIO); > + } > + > + /* Optional properties */ > + (void)device_get_property(dev, "mod-def0-gpios", &sc->mod_def, > + sizeof(sc->mod_def), DEVICE_PROP_HANDLE); > + (void)device_get_property(dev, "los-gpios", &sc->los, = sizeof(sc->los), > + DEVICE_PROP_HANDLE); > + (void)device_get_property(dev, "tx-fault-gpios", &sc->tx_fault, > + sizeof(sc->tx_fault), DEVICE_PROP_HANDLE); > + (void)device_get_property(dev, "tx-disable-gpios", &sc->tx_disable, > + sizeof(sc->tx_disable), DEVICE_PROP_HANDLE); > + (void)device_get_property(dev, "rate-select0-gpios", &sc->rx_rate, > + sizeof(sc->rx_rate), DEVICE_PROP_HANDLE); > + (void)device_get_property(dev, "rate-select1-gpios", &sc->tx_rate, > + sizeof(sc->tx_rate), DEVICE_PROP_HANDLE); > + (void)device_get_property(dev, "maximum-power-milliwatt", = &sc->max_power, > + sizeof(sc->max_power), DEVICE_PROP_UINT32); > + > + error =3D OF_device_register_xref(OF_xref_from_node(sc->ofw_node), = dev); > + if (error !=3D 0) > + device_printf(dev, "%s: failed to register xref %#x\n", > + __func__, OF_xref_from_node(sc->ofw_node)); : %d, error? Jess > + > + return (error); > +} > + > +static int > +sfp_fdt_get_i2c_bus(device_t dev, device_t *i2c_bus) > +{ > + struct sfp_fdt_softc *sc; > + device_t xdev; > + > + KASSERT(i2c_bus !=3D NULL, ("%s: i2c_bus is NULL", __func__)); > + > + sc =3D device_get_softc(dev); > + xdev =3D OF_device_from_xref(OF_xref_from_node(sc->i2c_bus)); > + if (xdev =3D=3D NULL) > + return (ENXIO); > + > + *i2c_bus =3D xdev; > + return (0); > +} > + > +static device_method_t sfp_fdt_methods[] =3D { > + /* Device interface */ > + DEVMETHOD(device_probe, sfp_fdt_probe), > + DEVMETHOD(device_attach, sfp_fdt_attach), > + DEVMETHOD(device_detach, bus_generic_detach), > + > + /* SFF */ > + DEVMETHOD(sff_get_i2c_bus, sfp_fdt_get_i2c_bus), > + > + DEVMETHOD_END > +}; > + > +DEFINE_CLASS_0(sfp_fdt, sfp_fdt_driver, sfp_fdt_methods, > + sizeof(struct sfp_fdt_softc)); > + > +EARLY_DRIVER_MODULE(sfp_fdt, simplebus, sfp_fdt_driver, 0, 0, > + BUS_PASS_SUPPORTDEV); > +EARLY_DRIVER_MODULE(sfp_fdt, ofwbus, sfp_fdt_driver, 0, 0, > + BUS_PASS_SUPPORTDEV); > diff --git a/sys/modules/Makefile b/sys/modules/Makefile > index 201cfbcca725..4b98c7ed6e0d 100644 > --- a/sys/modules/Makefile > +++ b/sys/modules/Makefile > @@ -355,6 +355,7 @@ SUBDIR=3D \ > ${_sdhci_fdt} \ > sdhci_pci \ > sdio \ > + ${_sff} \ > sem \ > send \ > ${_sfxge} \ > @@ -678,6 +679,7 @@ _cxgb=3D cxgb > .if ${MACHINE_CPUARCH} =3D=3D "aarch64" > _armv8crypto=3D armv8crypto > _dpaa2=3D dpaa2 > +_sff=3D sff > _em=3D em > _hyperv=3D hyperv >=20 > diff --git a/sys/modules/sff/Makefile b/sys/modules/sff/Makefile > new file mode 100644 > index 000000000000..96832070de63 > --- /dev/null > +++ b/sys/modules/sff/Makefile > @@ -0,0 +1,13 @@ > +.PATH: ${SRCTOP}/sys/dev/sff > + > +KMOD=3D sff > + > +SRCS+=3D sff_if.c sff_if.h > +SRCS+=3D bus_if.h device_if.h > + > +.if !empty(OPT_FDT) > +SRCS+=3D sfp_fdt.c \ > + ofw_bus_if.h > +.endif > + > +.include From nobody Fri Aug 18 16:23:25 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RS6cZ2L7Pz4qkrZ; Fri, 18 Aug 2023 16:23: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RS6cY4p4Jz3QgZ; Fri, 18 Aug 2023 16:23:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692375805; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=RV6zzNKeMvl7JHgEkzu02YQxuU7AjiPoPNvcdrN6TAQ=; b=CwwGp1rerci13FzrFphht9RrxeDnUFH3yweVqddnGXwRzWsXGQex3/ZgtYhI1xN7zv65Qd Kh4Vk+39eRH+qoWcXmvnK0VGmyIrmnZ27RdXexG52JkFoLe6Jyxl4qWVucC/wBNpZWH0/I 3nz9c+auiDZgfluXrk5SToz2nUMQJWdIX/deaYc8mMerzWXl5Wq8Qxv2qf3uPcDSQPnOfD +aySOTWqMosmss3zWG4rY9ROwFkldS06j9XVqw0eq9/PATYXrnfefYSZMC13oyt+zQ1hcA pmibaCKr5YPHuSeg440Eiz/0drIGssXexgDd//NLzmIAXhB+YP/w9R14clIDmA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692375805; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=RV6zzNKeMvl7JHgEkzu02YQxuU7AjiPoPNvcdrN6TAQ=; b=KxazNgVjuLsFWjeV32Ap1XRoIgj0iCzrl/iUXZGC5R/IhN5KUlaPKVP46YRWGx4R3MlxDH 7u3d3i6QVSZSb4uTWiTranEWHG/3WhYKx4+UpyNC76Y2xy5CMJoNCUEsPLVKa79os1b2v9 G795GG87f66OPfkJwiphOmvRXa7QYS/j1Yb7L6O5Xv7F/UMShGcw0Wm3Sshcv84MXuXnbk jAreWg+dbafNrQ30CoICex7V3Iuq7Suny0PEuvfZltCm9j9f6Fn671jNG6VuvejlnOO/dx ASfEOrgmqN8I1VNKApkehQNisYkEIoMl83zLFm4k7SPnUPMq+SR3PSG4Q4iYBQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692375805; a=rsa-sha256; cv=none; b=vndhGWpoApnILJ+v5fEMTd93CHISHMXW26EsIW5jE8TlHKkuYrF6mU2dXB5eeChLnpgzBO awVbOnq1ygUOtVKE2zfbD+w5HtW+l1ITHiEX4ymO8yGkc+X1ImcDBt1E2zui7hVFQphiSN FAXou/8rp1GcOkZVWGkVRuIvjmOEsXhELqBhatZH4dh/Rv7wOcIQJsgdRsNfQLquECBV9y A0dpK5xia7dnLmqtdKmG1a3Y6vEblb6/Jg1+mGuuZMLO0g1XbwjArij1Qb30ehEy/M/U7G P8x+2ihUVluTvnd4yV92Yr4fgn5zH8lPJRKo2rwbykV27lheS8JZ8S3MsCcg2A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RS6cY3sV3z7nd; Fri, 18 Aug 2023 16:23:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37IGNPV5033632; Fri, 18 Aug 2023 16:23:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37IGNP1p033629; Fri, 18 Aug 2023 16:23:25 GMT (envelope-from git) Date: Fri, 18 Aug 2023 16:23:25 GMT Message-Id: <202308181623.37IGNP1p033629@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: 3bf46f880f43 - stable/13 - Cirrus update to new freebsd instance version List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: emaste X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 3bf46f880f439c85e906a5d4061b0ba9d94d26d8 Auto-Submitted: auto-generated The branch stable/13 has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=3bf46f880f439c85e906a5d4061b0ba9d94d26d8 commit 3bf46f880f439c85e906a5d4061b0ba9d94d26d8 Author: QWERTIOX AuthorDate: 2023-04-19 13:01:15 +0000 Commit: Ed Maste CommitDate: 2023-08-18 16:23:02 +0000 Cirrus update to new freebsd instance version MFC after: 2 weeks Pull Request: https://github.com/freebsd/freebsd-src/pull/718 (cherry picked from commit 5e2ba9cb6b0bc097f6ed176894cfee3b5bd405f4) --- .cirrus.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.cirrus.yml b/.cirrus.yml index fb0149a5d91b..bc53e2124259 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -5,7 +5,7 @@ compute_engine_instance: # gcloud compute images list --project freebsd-org-cloud-dev --no-standard-images platform: freebsd image_project: freebsd-org-cloud-dev - image: freebsd-13-1-release-amd64 + image: freebsd-13-2-release-amd64 cpu: 8 memory: 8G disk: 40 From nobody Fri Aug 18 16:28:48 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RS6km35s2z4qlQW; Fri, 18 Aug 2023 16:28:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RS6km2XNnz3QpJ; Fri, 18 Aug 2023 16:28:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692376128; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=iehST8c47usACCkV+7dkdiB38Q9WSVy1UnYmAmQ4sbQ=; b=fZBEzXQAu30B+awDboujJZjvuP8Ux21NaBctLeeJQJSC/B1eYNTmPKLQE07jBukWMEIV9Q XuoSt7aoy8pNMPbotbaur3rJMHyYUV8Eem1Ah1Gjj3Fbq5e2Aet8a5XULSb7t2ADF6lIiV y7WO91njRSFuL11FLAYCJ6llZbggl9KXOKD4A/Hc9r5VAePSIMcpGzo7zWb39Vmyml8ooL 6JIUPnkwuwym0U7JSXkIsYqVdDUqtTfGWwdyOizdCDWCpG7h4Yf87/69d63jjVINC9Y0jv N2tVHneW3Jn83IguoYPrWqUTQzDYH14IsC6MBw6R4YnevrfezNe8nruWkuDllA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692376128; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=iehST8c47usACCkV+7dkdiB38Q9WSVy1UnYmAmQ4sbQ=; b=Q9+24fDjX2UdHo3ai5eZrbxuaqn7GfH4/O+/jVgY6UPC+6LbEvoE0FEN3y94Lqpqj0RKBt Zc52C0v820H4i6I/0euvatNpeP80O5PMkcyL893zbaxE0EU7+CFP+bAavOKEJQyEMeaisq Z47nb2bzDeK8kJOe8OXAkfNIc6/iInuKhi27cWzOUL5mCvJyS8nHdvzeLijNNbGla5+s63 KdbVSfXj03hzedVE9X3+Yd1vWMDcJ5cWyKvBg7nCwQahA++P9fldV20+XueTkHIt5fG53W EPARNAKH6sOQ1KRm00HEXwPTe++Wuj1nZZeLEqIPRysAsjH1/kfzDdnuNyJNyg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692376128; a=rsa-sha256; cv=none; b=ZonQ45G+j/8KfqeXeix2S40jw0CASF6XUgwAVCzhy14ZnmfLMgmDvtXMp6OCY4METjnP1o gaRB38RhtoYwye33O7K5wkPGvmuor8wl/kFYl/21cNwyD1WRa+GYlcQgdWL+/evh13dzLZ HzI9+y4EAfWjlxRmQQ6qiAz/ah0PPMShHO1l3+OWY6caq84pgoZy6+xUWOPKqa8xlkaFLK ofU8aKOqPC5QIrFzul5RzhNcW7NpMi9DIBSV6tFxfzuPQ7e37dHpyhFkrRrlrQdmouJ/Hb ElEa7PFd73ekgeWN/eGS0j/GE8rm5lVlNszBT39Cz916Cy/Ay6MG4yrwyiYKjA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RS6km1c1Qz7nf; Fri, 18 Aug 2023 16:28:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37IGSm4V034495; Fri, 18 Aug 2023 16:28:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37IGSmeO034492; Fri, 18 Aug 2023 16:28:48 GMT (envelope-from git) Date: Fri, 18 Aug 2023 16:28:48 GMT Message-Id: <202308181628.37IGSmeO034492@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: 04f683b25a81 - main - subr_unit.c: another attempt to fix the build List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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/main X-Git-Reftype: branch X-Git-Commit: 04f683b25a81ad47c998e3e496419c08ae4905eb Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=04f683b25a81ad47c998e3e496419c08ae4905eb commit 04f683b25a81ad47c998e3e496419c08ae4905eb Author: Konstantin Belousov AuthorDate: 2023-08-18 15:42:59 +0000 Commit: Konstantin Belousov CommitDate: 2023-08-18 16:28:42 +0000 subr_unit.c: another attempt to fix the build Reported by: cy Sponsored by: The FreeBSD Foundation MFC after: 1 week --- sys/kern/subr_unit.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/sys/kern/subr_unit.c b/sys/kern/subr_unit.c index 7a23f216d98e..6826678104d6 100644 --- a/sys/kern/subr_unit.c +++ b/sys/kern/subr_unit.c @@ -340,6 +340,10 @@ free_iter_unr(void *handle) } #if defined(DIAGNOSTIC) || !defined(_KERNEL) +#ifndef __diagused +#define __diagused +#endif + /* * Consistency check function. * From nobody Fri Aug 18 17:00:32 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RS7RN4YcSz4qn9L; Fri, 18 Aug 2023 17:00: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RS7RN45nyz3TmX; Fri, 18 Aug 2023 17:00:32 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692378032; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xnCt3PV75IxjOueBNgJlHMY2nyAzgJPj1mCO2I9z+/4=; b=Xb6Ru4tWvN2Mvy/3XKx0ifl59nu9yAH03315MHbdoev/ajD6ys032edKSJ4hOdv05t8e1X fonQxVaZTTZnx1QK+7Hjl/OmwlgOPdpelk4DuYcvn7wdYmNrzYjZFzv7pM437XgP/Q+3lk /+ynELroiUWsy++ieEWV1Yy6DDEy52MrYnhacItbBSJnUpr04X/AbcxoplJTpj1d+r0QPS Rny+BRA/NnUQH5qjVKuBeS4oxwK5JsUlFeBmQUapoP3TvGIhzo1KA/jrm18ZkGw+joifaI JyDoCZWkHMulJiJ31X/yL3k0997NY2G2Kk2jSwd8fcenVdSUKI00Rkkkcf/jBQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692378032; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xnCt3PV75IxjOueBNgJlHMY2nyAzgJPj1mCO2I9z+/4=; b=OldUMsc6Rb8JyzX7HO/6PX5oqdLIZlx29VrTvlUhSoSJ0tN25i88/29rdXkT1rtgvfCzzT hBcys76aNTjEVZyvemE/ALGIVf2yoOUfHhH9aPXpBUkLjnLgmbuN9Ma/Ut7J5fLJY1mhNL tOvIr/dMmXxrf/Xhb/SDgqXI0Q4lHpB8eOhf1uw+Sgcs1JXNnx2afB9l5Tjg/zIlF64ur+ WbMOHjG0N7lU3iAtjvoo8DoUq9RPN3aySxzV4qhQTOw/b5TSLj9R7BRLdtWt7eVmvL/tGG l/GI1UPQ1JwtWQJBu8qbQZNgQJ7S/oOjURC24jw5c0HKdNJqdZglTXRuJrlXDQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692378032; a=rsa-sha256; cv=none; b=t9dPBYqQAdfas5AHA0Yvu8MuHNOiyfBgmaf+d5TGMvlMtjVFBVZQvkjgmfX7TUuZXxYH/p 4KVrY8pNgW4FqZbbBDN1iRutNkIoDKmnM+jlv7pk0+FF86ZO5gbgSj7HDp2ufsci7xaJt2 Yobt9XTaHyiIHnV84uBpvuYbzfLIGU8yrZR0HIZLDS58iQqQ+VDBu5WWdVQZeP0TXyiM4k dIGwcV+fQnST4xF0toKIdkzy7ZK5HFc2pGaUAOBGNRsc9QWXe18EjcauiVt9pQ/ESJas0t 48RgQP86YiUa2LjXUMrKFRuU96bJXtKhm4JGfdAAkUwCezsgRj9RYB3KozM1Lw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RS7RN3B75z8kh; Fri, 18 Aug 2023 17:00:32 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37IH0WGv094406; Fri, 18 Aug 2023 17:00:32 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37IH0WZT094403; Fri, 18 Aug 2023 17:00:32 GMT (envelope-from git) Date: Fri, 18 Aug 2023 17:00:32 GMT Message-Id: <202308181700.37IH0WZT094403@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Graham Perrin Subject: git: edacf4b4824a - main - UPDATING: fix a typo, adjust a white space List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: grahamperrin X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: edacf4b4824af3630a953eb1080baf9c46f176de Auto-Submitted: auto-generated The branch main has been updated by grahamperrin: URL: https://cgit.FreeBSD.org/src/commit/?id=edacf4b4824af3630a953eb1080baf9c46f176de commit edacf4b4824af3630a953eb1080baf9c46f176de Author: Graham Perrin AuthorDate: 2023-08-18 16:55:25 +0000 Commit: Graham Perrin CommitDate: 2023-08-18 16:55:25 +0000 UPDATING: fix a typo, adjust a white space From: > … chagned. boot0sio … to: > … changed. boot0sio … Fixes: 4722ceb7d53e Use 115200 bps by default for serial communication --- UPDATING | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/UPDATING b/UPDATING index 705ca6431a32..b818d4dc8d29 100644 --- a/UPDATING +++ b/UPDATING @@ -34,7 +34,7 @@ NOTE TO PEOPLE WHO THINK THAT FreeBSD 14.x IS SLOW: configuration. Note that the early x86 BIOS bootloader (i.e., boot0sio) does not - support rates above 9600 bps and is not chagned. boot0sio users may + support rates above 9600 bps and is not changed. boot0sio users may set BOOT_COMCONSOLE_SPEED=9600 to use 9600 for all of the boot components, or use the standard boot0 and have the boot2 stage start with the serial port at 115200. From nobody Fri Aug 18 17:18:20 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RS87s5Qnlz4qpqr; Fri, 18 Aug 2023 17:32:09 +0000 (UTC) (envelope-from dsl@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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RS87s4z7Sz3Wxt; Fri, 18 Aug 2023 17:32:09 +0000 (UTC) (envelope-from dsl@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692379929; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=hDsLChW1xgDHIbZ2gOOCdmFd9hRq6xKGYK9dUYkbThY=; b=r3yNkKouKLSNiytCytzmBibPSICnDwHUipAqxn4dSttYmNp/e5OyGenbTrPezDcQx4NXyf bhXmmq/Xx9bCYYj35Afi4jACMwDUktkLBVX79jLZnfQt1yidQSHzcAj1J+2wCqTBd2ivLb ITYVlJ5WLm6u3VsbJ+YWNs9v7JFOll2dRJdcgsloRuUXNogZjuMgfgH7G47fPBxRJ8mXUS yvdwVSro5ZtrrcARxmmSR27kmMQVS/qBbF+LENOAYWhbmMbdDlq/gFUJnnIZKQECzOaAkm vhM7qfV4e5pP2negx+iNZizGhK9UXblNXZPAi/6eob+SRqLXbluUNNPJKLuFRw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692379929; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=hDsLChW1xgDHIbZ2gOOCdmFd9hRq6xKGYK9dUYkbThY=; b=EAf4LLBX/qq8r1WvsaIFSxKm76oXlXecBEdEuLXabEpoWOevenVoUFC+lLeRIaSxzuB7pg 9ourlA3c5hvz3LGbvACgZ2C0xIDD0T3gNWsi5nftziCI9fIeshMPnfy2XfiiyLCOjsIJP2 jiQ9EfWUuZyzkFmuV0avfTYyiauszvVNfYoPs6mFUPJ3bW6cUuEXDu7sRyGdnbfxDEMaYu ulW7+vMT3r6GJkvm4KsI/SXrSaA23Ja9+a6k4oxu/Fzre5aSimmN500UsBw6OQqj+bk7NZ XNzyboTY5fi5b7cNgDIW1/rfeCD7kJbAeuepYhBQSx++Z85AmX9o+PzK8ZiqzA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692379929; a=rsa-sha256; cv=none; b=jLXYRtZ02qkIIHut9pcC16dY6rE4e68QeR4wyoi5Ltvj8AUUEkys8oL4kzHk1Tm5+UTdUz SJq9rlhif9If4CsLBbHGxcAcR6zgAo7e5v9cMBOzhBU1RI/KF9DGFI6Nusterw4f3DaDRR 4zC4XvcR9zze3snX+8cMUvzc6T09qPMddInElK2krfxaLLQIZj90XjlKEHbjH8qQIjbkQ7 1WcXe7pmghvpdKXNz3BoXR4Am25lPSQ1Y+LgDqdFqRThLgo91V/h//7WuS82o7aRIdNKhX 5gzPY8T+idbLFVBnTKTsy1ozEVQ3SoitBI3Jh/c48arrc94oB29ZxGn4ZBpZZw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from localhost (unknown [91.226.51.235]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-256) server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) (Authenticated sender: dsl) by smtp.freebsd.org (Postfix) with ESMTPSA id 4RS87s0fpXz1JP9; Fri, 18 Aug 2023 17:32:08 +0000 (UTC) (envelope-from dsl@FreeBSD.org) References: <202308181040.37IAetMR060855@gitrepo.freebsd.org> <7DD26452-7D0C-45BA-AA01-825B1073FEC6@freebsd.org> User-agent: mu4e 1.8.13; emacs 28.2 From: Dmitry Salychev To: Jessica Clarke Cc: "src-committers@freebsd.org" , "dev-commits-src-all@freebsd.org" , "dev-commits-src-main@freebsd.org" Subject: Re: git: 2a9021898c4e - main - sff: Add SFP driver (fdt-based draft) Date: Fri, 18 Aug 2023 19:18:20 +0200 In-reply-to: <7DD26452-7D0C-45BA-AA01-825B1073FEC6@freebsd.org> Message-ID: <86h6ow5k9y.fsf@peasant.tower.home> List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Jessica Clarke writes: > On 18 Aug 2023, at 11:40, Dmitry Salychev wrote: >>=20 >> The branch main has been updated by dsl: >>=20 >> URL: https://cgit.FreeBSD.org/src/commit/?id=3D2a9021898c4ee2154787da862= c238cfeccd655df >>=20 >> commit 2a9021898c4ee2154787da862c238cfeccd655df >> Author: Dmitry Salychev >> AuthorDate: 2023-08-18 09:17:31 +0000 >> Commit: Dmitry Salychev >> CommitDate: 2023-08-18 10:40:11 +0000 >>=20 >> sff: Add SFP driver (fdt-based draft) >>=20 >> This basic version of the driver obtains properties of the "sff,sfp" >> compatible devices and implements a simple interface to provide an I2C >> bus device for the rest of the drivers (e.g. to implement SIOCGI2C). >>=20 >> Both of the interface and driver are subjects for a further >> generalization to be used in case of non-FDT and non-arm64 platforms. >>=20 >> Reviewed by: bz, manu >> Approved by: bz (mentor) >> MFC after: 3 weeks >> Differential Revision: https://reviews.freebsd.org/D41440 >> --- >> sys/arm64/conf/std.nxp | 3 + >> sys/conf/files | 2 + >> sys/dev/sff/sff_if.m | 35 +++++++++++ >> sys/dev/sff/sfp_fdt.c | 155 +++++++++++++++++++++++++++++++++++++++++= ++++++ >> sys/modules/Makefile | 2 + >> sys/modules/sff/Makefile | 13 ++++ >> 6 files changed, 210 insertions(+) >>=20 >> diff --git a/sys/arm64/conf/std.nxp b/sys/arm64/conf/std.nxp >> index 5b2e2b52d4e6..b4552fadaff4 100644 >> --- a/sys/arm64/conf/std.nxp >> +++ b/sys/arm64/conf/std.nxp >> @@ -25,6 +25,9 @@ device sdhci >> device dpaa2 # Data Path Acceleration Architecture (2nd Gen) >> device enetc # QorIQ LS1028A NIC >>=20 >> +# SFF/SFP >> +device sff # Small Form Factor Transceivers >> + >> options FDT >> device acpi >>=20 >> diff --git a/sys/conf/files b/sys/conf/files >> index 0db5887e6a75..b5cd85cba0e4 100644 >> --- a/sys/conf/files >> +++ b/sys/conf/files >> @@ -3044,6 +3044,8 @@ dev/sdhci/sdhci_pci.c optional sdhci pci >> dev/sdio/sdio_if.m optional mmccam >> dev/sdio/sdio_subr.c optional mmccam >> dev/sdio/sdiob.c optional mmccam >> +dev/sff/sff_if.m optional sff >> +dev/sff/sfp_fdt.c optional sff fdt >> dev/sge/if_sge.c optional sge pci >> dev/siis/siis.c optional siis pci >> dev/sis/if_sis.c optional sis pci >> diff --git a/sys/dev/sff/sff_if.m b/sys/dev/sff/sff_if.m >> new file mode 100644 >> index 000000000000..823e557992c2 >> --- /dev/null >> +++ b/sys/dev/sff/sff_if.m >> @@ -0,0 +1,35 @@ >> +#- >> +# SPDX-License-Identifier: BSD-2-Clause >> +# >> +# Copyright =C2=A9 2023 Dmitry Salychev >> +# >> +# Redistribution and use in source and binary forms, with or without >> +# modification, are permitted provided that the following conditions >> +# are met: >> +# 1. Redistributions of source code must retain the above copyright >> +# notice, this list of conditions and the following disclaimer. >> +# 2. Redistributions in binary form must reproduce the above copyright >> +# notice, this list of conditions and the following disclaimer in the >> +# documentation and/or other materials provided with the distributio= n. >> +# >> +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND >> +# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE >> +# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PU= RPOSE >> +# ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIAB= LE >> +# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUE= NTIAL >> +# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOO= DS >> +# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) >> +# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, S= TRICT >> +# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY= WAY >> +# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF >> +# SUCH DAMAGE. >> +# >> + >> +#include >> + >> +INTERFACE sff; >> + >> +METHOD int get_i2c_bus { >> + device_t dev; >> + device_t *i2c_bus; >> +}; >> diff --git a/sys/dev/sff/sfp_fdt.c b/sys/dev/sff/sfp_fdt.c >> new file mode 100644 >> index 000000000000..7430282ede70 >> --- /dev/null >> +++ b/sys/dev/sff/sfp_fdt.c >> @@ -0,0 +1,155 @@ >> +/*- >> + * SPDX-License-Identifier: BSD-2-Clause >> + * >> + * Copyright =C2=A9 2023 Dmitry Salychev >> + * >> + * Redistribution and use in source and binary forms, with or without >> + * modification, are permitted provided that the following conditions >> + * are met: >> + * 1. Redistributions of source code must retain the above copyright >> + * notice, this list of conditions and the following disclaimer. >> + * 2. Redistributions in binary form must reproduce the above copyright >> + * notice, this list of conditions and the following disclaimer in t= he >> + * documentation and/or other materials provided with the distributi= on. >> + * >> + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' A= ND >> + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE >> + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR P= URPOSE >> + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIA= BLE >> + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQU= ENTIAL >> + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GO= ODS >> + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) >> + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, = STRICT >> + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN AN= Y WAY >> + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY = OF >> + * SUCH DAMAGE. >> + */ >> + >> +/* >> + * Small Form Factor (SFF) Committee Pluggable (SFP) Transceiver (FDT-b= ased). >> + */ >> + >> +#include >> +#include >> +#include >> +#include >> + >> +#include >> +#include >> +#include >> + >> +#include "sff_if.h" >> + >> +struct sfp_fdt_softc { >> + phandle_t ofw_node; >> + phandle_t i2c_bus; >> + >> + phandle_t mod_def; >> + phandle_t los; >> + phandle_t tx_fault; >> + phandle_t tx_disable; >> + phandle_t rx_rate; >> + phandle_t tx_rate; > > These names sound like they should be numbers, not handles to GPIOs. > FDT example: sfp_xg1: dpmac1-sfp { compatible =3D "sff,sfp"; i2c-bus =3D <&sfpupper_i2c>; tx-fault-gpios =3D <&sfpgpio 4 GPIO_ACTIVE_HIGH>; tx-disable-gpios =3D <&sfpgpio 5 GPIO_ACTIVE_HIGH>; mod-def0-gpios =3D <&sfpgpio 6 GPIO_ACTIVE_LOW>; los-gpios =3D <&sfpgpio 7 GPIO_ACTIVE_HIGH>; maximum-power-milliwatt =3D <2000>; }; >> + uint32_t max_power; /* in mW */ >> +}; >> + >> +static int >> +sfp_fdt_probe(device_t dev) >> +{ >> + phandle_t node; >> + ssize_t s; >> + >> + node =3D ofw_bus_get_node(dev); >> + if (!ofw_bus_node_is_compatible(node, "sff,sfp")) >> + return (ENXIO); >> + >> + s =3D device_get_property(dev, "i2c-bus", &node, sizeof(node), >> + DEVICE_PROP_HANDLE); >> + if (s =3D=3D -1) { >> + device_printf(dev, "%s: '%s' has no 'i2c-bus' property, s %zd\n", >> + __func__, ofw_bus_get_name(dev), s); > > What=E2=80=99s the point of printing s when it=E2=80=99s known to be -1? > The only reason is to check the watchful eye of the project, of course :) >> + return (ENXIO); >> + } >> + >> + device_set_desc(dev, "Small Form-factor Pluggable Transceiver"); >> + return (BUS_PROBE_DEFAULT); >> +} >> + >> +static int >> +sfp_fdt_attach(device_t dev) >> +{ >> + struct sfp_fdt_softc *sc; >> + ssize_t s; >> + int error; >> + >> + sc =3D device_get_softc(dev); >> + sc->ofw_node =3D ofw_bus_get_node(dev); >> + >> + s =3D device_get_property(dev, "i2c-bus", &sc->i2c_bus, >> + sizeof(sc->i2c_bus), DEVICE_PROP_HANDLE); >> + if (s =3D=3D -1) { >> + device_printf(dev, "%s: cannot find 'i2c-bus' property: %zd\n", >> + __func__, s); > > Ditto. > >> + return (ENXIO); >> + } >> + >> + /* Optional properties */ >> + (void)device_get_property(dev, "mod-def0-gpios", &sc->mod_def, >> + sizeof(sc->mod_def), DEVICE_PROP_HANDLE); >> + (void)device_get_property(dev, "los-gpios", &sc->los, sizeof(sc->los), >> + DEVICE_PROP_HANDLE); >> + (void)device_get_property(dev, "tx-fault-gpios", &sc->tx_fault, >> + sizeof(sc->tx_fault), DEVICE_PROP_HANDLE); >> + (void)device_get_property(dev, "tx-disable-gpios", &sc->tx_disable, >> + sizeof(sc->tx_disable), DEVICE_PROP_HANDLE); >> + (void)device_get_property(dev, "rate-select0-gpios", &sc->rx_rate, >> + sizeof(sc->rx_rate), DEVICE_PROP_HANDLE); >> + (void)device_get_property(dev, "rate-select1-gpios", &sc->tx_rate, >> + sizeof(sc->tx_rate), DEVICE_PROP_HANDLE); >> + (void)device_get_property(dev, "maximum-power-milliwatt", &sc->max_pow= er, >> + sizeof(sc->max_power), DEVICE_PROP_UINT32); >> + >> + error =3D OF_device_register_xref(OF_xref_from_node(sc->ofw_node), dev= ); >> + if (error !=3D 0) >> + device_printf(dev, "%s: failed to register xref %#x\n", >> + __func__, OF_xref_from_node(sc->ofw_node)); > > : %d, error? Good catch, thanks! > > Jess > >> + >> + return (error); >> +} >> + >> +static int >> +sfp_fdt_get_i2c_bus(device_t dev, device_t *i2c_bus) >> +{ >> + struct sfp_fdt_softc *sc; >> + device_t xdev; >> + >> + KASSERT(i2c_bus !=3D NULL, ("%s: i2c_bus is NULL", __func__)); >> + >> + sc =3D device_get_softc(dev); >> + xdev =3D OF_device_from_xref(OF_xref_from_node(sc->i2c_bus)); >> + if (xdev =3D=3D NULL) >> + return (ENXIO); >> + >> + *i2c_bus =3D xdev; >> + return (0); >> +} >> + >> +static device_method_t sfp_fdt_methods[] =3D { >> + /* Device interface */ >> + DEVMETHOD(device_probe, sfp_fdt_probe), >> + DEVMETHOD(device_attach, sfp_fdt_attach), >> + DEVMETHOD(device_detach, bus_generic_detach), >> + >> + /* SFF */ >> + DEVMETHOD(sff_get_i2c_bus, sfp_fdt_get_i2c_bus), >> + >> + DEVMETHOD_END >> +}; >> + >> +DEFINE_CLASS_0(sfp_fdt, sfp_fdt_driver, sfp_fdt_methods, >> + sizeof(struct sfp_fdt_softc)); >> + >> +EARLY_DRIVER_MODULE(sfp_fdt, simplebus, sfp_fdt_driver, 0, 0, >> + BUS_PASS_SUPPORTDEV); >> +EARLY_DRIVER_MODULE(sfp_fdt, ofwbus, sfp_fdt_driver, 0, 0, >> + BUS_PASS_SUPPORTDEV); >> diff --git a/sys/modules/Makefile b/sys/modules/Makefile >> index 201cfbcca725..4b98c7ed6e0d 100644 >> --- a/sys/modules/Makefile >> +++ b/sys/modules/Makefile >> @@ -355,6 +355,7 @@ SUBDIR=3D \ >> ${_sdhci_fdt} \ >> sdhci_pci \ >> sdio \ >> + ${_sff} \ >> sem \ >> send \ >> ${_sfxge} \ >> @@ -678,6 +679,7 @@ _cxgb=3D cxgb >> .if ${MACHINE_CPUARCH} =3D=3D "aarch64" >> _armv8crypto=3D armv8crypto >> _dpaa2=3D dpaa2 >> +_sff=3D sff >> _em=3D em >> _hyperv=3D hyperv >>=20 >> diff --git a/sys/modules/sff/Makefile b/sys/modules/sff/Makefile >> new file mode 100644 >> index 000000000000..96832070de63 >> --- /dev/null >> +++ b/sys/modules/sff/Makefile >> @@ -0,0 +1,13 @@ >> +.PATH: ${SRCTOP}/sys/dev/sff >> + >> +KMOD=3D sff >> + >> +SRCS+=3D sff_if.c sff_if.h >> +SRCS+=3D bus_if.h device_if.h >> + >> +.if !empty(OPT_FDT) >> +SRCS+=3D sfp_fdt.c \ >> + ofw_bus_if.h >> +.endif >> + >> +.include Regards, Dmitry --=20 https://wiki.freebsd.org/DmitrySalychev From nobody Fri Aug 18 17:35:47 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RS8DJ51C4z4qq57 for ; Fri, 18 Aug 2023 17:36:00 +0000 (UTC) (envelope-from jrtc27@jrtc27.com) Received: from mail-wm1-f53.google.com (mail-wm1-f53.google.com [209.85.128.53]) (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 "GTS CA 1D4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RS8DJ35TKz3Y4v for ; Fri, 18 Aug 2023 17:36:00 +0000 (UTC) (envelope-from jrtc27@jrtc27.com) Authentication-Results: mx1.freebsd.org; none Received: by mail-wm1-f53.google.com with SMTP id 5b1f17b1804b1-3fe4ad22e36so11424275e9.2 for ; Fri, 18 Aug 2023 10:36:00 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1692380159; x=1692984959; 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=qrD5C1S6U2/lsGJPSHaSPEuojLaTeHGekT7oSZEr4gE=; b=SkWrfmXw5TooUvQjSqaLrl93U+uL0DbDoS8Io0VFUlvJomDm9ta+8+jf1DetiGkUvK Zhm4ggziw7LUr97iKbGjtYPXBKMvAS00dA4aNFf+lqkbWTl6IFxilmmgZ4shoGw6I6mJ 0l8cJI6n6Ua+reyOTQ6AA1z//IbD6nXTEEyA/zT7FrDHlgzqSex/kPsCiaThvE3FomBY KOhGKaSJQ90nZKYGCMcS5k0jv221k7kZ0cDpjSIo5lC3VZUtPfF9v8Fz0k0xayAnnNnf 7y+l0VJr+X+EJVRoIvZ1rayZBsxv3oPRqHxawUOG8CyZIDLAEgQisbTDVo4AZ+f1v3hQ v7OA== X-Gm-Message-State: AOJu0Yxie+lt92g50aEVqdeYFfLLb+fqFX44gaHWKf4W1qRxqcC+m7pp AJ50q1/Mj47euAlpr6N1vykuUV9ic8bOWil/IXI= X-Google-Smtp-Source: AGHT+IEYeI/jgfkeN9paa7Vba120ECAtjnAOOAw9zS2fS5jzbiE1EL+ERkPkpUOZ9D5Kh5h9cyjmGg== X-Received: by 2002:adf:f202:0:b0:317:1b08:b317 with SMTP id p2-20020adff202000000b003171b08b317mr2473331wro.6.1692380158406; Fri, 18 Aug 2023 10:35:58 -0700 (PDT) Received: from smtpclient.apple ([131.111.5.246]) by smtp.gmail.com with ESMTPSA id p6-20020a5d68c6000000b00317c742ca9asm3539785wrw.43.2023.08.18.10.35.57 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 18 Aug 2023 10:35:58 -0700 (PDT) Content-Type: text/plain; charset=utf-8 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org Mime-Version: 1.0 (Mac OS X Mail 16.0 \(3731.600.7\)) Subject: Re: git: 2a9021898c4e - main - sff: Add SFP driver (fdt-based draft) From: Jessica Clarke In-Reply-To: <86h6ow5k9y.fsf@peasant.tower.home> Date: Fri, 18 Aug 2023 18:35:47 +0100 Cc: "src-committers@freebsd.org" , "dev-commits-src-all@freebsd.org" , "dev-commits-src-main@freebsd.org" Content-Transfer-Encoding: quoted-printable Message-Id: <00BDB172-6E09-4000-B59F-843DA4F723F7@freebsd.org> References: <202308181040.37IAetMR060855@gitrepo.freebsd.org> <7DD26452-7D0C-45BA-AA01-825B1073FEC6@freebsd.org> <86h6ow5k9y.fsf@peasant.tower.home> To: Dmitry Salychev X-Mailer: Apple Mail (2.3731.600.7) X-Rspamd-Queue-Id: 4RS8DJ35TKz3Y4v X-Spamd-Bar: ---- 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] On 18 Aug 2023, at 18:18, Dmitry Salychev wrote: >=20 >=20 > Jessica Clarke writes: >=20 >> On 18 Aug 2023, at 11:40, Dmitry Salychev wrote: >>>=20 >>> The branch main has been updated by dsl: >>>=20 >>> URL: = https://cgit.FreeBSD.org/src/commit/?id=3D2a9021898c4ee2154787da862c238cfe= ccd655df >>>=20 >>> commit 2a9021898c4ee2154787da862c238cfeccd655df >>> Author: Dmitry Salychev >>> AuthorDate: 2023-08-18 09:17:31 +0000 >>> Commit: Dmitry Salychev >>> CommitDate: 2023-08-18 10:40:11 +0000 >>>=20 >>> sff: Add SFP driver (fdt-based draft) >>>=20 >>> This basic version of the driver obtains properties of the = "sff,sfp" >>> compatible devices and implements a simple interface to provide an = I2C >>> bus device for the rest of the drivers (e.g. to implement = SIOCGI2C). >>>=20 >>> Both of the interface and driver are subjects for a further >>> generalization to be used in case of non-FDT and non-arm64 = platforms. >>>=20 >>> Reviewed by: bz, manu >>> Approved by: bz (mentor) >>> MFC after: 3 weeks >>> Differential Revision: https://reviews.freebsd.org/D41440 >>> --- >>> sys/arm64/conf/std.nxp | 3 + >>> sys/conf/files | 2 + >>> sys/dev/sff/sff_if.m | 35 +++++++++++ >>> sys/dev/sff/sfp_fdt.c | 155 = +++++++++++++++++++++++++++++++++++++++++++++++ >>> sys/modules/Makefile | 2 + >>> sys/modules/sff/Makefile | 13 ++++ >>> 6 files changed, 210 insertions(+) >>>=20 >>> diff --git a/sys/arm64/conf/std.nxp b/sys/arm64/conf/std.nxp >>> index 5b2e2b52d4e6..b4552fadaff4 100644 >>> --- a/sys/arm64/conf/std.nxp >>> +++ b/sys/arm64/conf/std.nxp >>> @@ -25,6 +25,9 @@ device sdhci >>> device dpaa2 # Data Path Acceleration Architecture (2nd Gen) >>> device enetc # QorIQ LS1028A NIC >>>=20 >>> +# SFF/SFP >>> +device sff # Small Form Factor Transceivers >>> + >>> options FDT >>> device acpi >>>=20 >>> diff --git a/sys/conf/files b/sys/conf/files >>> index 0db5887e6a75..b5cd85cba0e4 100644 >>> --- a/sys/conf/files >>> +++ b/sys/conf/files >>> @@ -3044,6 +3044,8 @@ dev/sdhci/sdhci_pci.c optional sdhci pci >>> dev/sdio/sdio_if.m optional mmccam >>> dev/sdio/sdio_subr.c optional mmccam >>> dev/sdio/sdiob.c optional mmccam >>> +dev/sff/sff_if.m optional sff >>> +dev/sff/sfp_fdt.c optional sff fdt >>> dev/sge/if_sge.c optional sge pci >>> dev/siis/siis.c optional siis pci >>> dev/sis/if_sis.c optional sis pci >>> diff --git a/sys/dev/sff/sff_if.m b/sys/dev/sff/sff_if.m >>> new file mode 100644 >>> index 000000000000..823e557992c2 >>> --- /dev/null >>> +++ b/sys/dev/sff/sff_if.m >>> @@ -0,0 +1,35 @@ >>> +#- >>> +# SPDX-License-Identifier: BSD-2-Clause >>> +# >>> +# Copyright =C2=A9 2023 Dmitry Salychev >>> +# >>> +# Redistribution and use in source and binary forms, with or = without >>> +# modification, are permitted provided that the following = conditions >>> +# are met: >>> +# 1. Redistributions of source code must retain the above copyright >>> +# notice, this list of conditions and the following disclaimer. >>> +# 2. Redistributions in binary form must reproduce the above = copyright >>> +# notice, this list of conditions and the following disclaimer = in the >>> +# documentation and/or other materials provided with the = distribution. >>> +# >>> +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS = IS'' AND >>> +# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, = THE >>> +# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A = PARTICULAR PURPOSE >>> +# ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE = LIABLE >>> +# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR = CONSEQUENTIAL >>> +# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE = GOODS >>> +# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS = INTERRUPTION) >>> +# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN = CONTRACT, STRICT >>> +# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN = ANY WAY >>> +# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE = POSSIBILITY OF >>> +# SUCH DAMAGE. >>> +# >>> + >>> +#include >>> + >>> +INTERFACE sff; >>> + >>> +METHOD int get_i2c_bus { >>> + device_t dev; >>> + device_t *i2c_bus; >>> +}; >>> diff --git a/sys/dev/sff/sfp_fdt.c b/sys/dev/sff/sfp_fdt.c >>> new file mode 100644 >>> index 000000000000..7430282ede70 >>> --- /dev/null >>> +++ b/sys/dev/sff/sfp_fdt.c >>> @@ -0,0 +1,155 @@ >>> +/*- >>> + * SPDX-License-Identifier: BSD-2-Clause >>> + * >>> + * Copyright =C2=A9 2023 Dmitry Salychev >>> + * >>> + * Redistribution and use in source and binary forms, with or = without >>> + * modification, are permitted provided that the following = conditions >>> + * are met: >>> + * 1. Redistributions of source code must retain the above = copyright >>> + * notice, this list of conditions and the following disclaimer. >>> + * 2. Redistributions in binary form must reproduce the above = copyright >>> + * notice, this list of conditions and the following disclaimer = in the >>> + * documentation and/or other materials provided with the = distribution. >>> + * >>> + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS = IS'' AND >>> + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED = TO, THE >>> + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A = PARTICULAR PURPOSE >>> + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE = LIABLE >>> + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR = CONSEQUENTIAL >>> + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF = SUBSTITUTE GOODS >>> + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS = INTERRUPTION) >>> + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN = CONTRACT, STRICT >>> + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING = IN ANY WAY >>> + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE = POSSIBILITY OF >>> + * SUCH DAMAGE. >>> + */ >>> + >>> +/* >>> + * Small Form Factor (SFF) Committee Pluggable (SFP) Transceiver = (FDT-based). >>> + */ >>> + >>> +#include >>> +#include >>> +#include >>> +#include >>> + >>> +#include >>> +#include >>> +#include >>> + >>> +#include "sff_if.h" >>> + >>> +struct sfp_fdt_softc { >>> + phandle_t ofw_node; >>> + phandle_t i2c_bus; >>> + >>> + phandle_t mod_def; >>> + phandle_t los; >>> + phandle_t tx_fault; >>> + phandle_t tx_disable; >>> + phandle_t rx_rate; >>> + phandle_t tx_rate; >>=20 >> These names sound like they should be numbers, not handles to GPIOs. >>=20 >=20 > FDT example: >=20 > sfp_xg1: dpmac1-sfp { > compatible =3D "sff,sfp"; > i2c-bus =3D <&sfpupper_i2c>; > tx-fault-gpios =3D <&sfpgpio 4 GPIO_ACTIVE_HIGH>; > tx-disable-gpios =3D <&sfpgpio 5 GPIO_ACTIVE_HIGH>; > mod-def0-gpios =3D <&sfpgpio 6 GPIO_ACTIVE_LOW>; > los-gpios =3D <&sfpgpio 7 GPIO_ACTIVE_HIGH>; > maximum-power-milliwatt =3D <2000>; > }; Yes, exactly. =E2=80=9Ctx_rate=E2=80=9D sounds like it=E2=80=99s some = kind of bits-per-second measure, for example, that would be a uint32_t (like max_power), but is in fact a property called =E2=80=9Crate-select1-gpios=E2=80=9D that=E2=80=99= s a handle. That is, the softc member names are very confusing. Jess From nobody Fri Aug 18 17:55:03 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RS8gK2Z1Sz4qrds; Fri, 18 Aug 2023 17:55:57 +0000 (UTC) (envelope-from dsl@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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RS8gK1y5Kz3bCb; Fri, 18 Aug 2023 17:55:57 +0000 (UTC) (envelope-from dsl@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692381357; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=FEz+hk/K2F4X1dfdRkfd95Lm7p43wgoTU56jVtogkO4=; b=Si9NUEGZHOR+FDogrKDz3ypL3etrfgUPGqMVl/PT/4xVEEH7pY/zXiXKLNtjjjgO35ZMg4 IyYpTQydWqMG3Z3sUfzw+hke7bpX9rIgdTT2Zu8sr6B47FmpOnqkXXyriOI2dRL9noroAz 60bkc+ANkTY/sjdqH2+4xYhZC9ydI5BdoNUd1KIkCM0s3WwdA0yK5GQZ0o85jU1x7ljoCj FF85UXInuJT+LDnNFeNswH1YE4E13Fz43aHfVgMN778hzprvPa9TC6k5Fo90L76TrDyaCp toAAouhqKHaHMUHLK5SCrkgaHzNsdiz32kBrPs5MsqzZuEywNItsh4NvjwlEpA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692381357; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=FEz+hk/K2F4X1dfdRkfd95Lm7p43wgoTU56jVtogkO4=; b=JC3+jBgHi4e1wozbvVTD9kIDBcual+WVC2U1ELqviu7GI3nw5BBlhHfZzP8NQEFKKUNOLM klK5PfHyrQZoSyN8Ny3DutWY1PrKx3wODMZwvKCl1UErHdIC5wYW9LNLs9Oy+nMqWP17ta HrJJcvRWvloQ7FKL4Rp+xCFFmZ+L+ujuCVhvNUb8Z+Wv25INT5GlKXwZAgxAhtpMju1590 1b7/AyGCXUxB8KZRV+NWDeAzSOU7BblrNvR2qM22BtjsxLzxgBUpSRhN/D2A68nbguMRff UzntVYjszdUGATyeAnlaWnv59amml64exhrx4e7+G3V/EAdtltjGFktifhMIaA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692381357; a=rsa-sha256; cv=none; b=nL8UOl74IPz12gTL2yfy2AYhERi6z2PMAVGGkjf1pXSEi4Ijg8BErt9CVxartWBRWC75mi +Z9IAWQR/FrA0V2c6wqP0y8ESCwB00WfVAraIcwFLgh1ZEh/5raknNlzODMv+z4FultCWm ZKdXxENPU+1uB7qRePydl3fPxcTWp4jOm/OjKM6tx7rI2FEIgjYJ2+t1TOfj/An2aGbF3l JnU8wIZ9/2v2Lwhx4k7V90qofUKYITM2g7nYsRVLTjHof84YoAfDD0J9zodcQmzLqJ1P8I bBi2cCqGslkRPAe4u156AKVcA65EmJPbNg8Odo6snYO61fOEADh1jbi4Qbtrtw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from localhost (unknown [91.226.51.235]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-256) server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) (Authenticated sender: dsl) by smtp.freebsd.org (Postfix) with ESMTPSA id 4RS8gJ54VLz1JDK; Fri, 18 Aug 2023 17:55:56 +0000 (UTC) (envelope-from dsl@FreeBSD.org) References: <202308181040.37IAetMR060855@gitrepo.freebsd.org> <7DD26452-7D0C-45BA-AA01-825B1073FEC6@freebsd.org> <86h6ow5k9y.fsf@peasant.tower.home> <00BDB172-6E09-4000-B59F-843DA4F723F7@freebsd.org> User-agent: mu4e 1.8.13; emacs 28.2 From: Dmitry Salychev To: Jessica Clarke Cc: "src-committers@freebsd.org" , "dev-commits-src-all@freebsd.org" , "dev-commits-src-main@freebsd.org" Subject: Re: git: 2a9021898c4e - main - sff: Add SFP driver (fdt-based draft) Date: Fri, 18 Aug 2023 19:55:03 +0200 In-reply-to: <00BDB172-6E09-4000-B59F-843DA4F723F7@freebsd.org> Message-ID: <86a5uo5j6b.fsf@peasant.tower.home> List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Jessica Clarke writes: > On 18 Aug 2023, at 18:18, Dmitry Salychev wrote: >>=20 >>=20 >> Jessica Clarke writes: >>=20 >>> On 18 Aug 2023, at 11:40, Dmitry Salychev wrote: >>>>=20 >>>> The branch main has been updated by dsl: >>>>=20 >>>> URL: https://cgit.FreeBSD.org/src/commit/?id=3D2a9021898c4ee2154787da8= 62c238cfeccd655df >>>>=20 >>>> commit 2a9021898c4ee2154787da862c238cfeccd655df >>>> Author: Dmitry Salychev >>>> AuthorDate: 2023-08-18 09:17:31 +0000 >>>> Commit: Dmitry Salychev >>>> CommitDate: 2023-08-18 10:40:11 +0000 >>>>=20 >>>> sff: Add SFP driver (fdt-based draft) >>>>=20 >>>> This basic version of the driver obtains properties of the "sff,sfp" >>>> compatible devices and implements a simple interface to provide an I= 2C >>>> bus device for the rest of the drivers (e.g. to implement SIOCGI2C). >>>>=20 >>>> Both of the interface and driver are subjects for a further >>>> generalization to be used in case of non-FDT and non-arm64 platforms. >>>>=20 >>>> Reviewed by: bz, manu >>>> Approved by: bz (mentor) >>>> MFC after: 3 weeks >>>> Differential Revision: https://reviews.freebsd.org/D41440 >>>> --- >>>> sys/arm64/conf/std.nxp | 3 + >>>> sys/conf/files | 2 + >>>> sys/dev/sff/sff_if.m | 35 +++++++++++ >>>> sys/dev/sff/sfp_fdt.c | 155 +++++++++++++++++++++++++++++++++++++++= ++++++++ >>>> sys/modules/Makefile | 2 + >>>> sys/modules/sff/Makefile | 13 ++++ >>>> 6 files changed, 210 insertions(+) >>>>=20 >>>> diff --git a/sys/arm64/conf/std.nxp b/sys/arm64/conf/std.nxp >>>> index 5b2e2b52d4e6..b4552fadaff4 100644 >>>> --- a/sys/arm64/conf/std.nxp >>>> +++ b/sys/arm64/conf/std.nxp >>>> @@ -25,6 +25,9 @@ device sdhci >>>> device dpaa2 # Data Path Acceleration Architecture (2nd Gen) >>>> device enetc # QorIQ LS1028A NIC >>>>=20 >>>> +# SFF/SFP >>>> +device sff # Small Form Factor Transceivers >>>> + >>>> options FDT >>>> device acpi >>>>=20 >>>> diff --git a/sys/conf/files b/sys/conf/files >>>> index 0db5887e6a75..b5cd85cba0e4 100644 >>>> --- a/sys/conf/files >>>> +++ b/sys/conf/files >>>> @@ -3044,6 +3044,8 @@ dev/sdhci/sdhci_pci.c optional sdhci pci >>>> dev/sdio/sdio_if.m optional mmccam >>>> dev/sdio/sdio_subr.c optional mmccam >>>> dev/sdio/sdiob.c optional mmccam >>>> +dev/sff/sff_if.m optional sff >>>> +dev/sff/sfp_fdt.c optional sff fdt >>>> dev/sge/if_sge.c optional sge pci >>>> dev/siis/siis.c optional siis pci >>>> dev/sis/if_sis.c optional sis pci >>>> diff --git a/sys/dev/sff/sff_if.m b/sys/dev/sff/sff_if.m >>>> new file mode 100644 >>>> index 000000000000..823e557992c2 >>>> --- /dev/null >>>> +++ b/sys/dev/sff/sff_if.m >>>> @@ -0,0 +1,35 @@ >>>> +#- >>>> +# SPDX-License-Identifier: BSD-2-Clause >>>> +# >>>> +# Copyright =C2=A9 2023 Dmitry Salychev >>>> +# >>>> +# Redistribution and use in source and binary forms, with or without >>>> +# modification, are permitted provided that the following conditions >>>> +# are met: >>>> +# 1. Redistributions of source code must retain the above copyright >>>> +# notice, this list of conditions and the following disclaimer. >>>> +# 2. Redistributions in binary form must reproduce the above copyright >>>> +# notice, this list of conditions and the following disclaimer in = the >>>> +# documentation and/or other materials provided with the distribut= ion. >>>> +# >>>> +# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' = AND >>>> +# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, T= HE >>>> +# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR = PURPOSE >>>> +# ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LI= ABLE >>>> +# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQ= UENTIAL >>>> +# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE G= OODS >>>> +# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTIO= N) >>>> +# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,= STRICT >>>> +# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN A= NY WAY >>>> +# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY= OF >>>> +# SUCH DAMAGE. >>>> +# >>>> + >>>> +#include >>>> + >>>> +INTERFACE sff; >>>> + >>>> +METHOD int get_i2c_bus { >>>> + device_t dev; >>>> + device_t *i2c_bus; >>>> +}; >>>> diff --git a/sys/dev/sff/sfp_fdt.c b/sys/dev/sff/sfp_fdt.c >>>> new file mode 100644 >>>> index 000000000000..7430282ede70 >>>> --- /dev/null >>>> +++ b/sys/dev/sff/sfp_fdt.c >>>> @@ -0,0 +1,155 @@ >>>> +/*- >>>> + * SPDX-License-Identifier: BSD-2-Clause >>>> + * >>>> + * Copyright =C2=A9 2023 Dmitry Salychev >>>> + * >>>> + * Redistribution and use in source and binary forms, with or without >>>> + * modification, are permitted provided that the following conditions >>>> + * are met: >>>> + * 1. Redistributions of source code must retain the above copyright >>>> + * notice, this list of conditions and the following disclaimer. >>>> + * 2. Redistributions in binary form must reproduce the above copyrig= ht >>>> + * notice, this list of conditions and the following disclaimer in= the >>>> + * documentation and/or other materials provided with the distribu= tion. >>>> + * >>>> + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS''= AND >>>> + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, = THE >>>> + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR= PURPOSE >>>> + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE L= IABLE >>>> + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSE= QUENTIAL >>>> + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE = GOODS >>>> + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTI= ON) >>>> + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT= , STRICT >>>> + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN = ANY WAY >>>> + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILIT= Y OF >>>> + * SUCH DAMAGE. >>>> + */ >>>> + >>>> +/* >>>> + * Small Form Factor (SFF) Committee Pluggable (SFP) Transceiver (FDT= -based). >>>> + */ >>>> + >>>> +#include >>>> +#include >>>> +#include >>>> +#include >>>> + >>>> +#include >>>> +#include >>>> +#include >>>> + >>>> +#include "sff_if.h" >>>> + >>>> +struct sfp_fdt_softc { >>>> + phandle_t ofw_node; >>>> + phandle_t i2c_bus; >>>> + >>>> + phandle_t mod_def; >>>> + phandle_t los; >>>> + phandle_t tx_fault; >>>> + phandle_t tx_disable; >>>> + phandle_t rx_rate; >>>> + phandle_t tx_rate; >>>=20 >>> These names sound like they should be numbers, not handles to GPIOs. >>>=20 >>=20 >> FDT example: >>=20 >> sfp_xg1: dpmac1-sfp { >> compatible =3D "sff,sfp"; >> i2c-bus =3D <&sfpupper_i2c>; >> tx-fault-gpios =3D <&sfpgpio 4 GPIO_ACTIVE_HIGH>; >> tx-disable-gpios =3D <&sfpgpio 5 GPIO_ACTIVE_HIGH>; >> mod-def0-gpios =3D <&sfpgpio 6 GPIO_ACTIVE_LOW>; >> los-gpios =3D <&sfpgpio 7 GPIO_ACTIVE_HIGH>; >> maximum-power-milliwatt =3D <2000>; >> }; > > Yes, exactly. =E2=80=9Ctx_rate=E2=80=9D sounds like it=E2=80=99s some kin= d of bits-per-second > measure, for example, that would be a uint32_t (like max_power), but is > in fact a property called =E2=80=9Crate-select1-gpios=E2=80=9D that=E2=80= =99s a handle. That > is, the softc member names are very confusing. > > Jess OK, understood. I'll update names in the next patch as well. Regards, Dmitry --=20 https://wiki.freebsd.org/DmitrySalychev From nobody Fri Aug 18 18:30:44 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RS9RS4fv8z4qtfk; Fri, 18 Aug 2023 18:30:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RS9RS4CrGz4DLC; Fri, 18 Aug 2023 18:30:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692383444; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6gbqAZPtvSZakvw1qYaTuX9LsXP2KAhhW4yG2BaokA4=; b=Zrewsf6HsSgZj46cW14P1PcYEnbLI5uPQdeAKFSohsIu+zxq1d+kd3OaFPU+YRUwqZulgJ ORaM8r8jr+Adr3zPWWpgAE3LQbe+wEjbvx14p/XpwCcY61c1hUqLOMhMC0NDUFCZwTP8w3 nuSrrvZk6ZhKkb0kdPj3w/1o2z3hC7JAhOMVwBPdEiNnwwlUBG4LXGgdpOnylsSXkWcG79 NWuQ4x0X1mNleWI2JE0SBVvFvqs0ytKXAQRACr58zatYS650Jc5wzCb+rhDT9pFGyUbJoc nB60r0vV6XVAMcMX+8ZE5ORQKbym9FNwURaQ5k+DQs43VCY+DKREVvz/il61uw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692383444; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6gbqAZPtvSZakvw1qYaTuX9LsXP2KAhhW4yG2BaokA4=; b=v4Wvcv6uk7UIFE6yWAtfgKSovemTybJAl2a0LCLc3yhGBV4UxhFOh4nslCRxv6GZs3YxTE UdKGhtseHK/LPljjHTQcty1LP3pXc/BPIQx2Uas9SDAp5Z6DC+4tj2F8Jm7I+M1lsIhibH niHPGzpZDODOM/nd7vO9PBhbez2pKFwSQr9tx16mWMgGhLaWLqm6Vep8kwbzFN1C24ckYZ 8gTK6rLIyHcJrt9tdE+cLPFBwpMHJURmMBbQIfEXHdn4rfljWem+3hVam+Ycmf8R13r7Qs 7qIsDJHEzSPgircFTHIXzOtusRvMXBNQDVv3JhFflf1TeGZQKLqankfDgt4oJg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692383444; a=rsa-sha256; cv=none; b=e/9qSr6NkUUXQ9YN6HwFDo5IaPD4019XTm4tOsIX9SfPPi4kkdNTxKAExsdLzUxhehL0Z2 H+wAxXZJo395dN21U/0WigH27sf+8VZw0jncCxIaowNlLmD+9T5J8nEL9OQoUSnmAJfDeQ yr5ZgVDgzVOu1V8JDNpsGYrIyZ22TjqYmf9/whta3K4WlEim8A2pCJ1zM2YfhAr6Mod0oe M1xv598Qlh1aVLSfUYK2NmUJ6Hd0WIfkYRrD7I8Cdeb6OJSlPvfTT/TYTzdWTM6/9QEWGa v1lcmkeiIyUc21gC/pUX4CDvgk/J6STFzbGRgFwqB1j8fAcKFjUZ0rwN5R+Oew== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RS9RS2x39zBs7; Fri, 18 Aug 2023 18:30:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37IIUiVv046079; Fri, 18 Aug 2023 18:30:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37IIUio7046074; Fri, 18 Aug 2023 18:30:44 GMT (envelope-from git) Date: Fri, 18 Aug 2023 18:30:44 GMT Message-Id: <202308181830.37IIUio7046074@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Eric Joyner Subject: git: 01fbb86991d5 - main - irdma(4): upgrade to 1.2.17-k List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: erj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 01fbb86991d524288a785b544c29d9c5ea1b61fb Auto-Submitted: auto-generated The branch main has been updated by erj: URL: https://cgit.FreeBSD.org/src/commit/?id=01fbb86991d524288a785b544c29d9c5ea1b61fb commit 01fbb86991d524288a785b544c29d9c5ea1b61fb Author: Bartosz Sobczak AuthorDate: 2023-08-18 18:14:33 +0000 Commit: Eric Joyner CommitDate: 2023-08-18 18:28:58 +0000 irdma(4): upgrade to 1.2.17-k Update Intel irdma driver to version 1.2.17-k Notable changes: - pf-reset handling improvements, including fixes in communication with if_ice(4) - avoid racing when handling various events - adding sw stats sysctls - hand over pe_criterr handling from ice(4) to irdma(4) - debug prints adjustments - fix crash after changes in irdma_add_mqh_ifa_cb Signed-off-by: Bartosz Sobczak Signed-off-by: Eric Joyner Reviewed by: erj@ MFC after: 1 month Sponsored by: Intel Corporation Differential Revision: https://reviews.freebsd.org/D41425 --- contrib/ofed/libirdma/irdma_defs.h | 25 +- contrib/ofed/libirdma/irdma_uk.c | 59 +---- contrib/ofed/libirdma/irdma_umain.c | 4 +- contrib/ofed/libirdma/irdma_user.h | 3 +- contrib/ofed/libirdma/irdma_uverbs.c | 61 ++--- contrib/ofed/libirdma/osdep.h | 82 +++---- sys/dev/ice/ice_rdma.c | 59 ++++- sys/dev/ice/ice_rdma.h | 11 +- sys/dev/ice/ice_rdma_internal.h | 2 + sys/dev/ice/if_ice_iflib.c | 15 +- sys/dev/irdma/fbsd_kcompat.c | 282 ++++++++++++++++++++++- sys/dev/irdma/fbsd_kcompat.h | 16 +- sys/dev/irdma/icrdma.c | 283 +++++++++++++++-------- sys/dev/irdma/irdma.h | 4 +- sys/dev/irdma/irdma_cm.c | 303 ++++++++++++------------ sys/dev/irdma/irdma_cm.h | 15 +- sys/dev/irdma/irdma_ctrl.c | 160 +++++-------- sys/dev/irdma/irdma_defs.h | 87 +++---- sys/dev/irdma/irdma_hmc.c | 6 +- sys/dev/irdma/irdma_hmc.h | 6 +- sys/dev/irdma/irdma_hw.c | 99 ++++---- sys/dev/irdma/irdma_kcompat.c | 121 +++++----- sys/dev/irdma/irdma_main.h | 12 +- sys/dev/irdma/irdma_pble.c | 16 +- sys/dev/irdma/irdma_pble.h | 6 +- sys/dev/irdma/irdma_protos.h | 8 +- sys/dev/irdma/irdma_puda.c | 8 +- sys/dev/irdma/irdma_puda.h | 6 +- sys/dev/irdma/irdma_type.h | 21 +- sys/dev/irdma/irdma_uda.c | 17 +- sys/dev/irdma/irdma_uda.h | 4 +- sys/dev/irdma/irdma_uk.c | 84 +------ sys/dev/irdma/irdma_user.h | 3 +- sys/dev/irdma/irdma_utils.c | 230 ++++++++++++++----- sys/dev/irdma/irdma_verbs.c | 431 +++++++++++++++++++---------------- sys/dev/irdma/irdma_verbs.h | 91 ++++++-- sys/dev/irdma/irdma_ws.c | 4 +- sys/dev/irdma/osdep.h | 61 +++-- 38 files changed, 1586 insertions(+), 1119 deletions(-) diff --git a/contrib/ofed/libirdma/irdma_defs.h b/contrib/ofed/libirdma/irdma_defs.h index 3d8b59c4b78e..9276490793a0 100644 --- a/contrib/ofed/libirdma/irdma_defs.h +++ b/contrib/ofed/libirdma/irdma_defs.h @@ -1,7 +1,7 @@ /*- * SPDX-License-Identifier: GPL-2.0 or Linux-OpenIB * - * Copyright (c) 2015 - 2022 Intel Corporation + * Copyright (c) 2015 - 2023 Intel Corporation * * This software is available to you under a choice of one of two * licenses. You may choose to be licensed under the terms of the GNU @@ -312,7 +312,7 @@ #define IRDMA_GET_CQ_ELEM_AT_OFFSET(_cq, _i, _cqe) \ { \ - register __u32 offset; \ + __u32 offset; \ offset = IRDMA_GET_RING_OFFSET((_cq)->cq_ring, _i); \ (_cqe) = (_cq)->cq_base[offset].buf; \ } @@ -338,7 +338,7 @@ #define IRDMA_RING_MOVE_HEAD(_ring, _retcode) \ { \ - register u32 size; \ + u32 size; \ size = (_ring).size; \ if (!IRDMA_RING_FULL_ERR(_ring)) { \ (_ring).head = ((_ring).head + 1) % size; \ @@ -349,7 +349,7 @@ } #define IRDMA_RING_MOVE_HEAD_BY_COUNT(_ring, _count, _retcode) \ { \ - register u32 size; \ + u32 size; \ size = (_ring).size; \ if ((IRDMA_RING_USED_QUANTA(_ring) + (_count)) < size) { \ (_ring).head = ((_ring).head + (_count)) % size; \ @@ -360,7 +360,7 @@ } #define IRDMA_SQ_RING_MOVE_HEAD(_ring, _retcode) \ { \ - register u32 size; \ + u32 size; \ size = (_ring).size; \ if (!IRDMA_SQ_RING_FULL_ERR(_ring)) { \ (_ring).head = ((_ring).head + 1) % size; \ @@ -371,7 +371,7 @@ } #define IRDMA_SQ_RING_MOVE_HEAD_BY_COUNT(_ring, _count, _retcode) \ { \ - register u32 size; \ + u32 size; \ size = (_ring).size; \ if ((IRDMA_RING_USED_QUANTA(_ring) + (_count)) < (size - 256)) { \ (_ring).head = ((_ring).head + (_count)) % size; \ @@ -457,6 +457,19 @@ enum irdma_qp_wqe_size { IRDMA_WQE_SIZE_256 = 256, }; +enum irdma_ws_op_type { + IRDMA_WS_OP_TYPE_NODE = 0, + IRDMA_WS_OP_TYPE_LEAF_NODE_GROUP, +}; + +enum irdma_ws_rate_limit_flags { + IRDMA_WS_RATE_LIMIT_FLAGS_VALID = 0x1, + IRDMA_WS_NO_RDMA_RATE_LIMIT = 0x2, + IRDMA_WS_LEAF_NODE_IS_PART_GROUP = 0x4, + IRDMA_WS_TREE_RATE_LIMITING = 0x8, + IRDMA_WS_PACING_CONTROL = 0x10, +}; + /** * set_64bit_val - set 64 bit value to hw wqe * @wqe_words: wqe addr to write diff --git a/contrib/ofed/libirdma/irdma_uk.c b/contrib/ofed/libirdma/irdma_uk.c index 97e3ac553c26..a1b796b318f4 100644 --- a/contrib/ofed/libirdma/irdma_uk.c +++ b/contrib/ofed/libirdma/irdma_uk.c @@ -1,7 +1,7 @@ /*- * SPDX-License-Identifier: GPL-2.0 or Linux-OpenIB * - * Copyright (c) 2015 - 2022 Intel Corporation + * Copyright (c) 2015 - 2023 Intel Corporation * * This software is available to you under a choice of one of two * licenses. You may choose to be licensed under the terms of the GNU @@ -275,7 +275,8 @@ irdma_qp_get_next_send_wqe(struct irdma_qp_uk *qp, u32 *wqe_idx, if (qp->uk_attrs->hw_rev == IRDMA_GEN_1 && wqe_quanta == 1 && (IRDMA_RING_CURRENT_HEAD(qp->sq_ring) & 1)) { wqe_0 = qp->sq_base[IRDMA_RING_CURRENT_HEAD(qp->sq_ring)].elem; - wqe_0[3] = htole64(FIELD_PREP(IRDMAQPSQ_VALID, !qp->swqe_polarity)); + wqe_0[3] = htole64(FIELD_PREP(IRDMAQPSQ_VALID, + qp->swqe_polarity ? 0 : 1)); } qp->sq_wrtrk_array[*wqe_idx].wrid = info->wr_id; qp->sq_wrtrk_array[*wqe_idx].wr_len = total_size; @@ -683,8 +684,8 @@ irdma_set_mw_bind_wqe(__le64 * wqe, * @polarity: polarity of wqe valid bit */ static void -irdma_copy_inline_data(u8 *wqe, struct irdma_sge *sge_list, u32 num_sges, - u8 polarity) +irdma_copy_inline_data(u8 *wqe, struct irdma_sge *sge_list, + u32 num_sges, u8 polarity) { u8 inline_valid = polarity << IRDMA_INLINE_VALID_S; u32 quanta_bytes_remaining = 8; @@ -1173,7 +1174,7 @@ irdma_repost_rq_wqes(struct irdma_qp_uk *qp, u32 start_idx, u32 end_idx) { __le64 *dst_wqe, *src_wqe; - u32 wqe_idx; + u32 wqe_idx = 0; u8 wqe_quanta = qp->rq_wqe_size_multiplier; bool flip_polarity; u64 val; @@ -1480,7 +1481,8 @@ irdma_uk_cq_poll_cmpl(struct irdma_cq_uk *cq, sw_wqe = qp->sq_base[tail].elem; get_64bit_val(sw_wqe, IRDMA_BYTE_24, &wqe_qword); - info->op_type = (u8)FIELD_GET(IRDMAQPSQ_OPCODE, wqe_qword); + info->op_type = (u8)FIELD_GET(IRDMAQPSQ_OPCODE, + wqe_qword); IRDMA_RING_SET_TAIL(qp->sq_ring, tail + qp->sq_wrtrk_array[tail].quanta); if (info->op_type != IRDMAQP_OP_NOP) { @@ -1834,6 +1836,9 @@ irdma_uk_clean_cq(void *q, struct irdma_cq_uk *cq) if (polarity != temp) break; + /* Ensure CQE contents are read after valid bit is checked */ + udma_from_device_barrier(); + get_64bit_val(cqe, IRDMA_BYTE_8, &comp_ctx); if ((void *)(irdma_uintptr) comp_ctx == q) set_64bit_val(cqe, IRDMA_BYTE_8, 0); @@ -1845,48 +1850,6 @@ irdma_uk_clean_cq(void *q, struct irdma_cq_uk *cq) return 0; } -/** - * irdma_nop - post a nop - * @qp: hw qp ptr - * @wr_id: work request id - * @signaled: signaled for completion - * @post_sq: ring doorbell - */ -int -irdma_nop(struct irdma_qp_uk *qp, u64 wr_id, bool signaled, bool post_sq) -{ - __le64 *wqe; - u64 hdr; - u32 wqe_idx; - struct irdma_post_sq_info info = {0}; - u16 quanta = IRDMA_QP_WQE_MIN_QUANTA; - - info.push_wqe = qp->push_db ? true : false; - info.wr_id = wr_id; - wqe = irdma_qp_get_next_send_wqe(qp, &wqe_idx, &quanta, 0, &info); - if (!wqe) - return ENOSPC; - - set_64bit_val(wqe, IRDMA_BYTE_0, 0); - set_64bit_val(wqe, IRDMA_BYTE_8, 0); - set_64bit_val(wqe, IRDMA_BYTE_16, 0); - - hdr = FIELD_PREP(IRDMAQPSQ_OPCODE, IRDMAQP_OP_NOP) | - FIELD_PREP(IRDMAQPSQ_SIGCOMPL, signaled) | - FIELD_PREP(IRDMAQPSQ_VALID, qp->swqe_polarity); - - udma_to_device_barrier(); /* make sure WQE is populated before valid bit is set */ - - set_64bit_val(wqe, IRDMA_BYTE_24, hdr); - - if (info.push_wqe) - irdma_qp_push_wqe(qp, wqe, quanta, wqe_idx, post_sq); - else if (post_sq) - irdma_uk_qp_post_wr(qp); - - return 0; -} - /** * irdma_fragcnt_to_quanta_sq - calculate quanta based on fragment count for SQ * @frag_cnt: number of fragments diff --git a/contrib/ofed/libirdma/irdma_umain.c b/contrib/ofed/libirdma/irdma_umain.c index 6c823646b375..9e223cae429f 100644 --- a/contrib/ofed/libirdma/irdma_umain.c +++ b/contrib/ofed/libirdma/irdma_umain.c @@ -1,7 +1,7 @@ /*- * SPDX-License-Identifier: GPL-2.0 or Linux-OpenIB * - * Copyright (c) 2021 - 2022 Intel Corporation + * Copyright (c) 2021 - 2023 Intel Corporation * * This software is available to you under a choice of one of two * licenses. You may choose to be licensed under the terms of the GNU @@ -49,7 +49,7 @@ /** * Driver version */ -char libirdma_version[] = "1.1.11-k"; +char libirdma_version[] = "1.2.17-k"; unsigned int irdma_dbg; diff --git a/contrib/ofed/libirdma/irdma_user.h b/contrib/ofed/libirdma/irdma_user.h index 8eb9ae7990e7..8d71a37d7bf4 100644 --- a/contrib/ofed/libirdma/irdma_user.h +++ b/contrib/ofed/libirdma/irdma_user.h @@ -1,7 +1,7 @@ /*- * SPDX-License-Identifier: GPL-2.0 or Linux-OpenIB * - * Copyright (c) 2015 - 2022 Intel Corporation + * Copyright (c) 2015 - 2023 Intel Corporation * * This software is available to you under a choice of one of two * licenses. You may choose to be licensed under the terms of the GNU @@ -572,7 +572,6 @@ void irdma_get_wqe_shift(struct irdma_uk_attrs *uk_attrs, u32 sge, u32 inline_data, u8 *shift); int irdma_get_sqdepth(struct irdma_uk_attrs *uk_attrs, u32 sq_size, u8 shift, u32 *sqdepth); int irdma_get_rqdepth(struct irdma_uk_attrs *uk_attrs, u32 rq_size, u8 shift, u32 *rqdepth); -int irdma_get_srqdepth(struct irdma_uk_attrs *uk_attrs, u32 srq_size, u8 shift, u32 *srqdepth); void irdma_qp_push_wqe(struct irdma_qp_uk *qp, __le64 *wqe, u16 quanta, u32 wqe_idx, bool post_sq); void irdma_clr_wqes(struct irdma_qp_uk *qp, u32 qp_wqe_idx); diff --git a/contrib/ofed/libirdma/irdma_uverbs.c b/contrib/ofed/libirdma/irdma_uverbs.c index 14efab96a107..c59d409e72cd 100644 --- a/contrib/ofed/libirdma/irdma_uverbs.c +++ b/contrib/ofed/libirdma/irdma_uverbs.c @@ -1,7 +1,7 @@ /*- * SPDX-License-Identifier: GPL-2.0 or Linux-OpenIB * - * Copyright (C) 2019 - 2022 Intel Corporation + * Copyright (C) 2019 - 2023 Intel Corporation * * This software is available to you under a choice of one of two * licenses. You may choose to be licensed under the terms of the GNU @@ -266,11 +266,13 @@ irdma_ualloc_mw(struct ibv_pd *pd, enum ibv_mw_type type) if (!mw) return NULL; - if (ibv_cmd_alloc_mw(pd, type, mw, &cmd, sizeof(cmd), &resp, - sizeof(resp))) { + err = ibv_cmd_alloc_mw(pd, type, mw, &cmd, sizeof(cmd), &resp, + sizeof(resp)); + if (err) { printf("%s: Failed to alloc memory window\n", __func__); free(mw); + errno = err; return NULL; } @@ -446,8 +448,10 @@ ucreate_cq(struct ibv_context *context, if (!iwucq) return NULL; - if (pthread_spin_init(&iwucq->lock, PTHREAD_PROCESS_PRIVATE)) { + ret = pthread_spin_init(&iwucq->lock, PTHREAD_PROCESS_PRIVATE); + if (ret) { free(iwucq); + errno = ret; return NULL; } @@ -464,8 +468,10 @@ ucreate_cq(struct ibv_context *context, iwucq->buf_size = total_size; info.cq_base = irdma_alloc_hw_buf(total_size); - if (!info.cq_base) + if (!info.cq_base) { + ret = ENOMEM; goto err_cq_base; + } memset(info.cq_base, 0, total_size); reg_mr_cmd.reg_type = IRDMA_MEMREG_TYPE_CQ; @@ -476,17 +482,17 @@ ucreate_cq(struct ibv_context *context, IBV_ACCESS_LOCAL_WRITE, &iwucq->vmr.ibv_mr, ®_mr_cmd.ibv_cmd, sizeof(reg_mr_cmd), ®_mr_resp, sizeof(reg_mr_resp)); - if (ret) { - errno = ret; + if (ret) goto err_dereg_mr; - } iwucq->vmr.ibv_mr.pd = &iwvctx->iwupd->ibv_pd; if (uk_attrs->feature_flags & IRDMA_FEATURE_CQ_RESIZE) { info.shadow_area = irdma_alloc_hw_buf(IRDMA_DB_SHADOW_AREA_SIZE); - if (!info.shadow_area) + if (!info.shadow_area) { + ret = ENOMEM; goto err_alloc_shadow; + } memset(info.shadow_area, 0, IRDMA_DB_SHADOW_AREA_SIZE); reg_mr_shadow_cmd.reg_type = IRDMA_MEMREG_TYPE_CQ; @@ -499,7 +505,6 @@ ucreate_cq(struct ibv_context *context, ®_mr_shadow_resp, sizeof(reg_mr_shadow_resp)); if (ret) { irdma_free_hw_buf(info.shadow_area, IRDMA_DB_SHADOW_AREA_SIZE); - errno = ret; goto err_alloc_shadow; } @@ -517,10 +522,8 @@ ucreate_cq(struct ibv_context *context, &cmd.ibv_cmd, sizeof(cmd.ibv_cmd), sizeof(cmd), &resp.ibv_resp, sizeof(resp.ibv_resp), sizeof(resp)); attr_ex->cqe = ncqe; - if (ret) { - errno = ret; + if (ret) goto err_create_cq; - } if (ext_cq) irdma_ibvcq_ex_fill_priv_funcs(iwucq, attr_ex); @@ -548,6 +551,7 @@ err_cq_base: free(iwucq); + errno = ret; return NULL; } @@ -1560,7 +1564,8 @@ irdma_ucreate_qp(struct ibv_pd *pd, memset(iwuqp, 0, sizeof(*iwuqp)); - if (pthread_spin_init(&iwuqp->lock, PTHREAD_PROCESS_PRIVATE)) + status = pthread_spin_init(&iwuqp->lock, PTHREAD_PROCESS_PRIVATE); + if (status) goto err_free_qp; info.sq_size = info.sq_depth >> info.sq_shift; @@ -1575,35 +1580,37 @@ irdma_ucreate_qp(struct ibv_pd *pd, } iwuqp->recv_sges = calloc(attr->cap.max_recv_sge, sizeof(*iwuqp->recv_sges)); - if (!iwuqp->recv_sges) + if (!iwuqp->recv_sges) { + status = errno; /* preserve errno */ goto err_destroy_lock; + } info.wqe_alloc_db = (u32 *)iwvctx->db; info.legacy_mode = iwvctx->legacy_mode; info.sq_wrtrk_array = calloc(info.sq_depth, sizeof(*info.sq_wrtrk_array)); - if (!info.sq_wrtrk_array) + if (!info.sq_wrtrk_array) { + status = errno; /* preserve errno */ goto err_free_rsges; + } info.rq_wrid_array = calloc(info.rq_depth, sizeof(*info.rq_wrid_array)); - if (!info.rq_wrid_array) + if (!info.rq_wrid_array) { + status = errno; /* preserve errno */ goto err_free_sq_wrtrk; + } iwuqp->sq_sig_all = attr->sq_sig_all; iwuqp->qp_type = attr->qp_type; status = irdma_vmapped_qp(iwuqp, pd, attr, &info, iwvctx->legacy_mode); - if (status) { - errno = status; + if (status) goto err_free_rq_wrid; - } iwuqp->qp.back_qp = iwuqp; iwuqp->qp.lock = &iwuqp->lock; status = irdma_uk_qp_init(&iwuqp->qp, &info); - if (status) { - errno = status; + if (status) goto err_free_vmap_qp; - } attr->cap.max_send_wr = (info.sq_depth - IRDMA_SQ_RSVD) >> info.sq_shift; attr->cap.max_recv_wr = (info.rq_depth - IRDMA_RQ_RSVD) >> info.rq_shift; @@ -1625,6 +1632,7 @@ err_free_qp: printf("%s: failed to create QP\n", __func__); free(iwuqp); + errno = status; return NULL; } @@ -2081,11 +2089,10 @@ irdma_ucreate_ah(struct ibv_pd *ibpd, struct ibv_ah_attr *attr) struct irdma_ucreate_ah_resp resp = {}; int err; - err = ibv_query_gid(ibpd->context, attr->port_num, attr->grh.sgid_index, - &sgid); - if (err) { + if (ibv_query_gid(ibpd->context, attr->port_num, attr->grh.sgid_index, + &sgid)) { fprintf(stderr, "irdma: Error from ibv_query_gid.\n"); - errno = err; + errno = ENOENT; return NULL; } diff --git a/contrib/ofed/libirdma/osdep.h b/contrib/ofed/libirdma/osdep.h index 1bbf6573b800..f7b8a96b93d2 100644 --- a/contrib/ofed/libirdma/osdep.h +++ b/contrib/ofed/libirdma/osdep.h @@ -1,7 +1,7 @@ /*- * SPDX-License-Identifier: GPL-2.0 or Linux-OpenIB * - * Copyright (c) 2021 - 2022 Intel Corporation + * Copyright (c) 2021 - 2023 Intel Corporation * * This software is available to you under a choice of one of two * licenses. You may choose to be licensed under the terms of the GNU @@ -46,7 +46,6 @@ #include #include -#define ATOMIC atomic_t #define IOMEM #define IRDMA_NTOHL(a) ntohl(a) #define IRDMA_NTOHS(a) ntohs(a) @@ -80,23 +79,13 @@ #define STATS_TIMER_DELAY 60000 /* a couple of linux size defines */ -#define SZ_128 128 -#define SZ_2K SZ_128 * 16 -#define SZ_1G (SZ_1K * SZ_1K * SZ_1K) -#define SPEED_1000 1000 -#define SPEED_10000 10000 -#define SPEED_20000 20000 -#define SPEED_25000 25000 -#define SPEED_40000 40000 -#define SPEED_100000 100000 - #define BIT_ULL(a) (1ULL << (a)) #define min(a, b) ((a) > (b) ? (b) : (a)) #ifndef likely -#define likely(x) __builtin_expect((x), 1) +#define likely(x) __builtin_expect((x), 1) #endif #ifndef unlikely -#define unlikely(x) __builtin_expect((x), 0) +#define unlikely(x) __builtin_expect((x), 0) #endif #define __aligned_u64 uint64_t __aligned(8) @@ -112,7 +101,7 @@ #define irdma_print(S, ...) printf("%s:%d "S, __FUNCTION__, __LINE__, ##__VA_ARGS__) #define irdma_debug_buf(dev, mask, desc, buf, size) \ do { \ - u32 i; \ + u32 i; \ if (!((mask) & (dev)->debug_mask)) { \ break; \ } \ @@ -122,20 +111,20 @@ do { \ irdma_debug(dev, mask, "index %03d val: %016lx\n", i, ((unsigned long *)(buf))[i / 8]); \ } while(0) -#define irdma_debug(h, m, s, ...) \ -do { \ - if (!(h)) { \ - if ((m) == IRDMA_DEBUG_INIT) \ +#define irdma_debug(h, m, s, ...) \ +do { \ + if (!(h)) { \ + if ((m) == IRDMA_DEBUG_INIT) \ printf("irdma INIT " s, ##__VA_ARGS__); \ - } else if (((m) & (h)->debug_mask)) { \ - printf("irdma " s, ##__VA_ARGS__); \ - } \ + } else if (((m) & (h)->debug_mask)) { \ + printf("irdma " s, ##__VA_ARGS__); \ + } \ } while (0) extern unsigned int irdma_dbg; -#define libirdma_debug(fmt, args...) \ -do { \ - if (irdma_dbg) \ - printf("libirdma-%s: " fmt, __func__, ##args); \ +#define libirdma_debug(fmt, args...) \ +do { \ + if (irdma_dbg) \ + printf("libirdma-%s: " fmt, __func__, ##args); \ } while (0) #define irdma_dev_err(ibdev, fmt, ...) \ pr_err("%s:%s:%d ERR "fmt, (ibdev)->name, __func__, __LINE__, ##__VA_ARGS__) @@ -144,18 +133,6 @@ do { \ #define irdma_dev_info(a, b, ...) printf(b, ##__VA_ARGS__) #define irdma_pr_warn printf -#define dump_struct(s, sz, name) \ -do { \ - unsigned char *a; \ - printf("%s %u", (name), (unsigned int)(sz)); \ - for (a = (unsigned char*)(s); a < (unsigned char *)(s) + (sz) ; a ++) { \ - if ((u64)a % 8 == 0) \ - printf("\n%p ", a); \ - printf("%2x ", *a); \ - } \ - printf("\n"); \ -}while(0) - /* * debug definition end */ @@ -179,13 +156,6 @@ struct irdma_sc_vsi; #define rt_tos2priority(tos) (tos >> 5) #define ah_attr_to_dmac(attr) ((attr).dmac) -#define kc_ib_modify_qp_is_ok(cur_state, next_state, type, mask, ll) \ - ib_modify_qp_is_ok(cur_state, next_state, type, mask) -#define kc_typeq_ib_wr const -#define kc_ifp_find ip_ifp_find -#define kc_ifp6_find ip6_ifp_find -#define kc_rdma_gid_attr_network_type(sgid_attr, gid_type, gid) \ - ib_gid_to_network_type(gid_type, gid) #define irdma_del_timer_compat(tt) del_timer((tt)) #define IRDMA_TAILQ_FOREACH CK_STAILQ_FOREACH #define IRDMA_TAILQ_FOREACH_SAFE CK_STAILQ_FOREACH_SAFE @@ -193,36 +163,36 @@ struct irdma_sc_vsi; static inline void db_wr32(__u32 val, __u32 *wqe_word) { - *wqe_word = val; + *wqe_word = val; } void *hw_to_dev(struct irdma_hw *hw); struct irdma_dma_mem { - void *va; - u64 pa; + void *va; + u64 pa; bus_dma_tag_t tag; bus_dmamap_t map; bus_dma_segment_t seg; bus_size_t size; - int nseg; - int flags; + int nseg; + int flags; }; struct irdma_virt_mem { - void *va; - u32 size; + void *va; + u32 size; }; #ifndef verbs_mr enum ibv_mr_type { - IBV_MR_TYPE_MR, - IBV_MR_TYPE_NULL_MR, + IBV_MR_TYPE_MR, + IBV_MR_TYPE_NULL_MR, }; struct verbs_mr { - struct ibv_mr ibv_mr; - enum ibv_mr_type mr_type; + struct ibv_mr ibv_mr; + enum ibv_mr_type mr_type; int access; }; #define verbs_get_mr(mr) container_of((mr), struct verbs_mr, ibv_mr) diff --git a/sys/dev/ice/ice_rdma.c b/sys/dev/ice/ice_rdma.c index decf9ea490d8..0bb4b79bb143 100644 --- a/sys/dev/ice/ice_rdma.c +++ b/sys/dev/ice/ice_rdma.c @@ -121,11 +121,10 @@ ice_rdma_pf_reset(struct ice_rdma_peer *peer) { struct ice_softc *sc = ice_rdma_peer_to_sc(peer); - /* - * Request that the driver re-initialize by bringing the interface - * down and up. - */ - ice_request_stack_reinit(sc); + /* Tell the base driver that RDMA is requesting a PFR */ + ice_set_state(&sc->state, ICE_STATE_RESET_PFR_REQ); + + /* XXX: Base driver will notify RDMA when it's done */ return (0); } @@ -331,6 +330,7 @@ ice_rdma_request_handler(struct ice_rdma_peer *peer, switch(req->type) { case ICE_RDMA_EVENT_RESET: + ice_rdma_pf_reset(peer); break; case ICE_RDMA_EVENT_QSET_REGISTER: ice_rdma_qset_register_request(peer, &req->res); @@ -865,3 +865,52 @@ ice_rdma_dcb_qos_update(struct ice_softc *sc, struct ice_port_info *pi) IRDMA_EVENT_HANDLER(peer, &event); sx_xunlock(&ice_rdma.mtx); } + +/** + * ice_rdma_notify_pe_intr - notify irdma on incoming interrupts regarding PE + * @sc: the ice driver softc + * @oicr: interrupt cause + * + * Pass the information about received interrupt to RDMA driver if it was + * relating to PE. Specifically PE_CRITERR and HMC_ERR. + * The irdma driver shall decide what should be done upon these interrupts. + */ +void +ice_rdma_notify_pe_intr(struct ice_softc *sc, uint32_t oicr) +{ + struct ice_rdma_peer *peer = &sc->rdma_entry.peer; + struct ice_rdma_event event; + + memset(&event, 0, sizeof(struct ice_rdma_event)); + event.type = ICE_RDMA_EVENT_CRIT_ERR; + event.oicr_reg = oicr; + + sx_xlock(&ice_rdma.mtx); + if (sc->rdma_entry.attached && ice_rdma.registered) + IRDMA_EVENT_HANDLER(peer, &event); + sx_xunlock(&ice_rdma.mtx); +} + +/** + * ice_rdma_notify_reset - notify irdma on incoming pf-reset + * @sc: the ice driver softc + * + * Inform irdma driver of an incoming PF reset. + * The irdma driver shall set its state to reset, and avoid using CQP + * anymore. Next step should be to call ice_rdma_pf_stop in order to + * remove resources. + */ +void +ice_rdma_notify_reset(struct ice_softc *sc) +{ + struct ice_rdma_peer *peer = &sc->rdma_entry.peer; + struct ice_rdma_event event; + + memset(&event, 0, sizeof(struct ice_rdma_event)); + event.type = ICE_RDMA_EVENT_RESET; + + sx_xlock(&ice_rdma.mtx); + if (sc->rdma_entry.attached && ice_rdma.registered) + IRDMA_EVENT_HANDLER(peer, &event); + sx_xunlock(&ice_rdma.mtx); +} diff --git a/sys/dev/ice/ice_rdma.h b/sys/dev/ice/ice_rdma.h index f83c30b33f6c..38e2ef491e8e 100644 --- a/sys/dev/ice/ice_rdma.h +++ b/sys/dev/ice/ice_rdma.h @@ -64,7 +64,7 @@ * considered stable. */ #define ICE_RDMA_MAJOR_VERSION 1 -#define ICE_RDMA_MINOR_VERSION 0 +#define ICE_RDMA_MINOR_VERSION 1 #define ICE_RDMA_PATCH_VERSION 0 /** @@ -273,18 +273,19 @@ struct ice_rdma_event { uint64_t baudrate; }; /* MTU change event */ - struct { - int mtu; - }; + int mtu; /* * TC/QoS/DCB change event - * RESET event use prep variable only * prep: if true, this is a pre-event, post-event otherwise */ struct { struct ice_qos_params port_qos; bool prep; }; + /* + * CRIT_ERR event + */ + uint32_t oicr_reg; }; }; diff --git a/sys/dev/ice/ice_rdma_internal.h b/sys/dev/ice/ice_rdma_internal.h index c80d4540194a..b36544609f45 100644 --- a/sys/dev/ice/ice_rdma_internal.h +++ b/sys/dev/ice/ice_rdma_internal.h @@ -98,4 +98,6 @@ int ice_rdma_pf_stop(struct ice_softc *sc); void ice_rdma_link_change(struct ice_softc *sc, int linkstate, uint64_t baudrate); void ice_rdma_notify_dcb_qos_change(struct ice_softc *sc); void ice_rdma_dcb_qos_update(struct ice_softc *sc, struct ice_port_info *pi); +void ice_rdma_notify_pe_intr(struct ice_softc *sc, uint32_t oicr); +void ice_rdma_notify_reset(struct ice_softc *sc); #endif diff --git a/sys/dev/ice/if_ice_iflib.c b/sys/dev/ice/if_ice_iflib.c index cb4931c4d54e..2397fce11596 100644 --- a/sys/dev/ice/if_ice_iflib.c +++ b/sys/dev/ice/if_ice_iflib.c @@ -1278,9 +1278,11 @@ ice_msix_admin(void *arg) ice_set_state(&sc->state, ICE_STATE_RESET_PFR_REQ); } - if (oicr & PFINT_OICR_PE_CRITERR_M) { - device_printf(dev, "Critical Protocol Engine Error detected!\n"); - ice_set_state(&sc->state, ICE_STATE_RESET_PFR_REQ); + if (oicr & (PFINT_OICR_PE_CRITERR_M | PFINT_OICR_HMC_ERR_M)) { + if (oicr & PFINT_OICR_HMC_ERR_M) + /* Log the HMC errors */ + ice_log_hmc_error(hw, dev); + ice_rdma_notify_pe_intr(sc, oicr); } if (oicr & PFINT_OICR_PCI_EXCEPTION_M) { @@ -1288,11 +1290,6 @@ ice_msix_admin(void *arg) ice_set_state(&sc->state, ICE_STATE_RESET_PFR_REQ); } - if (oicr & PFINT_OICR_HMC_ERR_M) { - /* Log the HMC errors, but don't disable the interrupt cause */ - ice_log_hmc_error(hw, dev); - } - return (FILTER_SCHEDULE_THREAD); } @@ -2298,6 +2295,8 @@ ice_prepare_for_reset(struct ice_softc *sc) if (ice_test_state(&sc->state, ICE_STATE_RECOVERY_MODE)) return; + /* inform the RDMA client */ + ice_rdma_notify_reset(sc); /* stop the RDMA client */ ice_rdma_pf_stop(sc); diff --git a/sys/dev/irdma/fbsd_kcompat.c b/sys/dev/irdma/fbsd_kcompat.c index 325429cdd993..013f9279952e 100644 --- a/sys/dev/irdma/fbsd_kcompat.c +++ b/sys/dev/irdma/fbsd_kcompat.c @@ -1,7 +1,7 @@ /*- * SPDX-License-Identifier: GPL-2.0 or Linux-OpenIB * - * Copyright (c) 2021 - 2022 Intel Corporation + * Copyright (c) 2021 - 2023 Intel Corporation * * This software is available to you under a choice of one of two * licenses. You may choose to be licensed under the terms of the GNU @@ -273,12 +273,15 @@ irdma_add_ip(struct irdma_device *iwdev) { struct ifnet *ifp = iwdev->netdev; struct ifnet *ifv; + struct epoch_tracker et; int i; irdma_add_ipv4_addr(iwdev, ifp); irdma_add_ipv6_addr(iwdev, ifp); for (i = 0; if_getvlantrunk(ifp) != NULL && i < VLAN_N_VID; ++i) { + NET_EPOCH_ENTER(et); ifv = VLAN_DEVAT(ifp, i); + NET_EPOCH_EXIT(et); if (!ifv) continue; irdma_add_ipv4_addr(iwdev, ifv); @@ -361,7 +364,8 @@ irdma_get_route_ifp(struct sockaddr *dst_sin, struct ifnet *netdev, struct nhop_object *nh; if (dst_sin->sa_family == AF_INET6) - nh = fib6_lookup(RT_DEFAULT_FIB, &((struct sockaddr_in6 *)dst_sin)->sin6_addr, 0, NHR_NONE, 0); + nh = fib6_lookup(RT_DEFAULT_FIB, &((struct sockaddr_in6 *)dst_sin)->sin6_addr, + ((struct sockaddr_in6 *)dst_sin)->sin6_scope_id, NHR_NONE, 0); else nh = fib4_lookup(RT_DEFAULT_FIB, ((struct sockaddr_in *)dst_sin)->sin_addr, 0, NHR_NONE, 0); if (!nh || (nh->nh_ifp != netdev && @@ -591,6 +595,188 @@ irdma_sysctl_dcqcn_update(SYSCTL_HANDLER_ARGS) return 0; } +enum irdma_cqp_stats_info { + IRDMA_CQP_REQ_CMDS = 28, + IRDMA_CQP_CMPL_CMDS = 29 +}; + +static int +irdma_sysctl_cqp_stats(SYSCTL_HANDLER_ARGS) +{ + struct irdma_sc_cqp *cqp = (struct irdma_sc_cqp *)arg1; + char rslt[192] = "no cqp available yet"; + int rslt_size = sizeof(rslt) - 1; + int option = (int)arg2; + + if (!cqp) { + return sysctl_handle_string(oidp, rslt, sizeof(rslt), req); + } + + snprintf(rslt, sizeof(rslt), ""); + switch (option) { + case IRDMA_CQP_REQ_CMDS: + snprintf(rslt, rslt_size, "%lu", cqp->requested_ops); + break; + case IRDMA_CQP_CMPL_CMDS: + snprintf(rslt, rslt_size, "%lu", atomic64_read(&cqp->completed_ops)); + break; + } + + return sysctl_handle_string(oidp, rslt, sizeof(rslt), req); +} + +struct irdma_sw_stats_tunable_info { + u8 op_type; + const char name[32]; + const char desc[32]; + uintptr_t value; +}; + +static const struct irdma_sw_stats_tunable_info irdma_sws_list[] = { + {IRDMA_OP_CEQ_DESTROY, "ceq_destroy", "ceq_destroy", 0}, + {IRDMA_OP_AEQ_DESTROY, "aeq_destroy", "aeq_destroy", 0}, + {IRDMA_OP_DELETE_ARP_CACHE_ENTRY, "delete_arp_cache_entry", + "delete_arp_cache_entry", 0}, + {IRDMA_OP_MANAGE_APBVT_ENTRY, "manage_apbvt_entry", + "manage_apbvt_entry", 0}, + {IRDMA_OP_CEQ_CREATE, "ceq_create", "ceq_create", 0}, + {IRDMA_OP_AEQ_CREATE, "aeq_create", "aeq_create", 0}, + {IRDMA_OP_MANAGE_QHASH_TABLE_ENTRY, "manage_qhash_table_entry", + "manage_qhash_table_entry", 0}, + {IRDMA_OP_QP_MODIFY, "qp_modify", "qp_modify", 0}, + {IRDMA_OP_QP_UPLOAD_CONTEXT, "qp_upload_context", "qp_upload_context", + 0}, + {IRDMA_OP_CQ_CREATE, "cq_create", "cq_create", 0}, + {IRDMA_OP_CQ_DESTROY, "cq_destroy", "cq_destroy", 0}, + {IRDMA_OP_QP_CREATE, "qp_create", "qp_create", 0}, + {IRDMA_OP_QP_DESTROY, "qp_destroy", "qp_destroy", 0}, + {IRDMA_OP_ALLOC_STAG, "alloc_stag", "alloc_stag", 0}, + {IRDMA_OP_MR_REG_NON_SHARED, "mr_reg_non_shared", "mr_reg_non_shared", + 0}, + {IRDMA_OP_DEALLOC_STAG, "dealloc_stag", "dealloc_stag", 0}, + {IRDMA_OP_MW_ALLOC, "mw_alloc", "mw_alloc", 0}, + {IRDMA_OP_QP_FLUSH_WQES, "qp_flush_wqes", "qp_flush_wqes", 0}, + {IRDMA_OP_ADD_ARP_CACHE_ENTRY, "add_arp_cache_entry", + "add_arp_cache_entry", 0}, + {IRDMA_OP_MANAGE_PUSH_PAGE, "manage_push_page", "manage_push_page", 0}, + {IRDMA_OP_UPDATE_PE_SDS, "update_pe_sds", "update_pe_sds", 0}, + {IRDMA_OP_MANAGE_HMC_PM_FUNC_TABLE, "manage_hmc_pm_func_table", + "manage_hmc_pm_func_table", 0}, + {IRDMA_OP_SUSPEND, "suspend", "suspend", 0}, + {IRDMA_OP_RESUME, "resume", "resume", 0}, + {IRDMA_OP_MANAGE_VCHNL_REQ_PBLE_BP, "manage_vchnl_req_pble_bp", + "manage_vchnl_req_pble_bp", 0}, + {IRDMA_OP_QUERY_FPM_VAL, "query_fpm_val", "query_fpm_val", 0}, + {IRDMA_OP_COMMIT_FPM_VAL, "commit_fpm_val", "commit_fpm_val", 0}, + {IRDMA_OP_AH_CREATE, "ah_create", "ah_create", 0}, + {IRDMA_OP_AH_MODIFY, "ah_modify", "ah_modify", 0}, + {IRDMA_OP_AH_DESTROY, "ah_destroy", "ah_destroy", 0}, + {IRDMA_OP_MC_CREATE, "mc_create", "mc_create", 0}, + {IRDMA_OP_MC_DESTROY, "mc_destroy", "mc_destroy", 0}, + {IRDMA_OP_MC_MODIFY, "mc_modify", "mc_modify", 0}, + {IRDMA_OP_STATS_ALLOCATE, "stats_allocate", "stats_allocate", 0}, + {IRDMA_OP_STATS_FREE, "stats_free", "stats_free", 0}, + {IRDMA_OP_STATS_GATHER, "stats_gather", "stats_gather", 0}, + {IRDMA_OP_WS_ADD_NODE, "ws_add_node", "ws_add_node", 0}, + {IRDMA_OP_WS_MODIFY_NODE, "ws_modify_node", "ws_modify_node", 0}, + {IRDMA_OP_WS_DELETE_NODE, "ws_delete_node", "ws_delete_node", 0}, + {IRDMA_OP_WS_FAILOVER_START, "ws_failover_start", "ws_failover_start", + 0}, + {IRDMA_OP_WS_FAILOVER_COMPLETE, "ws_failover_complete", + "ws_failover_complete", 0}, + {IRDMA_OP_SET_UP_MAP, "set_up_map", "set_up_map", 0}, + {IRDMA_OP_GEN_AE, "gen_ae", "gen_ae", 0}, + {IRDMA_OP_QUERY_RDMA_FEATURES, "query_rdma_features", + "query_rdma_features", 0}, + {IRDMA_OP_ALLOC_LOCAL_MAC_ENTRY, "alloc_local_mac_entry", + "alloc_local_mac_entry", 0}, + {IRDMA_OP_ADD_LOCAL_MAC_ENTRY, "add_local_mac_entry", + "add_local_mac_entry", 0}, + {IRDMA_OP_DELETE_LOCAL_MAC_ENTRY, "delete_local_mac_entry", + "delete_local_mac_entry", 0}, + {IRDMA_OP_CQ_MODIFY, "cq_modify", "cq_modify", 0} +}; + +static const struct irdma_sw_stats_tunable_info irdma_cmcs_list[] = { + {0, "cm_nodes_created", "cm_nodes_created", + offsetof(struct irdma_cm_core, stats_nodes_created)}, + {0, "cm_nodes_destroyed", "cm_nodes_destroyed", + offsetof(struct irdma_cm_core, stats_nodes_destroyed)}, + {0, "cm_listen_created", "cm_listen_created", + offsetof(struct irdma_cm_core, stats_listen_created)}, + {0, "cm_listen_destroyed", "cm_listen_destroyed", + offsetof(struct irdma_cm_core, stats_listen_destroyed)}, + {0, "cm_listen_nodes_created", "cm_listen_nodes_created", + offsetof(struct irdma_cm_core, stats_listen_nodes_created)}, + {0, "cm_listen_nodes_destroyed", "cm_listen_nodes_destroyed", + offsetof(struct irdma_cm_core, stats_listen_nodes_destroyed)}, + {0, "cm_lpbs", "cm_lpbs", offsetof(struct irdma_cm_core, stats_lpbs)}, + {0, "cm_accepts", "cm_accepts", offsetof(struct irdma_cm_core, + stats_accepts)}, + {0, "cm_rejects", "cm_rejects", offsetof(struct irdma_cm_core, + stats_rejects)}, *** 4485 LINES SKIPPED *** From nobody Fri Aug 18 18:56:56 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RSB1j0Pqhz4qwv0; Fri, 18 Aug 2023 18:56: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RSB1h71Vbz4HT6; Fri, 18 Aug 2023 18:56:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692385017; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=llAPWbToreaFdCBGxHMQlemU+UvGqcikliSNNO3WgW4=; b=mcu9CHdsX68XWNJ4xkTFZgw24Ns2cWs/vwFWUuJxPM/RjeYXjO0IkbM16zJ+RE8a0dvRwy Hp92vReLGJhu14F+r6eelQaIzHXI3ee/QgkoPzYoFTfLNABgf/FsSE9OTDmyQ7AR9hk5Nz BrhcI9tfYGL+cx2w4sZdmacc3Vy/T9DYiC3zKFdrd9U6p78I4i+MotVUcjNz324Eps1xw7 dmTiTqOUKjW8QwXPYu7aE56sJKW0XJip6h8fPQaoUukNkJH70CN+rmAaEb+yx8ZAK/2lW2 B6E0D35XGAgQ0a+W2TW+DA3U9fVMJ3hjfho3ZeWcOBInvIjl04OfdrLsbA73wQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692385017; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=llAPWbToreaFdCBGxHMQlemU+UvGqcikliSNNO3WgW4=; b=coUY6gZ7sW2pzJPBKwNNFQlJecrGOKOpWLwLRmR8eu/DSys9ppMN5AzudLVVO+ZqN/n7gE PPBnlWFDjnqyJ5P2G10glhv7Y3QUPucLCzVdMpjtPHIvyB0MXNOWcHprZJW0IHDvGXiiPc 4ROwDBwFjaKdCQdlt3374y/xe0IkFOiZ6atzAJsZlWm0ZSLhwlCrh6sbJDlhZNL7JvIgQu O0SUkAt2WV+GtZrpbZEFGDCDkU/Pexw4CzIFxYriSg5JqwbQ2FQ8D/WOLwB0e4/qQGioS6 KdmzLRFzd/zbPCr7A2wyM80KSovPIgNZIlfdDsqofSThddhISaUAzvXt8wFJcA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692385017; a=rsa-sha256; cv=none; b=Zg+RHVWXcGR/0cJINuA3dC23p4oe6F86a/hEmp8Fv4Lj9whc1yPDGqyFAOAJvUIVwhA+xm UvStY53a1uGwTO1H4s1lb/ryNW4k8LtnzYp5Lgz8h0QLQ+mvx/45JUMdXNg+MsNmLXT7i0 uAcERMoZEnB9plveRJGX2QJzZcC2d9sSufeALY5yLB84ayLjpqexgyvxQOJROaC/I0Op5G lS5l022dgpenI4O2ypWgjfJ2iP5dKzJUCrTGZ9TDiYYDQqo2ENVY5rVy4kDf+KyRRGmBcz DAhqaq1vFQ6AftWP9TWFQ79GdOvLg4Fa5RMQMZ8/NKgTrJicN2Q67thQJG7z9g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RSB1h64FRzCT6; Fri, 18 Aug 2023 18:56:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37IIuu32084179; Fri, 18 Aug 2023 18:56:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37IIuu9E084176; Fri, 18 Aug 2023 18:56:56 GMT (envelope-from git) Date: Fri, 18 Aug 2023 18:56:56 GMT Message-Id: <202308181856.37IIuu9E084176@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: e5e6a865358d - main - libcrypto: add err_all_legacy.c to the build List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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/main X-Git-Reftype: branch X-Git-Commit: e5e6a865358df439021caee7a0c85c086b4a11be Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=e5e6a865358df439021caee7a0c85c086b4a11be commit e5e6a865358df439021caee7a0c85c086b4a11be Author: Ed Maste AuthorDate: 2023-08-18 18:28:42 +0000 Commit: Ed Maste CommitDate: 2023-08-18 18:56:22 +0000 libcrypto: add err_all_legacy.c to the build It provides the ERR_load_*_strings routines, which are deprecated as of 3.0 but are used by various ports. PR: 272580 Reviewed by: kbowling Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D41505 --- secure/lib/libcrypto/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/secure/lib/libcrypto/Makefile b/secure/lib/libcrypto/Makefile index f7ea9cb6a93a..006577737d7b 100644 --- a/secure/lib/libcrypto/Makefile +++ b/secure/lib/libcrypto/Makefile @@ -243,7 +243,7 @@ SRCS+= eng_rdrand.c eng_table.c tb_asnmth.c tb_cipher.c tb_dh.c tb_digest.c SRCS+= tb_dsa.c tb_eckey.c tb_pkmeth.c tb_rand.c tb_rsa.c # err -SRCS+= err.c err_all.c err_blocks.c err_prn.c +SRCS+= err.c err_all.c err_all_legacy.c err_blocks.c err_prn.c # ess SRCS+= ess_asn1.c ess_err.c ess_lib.c From nobody Fri Aug 18 19:33:24 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RSBqm2lqMz4r0TL; Fri, 18 Aug 2023 19:33:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RSBqm2JKkz4L2d; Fri, 18 Aug 2023 19:33:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692387204; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6UaIsHIeQLprCAp2+d6PdTlc8fwUubpHlWhi0Ng2tAU=; b=MuTQzkP6JhlGqc169VxCQz4JQUgejSRBb8g+Wi+yAkD+TnXgK8OeZ3/PVefk0S6biMA7hH lgLXtjGrlX1G2+jN+r2rKFKvMhAPD2l70jbtCggRv5IeU4l4vlOr9zuGQsY2ZN26ZerAAw TUhMcvW7qoQZlqdDJs3bNJK4QMtig7VJ8OvUfxhQI/TlJS6rH1Ufi9k0HDWsVPl7xTh+6n iWibTAUeC0GCxDl1Km7YqYuqVu/Cmhiyu9NLPcG3S1D+KrfnowvXaYalqyQ5RKBTPAyN4I qwkX9GP/Tn1/n5gwbXGcEcDwprdE4uVHj1irtC9Ji+k1QcN8ZfP2BUxw9QBWFA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692387204; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6UaIsHIeQLprCAp2+d6PdTlc8fwUubpHlWhi0Ng2tAU=; b=lBlwdQnzRR5W2uK4VMrmF2bWNq905WnV8AzDSdTylcH0mNyEjSPwbU0ccke4UK8BIMU+nM iJy1acRZeGBP3YHMoZVxUJlUCMYaHabLePgewKZWnemAhWo2ZilvzpMV9faIohxX2ljPcg qpwIZdf5alKejFnXv6NCbOpFPdRNUY7HykU4Z9rzM6i9qxPvUr+Nh/SxhDfonCTArhg4jv 9nBJ8BBm4EwgMgSUE5OshzQSEmOuANxl+qIuVnRXvAqCn8QQC7g/PlzR6AgcGMlUGa32p8 Ra3qLq6Ge0rqY3jk2Nj5XK37g9mKslNnsYC5b5jdqc5fnuWlbmsgReWTulg2YQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692387204; a=rsa-sha256; cv=none; b=icLsS2kFgB4jmuhAggFp16ZzQ41/oKhdGiEf/zFvEZADhXlg+4+CZbgV+RXfSv1IpH/10A Bvj4y+/n3X9+3K8rzM3bSlmKHmrqzA3LPDSWArOF0QWhQPQLH/9Owb/NYYXdKN+6mcJdHG cUQzp+D/bBNfmAWwbMsoPDxRwKKGVrZvwP+CVIzWdxH1/apzqghbzvE31f80P0Zl/IUZOI FMDeVEYTYezct7nmMoifjHi4OTRAWjTT9Gw1Vt/0OSIaB3M3Zj4xjUBI6iE1L2uW8vWce/ dbcONgCYuqTZ8Mtsd+kNNY4he+53f9kGccBpv4sN+tGKWacELOMMsI1EOWuJlA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RSBqm1LTjzD9r; Fri, 18 Aug 2023 19:33:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37IJXOlc050372; Fri, 18 Aug 2023 19:33:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37IJXOQg050369; Fri, 18 Aug 2023 19:33:24 GMT (envelope-from git) Date: Fri, 18 Aug 2023 19:33:24 GMT Message-Id: <202308181933.37IJXOQg050369@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Enji Cooper Subject: git: 0c785f06020f - main - Fix GoogleTest 1.14.0 import List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ngie X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0c785f06020f3b02e34c97eb27fecd3af8eb2a7b Auto-Submitted: auto-generated The branch main has been updated by ngie: URL: https://cgit.FreeBSD.org/src/commit/?id=0c785f06020f3b02e34c97eb27fecd3af8eb2a7b commit 0c785f06020f3b02e34c97eb27fecd3af8eb2a7b Author: Enji Cooper AuthorDate: 2023-08-18 11:28:13 +0000 Commit: Enji Cooper CommitDate: 2023-08-19 02:33:58 +0000 Fix GoogleTest 1.14.0 import - Prune headers and tests no longer installed after the upgrade. - Remove GoogleTest-related files when MK_GOOGLETEST == no. - Disable `-Werror` with gcc to unbreak the gcc12 CI run with `lib/googletest`. Any issues found by g++ will be filed upstream and hopefully resolved in a future version. - Remove clang -Werror issues which are resolved in version 1.14.0 to avoid masking valid issues. MFC after: 1 week MFC with: 28f6c2f292806bf31230a959bc4b19d7081669a7 --- ObsoleteFiles.inc | 16 ++++ lib/googletest/tests/gmock_main/Makefile | 1 + lib/googletest/tests/gtest/Makefile | 1 + lib/googletest/tests/gtest_main/Makefile | 1 + share/mk/googletest.test.inc.mk | 11 --- tools/build/mk/OptionalObsoleteFiles.inc | 157 +++++++++++++++---------------- 6 files changed, 94 insertions(+), 93 deletions(-) diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc index d930b2e52b34..655a81cd900f 100644 --- a/ObsoleteFiles.inc +++ b/ObsoleteFiles.inc @@ -51,6 +51,22 @@ # xargs -n1 | sort | uniq -d; # done +# 20230807: GoogleTest 1.14.0 upgrade. +OLD_FILES+=usr/include/private/gmock/gmock-generated-actions.h +OLD_FILES+=usr/include/private/gmock/gmock-generated-function-mockers.h +OLD_FILES+=usr/include/private/gmock/gmock-generated-matchers.h +OLD_FILES+=usr/include/private/gmock/gmock-generated-nice-strict.h +OLD_FILES+=usr/include/private/gmock/internal/gmock-generated-internal-utils.h +OLD_FILES+=usr/include/private/gtest/internal/gtest-linked_ptr.h +OLD_FILES+=usr/include/private/gtest/internal/gtest-param-util-generated.h +OLD_FILES+=usr/include/private/gtest/internal/gtest-tuple.h +OLD_FILES+=usr/tests/lib/googletest/gmock_main/gmock-generated-actions_test +OLD_FILES+=usr/tests/lib/googletest/gmock_main/gmock-generated-function-mockers_test +OLD_FILES+=usr/tests/lib/googletest/gmock_main/gmock-generated-internal-utils_test +OLD_FILES+=usr/tests/lib/googletest/gmock_main/gmock-generated-matchers_test +OLD_FILES+=usr/tests/lib/googletest/gmock_main/gmock-matchers_test +OLD_FILES+=usr/tests/lib/googletest/gtest_main/googletest-linked-ptr-test + # 20230807: Removal of the ath(4) AHB bus-frontend for MIPS OLD_FILES+=usr/share/man/man4/ath_ahb.4 OLD_FILES+=usr/share/man/man4/ath_pci.4 diff --git a/lib/googletest/tests/gmock_main/Makefile b/lib/googletest/tests/gmock_main/Makefile index 737c64b653a4..7523b585ac2c 100644 --- a/lib/googletest/tests/gmock_main/Makefile +++ b/lib/googletest/tests/gmock_main/Makefile @@ -34,5 +34,6 @@ CXXFLAGS.clang+= -Wno-error=inconsistent-missing-override CXXFLAGS.clang+= -Wno-error=missing-variable-declarations CXXFLAGS.clang+= -Wno-error=sign-compare CXXFLAGS.clang+= -Wno-error=unused-parameter +MK_WERROR.gcc= no .include diff --git a/lib/googletest/tests/gtest/Makefile b/lib/googletest/tests/gtest/Makefile index e95101738322..0000167dfe70 100644 --- a/lib/googletest/tests/gtest/Makefile +++ b/lib/googletest/tests/gtest/Makefile @@ -36,6 +36,7 @@ SRCS.googletest-param-test-test= \ LIBADD+= gtest CXXFLAGS.clang+= -Wno-error=missing-variable-declarations +MK_WERROR.gcc= no # XXX: explicitly listing -lpthread is incorrect. src.libnames.mk should be # handling this. diff --git a/lib/googletest/tests/gtest_main/Makefile b/lib/googletest/tests/gtest_main/Makefile index 49831d7513af..3124042f8b95 100644 --- a/lib/googletest/tests/gtest_main/Makefile +++ b/lib/googletest/tests/gtest_main/Makefile @@ -38,5 +38,6 @@ LIBADD.gtest_unittest+= pthread CXXFLAGS.clang+= -Wno-error=missing-variable-declarations CXXFLAGS.clang+= -Wno-error=unused-but-set-variable +MK_WERROR.gcc= no .include diff --git a/share/mk/googletest.test.inc.mk b/share/mk/googletest.test.inc.mk index 2034e12eaf30..05415775448b 100644 --- a/share/mk/googletest.test.inc.mk +++ b/share/mk/googletest.test.inc.mk @@ -1,4 +1,3 @@ - GTESTS_CXXFLAGS+= -DGTEST_HAS_POSIX_RE=1 GTESTS_CXXFLAGS+= -DGTEST_HAS_PTHREAD=1 GTESTS_CXXFLAGS+= -DGTEST_HAS_STREAM_REDIRECTION=1 @@ -6,16 +5,6 @@ GTESTS_CXXFLAGS+= -frtti .include -.if ${COMPILER_TYPE} == "clang" && ${COMPILER_VERSION} >= 100000 -# Required until googletest is upgraded to a more recent version (after -# upstream commit efecb0bfa687cf87836494f5d62868485c00fb66). -GTESTS_CXXFLAGS+= -Wno-deprecated-copy - -# Required until googletest is upgraded to a more recent version (after -# upstream commit d44b137fd104dfffdcdea103f7de11b9eccc45c2). -GTESTS_CXXFLAGS+= -Wno-signed-unsigned-wchar -.endif - # XXX: src.libnames.mk should handle adding this directory for libgtest's, # libgmock's, etc, headers. CXXFLAGS+= -I${DESTDIR}${INCLUDEDIR}/private diff --git a/tools/build/mk/OptionalObsoleteFiles.inc b/tools/build/mk/OptionalObsoleteFiles.inc index d358af7bf588..470f18346dc5 100644 --- a/tools/build/mk/OptionalObsoleteFiles.inc +++ b/tools/build/mk/OptionalObsoleteFiles.inc @@ -2125,103 +2125,91 @@ OLD_DIRS+=usr/tests/usr.bin/dc .endif .if ${MK_GOOGLETEST} == no -OLD_FILES+=usr/include/gmock/gmock-actions.h -OLD_FILES+=usr/include/gmock/gmock-cardinalities.h -OLD_FILES+=usr/include/gmock/gmock-generated-actions.h -OLD_FILES+=usr/include/gmock/gmock-generated-function-mockers.h -OLD_FILES+=usr/include/gmock/gmock-generated-matchers.h -OLD_FILES+=usr/include/gmock/gmock-generated-nice-strict.h -OLD_FILES+=usr/include/gmock/gmock-matchers.h -OLD_FILES+=usr/include/gmock/gmock-more-actions.h -OLD_FILES+=usr/include/gmock/gmock-more-matchers.h -OLD_FILES+=usr/include/gmock/gmock-spec-builders.h -OLD_FILES+=usr/include/gmock/gmock.h -OLD_FILES+=usr/include/gmock/internal/custom/gmock-generated-actions.h -OLD_FILES+=usr/include/gmock/internal/custom/gmock-matchers.h -OLD_FILES+=usr/include/gmock/internal/custom/gmock-port.h -OLD_FILES+=usr/include/gmock/internal/gmock-generated-internal-utils.h -OLD_FILES+=usr/include/gmock/internal/gmock-internal-utils.h -OLD_FILES+=usr/include/gmock/internal/gmock-port.h -OLD_DIRS+=usr/include/gmock -OLD_FILES+=usr/include/gtest/gtest_pred_impl.h -OLD_FILES+=usr/include/gtest/gtest_prod.h -OLD_FILES+=usr/include/gtest/gtest-death-test.h -OLD_FILES+=usr/include/gtest/gtest-message.h -OLD_FILES+=usr/include/gtest/gtest-param-test.h -OLD_FILES+=usr/include/gtest/gtest-printers.h -OLD_FILES+=usr/include/gtest/gtest-spi.h -OLD_FILES+=usr/include/gtest/gtest-test-part.h -OLD_FILES+=usr/include/gtest/gtest-typed-test.h -OLD_FILES+=usr/include/gtest/gtest.h -OLD_FILES+=usr/include/gtest/internal/custom/gtest-port.h -OLD_FILES+=usr/include/gtest/internal/custom/gtest-printers.h -OLD_FILES+=usr/include/gtest/internal/custom/gtest.h -OLD_FILES+=usr/include/gtest/internal/gtest-death-test-internal.h -OLD_FILES+=usr/include/gtest/internal/gtest-filepath.h -OLD_FILES+=usr/include/gtest/internal/gtest-internal.h -OLD_FILES+=usr/include/gtest/internal/gtest-linked_ptr.h -OLD_FILES+=usr/include/gtest/internal/gtest-param-util-generated.h -OLD_FILES+=usr/include/gtest/internal/gtest-param-util.h -OLD_FILES+=usr/include/gtest/internal/gtest-port-arch.h -OLD_FILES+=usr/include/gtest/internal/gtest-port.h -OLD_FILES+=usr/include/gtest/internal/gtest-string.h -OLD_FILES+=usr/include/gtest/internal/gtest-tuple.h -OLD_FILES+=usr/include/gtest/internal/gtest-type-util.h -OLD_DIRS+=usr/include/gtest -OLD_FILES+=usr/lib/libprivategmock_main.a -OLD_FILES+=usr/lib/libprivategmock_main.so -OLD_LIBS+=usr/lib/libprivategmock_main.so.0 -OLD_FILES+=usr/lib/libprivategmock_main_p.a +OLD_FILES+=usr/include/private/gmock/gmock-actions.h +OLD_FILES+=usr/include/private/gmock/gmock-cardinalities.h +OLD_FILES+=usr/include/private/gmock/gmock-function-mocker.h +OLD_FILES+=usr/include/private/gmock/gmock-matchers.h +OLD_FILES+=usr/include/private/gmock/gmock-more-actions.h +OLD_FILES+=usr/include/private/gmock/gmock-more-matchers.h +OLD_FILES+=usr/include/private/gmock/gmock-nice-strict.h +OLD_FILES+=usr/include/private/gmock/gmock-spec-builders.h +OLD_FILES+=usr/include/private/gmock/gmock.h +OLD_FILES+=usr/include/private/gmock/internal/custom/gmock-generated-actions.h +OLD_FILES+=usr/include/private/gmock/internal/custom/gmock-matchers.h +OLD_FILES+=usr/include/private/gmock/internal/custom/gmock-port.h +OLD_FILES+=usr/include/private/gmock/internal/gmock-internal-utils.h +OLD_FILES+=usr/include/private/gmock/internal/gmock-port.h +OLD_FILES+=usr/include/private/gmock/internal/gmock-pp.h +OLD_FILES+=usr/include/private/gtest/gtest-assertion-result.h +OLD_FILES+=usr/include/private/gtest/gtest-death-test.h +OLD_FILES+=usr/include/private/gtest/gtest-matchers.h +OLD_FILES+=usr/include/private/gtest/gtest-message.h +OLD_FILES+=usr/include/private/gtest/gtest-param-test.h +OLD_FILES+=usr/include/private/gtest/gtest-printers.h +OLD_FILES+=usr/include/private/gtest/gtest-spi.h +OLD_FILES+=usr/include/private/gtest/gtest-test-part.h +OLD_FILES+=usr/include/private/gtest/gtest-typed-test.h +OLD_FILES+=usr/include/private/gtest/gtest.h +OLD_FILES+=usr/include/private/gtest/gtest_pred_impl.h +OLD_FILES+=usr/include/private/gtest/gtest_prod.h +OLD_FILES+=usr/include/private/gtest/internal/custom/gtest-port.h +OLD_FILES+=usr/include/private/gtest/internal/custom/gtest-printers.h +OLD_FILES+=usr/include/private/gtest/internal/custom/gtest.h +OLD_FILES+=usr/include/private/gtest/internal/gtest-death-test-internal.h +OLD_FILES+=usr/include/private/gtest/internal/gtest-filepath.h +OLD_FILES+=usr/include/private/gtest/internal/gtest-internal.h +OLD_FILES+=usr/include/private/gtest/internal/gtest-param-util.h +OLD_FILES+=usr/include/private/gtest/internal/gtest-port-arch.h +OLD_FILES+=usr/include/private/gtest/internal/gtest-port.h +OLD_FILES+=usr/include/private/gtest/internal/gtest-string.h +OLD_FILES+=usr/include/private/gtest/internal/gtest-type-util.h OLD_FILES+=usr/lib/libprivategmock.a -OLD_FILES+=usr/lib/libprivategmock.so -OLD_LIBS+=usr/lib/libprivategmock.so.0 OLD_FILES+=usr/lib/libprivategmock_p.a -OLD_FILES+=usr/lib/libprivategtest_main.a -OLD_FILES+=usr/lib/libprivategtest_main.so -OLD_LIBS+=usr/lib/libprivategtest_main.so.0 -OLD_FILES+=usr/lib/libprivategtest_main_p.a +OLD_LIBS+=usr/lib/libprivategmock.so +OLD_LIBS+=usr/lib/libprivategmock.so.0 +OLD_FILES+=usr/lib/libprivategmock_main.a +OLD_FILES+=usr/lib/libprivategmock_main_p.a +OLD_LIBS+=usr/lib/libprivategmock_main.so +OLD_LIBS+=usr/lib/libprivategmock_main.so.0 OLD_FILES+=usr/lib/libprivategtest.a -OLD_FILES+=usr/lib/libprivategtest.so -OLD_LIBS+=usr/lib/libprivategtest.so.0 OLD_FILES+=usr/lib/libprivategtest_p.a -OLD_FILES+=usr/tests/lib/googletest/gmock/gmock_stress_test +OLD_LIBS+=usr/lib/libprivategtest.so +OLD_LIBS+=usr/lib/libprivategtest.so.0 +OLD_FILES+=usr/lib/libprivategtest_main.a +OLD_FILES+=usr/lib/libprivategtest_main_p.a +OLD_LIBS+=usr/lib/libprivategtest_main.so +OLD_LIBS+=usr/lib/libprivategtest_main.so.0 +OLD_FILES+=usr/tests/lib/googletest/Kyuafile OLD_FILES+=usr/tests/lib/googletest/gmock/Kyuafile -OLD_DIRS+=usr/tests/lib/googletest/gmock -OLD_FILES+=usr/tests/lib/googletest/gmock_main/gmock_ex_test -OLD_FILES+=usr/tests/lib/googletest/gmock_main/gmock_link_test -OLD_FILES+=usr/tests/lib/googletest/gmock_main/gmock_test +OLD_FILES+=usr/tests/lib/googletest/gmock/gmock_stress_test +OLD_FILES+=usr/tests/lib/googletest/gmock_main/Kyuafile OLD_FILES+=usr/tests/lib/googletest/gmock_main/gmock-actions_test OLD_FILES+=usr/tests/lib/googletest/gmock_main/gmock-cardinalities_test -OLD_FILES+=usr/tests/lib/googletest/gmock_main/gmock-ex_test -OLD_FILES+=usr/tests/lib/googletest/gmock_main/gmock-generated-actions_test -OLD_FILES+=usr/tests/lib/googletest/gmock_main/gmock-generated-function-mockers_test -OLD_FILES+=usr/tests/lib/googletest/gmock_main/gmock-generated-internal-utils_test -OLD_FILES+=usr/tests/lib/googletest/gmock_main/gmock-generated-matchers_test +OLD_FILES+=usr/tests/lib/googletest/gmock_main/gmock-function-mocker_test OLD_FILES+=usr/tests/lib/googletest/gmock_main/gmock-internal-utils_test -OLD_FILES+=usr/tests/lib/googletest/gmock_main/gmock-matchers_test +OLD_FILES+=usr/tests/lib/googletest/gmock_main/gmock-matchers-arithmetic_test +OLD_FILES+=usr/tests/lib/googletest/gmock_main/gmock-matchers-comparisons_test +OLD_FILES+=usr/tests/lib/googletest/gmock_main/gmock-matchers-containers_test +OLD_FILES+=usr/tests/lib/googletest/gmock_main/gmock-matchers-misc_test OLD_FILES+=usr/tests/lib/googletest/gmock_main/gmock-more-actions_test OLD_FILES+=usr/tests/lib/googletest/gmock_main/gmock-nice-strict_test OLD_FILES+=usr/tests/lib/googletest/gmock_main/gmock-port_test OLD_FILES+=usr/tests/lib/googletest/gmock_main/gmock-spec-builders_test -OLD_FILES+=usr/tests/lib/googletest/gmock_main/Kyuafile -OLD_DIRS+=usr/tests/lib/googletest/gmock_main +OLD_FILES+=usr/tests/lib/googletest/gmock_main/gmock_ex_test +OLD_FILES+=usr/tests/lib/googletest/gmock_main/gmock_link_test +OLD_FILES+=usr/tests/lib/googletest/gmock_main/gmock_test +OLD_FILES+=usr/tests/lib/googletest/gtest/Kyuafile OLD_FILES+=usr/tests/lib/googletest/gtest/googletest-param-test-test -OLD_FILES+=usr/tests/lib/googletest/gtest/gtest_all_test +OLD_FILES+=usr/tests/lib/googletest/gtest/gtest-unittest-api_test OLD_FILES+=usr/tests/lib/googletest/gtest/gtest_environment_test OLD_FILES+=usr/tests/lib/googletest/gtest/gtest_no_test_unittest OLD_FILES+=usr/tests/lib/googletest/gtest/gtest_premature_exit_test OLD_FILES+=usr/tests/lib/googletest/gtest/gtest_repeat_test OLD_FILES+=usr/tests/lib/googletest/gtest/gtest_stress_test OLD_FILES+=usr/tests/lib/googletest/gtest/gtest_throw_on_failure_ex_test -OLD_FILES+=usr/tests/lib/googletest/gtest/gtest-death-test_ex_catch_test -OLD_FILES+=usr/tests/lib/googletest/gtest/gtest-death-test_ex_nocatch_test -OLD_FILES+=usr/tests/lib/googletest/gtest/gtest-unittest-api_test -OLD_FILES+=usr/tests/lib/googletest/gtest/Kyuafile -OLD_DIRS+=usr/tests/lib/googletest/gtest OLD_FILES+=usr/tests/lib/googletest/gtest_main/Kyuafile OLD_FILES+=usr/tests/lib/googletest/gtest_main/googletest-death-test-test OLD_FILES+=usr/tests/lib/googletest/gtest_main/googletest-filepath-test -OLD_FILES+=usr/tests/lib/googletest/gtest_main/googletest-linked-ptr-test OLD_FILES+=usr/tests/lib/googletest/gtest_main/googletest-listener-test OLD_FILES+=usr/tests/lib/googletest/gtest_main/googletest-message-test OLD_FILES+=usr/tests/lib/googletest/gtest_main/googletest-options-test @@ -2229,7 +2217,6 @@ OLD_FILES+=usr/tests/lib/googletest/gtest_main/googletest-port-test OLD_FILES+=usr/tests/lib/googletest/gtest_main/googletest-printers-test OLD_FILES+=usr/tests/lib/googletest/gtest_main/googletest-test-part-test OLD_FILES+=usr/tests/lib/googletest/gtest_main/gtest-typed-test_test -OLD_FILES+=usr/tests/lib/googletest/gtest_main/gtest_help_test_ OLD_FILES+=usr/tests/lib/googletest/gtest_main/gtest_main_unittest OLD_FILES+=usr/tests/lib/googletest/gtest_main/gtest_pred_impl_unittest OLD_FILES+=usr/tests/lib/googletest/gtest_main/gtest_prod_test @@ -2237,14 +2224,9 @@ OLD_FILES+=usr/tests/lib/googletest/gtest_main/gtest_skip_in_environment_setup_t OLD_FILES+=usr/tests/lib/googletest/gtest_main/gtest_skip_test OLD_FILES+=usr/tests/lib/googletest/gtest_main/gtest_sole_header_test OLD_FILES+=usr/tests/lib/googletest/gtest_main/gtest_unittest -OLD_FILES+=usr/tests/lib/googletest/gtest_main/gtest_xml_outfile1_test_ -OLD_FILES+=usr/tests/lib/googletest/gtest_main/gtest_xml_outfile2_test_ -OLD_DIRS+=usr/tests/lib/googletest/gtest_main -OLD_FILES+=usr/tests/lib/googletest/Kyuafile -OLD_DIRS+=usr/tests/lib/googletest/ OLD_FILES+=usr/tests/share/examples/tests/googletest/Kyuafile -OLD_FILES+=usr/tests/share/examples/tests/googletest/sample1_unittest OLD_FILES+=usr/tests/share/examples/tests/googletest/sample10_unittest +OLD_FILES+=usr/tests/share/examples/tests/googletest/sample1_unittest OLD_FILES+=usr/tests/share/examples/tests/googletest/sample2_unittest OLD_FILES+=usr/tests/share/examples/tests/googletest/sample3_unittest OLD_FILES+=usr/tests/share/examples/tests/googletest/sample4_unittest @@ -2252,6 +2234,17 @@ OLD_FILES+=usr/tests/share/examples/tests/googletest/sample5_unittest OLD_FILES+=usr/tests/share/examples/tests/googletest/sample6_unittest OLD_FILES+=usr/tests/share/examples/tests/googletest/sample7_unittest OLD_FILES+=usr/tests/share/examples/tests/googletest/sample8_unittest +OLD_DIRS+=usr/include/private/gmock/ +OLD_DIRS+=usr/include/private/gmock/internal +OLD_DIRS+=usr/include/private/gmock/internal/custom +OLD_DIRS+=usr/include/private/gtest/ +OLD_DIRS+=usr/include/private/gtest/internal +OLD_DIRS+=usr/include/private/gtest/internal/custom +OLD_DIRS+=usr/tests/lib/googletest +OLD_DIRS+=usr/tests/lib/googletest/gmock +OLD_DIRS+=usr/tests/lib/googletest/gmock_main +OLD_DIRS+=usr/tests/lib/googletest/gtest +OLD_DIRS+=usr/tests/lib/googletest/gtest_main OLD_DIRS+=usr/tests/share/examples/tests/googletest .endif From nobody Fri Aug 18 20:05:27 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RSCXl3ZgSz4r2mm; Fri, 18 Aug 2023 20:05: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RSCXl31jxz4PJS; Fri, 18 Aug 2023 20:05:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692389127; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=GLZl/hJru3ufx5dp5lhg+fxUHj8D0ZX36bscGv0drrg=; b=Cq8WUOgGGkpFetEz1WZPm2yvZeEpZHpGWvZWQE0HuwVx9VfL1FxfB+xCVr4bLhuRlwX/rl wm5i4Bq1l9Gu4t7IZXZXTjSbV2hBuvgG9ijMwjKYZgLf2QwfGwF0pk/6GWgCwCEATTGCOU Q6o+0iZ5DB5j+/oXfvG/JOQEG4Cy4nOjLLPtBBVpmJzDFep5gzA3P7fZVPO58H9bNMn0mA Yx+2NxAsAXZgpJU9nMz66kYeTHdlNAyK0XL4buPs27f4i9oeK+RfuXgcRIn6OK3Bib4S0L nLVt12BJsD2wdoZsNbCQQPnOWPEkkUILyR/blA6LnReyu33KSsjFhz/QKyQX9A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692389127; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=GLZl/hJru3ufx5dp5lhg+fxUHj8D0ZX36bscGv0drrg=; b=JqCQaS+I5Z2+t2EJRSK8CM2buccveyl9oT8TOCtppcxkg5s7E9DDgNZEwvFnEIQsdBi9q5 +r7v2GmWjvCVCAKjpA/E4Urqof8Btb2Ijejg/CLl01u/NCmWnKIFJaIGIQw9Cx3GQve1PM fbi89l/TUdajJUuVXFo9mQ8WoHx75Kt1L/pErbevGHy8jLgGPOgLQeLZcRfGFx6X9S+bPF 241tuNSBCgtNJmqG8tx4S0XdFIGxwrJ2xN0ETgj0i9GONm7qengKLFwCuhbGY0fyOcadMH ebSIBXyO3EDsP+JsL3jktuBpS3SSBlT4MNR9zf6GmTYRZUWJP9Bkrn7nHfYd7g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692389127; a=rsa-sha256; cv=none; b=Za+jI5s1JVneH2pETCAN3cRGmom8LNRttTIz/Pt0Tha6eMB54d3m2v2/ef34IJNQfYJxxK J4pCN6taLTLPi3SnaNO647wDtNV11pOfYTmAM5F1gcWD62+WM0GeuLeoL4KaE0IR2XXGKo Z9hTg+kjWI6OX5ZgVHXLQyaNxzbQce0UuuJdKNd0U1KhdnMSensWM5jYvm+nFdL9BMvs8F RB4OaDWjgfcKUQnsTOd2VWfSiy3ahOgralg47QTvP8+RqnCsocs1OCV/qON8fcuoTBn2tN jBvFNQVbytJyW/YfXm/KrrggpPkAqrLBk7sAwiZRJyQEtg9qewcnPPJ5DQTZvA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RSCXl22SmzDSl; Fri, 18 Aug 2023 20:05:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37IK5RKm001694; Fri, 18 Aug 2023 20:05:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37IK5R3S001691; Fri, 18 Aug 2023 20:05:27 GMT (envelope-from git) Date: Fri, 18 Aug 2023 20:05:27 GMT Message-Id: <202308182005.37IK5R3S001691@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: cbe53bd975b7 - main - pcm: Turn SND_DECLARE_FILE into a no-op. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: cbe53bd975b7fa05eb5165c5d6bbcb7b4b37407f Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=cbe53bd975b7fa05eb5165c5d6bbcb7b4b37407f commit cbe53bd975b7fa05eb5165c5d6bbcb7b4b37407f Author: John Baldwin AuthorDate: 2023-08-18 20:04:33 +0000 Commit: John Baldwin CommitDate: 2023-08-18 20:04:33 +0000 pcm: Turn SND_DECLARE_FILE into a no-op. SND_DECLARE_FILE originally added lines to the output of /dev/sndstat listing the $FreeBSD$ strings for individual files, but only if the value of hw.snd.verbose was raised to 3. With the switch to Git these strings became meaningless as they were now all identical and no longer contained the path (which was implicitly included previously via the keyword expansion). This commit removes all of the infrastructure to support file version strings from /dev/sndstat, but preserves the KPI/KBI by turning the SND_DECLARE_FILE macro into a nop and changing the backing sysinit functions into null functions and is suitable for merging to stable/13. A future commit will remove SND_DECLARE_FILE entirely. Reviewed by: kbowling, emaste MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D41498 --- sys/dev/sound/pcm/sndstat.c | 67 ++++++++++----------------------------------- sys/dev/sound/pcm/sound.h | 15 ++-------- 2 files changed, 17 insertions(+), 65 deletions(-) diff --git a/sys/dev/sound/pcm/sndstat.c b/sys/dev/sound/pcm/sndstat.c index fc92bd783587..6bd3e56687bf 100644 --- a/sys/dev/sound/pcm/sndstat.c +++ b/sys/dev/sound/pcm/sndstat.c @@ -52,7 +52,6 @@ SND_DECLARE_FILE(""); -#define SS_TYPE_MODULE 0 #define SS_TYPE_PCM 1 #define SS_TYPE_MIDI 2 #define SS_TYPE_SEQUENCER 3 @@ -561,8 +560,6 @@ sndstat_create_devs_nvlist(nvlist_t **nvlp) struct snddev_info *d; nvlist_t *di; - if (ent->dev == NULL) - continue; d = device_get_softc(ent->dev); if (!PCM_REGISTERED(d)) continue; @@ -1063,21 +1060,16 @@ sndstat_register(device_t dev, char *str, sndstat_handler handler) const char *devtype; int type, unit; - if (dev) { - unit = device_get_unit(dev); - devtype = device_get_name(dev); - if (!strcmp(devtype, "pcm")) - type = SS_TYPE_PCM; - else if (!strcmp(devtype, "midi")) - type = SS_TYPE_MIDI; - else if (!strcmp(devtype, "sequencer")) - type = SS_TYPE_SEQUENCER; - else - return (EINVAL); - } else { - type = SS_TYPE_MODULE; - unit = -1; - } + unit = device_get_unit(dev); + devtype = device_get_name(dev); + if (!strcmp(devtype, "pcm")) + type = SS_TYPE_PCM; + else if (!strcmp(devtype, "midi")) + type = SS_TYPE_MIDI; + else if (!strcmp(devtype, "sequencer")) + type = SS_TYPE_SEQUENCER; + else + return (EINVAL); ent = malloc(sizeof *ent, M_DEVBUF, M_WAITOK | M_ZERO); ent->dev = dev; @@ -1108,10 +1100,9 @@ sndstat_register(device_t dev, char *str, sndstat_handler handler) return (0); } -int -sndstat_registerfile(char *str) +void +sndstat_registerfile(void *dummy __unused) { - return (sndstat_register(NULL, str, NULL)); } int @@ -1134,24 +1125,9 @@ sndstat_unregister(device_t dev) return (error); } -int -sndstat_unregisterfile(char *str) +void +sndstat_unregisterfile(void *dummy __unused) { - struct sndstat_entry *ent; - int error = ENXIO; - - SNDSTAT_LOCK(); - TAILQ_FOREACH(ent, &sndstat_devlist, link) { - if (ent->dev == NULL && ent->str == str) { - TAILQ_REMOVE(&sndstat_devlist, ent, link); - free(ent, M_DEVBUF); - error = 0; - break; - } - } - SNDSTAT_UNLOCK(); - - return (error); } /************************************************************************/ @@ -1177,8 +1153,6 @@ sndstat_prepare(struct sndstat_file *pf_self) /* generate list of installed devices */ k = 0; TAILQ_FOREACH(ent, &sndstat_devlist, link) { - if (ent->dev == NULL) - continue; d = device_get_softc(ent->dev); if (!PCM_REGISTERED(d)) continue; @@ -1226,19 +1200,6 @@ sndstat_prepare(struct sndstat_file *pf_self) if (k == 0) sbuf_printf(s, "No devices installed from userspace.\n"); - /* append any file versions */ - if (snd_verbose >= 3) { - k = 0; - TAILQ_FOREACH(ent, &sndstat_devlist, link) { - if (ent->dev == NULL && ent->str != NULL) { - if (!k++) - sbuf_printf(s, "\nFile Versions:\n"); - sbuf_printf(s, "%s\n", ent->str); - } - } - if (k == 0) - sbuf_printf(s, "\nNo file versions.\n"); - } sbuf_finish(s); return (sbuf_len(s)); } diff --git a/sys/dev/sound/pcm/sound.h b/sys/dev/sound/pcm/sound.h index 8ab3a05cbbf5..1b9168b9171b 100644 --- a/sys/dev/sound/pcm/sound.h +++ b/sys/dev/sound/pcm/sound.h @@ -347,20 +347,11 @@ void snd_mtxassert(void *m); typedef int (*sndstat_handler)(struct sbuf *s, device_t dev, int verbose); int sndstat_register(device_t dev, char *str, sndstat_handler handler); -int sndstat_registerfile(char *str); +void sndstat_registerfile(void *); int sndstat_unregister(device_t dev); -int sndstat_unregisterfile(char *str); +void sndstat_unregisterfile(void *); -#define SND_DECLARE_FILE(version) \ - _SND_DECLARE_FILE(__LINE__, version) - -#define _SND_DECLARE_FILE(uniq, version) \ - __SND_DECLARE_FILE(uniq, version) - -#define __SND_DECLARE_FILE(uniq, version) \ - static char sndstat_vinfo[] = version; \ - SYSINIT(sdf_ ## uniq, SI_SUB_DRIVERS, SI_ORDER_MIDDLE, sndstat_registerfile, sndstat_vinfo); \ - SYSUNINIT(sdf_ ## uniq, SI_SUB_DRIVERS, SI_ORDER_MIDDLE, sndstat_unregisterfile, sndstat_vinfo); +#define SND_DECLARE_FILE(version) /* usage of flags in device config entry (config file) */ #define DV_F_DRQ_MASK 0x00000007 /* mask for secondary drq */ From nobody Fri Aug 18 20:05:28 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RSCXm4jLkz4r2fL; Fri, 18 Aug 2023 20:05: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RSCXm4N0Hz4PJg; Fri, 18 Aug 2023 20:05:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692389128; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=TxGf9QVZ7RtAA1jEbSdh8Qt8TAPw24YJuhEDqkgn9Ss=; b=Ne/A2zQBfHlyPrifRvW3WK6RgXlylnJX0NIZFiHsgrWtL7GRxtVAe3MIGoEGT2lCy6YEKk 5RG8iGjN4s6BrxCwsnlhV1f515QHeU51gEYTFMqvN6V5jm6FoyGlXDiijf4WNR/t5U2O1I paNG/mlC300qeyZ4f6k1rQZUmFnzGQV8nH4QXVu/6F8z2RN22x/fhoj/GgaD6wrkDcr9i4 vWeR7Auo7nU5ks0H25AVJYE8Nul1SinFtAmWSBVfucgb3Jk9viGmy/uDDGyV+TZbim9EES 1EAYg+GaW+LrDowRawfa5zQzhfPBMpbltK6G2EgUW0F3DwBjuOFROHON+SFw4g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692389128; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=TxGf9QVZ7RtAA1jEbSdh8Qt8TAPw24YJuhEDqkgn9Ss=; b=UyfHughB5Sq/1Jjh4rjN6pxYl5oGM/kRIDp56glIrLDEO0x1qIxnNgDEDgl8VRNx7vIhHA cCgVHiA1rWq2sNv/sNET4bnJnfg/9l46ZZTDF3FkQhrKSMj7D+J34+lkLSgzcEL8W/pBJA RjC6SiRTV1LpWdc3X6dMaDdsqAX/srNM0I+r6ve1aMRGgBcbiWjjC45cqkAS6CsO8RWuJt 8hBeHVKVs+mn3Yyu7a/HkJ6O+8H7jwUWAzUdurHfkB8G6lHZgsWBowc4kseXVfgr4tHLtk voIqIrg0c7Xf4Omore5bAbKkC7PvaOUZBt9FuANenYEITeyd2WGEHfv7uhdOjQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692389128; a=rsa-sha256; cv=none; b=UYLMuJsADmYPBRAJkH5WgQ3hIhPOGTe82kop7elvbuaTR0eEweFfXJgC48nclYl4xiJM4x Q7xwpyc5Mw+npmOd53QKTi+BIG8TtbvzFKrqZgL+iqj9pB4QRR1gVise8m62b6UbdIBdC4 f1G1Yj4h/2S3tSZ8+HzLYgdMXMBc3YxXH7oyfeYeIFVXN9eiRAqZmGV1szch57DFh6Yx7P UUtGobPJubDUh0/UgoEa8YEA4aJlJ4zJ96/aT2ocKyxHJ3u+V8a8dqKBXQFbgI22LR0+vy ta5o1OKTYchuD5Ms1kgOxfOEfUYPmVfiNFif6UOuHNofoaCT2bpao+KqlQ3apA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RSCXm38qSzVCP; Fri, 18 Aug 2023 20:05:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37IK5SBH001731; Fri, 18 Aug 2023 20:05:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37IK5Shs001728; Fri, 18 Aug 2023 20:05:28 GMT (envelope-from git) Date: Fri, 18 Aug 2023 20:05:28 GMT Message-Id: <202308182005.37IK5Shs001728@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: 5aacf339f601 - main - sys: Remove SND_DECLARE_FILE List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5aacf339f60109917f8e18f5645cb66f544b33d2 Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=5aacf339f60109917f8e18f5645cb66f544b33d2 commit 5aacf339f60109917f8e18f5645cb66f544b33d2 Author: John Baldwin AuthorDate: 2023-08-18 20:05:12 +0000 Commit: John Baldwin CommitDate: 2023-08-18 20:05:12 +0000 sys: Remove SND_DECLARE_FILE Reviewed by: kbowling, imp, emaste Differential Revision: https://reviews.freebsd.org/D41499 --- sys/arm/broadcom/bcm2835/bcm2835_audio.c | 2 -- sys/dev/sound/pci/als4000.c | 2 -- sys/dev/sound/pci/atiixp.c | 2 -- sys/dev/sound/pci/cmi.c | 2 -- sys/dev/sound/pci/cs4281.c | 2 -- sys/dev/sound/pci/csa.c | 2 -- sys/dev/sound/pci/csamidi.c | 2 -- sys/dev/sound/pci/csapcm.c | 2 -- sys/dev/sound/pci/emu10k1.c | 2 -- sys/dev/sound/pci/envy24.c | 2 -- sys/dev/sound/pci/envy24ht.c | 2 -- sys/dev/sound/pci/es137x.c | 2 -- sys/dev/sound/pci/fm801.c | 2 -- sys/dev/sound/pci/hda/hdaa.c | 2 -- sys/dev/sound/pci/hda/hdaa_patches.c | 2 -- sys/dev/sound/pci/hda/hdac.c | 2 -- sys/dev/sound/pci/hda/hdacc.c | 2 -- sys/dev/sound/pci/hdspe-pcm.c | 2 -- sys/dev/sound/pci/hdspe.c | 2 -- sys/dev/sound/pci/ich.c | 2 -- sys/dev/sound/pci/maestro3.c | 2 -- sys/dev/sound/pci/neomagic.c | 2 -- sys/dev/sound/pci/solo.c | 2 -- sys/dev/sound/pci/t4dwave.c | 2 -- sys/dev/sound/pci/via8233.c | 2 -- sys/dev/sound/pci/via82c686.c | 2 -- sys/dev/sound/pci/vibes.c | 2 -- sys/dev/sound/pcm/ac97.c | 2 -- sys/dev/sound/pcm/ac97_patch.c | 2 -- sys/dev/sound/pcm/buffer.c | 2 -- sys/dev/sound/pcm/channel.c | 2 -- sys/dev/sound/pcm/dsp.c | 2 -- sys/dev/sound/pcm/feeder.c | 2 -- sys/dev/sound/pcm/feeder_chain.c | 2 -- sys/dev/sound/pcm/feeder_eq.c | 2 -- sys/dev/sound/pcm/feeder_format.c | 2 -- sys/dev/sound/pcm/feeder_matrix.c | 2 -- sys/dev/sound/pcm/feeder_mixer.c | 2 -- sys/dev/sound/pcm/feeder_rate.c | 2 -- sys/dev/sound/pcm/feeder_volume.c | 2 -- sys/dev/sound/pcm/mixer.c | 2 -- sys/dev/sound/pcm/sndstat.c | 13 ------------- sys/dev/sound/pcm/sound.c | 2 -- sys/dev/sound/pcm/sound.h | 4 ---- sys/dev/sound/pcm/vchan.c | 2 -- 45 files changed, 103 deletions(-) diff --git a/sys/arm/broadcom/bcm2835/bcm2835_audio.c b/sys/arm/broadcom/bcm2835/bcm2835_audio.c index 0d430cf19df7..e0f525fa9520 100644 --- a/sys/arm/broadcom/bcm2835/bcm2835_audio.c +++ b/sys/arm/broadcom/bcm2835/bcm2835_audio.c @@ -38,8 +38,6 @@ #include "vc_vchi_audioserv_defs.h" -SND_DECLARE_FILE(""); - /* Audio destination */ #define DEST_AUTO 0 #define DEST_HEADPHONES 1 diff --git a/sys/dev/sound/pci/als4000.c b/sys/dev/sound/pci/als4000.c index 89f7d6385493..5b7247517c13 100644 --- a/sys/dev/sound/pci/als4000.c +++ b/sys/dev/sound/pci/als4000.c @@ -48,8 +48,6 @@ #include "mixer_if.h" -SND_DECLARE_FILE(""); - /* Debugging macro's */ #undef DEB #ifndef DEB diff --git a/sys/dev/sound/pci/atiixp.c b/sys/dev/sound/pci/atiixp.c index 99468367c998..78be9475acd3 100644 --- a/sys/dev/sound/pci/atiixp.c +++ b/sys/dev/sound/pci/atiixp.c @@ -69,8 +69,6 @@ #include -SND_DECLARE_FILE(""); - #define ATI_IXP_DMA_RETRY_MAX 100 #define ATI_IXP_BUFSZ_MIN 4096 diff --git a/sys/dev/sound/pci/cmi.c b/sys/dev/sound/pci/cmi.c index 89a1eb24d878..4fd6ac4c0a75 100644 --- a/sys/dev/sound/pci/cmi.c +++ b/sys/dev/sound/pci/cmi.c @@ -61,8 +61,6 @@ #include "mixer_if.h" #include "mpufoi_if.h" -SND_DECLARE_FILE(""); - /* Supported chip ID's */ #define CMI8338A_PCI_ID 0x010013f6 #define CMI8338B_PCI_ID 0x010113f6 diff --git a/sys/dev/sound/pci/cs4281.c b/sys/dev/sound/pci/cs4281.c index fccbf807d965..25beb3f7fd0d 100644 --- a/sys/dev/sound/pci/cs4281.c +++ b/sys/dev/sound/pci/cs4281.c @@ -45,8 +45,6 @@ #include -SND_DECLARE_FILE(""); - #define CS4281_DEFAULT_BUFSZ 16384 /* Max fifo size for full duplex is 64 */ diff --git a/sys/dev/sound/pci/csa.c b/sys/dev/sound/pci/csa.c index 68edfd9338c2..7bb7967b74e7 100644 --- a/sys/dev/sound/pci/csa.c +++ b/sys/dev/sound/pci/csa.c @@ -54,8 +54,6 @@ #include -SND_DECLARE_FILE(""); - /* This is the pci device id. */ #define CS4610_PCI_ID 0x60011013 #define CS4614_PCI_ID 0x60031013 diff --git a/sys/dev/sound/pci/csamidi.c b/sys/dev/sound/pci/csamidi.c index cc4b41f86af9..df1699092990 100644 --- a/sys/dev/sound/pci/csamidi.c +++ b/sys/dev/sound/pci/csamidi.c @@ -54,8 +54,6 @@ #include "mpufoi_if.h" -SND_DECLARE_FILE(""); - /* pulled from mpu401.c */ #define MPU_DATAPORT 0 #define MPU_CMDPORT 1 diff --git a/sys/dev/sound/pci/csapcm.c b/sys/dev/sound/pci/csapcm.c index 14820a9c2216..8715072ec0e5 100644 --- a/sys/dev/sound/pci/csapcm.c +++ b/sys/dev/sound/pci/csapcm.c @@ -43,8 +43,6 @@ #include #include -SND_DECLARE_FILE(""); - /* Buffer size on dma transfer. Fixed for CS416x. */ #define CS461x_BUFFSIZE (4 * 1024) diff --git a/sys/dev/sound/pci/emu10k1.c b/sys/dev/sound/pci/emu10k1.c index d4624a549e42..92937c2d0c42 100644 --- a/sys/dev/sound/pci/emu10k1.c +++ b/sys/dev/sound/pci/emu10k1.c @@ -43,8 +43,6 @@ #include #include "mpufoi_if.h" -SND_DECLARE_FILE(""); - /* -------------------------------------------------------------------- */ #define NUM_G 64 /* use all channels */ diff --git a/sys/dev/sound/pci/envy24.c b/sys/dev/sound/pci/envy24.c index 8039d4e3186c..24b5abc0eeb9 100644 --- a/sys/dev/sound/pci/envy24.c +++ b/sys/dev/sound/pci/envy24.c @@ -41,8 +41,6 @@ #include "mixer_if.h" -SND_DECLARE_FILE(""); - static MALLOC_DEFINE(M_ENVY24, "envy24", "envy24 audio"); /* -------------------------------------------------------------------- */ diff --git a/sys/dev/sound/pci/envy24ht.c b/sys/dev/sound/pci/envy24ht.c index e9b6771e2162..6a3ef5afcf59 100644 --- a/sys/dev/sound/pci/envy24ht.c +++ b/sys/dev/sound/pci/envy24ht.c @@ -53,8 +53,6 @@ #include "mixer_if.h" -SND_DECLARE_FILE(""); - static MALLOC_DEFINE(M_ENVY24HT, "envy24ht", "envy24ht audio"); /* -------------------------------------------------------------------- */ diff --git a/sys/dev/sound/pci/es137x.c b/sys/dev/sound/pci/es137x.c index a11a106fee2f..8c1c2b34e1cf 100644 --- a/sys/dev/sound/pci/es137x.c +++ b/sys/dev/sound/pci/es137x.c @@ -90,8 +90,6 @@ #include "mixer_if.h" -SND_DECLARE_FILE(""); - #define MEM_MAP_REG 0x14 /* PCI IDs of supported chips */ diff --git a/sys/dev/sound/pci/fm801.c b/sys/dev/sound/pci/fm801.c index 34fb1f6f1bf6..d7aa731175bb 100644 --- a/sys/dev/sound/pci/fm801.c +++ b/sys/dev/sound/pci/fm801.c @@ -35,8 +35,6 @@ #include #include -SND_DECLARE_FILE(""); - #define PCI_VENDOR_FORTEMEDIA 0x1319 #define PCI_DEVICE_FORTEMEDIA1 0x08011319 /* Audio controller */ #define PCI_DEVICE_FORTEMEDIA2 0x08021319 /* Joystick controller */ diff --git a/sys/dev/sound/pci/hda/hdaa.c b/sys/dev/sound/pci/hda/hdaa.c index ef8f634ac8e8..1831ae0c1f19 100644 --- a/sys/dev/sound/pci/hda/hdaa.c +++ b/sys/dev/sound/pci/hda/hdaa.c @@ -47,8 +47,6 @@ #include "mixer_if.h" -SND_DECLARE_FILE(""); - #define hdaa_lock(devinfo) snd_mtxlock((devinfo)->lock) #define hdaa_unlock(devinfo) snd_mtxunlock((devinfo)->lock) #define hdaa_lockassert(devinfo) snd_mtxassert((devinfo)->lock) diff --git a/sys/dev/sound/pci/hda/hdaa_patches.c b/sys/dev/sound/pci/hda/hdaa_patches.c index 8331312b69c9..5bb4dcd79af7 100644 --- a/sys/dev/sound/pci/hda/hdaa_patches.c +++ b/sys/dev/sound/pci/hda/hdaa_patches.c @@ -47,8 +47,6 @@ #include "pin_patch.h" #include "pin_patch_realtek.h" -SND_DECLARE_FILE(""); - static const struct { uint32_t model; uint32_t id; diff --git a/sys/dev/sound/pci/hda/hdac.c b/sys/dev/sound/pci/hda/hdac.c index 79ab71516cd9..422f7f930ea5 100644 --- a/sys/dev/sound/pci/hda/hdac.c +++ b/sys/dev/sound/pci/hda/hdac.c @@ -51,8 +51,6 @@ #define HDA_DRV_TEST_REV "20120126_0002" -SND_DECLARE_FILE(""); - #define hdac_lock(sc) snd_mtxlock((sc)->lock) #define hdac_unlock(sc) snd_mtxunlock((sc)->lock) #define hdac_lockassert(sc) snd_mtxassert((sc)->lock) diff --git a/sys/dev/sound/pci/hda/hdacc.c b/sys/dev/sound/pci/hda/hdacc.c index 4616b3b23a48..b551b4b37701 100644 --- a/sys/dev/sound/pci/hda/hdacc.c +++ b/sys/dev/sound/pci/hda/hdacc.c @@ -43,8 +43,6 @@ #include #include -SND_DECLARE_FILE(""); - struct hdacc_fg { device_t dev; nid_t nid; diff --git a/sys/dev/sound/pci/hdspe-pcm.c b/sys/dev/sound/pci/hdspe-pcm.c index b23304d32fc7..04ab7d2d35ce 100644 --- a/sys/dev/sound/pci/hdspe-pcm.c +++ b/sys/dev/sound/pci/hdspe-pcm.c @@ -40,8 +40,6 @@ #include -SND_DECLARE_FILE(""); - struct hdspe_latency { uint32_t n; uint32_t period; diff --git a/sys/dev/sound/pci/hdspe.c b/sys/dev/sound/pci/hdspe.c index ac253b28df3a..7124fb1f5c57 100644 --- a/sys/dev/sound/pci/hdspe.c +++ b/sys/dev/sound/pci/hdspe.c @@ -40,8 +40,6 @@ #include -SND_DECLARE_FILE(""); - static struct hdspe_channel chan_map_aio[] = { { 0, 1, "line", 1, 1 }, { 6, 7, "phone", 1, 0 }, diff --git a/sys/dev/sound/pci/ich.c b/sys/dev/sound/pci/ich.c index d5e8a48a186c..70a9440d9b23 100644 --- a/sys/dev/sound/pci/ich.c +++ b/sys/dev/sound/pci/ich.c @@ -38,8 +38,6 @@ #include #include -SND_DECLARE_FILE(""); - /* -------------------------------------------------------------------- */ #define ICH_TIMEOUT 1000 /* semaphore timeout polling count */ diff --git a/sys/dev/sound/pci/maestro3.c b/sys/dev/sound/pci/maestro3.c index c60c69b6baf5..9ba83fe4de11 100644 --- a/sys/dev/sound/pci/maestro3.c +++ b/sys/dev/sound/pci/maestro3.c @@ -69,8 +69,6 @@ #include #include -SND_DECLARE_FILE(""); - /* -------------------------------------------------------------------- */ enum {CHANGE=0, CALL=1, INTR=2, BORING=3, NONE=-1}; diff --git a/sys/dev/sound/pci/neomagic.c b/sys/dev/sound/pci/neomagic.c index 162d99b57c70..1b325205da5f 100644 --- a/sys/dev/sound/pci/neomagic.c +++ b/sys/dev/sound/pci/neomagic.c @@ -40,8 +40,6 @@ #include #include -SND_DECLARE_FILE(""); - /* -------------------------------------------------------------------- */ #define NM_BUFFSIZE 16384 diff --git a/sys/dev/sound/pci/solo.c b/sys/dev/sound/pci/solo.c index 1788929811ed..d626da4fbb68 100644 --- a/sys/dev/sound/pci/solo.c +++ b/sys/dev/sound/pci/solo.c @@ -39,8 +39,6 @@ #include "mixer_if.h" -SND_DECLARE_FILE(""); - #define SOLO_DEFAULT_BUFSZ 16384 #define ABS(x) (((x) < 0)? -(x) : (x)) diff --git a/sys/dev/sound/pci/t4dwave.c b/sys/dev/sound/pci/t4dwave.c index b7363402ba8b..250b04426482 100644 --- a/sys/dev/sound/pci/t4dwave.c +++ b/sys/dev/sound/pci/t4dwave.c @@ -37,8 +37,6 @@ #include #include -SND_DECLARE_FILE(""); - /* -------------------------------------------------------------------- */ #define TDX_PCI_ID 0x20001023 diff --git a/sys/dev/sound/pci/via8233.c b/sys/dev/sound/pci/via8233.c index 6656670c9e1c..517e80fadb4f 100644 --- a/sys/dev/sound/pci/via8233.c +++ b/sys/dev/sound/pci/via8233.c @@ -50,8 +50,6 @@ #include -SND_DECLARE_FILE(""); - #define VIA8233_PCI_ID 0x30591106 #define VIA8233_REV_ID_8233PRE 0x10 diff --git a/sys/dev/sound/pci/via82c686.c b/sys/dev/sound/pci/via82c686.c index 076df8c81aa0..266441a938c6 100644 --- a/sys/dev/sound/pci/via82c686.c +++ b/sys/dev/sound/pci/via82c686.c @@ -39,8 +39,6 @@ #include -SND_DECLARE_FILE(""); - #define VIA_PCI_ID 0x30581106 #define NSEGS 4 /* Number of segments in SGD table */ diff --git a/sys/dev/sound/pci/vibes.c b/sys/dev/sound/pci/vibes.c index 1299f15dc814..538aa961d987 100644 --- a/sys/dev/sound/pci/vibes.c +++ b/sys/dev/sound/pci/vibes.c @@ -44,8 +44,6 @@ #include "mixer_if.h" -SND_DECLARE_FILE(""); - /* ------------------------------------------------------------------------- */ /* Constants */ diff --git a/sys/dev/sound/pcm/ac97.c b/sys/dev/sound/pcm/ac97.c index d83e3f2fefa5..d04ec2d8271c 100644 --- a/sys/dev/sound/pcm/ac97.c +++ b/sys/dev/sound/pcm/ac97.c @@ -38,8 +38,6 @@ #include "mixer_if.h" -SND_DECLARE_FILE(""); - static MALLOC_DEFINE(M_AC97, "ac97", "ac97 codec"); struct ac97mixtable_entry { diff --git a/sys/dev/sound/pcm/ac97_patch.c b/sys/dev/sound/pcm/ac97_patch.c index aff8075fe96c..671b6598f51a 100644 --- a/sys/dev/sound/pcm/ac97_patch.c +++ b/sys/dev/sound/pcm/ac97_patch.c @@ -34,8 +34,6 @@ #include #include -SND_DECLARE_FILE(""); - void ad1886_patch(struct ac97_info* codec) { #define AC97_AD_JACK_SPDIF 0x72 diff --git a/sys/dev/sound/pcm/buffer.c b/sys/dev/sound/pcm/buffer.c index d5a519362c5e..915c9110f107 100644 --- a/sys/dev/sound/pcm/buffer.c +++ b/sys/dev/sound/pcm/buffer.c @@ -40,8 +40,6 @@ #define SND_DECLARE_FXDIV #include "snd_fxdiv_gen.h" -SND_DECLARE_FILE(""); - struct snd_dbuf * sndbuf_create(device_t dev, char *drv, char *desc, struct pcm_channel *channel) { diff --git a/sys/dev/sound/pcm/channel.c b/sys/dev/sound/pcm/channel.c index d56f5fb51dc9..4cb2b2a92b44 100644 --- a/sys/dev/sound/pcm/channel.c +++ b/sys/dev/sound/pcm/channel.c @@ -38,8 +38,6 @@ #include "feeder_if.h" -SND_DECLARE_FILE(""); - int report_soft_formats = 1; SYSCTL_INT(_hw_snd, OID_AUTO, report_soft_formats, CTLFLAG_RW, &report_soft_formats, 0, "report software-emulated formats"); diff --git a/sys/dev/sound/pcm/dsp.c b/sys/dev/sound/pcm/dsp.c index 98d241e65a52..5aa7979b98c9 100644 --- a/sys/dev/sound/pcm/dsp.c +++ b/sys/dev/sound/pcm/dsp.c @@ -43,8 +43,6 @@ #include #include -SND_DECLARE_FILE(""); - static int dsp_mmap_allow_prot_exec = 0; SYSCTL_INT(_hw_snd, OID_AUTO, compat_linux_mmap, CTLFLAG_RWTUN, &dsp_mmap_allow_prot_exec, 0, diff --git a/sys/dev/sound/pcm/feeder.c b/sys/dev/sound/pcm/feeder.c index 8fb377533907..8278a85948a8 100644 --- a/sys/dev/sound/pcm/feeder.c +++ b/sys/dev/sound/pcm/feeder.c @@ -35,8 +35,6 @@ #include "feeder_if.h" -SND_DECLARE_FILE(""); - static MALLOC_DEFINE(M_FEEDER, "feeder", "pcm feeder"); #define MAXFEEDERS 256 diff --git a/sys/dev/sound/pcm/feeder_chain.c b/sys/dev/sound/pcm/feeder_chain.c index 01def5f6e9cb..52351ef58510 100644 --- a/sys/dev/sound/pcm/feeder_chain.c +++ b/sys/dev/sound/pcm/feeder_chain.c @@ -34,8 +34,6 @@ #include "feeder_if.h" -SND_DECLARE_FILE(""); - /* chain state */ struct feeder_chain_state { uint32_t afmt; /* audio format */ diff --git a/sys/dev/sound/pcm/feeder_eq.c b/sys/dev/sound/pcm/feeder_eq.c index 70797a706367..a097b13cd986 100644 --- a/sys/dev/sound/pcm/feeder_eq.c +++ b/sys/dev/sound/pcm/feeder_eq.c @@ -45,8 +45,6 @@ #define SND_USE_FXDIV #include "snd_fxdiv_gen.h" - -SND_DECLARE_FILE(""); #endif #include "feeder_eq_gen.h" diff --git a/sys/dev/sound/pcm/feeder_format.c b/sys/dev/sound/pcm/feeder_format.c index 3a741430e0ca..1e18e3e07450 100644 --- a/sys/dev/sound/pcm/feeder_format.c +++ b/sys/dev/sound/pcm/feeder_format.c @@ -43,8 +43,6 @@ #define SND_USE_FXDIV #include "snd_fxdiv_gen.h" - -SND_DECLARE_FILE(""); #endif #define FEEDFORMAT_RESERVOIR (SND_CHN_MAX * PCM_32_BPS) diff --git a/sys/dev/sound/pcm/feeder_matrix.c b/sys/dev/sound/pcm/feeder_matrix.c index 0afdb47c04d8..f5f02e2bf4f5 100644 --- a/sys/dev/sound/pcm/feeder_matrix.c +++ b/sys/dev/sound/pcm/feeder_matrix.c @@ -53,8 +53,6 @@ #define SND_USE_FXDIV #include "snd_fxdiv_gen.h" - -SND_DECLARE_FILE(""); #endif #define FEEDMATRIX_RESERVOIR (SND_CHN_MAX * PCM_32_BPS) diff --git a/sys/dev/sound/pcm/feeder_mixer.c b/sys/dev/sound/pcm/feeder_mixer.c index 42ebe89d7c09..9f6b653effa3 100644 --- a/sys/dev/sound/pcm/feeder_mixer.c +++ b/sys/dev/sound/pcm/feeder_mixer.c @@ -37,8 +37,6 @@ #define SND_USE_FXDIV #include "snd_fxdiv_gen.h" - -SND_DECLARE_FILE(""); #endif #undef SND_FEEDER_MULTIFORMAT diff --git a/sys/dev/sound/pcm/feeder_rate.c b/sys/dev/sound/pcm/feeder_rate.c index b2afe0651bf5..c8cc67e8fa80 100644 --- a/sys/dev/sound/pcm/feeder_rate.c +++ b/sys/dev/sound/pcm/feeder_rate.c @@ -60,8 +60,6 @@ #define SND_USE_FXDIV #include "snd_fxdiv_gen.h" - -SND_DECLARE_FILE(""); #endif #include "feeder_rate_gen.h" diff --git a/sys/dev/sound/pcm/feeder_volume.c b/sys/dev/sound/pcm/feeder_volume.c index fa11a089af76..452d8788a5a5 100644 --- a/sys/dev/sound/pcm/feeder_volume.c +++ b/sys/dev/sound/pcm/feeder_volume.c @@ -38,8 +38,6 @@ #define SND_USE_FXDIV #include "snd_fxdiv_gen.h" - -SND_DECLARE_FILE(""); #endif typedef void (*feed_volume_t)(int *, int *, uint32_t, uint8_t *, uint32_t); diff --git a/sys/dev/sound/pcm/mixer.c b/sys/dev/sound/pcm/mixer.c index 0c7576390b72..ee1ed11a8ed0 100644 --- a/sys/dev/sound/pcm/mixer.c +++ b/sys/dev/sound/pcm/mixer.c @@ -37,8 +37,6 @@ #include "feeder_if.h" #include "mixer_if.h" -SND_DECLARE_FILE(""); - static MALLOC_DEFINE(M_MIXER, "mixer", "mixer"); static int mixer_bypass = 1; diff --git a/sys/dev/sound/pcm/sndstat.c b/sys/dev/sound/pcm/sndstat.c index 6bd3e56687bf..32b47b8ee105 100644 --- a/sys/dev/sound/pcm/sndstat.c +++ b/sys/dev/sound/pcm/sndstat.c @@ -49,9 +49,6 @@ #include #include - -SND_DECLARE_FILE(""); - #define SS_TYPE_PCM 1 #define SS_TYPE_MIDI 2 #define SS_TYPE_SEQUENCER 3 @@ -1100,11 +1097,6 @@ sndstat_register(device_t dev, char *str, sndstat_handler handler) return (0); } -void -sndstat_registerfile(void *dummy __unused) -{ -} - int sndstat_unregister(device_t dev) { @@ -1125,11 +1117,6 @@ sndstat_unregister(device_t dev) return (error); } -void -sndstat_unregisterfile(void *dummy __unused) -{ -} - /************************************************************************/ static int diff --git a/sys/dev/sound/pcm/sound.c b/sys/dev/sound/pcm/sound.c index 17dc8d968b3c..b23a28d3af08 100644 --- a/sys/dev/sound/pcm/sound.c +++ b/sys/dev/sound/pcm/sound.c @@ -44,8 +44,6 @@ #include "feeder_if.h" -SND_DECLARE_FILE(""); - devclass_t pcm_devclass; int pcm_veto_load = 1; diff --git a/sys/dev/sound/pcm/sound.h b/sys/dev/sound/pcm/sound.h index 1b9168b9171b..5981266116fb 100644 --- a/sys/dev/sound/pcm/sound.h +++ b/sys/dev/sound/pcm/sound.h @@ -347,11 +347,7 @@ void snd_mtxassert(void *m); typedef int (*sndstat_handler)(struct sbuf *s, device_t dev, int verbose); int sndstat_register(device_t dev, char *str, sndstat_handler handler); -void sndstat_registerfile(void *); int sndstat_unregister(device_t dev); -void sndstat_unregisterfile(void *); - -#define SND_DECLARE_FILE(version) /* usage of flags in device config entry (config file) */ #define DV_F_DRQ_MASK 0x00000007 /* mask for secondary drq */ diff --git a/sys/dev/sound/pcm/vchan.c b/sys/dev/sound/pcm/vchan.c index c84d8f14e075..d10c3ff4aabb 100644 --- a/sys/dev/sound/pcm/vchan.c +++ b/sys/dev/sound/pcm/vchan.c @@ -36,8 +36,6 @@ #include #include -SND_DECLARE_FILE(""); - /* * [ac3 , dts , linear , 0, linear, 0] */ From nobody Fri Aug 18 20:16:53 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RSCnx4Y5tz4r36K; Fri, 18 Aug 2023 20:16: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RSCnx41kXz4RVm; Fri, 18 Aug 2023 20:16:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692389813; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+aN9xQDfYF3Nemewxn8bZcd5K3/vv/0B/bJq13XJMrw=; b=yLiYSv0V5n4D1uC4hjzAg9ZhMZGVBs21eK+KORbKnl9sWC8xKaU2JYXuFdlCwYVFYwn5oJ nZHsgHzPKA3tDiM1z+bP6JvUpUDxXrswNErjS4KFvS3fyS/w7Taa3qp+07vvqWD91mvBJ3 yB8Cp9d7hL2KQxCbAdNkPwHZyO4eGxEYoorcERkqcbNbWuu0UALwyG2Gd/6snMIt8xYoc6 OCSEj+oBM+bXZry95r5y8YcU1Q3VqI3pMWGYR15UwibTVarlbj7gHWGC3tCVW8U4+xz464 5yDZB2gwjFefzj7z6WwcdKk/AgFT7KHZ7UwljliDMzmecqsD4M37rASkQ4ZXfA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692389813; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+aN9xQDfYF3Nemewxn8bZcd5K3/vv/0B/bJq13XJMrw=; b=nVMy2ZTomcZCnxT0QLzUba7OULaMn6lqF3qdG67QAwK+dp87Zs0emFM1ooZ/fGBts69cUS ++dP8y54T2pk+ZrFwcSDBzISpEzyctWgloKTRB2d8KVrA2ukpVQ/xp0/GVh+WJqFtxG3j9 NoGdmG3DXVYI1DLeA0XPUWc0sGV5qZNhnUkErqsH+ulEnKo3IDvhEYU9dB44kfXDbTQ9to 96ZGs1MWvtEPnCD/PZhxjsYmJCLsavmbsn2pV28qvmgHuhZjEJ3W7TRMC9l0ZgC9v3waYw amtkMVo+7QJjabiJaxLPlGTUzLtQOaqFlwziLe7I3+gIFa35TZg3u1Vz0VE6ig== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692389813; a=rsa-sha256; cv=none; b=wp8fb075J0ITc+jxuXV7mqjfL3yK3KQwq3Qr69yzPePw8VvROqRr/Y+uxtETZYJGtaR7UC ZFlOFP3nZf9l1Zik9ct5aKt3MRm8qRE6NQucPvP1cooR/IofpQxUn4PoD5xW2LEr5Yok9y k0DxzVtASIa6VbuqyWcd+CLy9g6XPdbsd55C6qQ4yRC+LSpTIxMqbAUrJQa/VXSv3SwN2n GcN2WA3QxvXOglIDuOWHlPQogcQPw1jJ4yLMF7HP3pbQpSlAxALBzLM5fsofOcK+/Na7FU ivfUoFVtfH3xZx42iEVlEArssmdl3x2QIcQ6h72hTHGu9mQi916Y+MkBXfWKBA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RSCnx34fKzVXQ; Fri, 18 Aug 2023 20:16:53 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37IKGr6F018742; Fri, 18 Aug 2023 20:16:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37IKGrmB018739; Fri, 18 Aug 2023 20:16:53 GMT (envelope-from git) Date: Fri, 18 Aug 2023 20:16:53 GMT Message-Id: <202308182016.37IKGrmB018739@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: 57a3b81785c0 - main - libcrypto: add rsa_depr.c to the build List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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/main X-Git-Reftype: branch X-Git-Commit: 57a3b81785c0f7f458789d0baa5c8265ecfd5bac Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=57a3b81785c0f7f458789d0baa5c8265ecfd5bac commit 57a3b81785c0f7f458789d0baa5c8265ecfd5bac Author: Ed Maste AuthorDate: 2023-08-18 19:03:40 +0000 Commit: Ed Maste CommitDate: 2023-08-18 20:15:48 +0000 libcrypto: add rsa_depr.c to the build It provides the RSA_generate_key function, which is deprecated as of 3.0 but is used by various ports. Reviewed by: kbowling Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D41506 --- secure/lib/libcrypto/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/secure/lib/libcrypto/Makefile b/secure/lib/libcrypto/Makefile index 006577737d7b..d4102c6cd0cf 100644 --- a/secure/lib/libcrypto/Makefile +++ b/secure/lib/libcrypto/Makefile @@ -474,7 +474,7 @@ SRCS+= rmd-586.S .endif # rsa -SRCS+= rsa_ameth.c rsa_asn1.c rsa_backend.c rsa_chk.c rsa_crpt.c +SRCS+= rsa_ameth.c rsa_asn1.c rsa_backend.c rsa_chk.c rsa_crpt.c rsa_depr.c SRCS+= rsa_err.c rsa_gen.c rsa_lib.c rsa_meth.c rsa_mp.c rsa_mp_names.c SRCS+= rsa_none.c rsa_oaep.c rsa_ossl.c rsa_pk1.c rsa_pmeth.c rsa_prn.c SRCS+= rsa_pss.c rsa_saos.c rsa_schemes.c rsa_sign.c rsa_sp800_56b_check.c From nobody Fri Aug 18 23:18:43 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RSHqm01lyz4fs5X; Fri, 18 Aug 2023 23:18:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RSHql6KfFz4nGY; Fri, 18 Aug 2023 23:18:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692400723; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vRSHYDeUKPNPssvmepZklgBbz/joMb6CuldignuhBLk=; b=Cdfoz9YDw4/of8wLUwMmCb9BL0HtZ4wqDlhiMBbPdDHR8wE1cgdlHEOrDmfh+oHtEWKokL NSpNyuOARaBdLiVkAIh2JK68SEXHvihxicMSu5B0yn8ZbCL5TVrOKSv1y3lKLp6Yw8v4sQ n2Azw51ZAsXXENuZIeayZVSh/QStpAK4F16uCai5TfsdjKhA1GqYkKqxS8TnBrf19M/Tsl Ef/c9E9cz4CztHJ3/yFzbLYPcpmXRezz6lJzLium3KIGz7POEwpQRWNNeHhDWMbIc879TN mZHSQgkhvtVn80SuuyRc1B785c1iRoy3bYTfzhZ6BNTXqxpTZlLBG9KbGx8LHg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692400723; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=vRSHYDeUKPNPssvmepZklgBbz/joMb6CuldignuhBLk=; b=SU92uTchADdX8KuQYcAd+KlynCc8M6ogYq78jzlbFqUEUcJbkXfXWQLEZPzvIwZ5rBn4p4 UKnEUrXWVIYXGWX9OJnWkee2vFanLTLBsZW7z/GlTG/CuwruwPmsVRI+RF1/u/WWLjyHl0 a4RI08Lk6d5KB5DeOG50FGyN1UPIkKbWEQUojAW9ovo4Cl9qBo0bU2+LvR3/ya1VAWd6VQ F+YROJXJNEYWnBr9PX6C7apGGSI3dEHE+cfXvIHdaDzNtNStIwSG05h4oLhrPJL1nqaPG4 N/d6C8zB5y7JwpOSZlVM5NcxhB3N9O/UHJCRBok/OMANWSq72qIT2sL3ofZgRA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692400723; a=rsa-sha256; cv=none; b=XmYLo+DAVQKGSGL1GxTjhbQiWkVI3JPiZlR8KGLpWVtgq8QzIu1yc5jK3wfCUvRDmmVYaU NqOTwDBCOoD6hGk84cwm1iO4MZyEK+iDpfu1AmhN5hfTG8R/tAl+ISn1X9cmZFpVHdfquu 6CpCbWCoY4BWRbZ23shIyvqvxc7zpYnTcaD6FI1KAlO1/veYu/WPYDDujG6rDdR2sTe2Ms 2Gf7Owz/UlGDjYv4dR8HWcLGsSF9p1ZPnuR73CGnocIJaeCmAwnByqR3PY5piJ6q3/5Z7j vZS0+Yt5LbsGHoeXGhngA5PScos4OCUkLFzAlxLfLlJ3aO3kxtp/Q/WWn/YSlw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RSHql5Hxwzb6Q; Fri, 18 Aug 2023 23:18:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37INIhUE018505; Fri, 18 Aug 2023 23:18:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37INIh3a018502; Fri, 18 Aug 2023 23:18:43 GMT (envelope-from git) Date: Fri, 18 Aug 2023 23:18:43 GMT Message-Id: <202308182318.37INIh3a018502@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Xin LI Subject: git: 4e846759f0a3 - stable/13 - Add gve, the driver for Google Virtual NIC (gVNIC) List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: delphij X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 4e846759f0a327c8e150ab8910b06f93edecf0d9 Auto-Submitted: auto-generated The branch stable/13 has been updated by delphij: URL: https://cgit.FreeBSD.org/src/commit/?id=4e846759f0a327c8e150ab8910b06f93edecf0d9 commit 4e846759f0a327c8e150ab8910b06f93edecf0d9 Author: Shailend Chand AuthorDate: 2023-06-02 18:58:24 +0000 Commit: Xin LI CommitDate: 2023-08-18 23:18:15 +0000 Add gve, the driver for Google Virtual NIC (gVNIC) gVNIC is a virtual network interface designed specifically for Google Compute Engine (GCE). It is required to support per-VM Tier_1 networking performance, and for using certain VM shapes on GCE. The NIC supports TSO, Rx and Tx checksum offloads, and RSS. It does not currently do hardware LRO, and thus the software-LRO in the host is used instead. It also supports jumbo frames. For each queue, the driver negotiates a set of pages with the NIC to serve as a fixed bounce buffer, this precludes the use of iflib. Reviewed-by: markj Differential Revision: https://reviews.freebsd.org/D39873 (cherry picked from commit 54dfc97b0bd99f1c3bcbb37357cf28cd81a7cf00) --- share/man/man4/Makefile | 5 + share/man/man4/gve.4 | 215 ++++++++++++ sys/conf/files | 7 + sys/dev/gve/gve.h | 459 ++++++++++++++++++++++++ sys/dev/gve/gve_adminq.c | 803 ++++++++++++++++++++++++++++++++++++++++++ sys/dev/gve/gve_adminq.h | 394 +++++++++++++++++++++ sys/dev/gve/gve_desc.h | 151 ++++++++ sys/dev/gve/gve_main.c | 853 +++++++++++++++++++++++++++++++++++++++++++++ sys/dev/gve/gve_plat.h | 94 +++++ sys/dev/gve/gve_qpl.c | 284 +++++++++++++++ sys/dev/gve/gve_register.h | 54 +++ sys/dev/gve/gve_rx.c | 684 ++++++++++++++++++++++++++++++++++++ sys/dev/gve/gve_sysctl.c | 261 ++++++++++++++ sys/dev/gve/gve_tx.c | 806 ++++++++++++++++++++++++++++++++++++++++++ sys/dev/gve/gve_utils.c | 405 +++++++++++++++++++++ sys/modules/Makefile | 6 + sys/modules/gve/Makefile | 36 ++ 17 files changed, 5517 insertions(+) diff --git a/share/man/man4/Makefile b/share/man/man4/Makefile index 4fc01a6c4b1f..b7372ac63c2e 100644 --- a/share/man/man4/Makefile +++ b/share/man/man4/Makefile @@ -174,6 +174,7 @@ MAN= aac.4 \ geom_map.4 \ geom_uzip.4 \ gif.4 \ + ${_gve.4} \ gpio.4 \ gpioiic.4 \ gpiokeys.4 \ @@ -922,6 +923,10 @@ _linux.4= linux.4 _ossl.4= ossl.4 .endif +.if ${MACHINE_CPUARCH} == "amd64" || ${MACHINE_CPUARCH} == "aarch64" +_gve.4= gve.4 +.endif + .if ${MACHINE_CPUARCH} == "arm" || ${MACHINE_CPUARCH} == "aarch64" || \ ${MACHINE_CPUARCH} == "riscv" _cgem.4= cgem.4 diff --git a/share/man/man4/gve.4 b/share/man/man4/gve.4 new file mode 100644 index 000000000000..9bb1be1b9a53 --- /dev/null +++ b/share/man/man4/gve.4 @@ -0,0 +1,215 @@ +.\" SPDX-License-Identifier: BSD-3-Clause +.\" +.\" Copyright (c) 2023 Google LLC +.\" +.\" Redistribution and use in source and binary forms, with or without modification, +.\" are permitted provided that the following conditions are met: +.\" +.\" 1. Redistributions of source code must retain the above copyright notice, this +.\" list of conditions and the following disclaimer. +.\" +.\" 2. Redistributions in binary form must reproduce the above copyright notice, +.\" this list of conditions and the following disclaimer in the documentation +.\" and/or other materials provided with the distribution. +.\" +.\" 3. Neither the name of the copyright holder nor the names of its contributors +.\" may be used to endorse or promote products derived from this software without +.\" specific prior written permission. +.\" +.\" THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND +.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED +.\" WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +.\" DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR +.\" ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES +.\" (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; +.\" LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON +.\" ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +.\" SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +.Dd April 26, 2023 +.Dt GVE 4 +.Os +.Sh NAME +.Nm gve +.Nd "Ethernet driver for Google Virtual NIC (gVNIC)" +.Sh SYNOPSIS +To compile this driver into the kernel, +place the following lines in your +kernel configuration file: +.Bd -ragged -offset indent +.Cd "device gve" +.Ed +.Pp +Alternatively, to load the driver as a +module at boot time, place the following line in +.Xr loader.conf 5 : +.Bd -literal -offset indent +if_gve_load="YES" +.Ed +.Sh DESCRIPTION +gVNIC is a virtual network interface designed specifically for Google Compute Engine (GCE). +It is required to support per-VM Tier-1 networking performance, and for using certain VM shapes on GCE. +.Pp +.Nm +is the driver for gVNIC. +It supports the following features: +.Pp +.Bl -bullet -compact +.It +RX checksum offload +.It +TX chesksum offload +.It +TCP Segmentation Offload (TSO) +.It +Large Receive Offload (LRO) in software +.It +Jumbo frames +.It +Receive Side Scaling (RSS) +.El +.Pp +For more information on configuring this device, see +.Xr ifconfig 8 . +.Sh HARDWARE +.Nm +binds to a single PCI device ID presented by gVNIC: +.Pp +.Bl -bullet -compact +.It +0x1AE0:0x0042 +.El +.Sh DIAGNOSTICS +The following messages are recorded during driver initialization: +.Bl -diag +.It "Enabled MSIX with %d vectors" +.It "Configured device resources" +.It "Successfully attached %s" +.It "Deconfigured device resources" +.El +.Pp +These messages are seen if driver initialization fails. +Global (across-queues) allocation failures: +.Bl -diag +.It "Failed to configure device resources: err=%d" +.It "No compatible queue formats" +.It "Failed to allocate ifnet struct" +.It "Failed to allocate admin queue mem" +.It "Failed to alloc DMA mem for DescribeDevice" +.It "Failed to allocate QPL page" +.El +.Pp +irq and BAR allocation failures: +.Bl -diag +.It "Failed to acquire any msix vectors" +.It "Tried to acquire %d msix vectors, got only %d" +.It "Failed to setup irq %d for Tx queue %d " +.It "Failed to setup irq %d for Rx queue %d " +.It "Failed to allocate irq %d for mgmnt queue" +.It "Failed to setup irq %d for mgmnt queue, err: %d" +.It "Failed to allocate BAR0" +.It "Failed to allocate BAR2" +.It "Failed to allocate msix table" +.El +.Pp +Rx queue-specific allocation failures: +.Bl -diag +.It "No QPL left for rx ring %d" +.It "Failed to alloc queue resources for rx ring %d" +.It "Failed to alloc desc ring for rx ring %d" +.It "Failed to alloc data ring for rx ring %d" +.El +.Pp +Tx queue-specific allocation failures: +.Bl -diag +.It "No QPL left for tx ring %d" +.It "Failed to alloc queue resources for tx ring %d" +.It "Failed to alloc desc ring for tx ring %d" +.It "Failed to vmap fifo, qpl_id = %d" +.El +.El +.Pp +The following messages are recorded when the interface detach fails: +.Bl -diag +.It "Failed to deconfigure device resources: err=%d" +.El +.Pp +If bootverbose is on, the following messages are recorded when the interface is being brought up: +.Bl -diag +.It "Created %d rx queues" +.It "Created %d tx queues" +.It "MTU set to %d" +.El +.Pp +The following messages are recorded when the interface is being brought down: +.Bl -diag +.It "Destroyed %d rx queues" +.It "Destroyed %d tx queues" +.El +.Pp +These messages are seen if errors are encountered when bringing the interface up or down: +.Bl -diag +.It "Failed to destroy rxq %d, err: %d" +.It "Failed to destroy txq %d, err: %d" +.It "Failed to create rxq %d, err: %d" +.It "Failed to create txq %d, err: %d" +.It "Failed to set MTU to %d" +.It "Invalid new MTU setting. new mtu: %d max mtu: %d min mtu: %d" +.It "Cannot bring the iface up when detached" +.It "Reached max number of registered pages %lu > %lu" +.It "Failed to init lro for rx ring %d" +.El +.Pp +These messages are seen if any admin queue command fails: +.Bl -diag +.It "AQ command(%u): failed with status %d" +.It "AQ command(%u): unknown status code %d" +.It "AQ commands timed out, need to reset AQ" +.It "Unknown AQ command opcode %d" +.El +.Pp +These messages are recorded when the device is being reset due to an error: +.Bl -diag +.It "Scheduling reset task!" +.It "Waiting until admin queue is released." +.It "Admin queue released" +.El +.Pp +If it was the NIC that requested the reset, this message is recorded: +.Bl -diag +.It "Device requested reset" +.El +.Pp +If the reset fails during the reinitialization phase, this message is recorded: +.Bl -diag +.It "Restore failed!" +.El +.Pp +These two messages correspoond to the NIC alerting the driver to link state changes: +.Bl -diag +.It "Device link is up." +.It "Device link is down." +.El +.Pp +Apart from these messages, the driver exposes per-queue packet and error counters as sysctl nodes. +Global (across queues) counters can be read using +.Xr netstat 8 . +.Sh LIMITATIONS +.Nm +does not support the transmission of VLAN-tagged packets. +All VLAN-tagged traffic is dropped. +.Sh SUPPORT +Please email gvnic-drivers@google.com with the specifics of the issue encountered. +.El +.Sh SEE ALSO +.Xr ifconfig 8 , +.Xr netstat 8 +.Sh HISTORY +The +.Nm +device driver first appeared in +.Fx 14.0 . +.Sh AUTHORS +The +.Nm +driver was written by Google. diff --git a/sys/conf/files b/sys/conf/files index b6b99253805e..2c0cbe38082d 100644 --- a/sys/conf/files +++ b/sys/conf/files @@ -1809,6 +1809,13 @@ dev/fxp/if_fxp.c optional fxp dev/fxp/inphy.c optional fxp dev/gem/if_gem.c optional gem dev/gem/if_gem_pci.c optional gem pci +dev/gve/gve_adminq.c optional gve +dev/gve/gve_main.c optional gve +dev/gve/gve_qpl.c optional gve +dev/gve/gve_rx.c optional gve +dev/gve/gve_sysctl.c optional gve +dev/gve/gve_tx.c optional gve +dev/gve/gve_utils.c optional gve dev/goldfish/goldfish_rtc.c optional goldfish_rtc fdt dev/gpio/dwgpio/dwgpio.c optional gpio dwgpio fdt dev/gpio/dwgpio/dwgpio_bus.c optional gpio dwgpio fdt diff --git a/sys/dev/gve/gve.h b/sys/dev/gve/gve.h new file mode 100644 index 000000000000..61781cddee94 --- /dev/null +++ b/sys/dev/gve/gve.h @@ -0,0 +1,459 @@ +/*- + * SPDX-License-Identifier: BSD-3-Clause + * + * Copyright (c) 2023 Google LLC + * + * Redistribution and use in source and binary forms, with or without modification, + * are permitted provided that the following conditions are met: + * + * 1. Redistributions of source code must retain the above copyright notice, this + * list of conditions and the following disclaimer. + * + * 2. Redistributions in binary form must reproduce the above copyright notice, + * this list of conditions and the following disclaimer in the documentation + * and/or other materials provided with the distribution. + * + * 3. Neither the name of the copyright holder nor the names of its contributors + * may be used to endorse or promote products derived from this software without + * specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED + * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR + * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES + * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON + * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ +#ifndef _GVE_FBSD_H +#define _GVE_FBSD_H + +#include "gve_desc.h" +#include "gve_plat.h" +#include "gve_register.h" + +#ifndef PCI_VENDOR_ID_GOOGLE +#define PCI_VENDOR_ID_GOOGLE 0x1ae0 +#endif + +#define PCI_DEV_ID_GVNIC 0x0042 +#define GVE_REGISTER_BAR 0 +#define GVE_DOORBELL_BAR 2 + +/* Driver can alloc up to 2 segments for the header and 2 for the payload. */ +#define GVE_TX_MAX_DESCS 4 +#define GVE_TX_BUFRING_ENTRIES 4096 + +#define ADMINQ_SIZE PAGE_SIZE + +#define GVE_DEFAULT_RX_BUFFER_SIZE 2048 +/* Each RX bounce buffer page can fit two packet buffers. */ +#define GVE_DEFAULT_RX_BUFFER_OFFSET (PAGE_SIZE / 2) + +/* + * Number of descriptors per queue page list. + * Page count AKA QPL size can be derived by dividing the number of elements in + * a page by the number of descriptors available. + */ +#define GVE_QPL_DIVISOR 16 + +static MALLOC_DEFINE(M_GVE, "gve", "gve allocations"); + +struct gve_dma_handle { + bus_addr_t bus_addr; + void *cpu_addr; + bus_dma_tag_t tag; + bus_dmamap_t map; +}; + +union gve_tx_desc { + struct gve_tx_pkt_desc pkt; /* first desc for a packet */ + struct gve_tx_mtd_desc mtd; /* optional metadata descriptor */ + struct gve_tx_seg_desc seg; /* subsequent descs for a packet */ +}; + +/* Tracks the memory in the fifo occupied by a segment of a packet */ +struct gve_tx_iovec { + uint32_t iov_offset; /* offset into this segment */ + uint32_t iov_len; /* length */ + uint32_t iov_padding; /* padding associated with this segment */ +}; + +/* Tracks allowed and current queue settings */ +struct gve_queue_config { + uint16_t max_queues; + uint16_t num_queues; /* current */ +}; + +struct gve_irq_db { + __be32 index; +} __aligned(CACHE_LINE_SIZE); + +/* + * GVE_QUEUE_FORMAT_UNSPECIFIED must be zero since 0 is the default value + * when the entire configure_device_resources command is zeroed out and the + * queue_format is not specified. + */ +enum gve_queue_format { + GVE_QUEUE_FORMAT_UNSPECIFIED = 0x0, + GVE_GQI_RDA_FORMAT = 0x1, + GVE_GQI_QPL_FORMAT = 0x2, + GVE_DQO_RDA_FORMAT = 0x3, +}; + +enum gve_state_flags_bit { + GVE_STATE_FLAG_ADMINQ_OK, + GVE_STATE_FLAG_RESOURCES_OK, + GVE_STATE_FLAG_QPLREG_OK, + GVE_STATE_FLAG_RX_RINGS_OK, + GVE_STATE_FLAG_TX_RINGS_OK, + GVE_STATE_FLAG_QUEUES_UP, + GVE_STATE_FLAG_LINK_UP, + GVE_STATE_FLAG_DO_RESET, + GVE_STATE_FLAG_IN_RESET, + GVE_NUM_STATE_FLAGS /* Not part of the enum space */ +}; + +BITSET_DEFINE(gve_state_flags, GVE_NUM_STATE_FLAGS); + +#define GVE_DEVICE_STATUS_RESET (0x1 << 1) +#define GVE_DEVICE_STATUS_LINK_STATUS (0x1 << 2) + +#define GVE_RING_LOCK(ring) mtx_lock(&(ring)->ring_mtx) +#define GVE_RING_TRYLOCK(ring) mtx_trylock(&(ring)->ring_mtx) +#define GVE_RING_UNLOCK(ring) mtx_unlock(&(ring)->ring_mtx) +#define GVE_RING_ASSERT(ring) mtx_assert(&(ring)->ring_mtx, MA_OWNED) + +#define GVE_IFACE_LOCK_INIT(lock) sx_init(&lock, "gve interface lock") +#define GVE_IFACE_LOCK_DESTROY(lock) sx_destroy(&lock) +#define GVE_IFACE_LOCK_LOCK(lock) sx_xlock(&lock) +#define GVE_IFACE_LOCK_UNLOCK(lock) sx_unlock(&lock) +#define GVE_IFACE_LOCK_ASSERT(lock) sx_assert(&lock, SA_XLOCKED) + +struct gve_queue_page_list { + uint32_t id; + uint32_t num_dmas; + uint32_t num_pages; + vm_offset_t kva; + vm_page_t *pages; + struct gve_dma_handle *dmas; +}; + +struct gve_irq { + struct resource *res; + void *cookie; +}; + +struct gve_rx_slot_page_info { + void *page_address; + vm_page_t page; + uint32_t page_offset; + uint16_t pad; +}; + +/* + * A single received packet split across multiple buffers may be + * reconstructed using the information in this structure. + */ +struct gve_rx_ctx { + /* head and tail of mbuf chain for the current packet */ + struct mbuf *mbuf_head; + struct mbuf *mbuf_tail; + uint32_t total_size; + uint8_t frag_cnt; + bool drop_pkt; +}; + +struct gve_ring_com { + struct gve_priv *priv; + uint32_t id; + + /* + * BAR2 offset for this ring's doorbell and the + * counter-array offset for this ring's counter. + * Acquired from the device individually for each + * queue in the queue_create adminq command. + */ + struct gve_queue_resources *q_resources; + struct gve_dma_handle q_resources_mem; + + /* Byte offset into BAR2 where this ring's 4-byte irq doorbell lies. */ + uint32_t irq_db_offset; + /* Byte offset into BAR2 where this ring's 4-byte doorbell lies. */ + uint32_t db_offset; + /* + * Index, not byte-offset, into the counter array where this ring's + * 4-byte counter lies. + */ + uint32_t counter_idx; + + /* + * The index of the MSIX vector that was assigned to + * this ring in `gve_alloc_irqs`. + * + * It is passed to the device in the queue_create adminq + * command. + * + * Additionally, this also serves as the index into + * `priv->irq_db_indices` where this ring's irq doorbell's + * BAR2 offset, `irq_db_idx`, can be found. + */ + int ntfy_id; + + /* + * The fixed bounce buffer for this ring. + * Once allocated, has to be offered to the device + * over the register-page-list adminq command. + */ + struct gve_queue_page_list *qpl; + + struct task cleanup_task; + struct taskqueue *cleanup_tq; +} __aligned(CACHE_LINE_SIZE); + +struct gve_rxq_stats { + counter_u64_t rbytes; + counter_u64_t rpackets; + counter_u64_t rx_dropped_pkt; + counter_u64_t rx_copybreak_cnt; + counter_u64_t rx_frag_flip_cnt; + counter_u64_t rx_frag_copy_cnt; + counter_u64_t rx_dropped_pkt_desc_err; + counter_u64_t rx_dropped_pkt_mbuf_alloc_fail; +}; + +#define NUM_RX_STATS (sizeof(struct gve_rxq_stats) / sizeof(counter_u64_t)) + +/* power-of-2 sized receive ring */ +struct gve_rx_ring { + struct gve_ring_com com; + struct gve_dma_handle desc_ring_mem; + struct gve_dma_handle data_ring_mem; + + /* accessed in the receive hot path */ + struct { + struct gve_rx_desc *desc_ring; + union gve_rx_data_slot *data_ring; + struct gve_rx_slot_page_info *page_info; + + struct gve_rx_ctx ctx; + struct lro_ctrl lro; + uint8_t seq_no; /* helps traverse the descriptor ring */ + uint32_t cnt; /* free-running total number of completed packets */ + uint32_t fill_cnt; /* free-running total number of descs and buffs posted */ + uint32_t mask; /* masks the cnt and fill_cnt to the size of the ring */ + struct gve_rxq_stats stats; + } __aligned(CACHE_LINE_SIZE); + +} __aligned(CACHE_LINE_SIZE); + +/* + * A contiguous representation of the pages composing the Tx bounce buffer. + * The xmit taskqueue and the completion taskqueue both simultaneously use it. + * Both operate on `available`: the xmit tq lowers it and the completion tq + * raises it. `head` is the last location written at and so only the xmit tq + * uses it. + */ +struct gve_tx_fifo { + vm_offset_t base; /* address of base of FIFO */ + uint32_t size; /* total size */ + volatile int available; /* how much space is still available */ + uint32_t head; /* offset to write at */ +}; + +struct gve_tx_buffer_state { + struct mbuf *mbuf; + struct gve_tx_iovec iov[GVE_TX_MAX_DESCS]; +}; + +struct gve_txq_stats { + counter_u64_t tbytes; + counter_u64_t tpackets; + counter_u64_t tso_packet_cnt; + counter_u64_t tx_dropped_pkt; + counter_u64_t tx_dropped_pkt_nospace_device; + counter_u64_t tx_dropped_pkt_nospace_bufring; + counter_u64_t tx_dropped_pkt_vlan; +}; + +#define NUM_TX_STATS (sizeof(struct gve_txq_stats) / sizeof(counter_u64_t)) + +/* power-of-2 sized transmit ring */ +struct gve_tx_ring { + struct gve_ring_com com; + struct gve_dma_handle desc_ring_mem; + + struct task xmit_task; + struct taskqueue *xmit_tq; + + /* accessed in the transmit hot path */ + struct { + union gve_tx_desc *desc_ring; + struct gve_tx_buffer_state *info; + struct buf_ring *br; + + struct gve_tx_fifo fifo; + struct mtx ring_mtx; + + uint32_t req; /* free-running total number of packets written to the nic */ + uint32_t done; /* free-running total number of completed packets */ + uint32_t mask; /* masks the req and done to the size of the ring */ + struct gve_txq_stats stats; + } __aligned(CACHE_LINE_SIZE); + +} __aligned(CACHE_LINE_SIZE); + +struct gve_priv { + if_t ifp; + device_t dev; + struct ifmedia media; + + uint8_t mac[ETHER_ADDR_LEN]; + + struct gve_dma_handle aq_mem; + + struct resource *reg_bar; /* BAR0 */ + struct resource *db_bar; /* BAR2 */ + struct resource *msix_table; + + uint32_t mgmt_msix_idx; + uint32_t rx_copybreak; + + uint16_t num_event_counters; + uint16_t default_num_queues; + uint16_t tx_desc_cnt; + uint16_t rx_desc_cnt; + uint16_t rx_pages_per_qpl; + uint64_t max_registered_pages; + uint64_t num_registered_pages; + uint32_t supported_features; + uint16_t max_mtu; + + struct gve_dma_handle counter_array_mem; + __be32 *counters; + struct gve_dma_handle irqs_db_mem; + struct gve_irq_db *irq_db_indices; + + enum gve_queue_format queue_format; + struct gve_queue_page_list *qpls; + struct gve_queue_config tx_cfg; + struct gve_queue_config rx_cfg; + uint32_t num_queues; + + struct gve_irq *irq_tbl; + struct gve_tx_ring *tx; + struct gve_rx_ring *rx; + + /* + * Admin queue - see gve_adminq.h + * Since AQ cmds do not run in steady state, 32 bit counters suffice + */ + struct gve_adminq_command *adminq; + vm_paddr_t adminq_bus_addr; + uint32_t adminq_mask; /* masks prod_cnt to adminq size */ + uint32_t adminq_prod_cnt; /* free-running count of AQ cmds executed */ + uint32_t adminq_cmd_fail; /* free-running count of AQ cmds failed */ + uint32_t adminq_timeouts; /* free-running count of AQ cmds timeouts */ + /* free-running count of each distinct AQ cmd executed */ + uint32_t adminq_describe_device_cnt; + uint32_t adminq_cfg_device_resources_cnt; + uint32_t adminq_register_page_list_cnt; + uint32_t adminq_unregister_page_list_cnt; + uint32_t adminq_create_tx_queue_cnt; + uint32_t adminq_create_rx_queue_cnt; + uint32_t adminq_destroy_tx_queue_cnt; + uint32_t adminq_destroy_rx_queue_cnt; + uint32_t adminq_dcfg_device_resources_cnt; + uint32_t adminq_set_driver_parameter_cnt; + uint32_t adminq_verify_driver_compatibility_cnt; + + uint32_t interface_up_cnt; + uint32_t interface_down_cnt; + uint32_t reset_cnt; + + struct task service_task; + struct taskqueue *service_tq; + + struct gve_state_flags state_flags; + struct sx gve_iface_lock; +}; + +static inline bool +gve_get_state_flag(struct gve_priv *priv, int pos) +{ + return (BIT_ISSET(GVE_NUM_STATE_FLAGS, pos, &priv->state_flags)); +} + +static inline void +gve_set_state_flag(struct gve_priv *priv, int pos) +{ + BIT_SET_ATOMIC(GVE_NUM_STATE_FLAGS, pos, &priv->state_flags); +} + +static inline void +gve_clear_state_flag(struct gve_priv *priv, int pos) +{ + BIT_CLR_ATOMIC(GVE_NUM_STATE_FLAGS, pos, &priv->state_flags); +} + +/* Defined in gve_main.c */ +void gve_schedule_reset(struct gve_priv *priv); + +/* Register access functions defined in gve_utils.c */ +uint32_t gve_reg_bar_read_4(struct gve_priv *priv, bus_size_t offset); +void gve_reg_bar_write_4(struct gve_priv *priv, bus_size_t offset, uint32_t val); +void gve_db_bar_write_4(struct gve_priv *priv, bus_size_t offset, uint32_t val); + +/* QPL (Queue Page List) functions defined in gve_qpl.c */ +int gve_alloc_qpls(struct gve_priv *priv); +void gve_free_qpls(struct gve_priv *priv); +int gve_register_qpls(struct gve_priv *priv); +int gve_unregister_qpls(struct gve_priv *priv); + +/* TX functions defined in gve_tx.c */ +int gve_alloc_tx_rings(struct gve_priv *priv); +void gve_free_tx_rings(struct gve_priv *priv); +int gve_create_tx_rings(struct gve_priv *priv); +int gve_destroy_tx_rings(struct gve_priv *priv); +int gve_tx_intr(void *arg); +int gve_xmit_ifp(if_t ifp, struct mbuf *mbuf); +void gve_qflush(if_t ifp); +void gve_xmit_tq(void *arg, int pending); +void gve_tx_cleanup_tq(void *arg, int pending); + +/* RX functions defined in gve_rx.c */ +int gve_alloc_rx_rings(struct gve_priv *priv); +void gve_free_rx_rings(struct gve_priv *priv); +int gve_create_rx_rings(struct gve_priv *priv); +int gve_destroy_rx_rings(struct gve_priv *priv); +int gve_rx_intr(void *arg); +void gve_rx_cleanup_tq(void *arg, int pending); + +/* DMA functions defined in gve_utils.c */ +int gve_dma_alloc_coherent(struct gve_priv *priv, int size, int align, + struct gve_dma_handle *dma); +void gve_dma_free_coherent(struct gve_dma_handle *dma); +int gve_dmamap_create(struct gve_priv *priv, int size, int align, + struct gve_dma_handle *dma); +void gve_dmamap_destroy(struct gve_dma_handle *dma); + +/* IRQ functions defined in gve_utils.c */ +void gve_free_irqs(struct gve_priv *priv); +int gve_alloc_irqs(struct gve_priv *priv); +void gve_unmask_all_queue_irqs(struct gve_priv *priv); +void gve_mask_all_queue_irqs(struct gve_priv *priv); + +/* Systcl functions defined in gve_sysctl.c*/ +void gve_setup_sysctl(struct gve_priv *priv); +void gve_accum_stats(struct gve_priv *priv, uint64_t *rpackets, + uint64_t *rbytes, uint64_t *rx_dropped_pkt, uint64_t *tpackets, + uint64_t *tbytes, uint64_t *tx_dropped_pkt); + +/* Stats functions defined in gve_utils.c */ +void gve_alloc_counters(counter_u64_t *stat, int num_stats); +void gve_free_counters(counter_u64_t *stat, int num_stats); + +#endif /* _GVE_FBSD_H_ */ diff --git a/sys/dev/gve/gve_adminq.c b/sys/dev/gve/gve_adminq.c new file mode 100644 index 000000000000..3c332607ebd4 --- /dev/null +++ b/sys/dev/gve/gve_adminq.c @@ -0,0 +1,803 @@ +/*- + * SPDX-License-Identifier: BSD-3-Clause + * + * Copyright (c) 2023 Google LLC + * + * Redistribution and use in source and binary forms, with or without modification, + * are permitted provided that the following conditions are met: + * + * 1. Redistributions of source code must retain the above copyright notice, this + * list of conditions and the following disclaimer. + * + * 2. Redistributions in binary form must reproduce the above copyright notice, + * this list of conditions and the following disclaimer in the documentation + * and/or other materials provided with the distribution. + * + * 3. Neither the name of the copyright holder nor the names of its contributors + * may be used to endorse or promote products derived from this software without + * specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED + * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR + * ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES + * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON + * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT + * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ +#include +#include +#include + +#include +#include +#include + +#include "gve.h" +#include "gve_adminq.h" + +#define GVE_ADMINQ_SLEEP_LEN_MS 20 +#define GVE_MAX_ADMINQ_EVENT_COUNTER_CHECK 10 +#define GVE_ADMINQ_DEVICE_DESCRIPTOR_VERSION 1 +#define GVE_REG_ADMINQ_ADDR 16 +#define ADMINQ_SLOTS (ADMINQ_SIZE / sizeof(struct gve_adminq_command)) + +#define GVE_DEVICE_OPTION_ERROR_FMT "%s option error:\n" \ + "Expected: length=%d, feature_mask=%x.\n" \ + "Actual: length=%d, feature_mask=%x.\n" + +#define GVE_DEVICE_OPTION_TOO_BIG_FMT "Length of %s option larger than expected." \ + " Possible older version of guest driver.\n" + +static +void gve_parse_device_option(struct gve_priv *priv, + struct gve_device_descriptor *device_descriptor, + struct gve_device_option *option, + struct gve_device_option_gqi_qpl **dev_op_gqi_qpl, + struct gve_device_option_jumbo_frames **dev_op_jumbo_frames) +{ + uint32_t req_feat_mask = be32toh(option->required_features_mask); + uint16_t option_length = be16toh(option->option_length); + uint16_t option_id = be16toh(option->option_id); + + /* + * If the length or feature mask doesn't match, continue without + * enabling the feature. + */ + switch (option_id) { + case GVE_DEV_OPT_ID_GQI_QPL: + if (option_length < sizeof(**dev_op_gqi_qpl) || + req_feat_mask != GVE_DEV_OPT_REQ_FEAT_MASK_GQI_QPL) { + device_printf(priv->dev, GVE_DEVICE_OPTION_ERROR_FMT, + "GQI QPL", (int)sizeof(**dev_op_gqi_qpl), + GVE_DEV_OPT_REQ_FEAT_MASK_GQI_QPL, + option_length, req_feat_mask); + break; + } + + if (option_length > sizeof(**dev_op_gqi_qpl)) { + device_printf(priv->dev, GVE_DEVICE_OPTION_TOO_BIG_FMT, + "GQI QPL"); + } + *dev_op_gqi_qpl = (void *)(option + 1); + break; + + case GVE_DEV_OPT_ID_JUMBO_FRAMES: + if (option_length < sizeof(**dev_op_jumbo_frames) || + req_feat_mask != GVE_DEV_OPT_REQ_FEAT_MASK_JUMBO_FRAMES) { + device_printf(priv->dev, GVE_DEVICE_OPTION_ERROR_FMT, + "Jumbo Frames", (int)sizeof(**dev_op_jumbo_frames), + GVE_DEV_OPT_REQ_FEAT_MASK_JUMBO_FRAMES, + option_length, req_feat_mask); + break; + } + + if (option_length > sizeof(**dev_op_jumbo_frames)) { + device_printf(priv->dev, + GVE_DEVICE_OPTION_TOO_BIG_FMT, "Jumbo Frames"); + } + *dev_op_jumbo_frames = (void *)(option + 1); + break; + + default: + /* + * If we don't recognize the option just continue + * without doing anything. + */ + device_printf(priv->dev, "Unrecognized device option 0x%hx not enabled.\n", + option_id); + } +} + +/* Process all device options for a given describe device call. */ +static int +gve_process_device_options(struct gve_priv *priv, + struct gve_device_descriptor *descriptor, + struct gve_device_option_gqi_qpl **dev_op_gqi_qpl, + struct gve_device_option_jumbo_frames **dev_op_jumbo_frames) +{ + char *desc_end = (char *)descriptor + be16toh(descriptor->total_length); + const int num_options = be16toh(descriptor->num_device_options); + struct gve_device_option *dev_opt; + int i; + + /* The options struct directly follows the device descriptor. */ + dev_opt = (void *)(descriptor + 1); + for (i = 0; i < num_options; i++) { + if ((char *)(dev_opt + 1) > desc_end || + (char *)(dev_opt + 1) + be16toh(dev_opt->option_length) > desc_end) { + device_printf(priv->dev, + "options exceed device_descriptor's total length.\n"); + return (EINVAL); + } + + gve_parse_device_option(priv, descriptor, dev_opt, + dev_op_gqi_qpl, dev_op_jumbo_frames); + dev_opt = (void *)((char *)(dev_opt + 1) + be16toh(dev_opt->option_length)); + } + + return (0); +} + +static int gve_adminq_execute_cmd(struct gve_priv *priv, + struct gve_adminq_command *cmd); + +static int +gve_adminq_destroy_tx_queue(struct gve_priv *priv, uint32_t id) +{ + struct gve_adminq_command cmd = (struct gve_adminq_command){}; + + cmd.opcode = htobe32(GVE_ADMINQ_DESTROY_TX_QUEUE); + cmd.destroy_tx_queue.queue_id = htobe32(id); + + return (gve_adminq_execute_cmd(priv, &cmd)); +} + +static int +gve_adminq_destroy_rx_queue(struct gve_priv *priv, uint32_t id) +{ + struct gve_adminq_command cmd = (struct gve_adminq_command){}; + + cmd.opcode = htobe32(GVE_ADMINQ_DESTROY_RX_QUEUE); + cmd.destroy_rx_queue.queue_id = htobe32(id); + + return (gve_adminq_execute_cmd(priv, &cmd)); +} + +int +gve_adminq_destroy_rx_queues(struct gve_priv *priv, uint32_t num_queues) +{ + int err; + int i; + + for (i = 0; i < num_queues; i++) { + err = gve_adminq_destroy_rx_queue(priv, i); + if (err != 0) { + device_printf(priv->dev, "Failed to destroy rxq %d, err: %d\n", + i, err); + } + } + + if (err != 0) + return (err); + + device_printf(priv->dev, "Destroyed %d rx queues\n", num_queues); + return (0); +} + +int +gve_adminq_destroy_tx_queues(struct gve_priv *priv, uint32_t num_queues) +{ + int err; + int i; + + for (i = 0; i < num_queues; i++) { + err = gve_adminq_destroy_tx_queue(priv, i); + if (err != 0) { + device_printf(priv->dev, "Failed to destroy txq %d, err: %d\n", + i, err); + } + } + + if (err != 0) + return (err); *** 4709 LINES SKIPPED *** From nobody Fri Aug 18 23:18:44 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RSHqn19rkz4fs0W; Fri, 18 Aug 2023 23:18:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RSHqn0ZBmz4nGt; Fri, 18 Aug 2023 23:18:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692400725; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=orVgJWChtTOcFozdwFyzQPQb4fXMPE6+W6yCWY5Wenw=; b=ZxYjP2lmjYseYjPiEeL5tlLwPbUvLNS725EReJdVaUDIewrd4z9cPX6l09Ea0zFZDQC698 rTtIjxXNK7VoIjjIoNQsgWK919br3n/IlADZfECWLYVkFE7YS4uKD3hsyjYpxX3xp+n2ek b3WR8bjI0QZQ7v2Cxx7M1znxlpKuTiLBZnayScikfXGCIEjvgP/6o3QEi8keGxfvqVOlbg hErsvaO4ms7lb9B/oWbACJwJH81Bp+JTJMi2OFBKP3Fo4YLHSTWwhl1/Y/29hDeQ6pikHa oZuzrdknDD93zTB/Zi1J+cBvWdZ9nymjwEPUUJ38WuoiURB8Rih0Ko3+vGFNmg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692400725; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=orVgJWChtTOcFozdwFyzQPQb4fXMPE6+W6yCWY5Wenw=; b=AYtJTgxw+09zVKixk3FJN3eeQkDzFFfko6+QiCcV1TMBwtPkquiNuBR0CX08Sknx398ppo JH4eOSa/7o1ruQ6eaPda6QmhwklPowW8nfSmJ1NdsttCFhRUpBisFyKgm8r9+63Ppm9yWf kxypVfxkReX3I8KcYgTfaIhj8irlhtglWz3rcp/SJzR+YmGCQVvKDUMdbOYBWpDC6TwpiW bQQmLmi1XUjpVwu1V3mE0hzvDrtQbANCIf9CdRFhODM3WzOoM9DDGWoV0+AwFWEXZFpQUw Nv5TQuj2A8PgP2lkSGTUzPHCR3WkKhmiLbi5hAN3g8oPsO2Xm+BHHDeM2seqPQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692400725; a=rsa-sha256; cv=none; b=I5z5Que3tkAYAmS5PKOxEM0k6DBOI5jrG3bRN/giL73XXqTFj4pDACA472JhvpwEXiuI6s /rf4f7mxNBn6Mb6pP8fz0rdysWAGdnEffSTtHYoGfTe+mhvYUPoFLFYd7phEL10eipMC4T h8NGCMyDaZU7nHS3wkt24wmjkNJi1LQ0fVlIjEhIYNQxxnNC+SyekOHIh4zJyMC/HfHyqq 537O+hBe1OZ7JykRdfRyFnLxh/Vi16gpq+pq4L4f/BCSBxAgB4gygeeqJrhxuhfksGPDbo BvjQKUxQunEd6MSzPtBW0ks4fGcT5vB4h5Pg1HvJHsLlBz1ddXNU5gncDsiBjQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RSHqm64FKzb40; Fri, 18 Aug 2023 23:18:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37INIixP018560; Fri, 18 Aug 2023 23:18:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37INIipR018557; Fri, 18 Aug 2023 23:18:44 GMT (envelope-from git) Date: Fri, 18 Aug 2023 23:18:44 GMT Message-Id: <202308182318.37INIipR018557@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Xin LI Subject: git: 78f491c86d04 - stable/13 - gve: Fix build on i386 and enable LINT builds. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: delphij X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 78f491c86d04b8938ff7b26481268b8f223d86e0 Auto-Submitted: auto-generated The branch stable/13 has been updated by delphij: URL: https://cgit.FreeBSD.org/src/commit/?id=78f491c86d04b8938ff7b26481268b8f223d86e0 commit 78f491c86d04b8938ff7b26481268b8f223d86e0 Author: Xin LI AuthorDate: 2023-06-04 23:35:00 +0000 Commit: Xin LI CommitDate: 2023-08-18 23:18:15 +0000 gve: Fix build on i386 and enable LINT builds. Reviewed-by: imp Differential Revision: https://reviews.freebsd.org/D40419 (cherry picked from commit 4d779448adb32ef6424abb781dab87065964d42f) --- share/man/man4/Makefile | 5 +---- sys/amd64/conf/LINT-NOIP | 1 + sys/amd64/conf/NOTES | 3 +++ sys/arm64/conf/NOTES | 3 +++ sys/dev/gve/gve_qpl.c | 6 +++--- sys/i386/conf/LINT-NOIP | 1 + sys/i386/conf/NOTES | 3 +++ sys/modules/Makefile | 5 +---- 8 files changed, 16 insertions(+), 11 deletions(-) diff --git a/share/man/man4/Makefile b/share/man/man4/Makefile index b7372ac63c2e..46437362dd90 100644 --- a/share/man/man4/Makefile +++ b/share/man/man4/Makefile @@ -918,15 +918,12 @@ _nvme.4= nvme.4 .if ${MACHINE_CPUARCH} == "amd64" || ${MACHINE_CPUARCH} == "i386" || \ ${MACHINE_CPUARCH} == "aarch64" +_gve.4= gve.4 _ipmi.4= ipmi.4 _linux.4= linux.4 _ossl.4= ossl.4 .endif -.if ${MACHINE_CPUARCH} == "amd64" || ${MACHINE_CPUARCH} == "aarch64" -_gve.4= gve.4 -.endif - .if ${MACHINE_CPUARCH} == "arm" || ${MACHINE_CPUARCH} == "aarch64" || \ ${MACHINE_CPUARCH} == "riscv" _cgem.4= cgem.4 diff --git a/sys/amd64/conf/LINT-NOIP b/sys/amd64/conf/LINT-NOIP index 544893cf1332..c99462fce081 100644 --- a/sys/amd64/conf/LINT-NOIP +++ b/sys/amd64/conf/LINT-NOIP @@ -13,6 +13,7 @@ nodevice ale nodevice bxe nodevice em nodevice fxp +nodevice gve nodevice jme nodevice msk nodevice mxge diff --git a/sys/amd64/conf/NOTES b/sys/amd64/conf/NOTES index a72e9f2623bb..eacfd77fd7e1 100644 --- a/sys/amd64/conf/NOTES +++ b/sys/amd64/conf/NOTES @@ -506,6 +506,9 @@ device virtio_console # VirtIO Console device # Linux KVM paravirtualization support device kvm_clock # KVM paravirtual clock driver +# Google Virtual NIC +device gve # Google Virtual NIC (gVNIC) driver + # Microsoft Hyper-V enhancement support device hyperv # HyperV drivers device hvhid # HyperV HID device diff --git a/sys/arm64/conf/NOTES b/sys/arm64/conf/NOTES index 0d275c0fdd2c..aa69035f291f 100644 --- a/sys/arm64/conf/NOTES +++ b/sys/arm64/conf/NOTES @@ -63,6 +63,9 @@ device virtio_mmio device virtio_blk device vtnet +# Google Virtual NIC +device gve # Google Virtual NIC (gVNIC) driver + # CPU frequency control device cpufreq diff --git a/sys/dev/gve/gve_qpl.c b/sys/dev/gve/gve_qpl.c index 891d132d2f10..3c6d9af6feee 100644 --- a/sys/dev/gve/gve_qpl.c +++ b/sys/dev/gve/gve_qpl.c @@ -101,9 +101,9 @@ gve_alloc_qpl(struct gve_priv *priv, uint32_t id, int npages, bool single_kva) int i; if (npages + priv->num_registered_pages > priv->max_registered_pages) { - device_printf(priv->dev, "Reached max number of registered pages %lu > %lu\n", - npages + priv->num_registered_pages, - priv->max_registered_pages); + device_printf(priv->dev, "Reached max number of registered pages %ju > %ju\n", + (uintmax_t)npages + priv->num_registered_pages, + (uintmax_t)priv->max_registered_pages); return (EINVAL); } diff --git a/sys/i386/conf/LINT-NOIP b/sys/i386/conf/LINT-NOIP index 1c91dae98baa..32c5af163381 100644 --- a/sys/i386/conf/LINT-NOIP +++ b/sys/i386/conf/LINT-NOIP @@ -12,6 +12,7 @@ nodevice ale nodevice bxe nodevice em nodevice fxp +nodevice gve nodevice jme nodevice lio nodevice msk diff --git a/sys/i386/conf/NOTES b/sys/i386/conf/NOTES index 2c069e1c52b8..07255ff81165 100644 --- a/sys/i386/conf/NOTES +++ b/sys/i386/conf/NOTES @@ -723,6 +723,9 @@ device virtio_console # VirtIO Console device # Linux KVM paravirtualization support device kvm_clock # KVM paravirtual clock driver +# Google Virtual NIC +device gve # Google Virtual NIC (gVNIC) driver + options HYPERV device hyperv # HyperV drivers device hvhid # HyperV HID device diff --git a/sys/modules/Makefile b/sys/modules/Makefile index 079638c2f6cd..48d6328835e0 100644 --- a/sys/modules/Makefile +++ b/sys/modules/Makefile @@ -534,6 +534,7 @@ SUBDIR+= linux_common .if ${MACHINE_CPUARCH} == "aarch64" || ${MACHINE_CPUARCH} == "amd64" || \ ${MACHINE_CPUARCH} == "i386" _ena= ena +_gve= gve .if ${MK_OFED} != "no" || defined(ALL_MODULES) _ibcore= ibcore _ipoib= ipoib @@ -557,10 +558,6 @@ _mlx4ib= mlx4ib _mlx5ib= mlx5ib .endif -.if ${MACHINE_CPUARCH} == "aarch64" || ${MACHINE_CPUARCH} == "amd64" -_gve= gve -.endif - _ossl= ossl _rtw88= rtw88 .if ${MK_SOURCELESS_UCODE} != "no" From nobody Fri Aug 18 23:18:45 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RSHqp1Yrcz4frxM; Fri, 18 Aug 2023 23:18: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RSHqp0x7Tz4nYG; Fri, 18 Aug 2023 23:18:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692400726; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=VzCzvM0df/QNylriAJf8balj0vHywVKRCIDeUODjA+8=; b=TgtwFTKOThjA49wZTIX05YdkHsb3KokCLpJmkitJzAQWV9rH3zpKRm6mJduF7GsJJVqSJ6 0fwvBTmDNbHLSwxshX+3/w+7MUjGVvpjPdOwi2hgVNIc5nxfLSNAd1LU6wxClhe4rOnXOF 8ZFRbHupd38tt/kOBC5bSLI4AvYTJjwFXqZRuA8Capm6wb83KEGUQiFmhp+yAhd8CfyXld x9dIkGkMCM2z4sS1EVjD3vUnvy5CCMHt79hsKdg1yTgKTh7+OjpmScjhy2AoJrvsMwht8u M0mZ8/E4+t/zogvAJk4/iEXioIdMy73f0FzC7JYRZz5oScAOUmQen7N5mb66rg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692400726; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=VzCzvM0df/QNylriAJf8balj0vHywVKRCIDeUODjA+8=; b=Sa4grg/ltkDYkZyZ6YMmqYCIav7bYBnSgbcU/kNnTXF7/psliGlfQM4HtCkS+zdjF0aAI+ JGXOe2BuRXgsFsMgUMbi2WUEStfoAUYJB8kLMp9TUW9VpbkYS+ppOIIj2GG7c0sUaEGlwf 1RU+L27l4WkipIpfuEBfWeEgTq8lRWNipA1qQfmLEfrytjhI/vhH8nhDdxrhRooW0AY4Ec 3Z1k6YlBOqeuSOvL4tw8bXZ5aYQKfO1MxB4CSWXyDGECgN5ltQ91CSaBzSW8L8q15NbUqy 3ZlLVWE8/++sRqID7HW/QUG3m9l2Ix6+V63sA1Stcgo0kSA+PbFlPfEoAb2K8w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692400726; a=rsa-sha256; cv=none; b=KjVMNFwQ13nB97xfsxH+9qW+NoJDUK9JcEWOOLKNCL1TJ2un7AYcd5T6b29fKI7kj6hIsr /GHGHabEKDcV43A5L0RgItaA6yOJNLZHwW9uSbL4tVb1Ev1wNnLaiC2MR8wL/ihBqUNgGP en7XltxTIsRQha4IvX3cAEwZDPUt37qX/LC4gQsZASJayAZ/lnDoVQ7mpos656vOIh1AHu vriZXScLgPl2zQlwFubyvRdw6G3mb4nJtkjMUBtg93TlBX3jW7vK72WiGb3RG9oZP/gDvY ORHawkV7ntzV2f4y6r+uROhmQtBNJnZ1HU9gw8Ws5LKyfhbkrV9+ctg+G7vZkw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RSHqp02ZFzbQv; Fri, 18 Aug 2023 23:18:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37INIjD2018617; Fri, 18 Aug 2023 23:18:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37INIjWu018614; Fri, 18 Aug 2023 23:18:45 GMT (envelope-from git) Date: Fri, 18 Aug 2023 23:18:45 GMT Message-Id: <202308182318.37INIjWu018614@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Xin LI Subject: git: 80a7ab5a4f79 - stable/13 - gve: Add PNP info to PCI attachment of gve(4) driver. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: delphij X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 80a7ab5a4f7952c24f817ee8a21bc1d4a1fb2436 Auto-Submitted: auto-generated The branch stable/13 has been updated by delphij: URL: https://cgit.FreeBSD.org/src/commit/?id=80a7ab5a4f7952c24f817ee8a21bc1d4a1fb2436 commit 80a7ab5a4f7952c24f817ee8a21bc1d4a1fb2436 Author: Xin LI AuthorDate: 2023-06-06 00:58:43 +0000 Commit: Xin LI CommitDate: 2023-08-18 23:18:15 +0000 gve: Add PNP info to PCI attachment of gve(4) driver. Reviewed-by: imp Differential Revision: https://reviews.freebsd.org/D40429 (cherry picked from commit 1bbdfb0b438689a839e29094fcb582a104cbabd9) --- sys/dev/gve/gve_main.c | 28 ++++++++++++++++++++++++---- 1 file changed, 24 insertions(+), 4 deletions(-) diff --git a/sys/dev/gve/gve_main.c b/sys/dev/gve/gve_main.c index ae45a0cfc24a..383fd326d33a 100644 --- a/sys/dev/gve/gve_main.c +++ b/sys/dev/gve/gve_main.c @@ -38,6 +38,16 @@ #define GVE_DEFAULT_RX_COPYBREAK 256 +/* Devices supported by this driver. */ +static struct gve_dev { + uint16_t vendor_id; + uint16_t device_id; + const char *name; +} gve_devs[] = { + { PCI_VENDOR_ID_GOOGLE, PCI_DEV_ID_GVNIC, "gVNIC" } +}; +#define GVE_DEVS_COUNT nitems(gve_devs) + struct sx gve_global_lock; static int @@ -701,10 +711,18 @@ gve_service_task(void *arg, int pending) static int gve_probe(device_t dev) { - if (pci_get_vendor(dev) == PCI_VENDOR_ID_GOOGLE && - pci_get_device(dev) == PCI_DEV_ID_GVNIC) { - device_set_desc(dev, "gVNIC"); - return (BUS_PROBE_DEFAULT); + uint16_t deviceid, vendorid; + int i; + + vendorid = pci_get_vendor(dev); + deviceid = pci_get_device(dev); + + for (i = 0; i < GVE_DEVS_COUNT; i++) { + if (vendorid == gve_devs[i].vendor_id && + deviceid == gve_devs[i].device_id) { + device_set_desc(dev, gve_devs[i].name); + return (BUS_PROBE_DEFAULT); + } } return (ENXIO); } @@ -851,3 +869,5 @@ DRIVER_MODULE(gve, pci, gve_driver, gve_devclass, 0, 0); #else DRIVER_MODULE(gve, pci, gve_driver, 0, 0); #endif +MODULE_PNP_INFO("U16:vendor;U16:device", pci, gve, gve_devs, + GVE_DEVS_COUNT); From nobody Fri Aug 18 23:18:47 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RSHqq6jZNz4fs3B; Fri, 18 Aug 2023 23:18:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RSHqq23GLz4nNZ; Fri, 18 Aug 2023 23:18:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692400727; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6UuCi8GqzM68uneb8rwSRdx4JXrz76Fodu+Ip2WwI8c=; b=IP9HLHT978tzQKbxQlE74ub60jxbCGpEzdyxkbIkuYAnj3lfSsjGxp98ACMon2iRz2IIRc 8PC4w/g5a7tMqruLfVFA8TcinCgDBLdtHBAFmphSKo9e2+l5zeGpYGEhoVwtI7Yj45xeZ9 6ZKydEI6qu0n6bmLpOC4AZwreLWrbNvr98jwoLB9CJ6tfjyLLJpQu9QXxFIA+XnG6jDHev Q4oCVTMW2o/fTW8LnG0LErysx3291Otd1Z7ByeCANArBamzA4hOlrIE+6SyvsP8N1B2aYQ FCNxSEujPOupRTR3s+Q9tz/Ok7/Gzpd+0sUgPaVlDY7j2Fk9pMKT8oyyQ6MFew== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692400727; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=6UuCi8GqzM68uneb8rwSRdx4JXrz76Fodu+Ip2WwI8c=; b=IHKYZuhxn31BHeGEH3/iuARvXRbCAMz9/EX4cuoY6ZQrus7QMKE8RBCNqxqJMOsBT7Sdwx cbpQ6dNaRyeR78tU1Iygg6p/WQT05sIrUZmJgM0MdPeMEfBgWWXcw3Y+aNnC8St7tu/Su8 p2ql8608c7HkYoMwcdyqk8BPUUOpDkt2xaBabk6CxGDMEb8SQDQOMVQWzm0IgXjOr+i4vL bOYN4qUiYs7qikvBoyhOAAIBB+phm24TDLTL+7vQ6/94VtU+BTYL+DUVoH7E50RnnFY85y sucfU4MCIZ5PvZFx/usaJaYPpG3nUjDLN+X7u8AzPtjQB7KNa1JWRyF1Bfxrrw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692400727; a=rsa-sha256; cv=none; b=pTrsuo8Te9QOoAp+ijixqmiev+tqFMX4zsWi+lHddhExdj7xz5C/LtycQc1yi96HGUmzhR EmJQwZ6duO8nKIY7e3zr9weK9Zll3jFJE3qzEewjbttue9IqboYTOJQSoeirSiOS2IJyDV xZeTAwZhyfVF9u0hTY2o54ksjJXkJ5r84id5cywN9gmT975+/sblz5WGYY1aSx/ZKVL2ZR Oc0ljfrbICok0jPEglZYV1G/6xsLya4fzaRUP0VIiOnNfdCngq0WnwHPRDCyIzpk3nKybD rJbDa3BjNaQXKblJpBXgyWUxKUMdOtOJEjEBhDy+DP//yE7IulZioE2cAotXsQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RSHqq15zjzb41; Fri, 18 Aug 2023 23:18:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37INIldN018671; Fri, 18 Aug 2023 23:18:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37INIlcJ018668; Fri, 18 Aug 2023 23:18:47 GMT (envelope-from git) Date: Fri, 18 Aug 2023 23:18:47 GMT Message-Id: <202308182318.37INIlcJ018668@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Xin LI Subject: git: 06d98c3bf47e - stable/13 - gve: Unobfuscate code by using nitems directly for loop. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: delphij X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 06d98c3bf47ec79f2e0c2942088eade399ea78b5 Auto-Submitted: auto-generated The branch stable/13 has been updated by delphij: URL: https://cgit.FreeBSD.org/src/commit/?id=06d98c3bf47ec79f2e0c2942088eade399ea78b5 commit 06d98c3bf47ec79f2e0c2942088eade399ea78b5 Author: Xin LI AuthorDate: 2023-06-07 04:14:30 +0000 Commit: Xin LI CommitDate: 2023-08-18 23:18:15 +0000 gve: Unobfuscate code by using nitems directly for loop. While there, also make MODULE_PNP_INFO to reflect that the device description is provided. Reported-by: jrtc27 Reviewed-by: jrtc27, imp Differential Revision: https://reviews.freebsd.org/D40430 (cherry picked from commit 1177a6c8dcfd6625c541d6ffc3c6915b8b6354f7) --- sys/dev/gve/gve_main.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/sys/dev/gve/gve_main.c b/sys/dev/gve/gve_main.c index 383fd326d33a..c3ee6d5c3433 100644 --- a/sys/dev/gve/gve_main.c +++ b/sys/dev/gve/gve_main.c @@ -46,7 +46,6 @@ static struct gve_dev { } gve_devs[] = { { PCI_VENDOR_ID_GOOGLE, PCI_DEV_ID_GVNIC, "gVNIC" } }; -#define GVE_DEVS_COUNT nitems(gve_devs) struct sx gve_global_lock; @@ -717,7 +716,7 @@ gve_probe(device_t dev) vendorid = pci_get_vendor(dev); deviceid = pci_get_device(dev); - for (i = 0; i < GVE_DEVS_COUNT; i++) { + for (i = 0; i < nitems(gve_devs); i++) { if (vendorid == gve_devs[i].vendor_id && deviceid == gve_devs[i].device_id) { device_set_desc(dev, gve_devs[i].name); @@ -869,5 +868,5 @@ DRIVER_MODULE(gve, pci, gve_driver, gve_devclass, 0, 0); #else DRIVER_MODULE(gve, pci, gve_driver, 0, 0); #endif -MODULE_PNP_INFO("U16:vendor;U16:device", pci, gve, gve_devs, - GVE_DEVS_COUNT); +MODULE_PNP_INFO("U16:vendor;U16:device;D:#", pci, gve, gve_devs, + nitems(gve_devs)); From nobody Fri Aug 18 23:18:48 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RSHqt0Ynwz4fs5j; Fri, 18 Aug 2023 23:18:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RSHqr3KWBz4nbh; Fri, 18 Aug 2023 23:18:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692400728; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=wKy0vfVKahljse/DD19vrmlUWd15UJ/0OlC0WUBPjJc=; b=r60z0HgjePPMn4paBWYM5OOdhqFEye+98Eiif667V4asxs58NvhAGnvcYs2xfvquJibkON pZcGCL5B9JIzyyTMufg3/HgrtF/iJXGHnkdFLb2Blr0z1vhDKiUCLQknmsVQxW/qpLHoLl /czPNgOIY/IZDM+29jGwNqofHCGEZvTO/Fm1/trxKbEZevTSSBfTubHwobhaViMN13oLeY tVdv7ApUag0drv+1EZ3P/ncfwdxB6vnDjRZ5GMnEvUkxFHUuhhBhF9HCuxYDQ9aq4vcZLM zXZCXthMC2S8hRBNIIMNPxRsEC+pzKH1f/ttUhsuKP9mcXYVoouLGASNRG/t8Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692400728; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=wKy0vfVKahljse/DD19vrmlUWd15UJ/0OlC0WUBPjJc=; b=Zp7lwxwf00ra6Mge5DnHVGrxQ3S3SGVtRloJB7Z5S1XBK9pycYRkg9CwFSpoELXfCCKk5V hDgiKqSpY69ZW3E99GhMM5GSZJsuh5xsC2se7aiI5TBZK5LlZhajq26QqJ0o8kdRb3J0rQ qpiIeXaarxwb0+kTs3eTRWKjfhw53rbfzJgaVsES3ITbympYKYFKAN9JFe1UjDe6y4YwHi YOaSkARsBSGKyX5nMbi2rHRQ8FpvxQdDO1a+5fTLdR1YMOC7Wl7Lcn0JX0ZVvp7ZPjSTGV 7UXmMUjb1fPda33tQAmIXXvTSl4R1PTzICIvoT4WHRa/fTs0OPMLsPIBpmwXcg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692400728; a=rsa-sha256; cv=none; b=jHt/MJKtBOHy0L/9hjiZag0XhtH+U7Mg4S+oEDdU9PtHtB1DGLXVm8BdGoziNuFh1xCGmq s+q5XqIfo64rnMqKwtOuX0FPjpdOEG7sJ2RtZTwq81+nYZp76Rj3cwS/33pQE7kpNbwHQp qF40dl2gRI5CkcECilpEkqJ9F1r5m4O0AiMm2wcdr13ZLCehywgXGt5OYKY5Je2JtLGo3v hDWnEyHL2+HFKvFsEHXuR3Lcqk3uoLHIgaBmp8TcQpVjo+qqWrXieH6X7ylJYcb0q66SrE juEHNjd9K0fBRMLHoA1q1c1Q+4wT9kFq6mU/DlakJcLMRPEyOBdrZcCkrWQYYg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RSHqr25xFzbQw; Fri, 18 Aug 2023 23:18:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37INImgl018718; Fri, 18 Aug 2023 23:18:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37INIm8C018715; Fri, 18 Aug 2023 23:18:48 GMT (envelope-from git) Date: Fri, 18 Aug 2023 23:18:48 GMT Message-Id: <202308182318.37INIm8C018715@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Xin LI Subject: git: 545ab0eb1993 - stable/13 - gve: Fix Tx tcpdump panic List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: delphij X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 545ab0eb19931d8b2e978da18811f16b97b94c78 Auto-Submitted: auto-generated The branch stable/13 has been updated by delphij: URL: https://cgit.FreeBSD.org/src/commit/?id=545ab0eb19931d8b2e978da18811f16b97b94c78 commit 545ab0eb19931d8b2e978da18811f16b97b94c78 Author: Shailend Chand AuthorDate: 2023-07-27 05:22:31 +0000 Commit: Xin LI CommitDate: 2023-08-18 23:18:16 +0000 gve: Fix Tx tcpdump panic Ringing the doorbell before making the BPF call can result in the mbuf being freed before the BPF call. Reviewed-by: markj Differential Revision: https://reviews.freebsd.org/D41189 (cherry picked from commit 74861578d95573e13a2099143f9d4e7edbb82806) --- sys/dev/gve/gve_tx.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sys/dev/gve/gve_tx.c b/sys/dev/gve/gve_tx.c index dd48bc35a258..db3f7415f412 100644 --- a/sys/dev/gve/gve_tx.c +++ b/sys/dev/gve/gve_tx.c @@ -706,12 +706,12 @@ gve_xmit_br(struct gve_tx_ring *tx) break; } + drbr_advance(ifp, tx->br); + BPF_MTAP(ifp, mbuf); + bus_dmamap_sync(tx->desc_ring_mem.tag, tx->desc_ring_mem.map, BUS_DMASYNC_PREWRITE); gve_db_bar_write_4(priv, tx->com.db_offset, tx->req); - - drbr_advance(ifp, tx->br); - BPF_MTAP(ifp, mbuf); } } From nobody Fri Aug 18 23:18:49 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RSHqt1Hhyz4fs0b; Fri, 18 Aug 2023 23:18:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RSHqs3xbWz4nNr; Fri, 18 Aug 2023 23:18:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692400729; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XuO75da1Yroy7TYuvmRHpe7XRJqVlIqW1PxJkKPfWFE=; b=Tg65g4ILqHJ/Mc/HgZEVEJdiylTXXH6mWfR6PsOxheFdXtY2B7RdyIexi7wVBOWOJ3YN/W TaNxScpiTn1MGaxK342EUyp03zL45l+cSha+TnCraON6sYjciBfuEjvCHDRdLRZeY8bhIC EO6TF5andVpNYGXodOzesxMAOkqgXX5ftsM5pnuNIzezIXFNDfJxUWYYRdRu6ScoflQ8Ul VFI44987nsHjaXWyENQ69qb3gRTAnkX8Yg+SWHceHkTj6kduubHn0pbqy6ERdIGaZ2I5gZ c6HMxeWloLxzMlMU7Qj5kHjNNsIHd3LvH2Wgfwg4B0ZT+eiRcwNwHMCG3WuvGQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692400729; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=XuO75da1Yroy7TYuvmRHpe7XRJqVlIqW1PxJkKPfWFE=; b=PRWQi+DdAw7WIOPqvEecAeGERm0cMVx2veOQ7R3e3kpcJmGijw7ml2lva5iv0DhXoqzT+x Rm8RKl9AFtA8RuHPDeedx3n4FU1pbAOpj3fzzPTdzpFCUry+rUis1/b+IHAANseHzf35xw ovgdfH1SuSbjWsfqRweCc5E8+GYC3YyaIfAzYvHw2VHrAFUUQBpF4QHxFjdZ1QNvCRKDSz PXaRJcO49lcoUDjsMhALkGsJZQ93YdtfgeK9lqiBkRxDSjr2U6y+aX21+domoWD6wRtb2g XvNrgvC4m57z2zyhc+dapTZQFS733KAfTbYuRNsKg1FLuQeyXlMLuFPfJsh8SQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692400729; a=rsa-sha256; cv=none; b=N2mtFv4udi2Fvz6bBng1SmxsTBlbI1fSqnPvASePprA+XaTkqEI3GeK9cSTVaWwxJo6Gn6 vMnoN7p7Z65UoUkWzqw6UyFHLzAeZTgRBJdhnyFTBsQPfNfdaOq3tul8pX7XsuM+OAygYE blqASoTq9UbrMV+V6KVxIsAi4wXqS6AiWbRik+BB4UonZiPpB20oGegowVIB22HqPyn63v Qt4Sus+WwG7tmClIJZg0ocNeQOdUvxBscd3k13ZHIsn1QkSTGnk97NraqOQKfDbAGt2Ak0 jijAE140VNopstlTJXiNn2V1mAMxW5NT6rlGd12qfKxs/E306IclAS4OxS6Nzw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RSHqs32Czzb6R; Fri, 18 Aug 2023 23:18:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37INInEQ018773; Fri, 18 Aug 2023 23:18:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37INInfw018770; Fri, 18 Aug 2023 23:18:49 GMT (envelope-from git) Date: Fri, 18 Aug 2023 23:18:49 GMT Message-Id: <202308182318.37INInfw018770@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Xin LI Subject: git: d3ca462c94b2 - stable/13 - gve: Simplify tx loop over buffer ring List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: delphij X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: d3ca462c94b268cfa04cb66101fa41a3c752651d Auto-Submitted: auto-generated The branch stable/13 has been updated by delphij: URL: https://cgit.FreeBSD.org/src/commit/?id=d3ca462c94b268cfa04cb66101fa41a3c752651d commit d3ca462c94b268cfa04cb66101fa41a3c752651d Author: Shailend Chand AuthorDate: 2023-08-12 07:59:26 +0000 Commit: Xin LI CommitDate: 2023-08-18 23:18:16 +0000 gve: Simplify tx loop over buffer ring Reviewed by: markj Differential Revision: https://reviews.freebsd.org/D41281 (cherry picked from commit 543cf924bcdcf064fed417ec3d66000ef66194d2) --- sys/dev/gve/gve_tx.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/sys/dev/gve/gve_tx.c b/sys/dev/gve/gve_tx.c index db3f7415f412..1e62e1226be1 100644 --- a/sys/dev/gve/gve_tx.c +++ b/sys/dev/gve/gve_tx.c @@ -696,10 +696,9 @@ gve_xmit_br(struct gve_tx_ring *tx) struct ifnet *ifp = priv->ifp; struct mbuf *mbuf; - while (!drbr_empty(ifp, tx->br) && - (if_getdrvflags(ifp) & IFF_DRV_RUNNING) != 0) { + while ((if_getdrvflags(ifp) & IFF_DRV_RUNNING) != 0 && + (mbuf = drbr_peek(ifp, tx->br)) != NULL) { - mbuf = drbr_peek(ifp, tx->br); if (__predict_false(gve_xmit(tx, mbuf) != 0)) { drbr_putback(ifp, tx->br, mbuf); taskqueue_enqueue(tx->xmit_tq, &tx->xmit_task); From nobody Fri Aug 18 23:57:34 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RSJhZ6Y9Fz4fw22; Fri, 18 Aug 2023 23:57: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RSJhZ62m0z4sPD; Fri, 18 Aug 2023 23:57:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692403054; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=A9CVSeZPzAV4qL15eGcETZIGevqt+Mof0JzD5fxz4O0=; b=Bbwp1pTg84mTgp+m6YgAFhiVUh8UTedIv0v7XAoT02v+9VpsfagNkGe5DkMO7SSLnMHt1D F58+cPSKjEarAtBq6T2KFeBuFRnjcoYQz8nrFVf444AkSG7x+wLsoXO2KvcgMfZ5WYdUc5 h4jJPeMNPhiB9pF0W7d+M9J+wOVU2/A6ezzu9R370YzLrNQQpg7z06V9uzxaMQU/Fl1FSU FH1a0kVhbG8i+LYQwJ9Ymk6bBtL9uK31M3cvh+8j6T/svEeSfKNq0LE3NSdROOy+FWDQEl QLxeO92nWsee8owmrKa18m2MebWq1FdriwPGiXmNUSSKPRMdvE9scvho2sN3Pg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692403054; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=A9CVSeZPzAV4qL15eGcETZIGevqt+Mof0JzD5fxz4O0=; b=LDqFUnxtQEHsmetR2fOnYrG5MD7k9SAyyamqo4rAidSJ21KngLtnVx+eWbbtZQT03fJ6zb LAS0JIGTcQM23C/T4wZcwlSbob8ZvUW05fmTpEVnOJ+rzdzhezF2NG+wTqtg0uUYnsODqi D0ech8ZU0jR6UPL1DtXxF0p7zrSQrOWrbgpFjH+fqto0FvjIBoOxf36jQUs4Mk6B1cS2ul sU7uAJJgYTt9ZRbVKuDdBQDbepq0EaPgn2YcVvqonGvCzSAR9AflL4spuEiSHwH6oKuaHc iH4+XcvF7dnwZlX7WQiLvgEcYXpXvtJF2/tq17LfC5bBhM/Z++tASX+wGMHbwQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692403054; a=rsa-sha256; cv=none; b=gUHkpxhF84VDTlGiAkQgsE+04YZFl5utsmXczTC5IP/iS1CZ2LfnTCsGHpHigUfLq14Zmk kxaZc8AVtKejm9BlwerEP33Q4Mb/R+de0emJR/b1EQ9CaDFqUw3q55zUtWz0Nqdgo/3Q/f eafzNdmTO2O2EJNMFoVdP2JrcV9jfNFganIYH2vCzQos+1Y/DwGlgpVP4UfWlkYfLcBz6H Ql26dX4JIAL/s1QOPYM7S8yxPPeBZEc8YFM6pqXKhUbWCQfbkpqItOhZ3NhgBuPzTy9Rqk DdOBDj0OWh4KWFtxLMhkmWMvdq0+z4VWByrAfsDAYvnLtedURn2iM1pVBS3+Vw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RSJhZ553wzcGH; Fri, 18 Aug 2023 23:57:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37INvYmp084006; Fri, 18 Aug 2023 23:57:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37INvYbI084004; Fri, 18 Aug 2023 23:57:34 GMT (envelope-from git) Date: Fri, 18 Aug 2023 23:57:34 GMT Message-Id: <202308182357.37INvYbI084004@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mateusz Guzik Subject: git: 64e881f2db96 - main - vfs: track how many times vn_alloc blocked on hitting the vnode limit List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mjg X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 64e881f2db968bf10c4aa22668ea270e1b9dd3c1 Auto-Submitted: auto-generated The branch main has been updated by mjg: URL: https://cgit.FreeBSD.org/src/commit/?id=64e881f2db968bf10c4aa22668ea270e1b9dd3c1 commit 64e881f2db968bf10c4aa22668ea270e1b9dd3c1 Author: Mateusz Guzik AuthorDate: 2023-08-18 23:56:58 +0000 Commit: Mateusz Guzik CommitDate: 2023-08-18 23:56:58 +0000 vfs: track how many times vn_alloc blocked on hitting the vnode limit --- sys/kern/vfs_subr.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/sys/kern/vfs_subr.c b/sys/kern/vfs_subr.c index 36bf8d80782a..0f3f00abfd4a 100644 --- a/sys/kern/vfs_subr.c +++ b/sys/kern/vfs_subr.c @@ -1712,6 +1712,10 @@ vtryrecycle(struct vnode *vp) * vnlru to clear things up, but ultimately always performs a M_WAITOK allocation. */ static u_long vn_alloc_cyclecount; +static u_long vn_alloc_sleeps; + +SYSCTL_ULONG(_vfs, OID_AUTO, vnode_alloc_sleeps, CTLFLAG_RD, &vn_alloc_sleeps, 0, + "Number of times vnode allocation blocked waiting on vnlru"); static struct vnode * __noinline vn_alloc_hard(struct mount *mp) @@ -1746,6 +1750,7 @@ vn_alloc_hard(struct mount *mp) * Wait for space for a new vnode. */ vnlru_kick(); + vn_alloc_sleeps++; msleep(&vnlruproc_sig, &vnode_list_mtx, PVFS, "vlruwk", hz); if (atomic_load_long(&numvnodes) + 1 > desiredvnodes && vnlru_read_freevnodes() > 1) From nobody Sat Aug 19 00:35:56 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RSKXr37ynz4fy4S; Sat, 19 Aug 2023 00:35: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RSKXr2Xlfz3FnD; Sat, 19 Aug 2023 00:35:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692405356; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=CQgOiI+buD1Hy8d/y+2vO+Ri1JRzwWaqfZiwXL8rYsI=; b=YAtsmL2TZ3Ibdl9lmDlZVvqCNqs9iV6/qNAHqAfgthY7Qnmv6NUUK1iP6a0lm7RqSz4d52 bq0rGPuyEh70InvOvJ83PyAHLZInL/kbk7nxKpxr1qWEZbHsKZGqWKxpi/WkBETUo2W4yy EGOr/aLaKsXFpV8ZlKRVS4qNyeA1IL2SsHWqUh8ft0dsXiIfEq1pie1zr1eWhh7Y9PBFqU UiXAOMLL0jRXOAd2VWEFHWqp1qRISYBZngpjPkrDTkso9kkl3LvoGMOti8e3Xbf5yZIwhw XNX3ZlTaz0RVE5it5Cbxc2OvUksKEmxacl2kcS2z7TbDcfvJarHcvMspYY5ZwA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692405356; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=CQgOiI+buD1Hy8d/y+2vO+Ri1JRzwWaqfZiwXL8rYsI=; b=aMcCOYpRRZ8sivpJWo9fsiuLel5iRLC4GLyjFT+ZHICtpqA2aFSOUI8NxcjdIVHXN2CTe4 Oj1zZYmJcw4K7xX0JkXfCS1wef8XYOUeHdULQWiblsxIG1nO2DIZY3eTwgziKKmEEpymY4 TsprsPU5U/k++BCM4+UGIHYCKuml0uTiAQR0MtAKZUVr2zYIAHyztH9+18Gt79LjfXetc+ cp8lhajoZefPaPLVDW1QimdHgkcnFfZH/HAs33usolOaYKL4l1rEi4fP6YmmUz99eu3Xd5 tEhPI4/dzzKTC5c3p8VxUxHF/yLHOlynwntxcvbWSKqbGDC0KUurh5Qqs8XlwQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692405356; a=rsa-sha256; cv=none; b=BuZIHIAZ1B44Ve52SW0FwsCgxgVp4TNOb6t/HSXMk/GPMya40j25FrkgObe8hHd3VyT9kV V3RNzshfxVQZ+N8zs/73kEkxpg6xMa6pR9Z+rk/KJdzMYA9VG8mne4Im5toAJDXKLsXVkE jnlUwdnPVp5GtjbgjGJHNdHAVVtGeA9e4IElQIrVv8nYPjbOpmcW2lkQCyDGoXlh/8MJ1V H7LbJ3DJ84hobTKT+FF879TP1qX9yjfmetutazGtzxTcxfu2P0vvxM+2e7j0nw5WSdVHTd VH00qz0HsJn4PkqDRXxYCWcjR6g2OQNbGYoeCYizz9o04+6ldv2vWKXBNXBaCw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RSKXr1bL9zd6K; Sat, 19 Aug 2023 00:35:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37J0ZuWb050582; Sat, 19 Aug 2023 00:35:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37J0ZuLn050579; Sat, 19 Aug 2023 00:35:56 GMT (envelope-from git) Date: Sat, 19 Aug 2023 00:35:56 GMT Message-Id: <202308190035.37J0ZuLn050579@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: 3b6a41e84994 - stable/13 - libc vdso time functions: correctly convert errors into errnos List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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/13 X-Git-Reftype: branch X-Git-Commit: 3b6a41e84994350767335a3e008f1a02a628689f Auto-Submitted: auto-generated The branch stable/13 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=3b6a41e84994350767335a3e008f1a02a628689f commit 3b6a41e84994350767335a3e008f1a02a628689f Author: Konstantin Belousov AuthorDate: 2023-08-12 15:45:43 +0000 Commit: Konstantin Belousov CommitDate: 2023-08-19 00:35:29 +0000 libc vdso time functions: correctly convert errors into errnos (cherry picked from commit 41acfee690da6289d570338e6365c1d7ef61dad5) --- lib/libc/sys/clock_gettime.c | 6 +++++- lib/libc/sys/gettimeofday.c | 6 +++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/lib/libc/sys/clock_gettime.c b/lib/libc/sys/clock_gettime.c index ec8ec13a754d..b2a414455245 100644 --- a/lib/libc/sys/clock_gettime.c +++ b/lib/libc/sys/clock_gettime.c @@ -48,7 +48,11 @@ __clock_gettime(clockid_t clock_id, struct timespec *ts) error = __vdso_clock_gettime(clock_id, ts); else error = ENOSYS; - if (error == ENOSYS) + if (error == ENOSYS) { error = __sys_clock_gettime(clock_id, ts); + } else if (error != 0) { + errno = error; + error = -1; + } return (error); } diff --git a/lib/libc/sys/gettimeofday.c b/lib/libc/sys/gettimeofday.c index 22177b15a5c7..d955aaa907e2 100644 --- a/lib/libc/sys/gettimeofday.c +++ b/lib/libc/sys/gettimeofday.c @@ -44,7 +44,11 @@ __gettimeofday(struct timeval *tv, struct timezone *tz) int error; error = __vdso_gettimeofday(tv, tz); - if (error == ENOSYS) + if (error == ENOSYS) { error = __sys_gettimeofday(tv, tz); + } else if (error != 0) { + errno = error; + error = -1; + } return (error); } From nobody Sat Aug 19 00:35:57 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RSKXs453Rz4fyRL; Sat, 19 Aug 2023 00:35: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RSKXs3S6wz3FYv; Sat, 19 Aug 2023 00:35:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692405357; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=khTtSBBXFiSZkarHKC03AIy5mDMtW0T8yGezViVivfs=; b=EWgZEfVt+LfPgN6Tnp8zXHHJYGBU7yOi/pZV8aDWCSJ/OwXzfCywD/F+Zc1aGt3G8N40vo JXEFRCfLNYMfedYwPMQhmMHeOmTVl6IM+wFkZPGs3K7JbU/EQCePwlTJczxALPb0A4cdYo n3qndVew8adQxCiuEii1HTBzR6Ec4m9FzzfgTOe3e8n3ixbApzYGG4p11oefT41hOFfoLX AyZZeyjNmdX/xVbGRdh/78vxs5b5HaQeNbTHf2qN7apzSuK8xH0+m00L3Iiu4UQ102BJ7J 47eG2LzcAak6zb7JGDu9pkAQFUldVWwo7ldkmlACLP290VFYcau0D0TMbfjT8A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692405357; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=khTtSBBXFiSZkarHKC03AIy5mDMtW0T8yGezViVivfs=; b=tZdeeWfgQtcuK9hbvcDOBTrZ/8T3lLT82FdQZu5UfyuUMvG2ULi0oroBH/xU/Qd249tpii +SEWGv31QV95qos3nU6TL7PrwwIB01uaQpWflrkiXrlv//XqkvJ1av8IYWs4oyuR0i6Vcq Cqr4CMnGGiAZ5GtuOrRCNcE38HNAEa4uob7FZa/r8hYutrgG5vg84m4WAlpr/2VjL00qsn RLoHQXBUFc8RJEOOAan9BDts4DV3SpBd57ky0gagJ5nnelaYswr61HFGMPPMaPw0uUyR0e 2uD8Awl+rMcAXH59ja7efA4RiH8E0ySKGYPMV8tPHOdTzyVmSMDaOgNuhIYX/Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692405357; a=rsa-sha256; cv=none; b=RXOlf92Iy82UA7aiaArQ5ACp3H2p7HQJSqkKbigvu7nGGRM0cBUU3VZtHfaO980n5GEnfj +qSNmmBQQ9TfnJKZTba9UiKSanr/z+lI+sNrzzYq3DDN1AJqeYgZn/wHP4lt9IZ5RulFGe pzKqLWM0FtECFN/vE9DHnFkQpPjuD7MO6zWHiJFNR2r85nP2rd4WDcQsPeP6sSglxMFLhJ rxodVCbjV/9cK1ZTEHZ0OpSwzjWWnKd00uobvLSSkCKr061XONTT1sqcqYFGN2CFQ+7Mq2 Wn7af/uP4tbLBiMPHsyYJ+SDp1ys85aqPt6t5KSNcZgRl/iQAneNW8bhWJXLJw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RSKXs2HcXzd0C; Sat, 19 Aug 2023 00:35:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37J0ZvjE050615; Sat, 19 Aug 2023 00:35:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37J0Zv3B050612; Sat, 19 Aug 2023 00:35:57 GMT (envelope-from git) Date: Sat, 19 Aug 2023 00:35:57 GMT Message-Id: <202308190035.37J0Zv3B050612@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: 8fe73008036b - stable/13 - tc_fill_vdso_timehands32(): fix List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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/13 X-Git-Reftype: branch X-Git-Commit: 8fe73008036b0770e3d0a5b41e9b845feb46bdf1 Auto-Submitted: auto-generated The branch stable/13 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=8fe73008036b0770e3d0a5b41e9b845feb46bdf1 commit 8fe73008036b0770e3d0a5b41e9b845feb46bdf1 Author: Konstantin Belousov AuthorDate: 2023-08-12 19:51:37 +0000 Commit: Konstantin Belousov CommitDate: 2023-08-19 00:35:29 +0000 tc_fill_vdso_timehands32(): fix PR: 273085 (cherry picked from commit 93626d54370292b09cd0ca604b144737109e9071) --- sys/dev/acpica/acpi_hpet.c | 3 ++- sys/x86/include/vdso.h | 7 ++++++- sys/x86/x86/pvclock.c | 2 +- sys/x86/x86/tsc.c | 3 ++- 4 files changed, 11 insertions(+), 4 deletions(-) diff --git a/sys/dev/acpica/acpi_hpet.c b/sys/dev/acpica/acpi_hpet.c index e35e3808a980..e6f83512feed 100644 --- a/sys/dev/acpica/acpi_hpet.c +++ b/sys/dev/acpica/acpi_hpet.c @@ -173,7 +173,8 @@ hpet_vdso_timehands32(struct vdso_timehands32 *vdso_th32, vdso_th32->th_algo = VDSO_TH_ALGO_X86_HPET; vdso_th32->th_x86_shift = 0; vdso_th32->th_x86_hpet_idx = device_get_unit(sc->dev); - vdso_th32->th_x86_pvc_last_systime = 0; + vdso_th32->th_x86_pvc_last_systime[0] = 0; + vdso_th32->th_x86_pvc_last_systime[1] = 0; vdso_th32->th_x86_pvc_stable_mask = 0; bzero(vdso_th32->th_res, sizeof(vdso_th32->th_res)); return (sc->mmap_allow != 0); diff --git a/sys/x86/include/vdso.h b/sys/x86/include/vdso.h index 546a92a47301..be90e26702f7 100644 --- a/sys/x86/include/vdso.h +++ b/sys/x86/include/vdso.h @@ -49,7 +49,12 @@ #ifdef _KERNEL #ifdef COMPAT_FREEBSD32 -#define VDSO_TIMEHANDS_MD32 VDSO_TIMEHANDS_MD +#define VDSO_TIMEHANDS_MD32 \ + uint32_t th_x86_shift; \ + uint32_t th_x86_hpet_idx; \ + uint32_t th_x86_pvc_last_systime[2];\ + uint8_t th_x86_pvc_stable_mask; \ + uint8_t th_res[15]; #endif #endif diff --git a/sys/x86/x86/pvclock.c b/sys/x86/x86/pvclock.c index 3da3373bb2ee..9d8ac99f5a8a 100644 --- a/sys/x86/x86/pvclock.c +++ b/sys/x86/x86/pvclock.c @@ -253,7 +253,7 @@ pvclock_tc_vdso_timehands32(struct vdso_timehands32 *vdso_th, vdso_th->th_algo = VDSO_TH_ALGO_X86_PVCLK; vdso_th->th_x86_shift = 0; vdso_th->th_x86_hpet_idx = 0; - vdso_th->th_x86_pvc_last_systime = + *(uint64_t *)&vdso_th->th_x86_pvc_last_systime[0] = atomic_load_acq_64(&pvclock_last_systime); vdso_th->th_x86_pvc_stable_mask = !pvc->vdso_force_unstable && pvc->stable_flag_supported ? PVCLOCK_FLAG_TSC_STABLE : 0; diff --git a/sys/x86/x86/tsc.c b/sys/x86/x86/tsc.c index 94305dfdc82f..4eab4dc1692b 100644 --- a/sys/x86/x86/tsc.c +++ b/sys/x86/x86/tsc.c @@ -967,7 +967,8 @@ x86_tsc_vdso_timehands32(struct vdso_timehands32 *vdso_th32, vdso_th32->th_algo = VDSO_TH_ALGO_X86_TSC; vdso_th32->th_x86_shift = (int)(intptr_t)tc->tc_priv; vdso_th32->th_x86_hpet_idx = 0xffffffff; - vdso_th32->th_x86_pvc_last_systime = 0; + vdso_th32->th_x86_pvc_last_systime[0] = 0; + vdso_th32->th_x86_pvc_last_systime[1] = 0; vdso_th32->th_x86_pvc_stable_mask = 0; bzero(vdso_th32->th_res, sizeof(vdso_th32->th_res)); return (1); From nobody Sat Aug 19 01:45:07 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RSM4h2HW6z4g3Lr; Sat, 19 Aug 2023 01:45:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RSM4h1lY9z3Mg5; Sat, 19 Aug 2023 01:45:08 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692409508; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kQjGKTEPJ9C9B1s/ZMZ9JR53UstX9NzpKZrV9JkwLLU=; b=jeK0bhmFVsD8pljVNaZ1fQWWOTnGxOqSE1f7yvX3YGRtfeW4LrkgYW2LxuXK0Wv4MjCcQa CHD353asipu9kOQBn2SAyR8YePVjHagnIhR6UD2J3mrd2hSIW55DMaGbVMxzwa5UN4pFrS i3rlqh0pMH1MdQ1FfUyLyZMabQnwWxaBVKgoSfU+U83MnejPzWP9BRaO9xxwFt12+jQmDv 7aKk9FZyuw6D0CaE94E6IcdxZf36c5OM+v20E6sGlNty6ZAqyHFoRWuKWNVz4FBP58yV2Z UKHRo9ylbc2sy6r4J6pDqGjuNTKwTAtxJ7NKr/L1aLumoczftpBdjWh5FlGnaA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692409508; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kQjGKTEPJ9C9B1s/ZMZ9JR53UstX9NzpKZrV9JkwLLU=; b=VBjDWGXRYbDwK6qTNPGOaZpdkIo7RLvQbFfCl8q23fXxd0Ln1ieSvmk8xGG8X/I1U8msY3 tAarIMAy1wzqunBUss6+J8wuocWn093d2KjNIEq/S30U7lT4vILkCC9q/hFUFc30zFq8CO ylnHN3saVtYZP2pIxoKVasIq9UjMpyK4XKfKpd3hXMf7Rmq2mdzStWqS9GPccv+hwa9QAV 9Pc+APcDPmjryj2PWfmamKuvNMuh6TpmSFBEHkVBQ8zQjrCQjbKdd5dI2CP34UoJXSSVhP 1OAcwXhvLYJCoFy379AyWZ5ai/eNsHnyIXID68ddX8aIEw84qdADW1TJqMEfHw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692409508; a=rsa-sha256; cv=none; b=ZU72AFPUZlCBPjXnwpU3MsiBfP9CHwbcf8C/mp9jif+5VAzOFL0GsK1zMQ38zk1Mx8E/KM 5O+d0zfLhVnwplVGwWZ7wEDtP0VX247OpfamPbRVkDZm5VbfuFl2U4jugUZE8BTKurQM7p NKAqD2eMws+RHRBj+3B5iGBnrURx/FRs9h7PxNdxcdCmaTKLo/WT4pPU5gDd0p20PxB0TE qIyyn0IjCW3CVcSUMUsKFpgobaRzIeewnoft3Nt+AQTIICKWAXDm+jkpzBfcokVgZXxop0 Frr+e/sTshs5BikU0WS4hixqEDK28Od0zWuBHC70W9qqqPfMYVBhfCWTDfgWAg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RSM4h0jRVzffs; Sat, 19 Aug 2023 01:45:08 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37J1j7Ee066910; Sat, 19 Aug 2023 01:45:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37J1j7op066907; Sat, 19 Aug 2023 01:45:07 GMT (envelope-from git) Date: Sat, 19 Aug 2023 01:45:07 GMT Message-Id: <202308190145.37J1j7op066907@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dag-Erling =?utf-8?Q?Sm=C3=B8rgrav?= Subject: git: 2ba1d4970a06 - main - unbound: Move config.h to lib directory. List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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/main X-Git-Reftype: branch X-Git-Commit: 2ba1d4970a06a1660b46f6fd99351d154b295683 Auto-Submitted: auto-generated The branch main has been updated by des: URL: https://cgit.FreeBSD.org/src/commit/?id=2ba1d4970a06a1660b46f6fd99351d154b295683 commit 2ba1d4970a06a1660b46f6fd99351d154b295683 Author: Dag-Erling Smørgrav AuthorDate: 2023-08-19 01:44:39 +0000 Commit: Dag-Erling Smørgrav CommitDate: 2023-08-19 01:44:58 +0000 unbound: Move config.h to lib directory. It was originally in contrib, and moved to usr.sbin in 6692aa840c1f; I always thought lib would make more sense but never got around to moving it. Reviewed by: cy Differential Revision: https://reviews.freebsd.org/D41504 --- contrib/unbound/freebsd-configure.sh | 1 + lib/libunbound/Makefile | 3 +-- {usr.sbin/unbound => lib/libunbound}/config.h | 0 usr.sbin/unbound/anchor/Makefile | 3 ++- usr.sbin/unbound/checkconf/Makefile | 3 ++- usr.sbin/unbound/control/Makefile | 3 ++- usr.sbin/unbound/daemon/Makefile | 3 ++- 7 files changed, 10 insertions(+), 6 deletions(-) diff --git a/contrib/unbound/freebsd-configure.sh b/contrib/unbound/freebsd-configure.sh index 7169bbcce732..cd45d4716320 100755 --- a/contrib/unbound/freebsd-configure.sh +++ b/contrib/unbound/freebsd-configure.sh @@ -39,3 +39,4 @@ cd $unbound --with-conf-file=/var/unbound/unbound.conf \ --with-run-dir=/var/unbound \ --with-username=unbound +mv config.h ../../lib/libunbound diff --git a/lib/libunbound/Makefile b/lib/libunbound/Makefile index 2b792d3ade2b..e6f095a09d10 100644 --- a/lib/libunbound/Makefile +++ b/lib/libunbound/Makefile @@ -11,8 +11,7 @@ LIB= unbound PRIVATELIB= PACKAGE= unbound -CFLAGS+= -I${UNBOUNDDIR} -I${LDNSDIR} -I${.OBJDIR} -CFLAGS+= -I${SRCTOP}/usr.sbin/unbound +CFLAGS+= -I${UNBOUNDDIR} -I${LDNSDIR} -I${.OBJDIR} -I${.CURDIR} CFLAGS+= -DOPENSSL_API_COMPAT=0x10100000L SRCS= alloc.c as112.c authzone.c autotrust.c cachedb.c config_file.c \ diff --git a/usr.sbin/unbound/config.h b/lib/libunbound/config.h similarity index 100% rename from usr.sbin/unbound/config.h rename to lib/libunbound/config.h diff --git a/usr.sbin/unbound/anchor/Makefile b/usr.sbin/unbound/anchor/Makefile index 01a7c53c8ae8..91ae1090415a 100644 --- a/usr.sbin/unbound/anchor/Makefile +++ b/usr.sbin/unbound/anchor/Makefile @@ -2,6 +2,7 @@ # Vendor sources and generated files LDNSDIR= ${SRCTOP}/contrib/ldns UNBOUNDDIR= ${SRCTOP}/contrib/unbound +LIBUNBOUNDDIR=${SRCTOP}/lib/libunbound EXPATDIR= ${SRCTOP}/contrib/expat .PATH: ${UNBOUNDDIR} ${UNBOUNDDIR}/smallapp ${UNBOUNDDIR}/doc @@ -9,7 +10,7 @@ EXPATDIR= ${SRCTOP}/contrib/expat PROG= local-unbound-anchor SRCS= unbound-anchor.c CFLAGS+= -I${UNBOUNDDIR} -I${LDNSDIR} -I${EXPATDIR}/lib -CFLAGS+= -I${.CURDIR:H} -I${.CURDIR} +CFLAGS+= -I${LIBUNBOUNDDIR} -I${.CURDIR} LIBADD= unbound bsdxml ssl crypto pthread MAN= local-unbound-anchor.8 diff --git a/usr.sbin/unbound/checkconf/Makefile b/usr.sbin/unbound/checkconf/Makefile index 264f3b829fc4..c8d8397225b0 100644 --- a/usr.sbin/unbound/checkconf/Makefile +++ b/usr.sbin/unbound/checkconf/Makefile @@ -2,13 +2,14 @@ # Vendor sources and generated files LDNSDIR= ${SRCTOP}/contrib/ldns UNBOUNDDIR= ${SRCTOP}/contrib/unbound +LIBUNBOUNDDIR=${SRCTOP}/lib/libunbound .PATH: ${UNBOUNDDIR} ${UNBOUNDDIR}/smallapp ${UNBOUNDDIR}/util ${UNBOUNDDIR}/doc PROG= local-unbound-checkconf SRCS= ub_event.c unbound-checkconf.c worker_cb.c CFLAGS+= -I${UNBOUNDDIR} -I${LDNSDIR} -CFLAGS+= -I${.CURDIR:H} -I${.CURDIR} +CFLAGS+= -I${LIBUNBOUNDDIR} -I${.CURDIR} LIBADD= unbound pthread MAN= local-unbound-checkconf.8 diff --git a/usr.sbin/unbound/control/Makefile b/usr.sbin/unbound/control/Makefile index b5340c0bca67..ad5f7eb21f09 100644 --- a/usr.sbin/unbound/control/Makefile +++ b/usr.sbin/unbound/control/Makefile @@ -2,13 +2,14 @@ # Vendor sources and generated files LDNSDIR= ${SRCTOP}/contrib/ldns UNBOUNDDIR= ${SRCTOP}/contrib/unbound +LIBUNBOUNDDIR=${SRCTOP}/lib/libunbound .PATH: ${UNBOUNDDIR} ${UNBOUNDDIR}/smallapp ${UNBOUNDDIR}/util ${UNBOUNDDIR}/doc PROG= local-unbound-control SRCS= ub_event.c unbound-control.c worker_cb.c CFLAGS+= -I${UNBOUNDDIR} -I${LDNSDIR} -CFLAGS+= -I${.CURDIR:H} -I${.CURDIR} +CFLAGS+= -I${LIBUNBOUNDDIR} -I${.CURDIR} LIBADD= unbound crypto ssl pthread MAN= local-unbound-control.8 diff --git a/usr.sbin/unbound/daemon/Makefile b/usr.sbin/unbound/daemon/Makefile index ad0f5b2fb245..28b451aa5061 100644 --- a/usr.sbin/unbound/daemon/Makefile +++ b/usr.sbin/unbound/daemon/Makefile @@ -2,6 +2,7 @@ # Vendor sources and generated files LDNSDIR= ${SRCTOP}/contrib/ldns UNBOUNDDIR= ${SRCTOP}/contrib/unbound +LIBUNBOUNDDIR=${SRCTOP}/lib/libunbound .PATH: ${UNBOUNDDIR} ${UNBOUNDDIR}/daemon ${UNBOUNDDIR}/util ${UNBOUNDDIR}/util/shm_side ${UNBOUNDDIR}/doc @@ -9,7 +10,7 @@ PROG= local-unbound SRCS= acl_list.c cachedump.c daemon.c remote.c shm_main.c stats.c \ ub_event.c unbound.c worker.c CFLAGS+= -I${UNBOUNDDIR} -I${LDNSDIR} -CFLAGS+= -I${.CURDIR:H} -I${.CURDIR} +CFLAGS+= -I${LIBUNBOUNDDIR} -I${.CURDIR} LIBADD= unbound util ssl crypto pthread MAN= local-unbound.8 local-unbound.conf.5 From nobody Sat Aug 19 02:36:16 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RSNCh3GFMz4g63V; Sat, 19 Aug 2023 02:36:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RSNCh2NNXz3T9p; Sat, 19 Aug 2023 02:36:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692412576; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=dCNyUwiQgZdAGRGNM1rTt/ZGKxd72nHf4JTFMskDFL8=; b=Vzqzeb9Ga2rv3e4q4AJwEdq/OyZajItF7WbBcF4FUyyu3hhYi9640NHe1Bqeuw4rs2aE8O HNmKp9wLg5KyvONNc9KeC1Z4XcSSPz59sa248c8T31hNCDkTTHypUEHUXnopGRIwBgMgx9 kLD6l/QIHTLliqU2JYpzm5OPT5kY22wO2WyjDInBsidiKg/DA/QeskMmJ2pF6IO7RJHgK9 vxVSFpJKX9A7N5KHZa55qdEXfmkQgO7Xxrgw89k0bcf8L6zgNRWN32p3bxA2zvA4Q5I9Yz xOOsqwLuTiNYUAqdzLiwPpiCplmXNdcVU63Lyv1uxrlsLGVr/HuW+2K+cYOJYQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692412576; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=dCNyUwiQgZdAGRGNM1rTt/ZGKxd72nHf4JTFMskDFL8=; b=gW4GRVUl6Qa5oERjOBJrGRr42oYsSTd+QXdT9W+MyjaJbWN6RdW6HnV+dYebkJ3xymj3Ey D7JFFF9015uXB0CmUPHB9sd0ZKljvKIgJgNUpUeYfh3I4bhf19gEqUIqNMMF+8vUIRXNQq qKO08oHjtsiU8t7uqYB1xrtu/NFy1x/sTW9NuuZ26VhuTWm+dJcOj9Mhl642qt+wUkubyT res8TmOgDIWA33yWVAbNABXV9dyy7/FDvkr4+85UM0fXgiNqrnhZw8iXldhJ0mN4UnpdHl KwGlDih30NcvG9GYA+ipEjpk4IgscJ+gnU91RsFbFkJyfl8NmC87tUHyGqo3Kw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692412576; a=rsa-sha256; cv=none; b=DVDZ0xyuZ6YjplsemovivC3zAbUvk1DVKv383Bkd8vAYYzhVj0mxrr0O+hg6+ht3sXY9cb VSK4yhoKEVNcai+Iu74kjAgt9wfcuzTFG2Opxslev9mK0UULrAirZTEOnnQyo9dt/+V8Cq nlsZpvn71YyXZlP10zhUsBicAqhwNXNnKQJyh5GDMuqY7pP8kA79VCnib2lxgrYT+FxwUd JOyRzevFmvrSptmxewDIyvNiE1Eyi+jNRAzq/uQCew5isGNEPvW/xz88gdnfQX9nENyRgN b6CT2Y4GWM4VWr0eCmTnzqg4CpcRdM08FzmekMi6nlP5oh6aUZUowZwWc3Js0g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RSNCh1RVFzgSQ; Sat, 19 Aug 2023 02:36:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37J2aGbV049925; Sat, 19 Aug 2023 02:36:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37J2aGP6049922; Sat, 19 Aug 2023 02:36:16 GMT (envelope-from git) Date: Sat, 19 Aug 2023 02:36:16 GMT Message-Id: <202308190236.37J2aGP6049922@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Ed Maste Subject: git: d8bb58586d90 - main - Cirrus-CI: restore amd64-gcc12 build/test on main List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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/main X-Git-Reftype: branch X-Git-Commit: d8bb58586d90a27852cc79f37aa890ac6397cc03 Auto-Submitted: auto-generated The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=d8bb58586d90a27852cc79f37aa890ac6397cc03 commit d8bb58586d90a27852cc79f37aa890ac6397cc03 Author: Ed Maste AuthorDate: 2023-08-19 01:27:26 +0000 Commit: Ed Maste CommitDate: 2023-08-19 02:35:39 +0000 Cirrus-CI: restore amd64-gcc12 build/test on main The Cirrus-CI log length issue was addressed by commit 5f72ceb2c50d ("Cirrus-CI: for *-gcc12, build world with make -s"), and the failure itself by commit 0c785f06020f ("Fix GoogleTest 1.14.0 import"). This reverts commit 0ed2e7e88984aa4ad01a41e9350c5870b271c0c3. Reported by: Jose Luis Duran Sponsored by: The FreeBSD Foundation --- .cirrus.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.cirrus.yml b/.cirrus.yml index 40ee22425884..345e7ab148bb 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -64,7 +64,6 @@ task: EXTRA_MAKE_FLAGS: -s - name: amd64-gcc12 World and kernel build and boot smoke test (FreeBSD repo) only_if: $CIRRUS_REPO_FULL_NAME == 'freebsd/freebsd-src' - trigger_type: manual env: TARGET: amd64 TARGET_ARCH: amd64 From nobody Sat Aug 19 04:53:31 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RSRG404Mxz4q9bD; Sat, 19 Aug 2023 04:53: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RSRG36L79z4Dqf; Sat, 19 Aug 2023 04:53:31 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692420811; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7BiIR2EK+FM0Xe4B4xGn/CpR3NfayinJHcoxp3dxHOU=; b=ZSeuGaz6PBuFjXnhd0CidgVK8armpr+rKpD/PAI80RE9/GTQUu1kbHGDmKrRFWBypBPXYo 7Wn9NdJWvo59yrQaG9XGh67uda//N/RFFWHUsKZrII5KsCD752zRxHlneLvV8Ax5k6ZEwC H4NrSQPxLQOxCND/EQP1ZrLlTzTxrp6C6zpD0QHIjTNl5bLG+nuIU8ggJURmeHkxX91Qo+ edYDpvOxb7Yc6wt+9j9pdA5VjExaNZjQ3B0XdUWpFkIMClNw7yLFb4iMJdWFrTjbpOXuW0 NZw1ZnhBWe9BeXjaJpKkBetnqeIOn9WkaUGavV+RC56xtxtUVz9M8QmAjmX6Aw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692420811; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7BiIR2EK+FM0Xe4B4xGn/CpR3NfayinJHcoxp3dxHOU=; b=C4kD3etCWP84YBn7LxQD7W6c165enEPPLTVdhPuzWDOPppYdVYuA6WY+QtmYfVG8irQs6R 79gB4SzHNqvJtYL3ysV9v4xoHfNdnlHt0TlLjTj0rMifGtqLpfMqTd35IdWxgi8/I16KjH DICMpcilAbmL7sqePmTw/JLT74gl8bITWuOHkkpkv4ZgXg3OcJI9bY6KcyoXMjn4oFG3ql rY9BrKdPdM4mYEGohDCQ4h0XyVYOcBHK594djMtIfCvh90PZ/ME2yftSsBf6sJ31/KtlSy VYADrmGeTe0QDwTrVeYxKAtB122dzH6lkuPkcq9URkL6ogT8tuJ+cCJUeHehJA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692420811; a=rsa-sha256; cv=none; b=JS/YbMJpmz3Dy8CgJueTl/ySinGsubAWpBnyUCaiIrUmVnhJSjZ4VQJaW71TkUhWaom7FB cq71tIFNt7bnod0xG8AOSSUoBpOpmrpGpKExifaMKanvwOdlaRzIQbmmX5J7xECh/mqj1b qheFCgep/TgdkoFIriHTsUlxuYBRFld4jHbdxIAyhR0g6WX6cL3MqWSbC3Rx/5Ml1WOh1d rPuxXmKzQR7idd8uaJHtJ+6haZ1TzUzw+C1fzv40hU3ZyvqoALNQyLOUqpI52O6DYPme6k JyD1Heik+uSiEIabIyBLoXXF8IhsldObdhb++UZxE7nUHvzD9HyGllF/+v7x7Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RSRG35Q3lzlHG; Sat, 19 Aug 2023 04:53:31 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37J4rVL2084907; Sat, 19 Aug 2023 04:53:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37J4rV3L084904; Sat, 19 Aug 2023 04:53:31 GMT (envelope-from git) Date: Sat, 19 Aug 2023 04:53:31 GMT Message-Id: <202308190453.37J4rV3L084904@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: 149c457de14a - main - LinuxKPI: skbuff: fix tracing List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 149c457de14a06a40e0419d7a4249b1a3b01ae7a Auto-Submitted: auto-generated The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=149c457de14a06a40e0419d7a4249b1a3b01ae7a commit 149c457de14a06a40e0419d7a4249b1a3b01ae7a Author: Bjoern A. Zeeb AuthorDate: 2023-08-19 04:50:03 +0000 Commit: Bjoern A. Zeeb CommitDate: 2023-08-19 04:53:00 +0000 LinuxKPI: skbuff: fix tracing Fix arguments to a trace line and remove another trace line until we actually will have the skb to trace along with a future implementation. Sponsored by: The FreeBSD Foundation MFC after: 10 days --- sys/compat/linuxkpi/common/include/linux/skbuff.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/sys/compat/linuxkpi/common/include/linux/skbuff.h b/sys/compat/linuxkpi/common/include/linux/skbuff.h index 5e5f7e4a0a69..6f48ac74996b 100644 --- a/sys/compat/linuxkpi/common/include/linux/skbuff.h +++ b/sys/compat/linuxkpi/common/include/linux/skbuff.h @@ -573,7 +573,7 @@ __skb_queue_tail(struct sk_buff_head *q, struct sk_buff *new) static inline void skb_queue_tail(struct sk_buff_head *q, struct sk_buff *new) { - SKB_TRACE2(q, skb); + SKB_TRACE2(q, new); return (__skb_queue_tail(q, new)); } @@ -1048,7 +1048,6 @@ static inline struct sk_buff * napi_build_skb(void *data, size_t len) { - SKB_TRACE(skb); SKB_TODO(); return (NULL); } From nobody Sat Aug 19 04:56:41 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RSRKk12B5z4q8Wt; Sat, 19 Aug 2023 04:56: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RSRKk0SRmz4FXs; Sat, 19 Aug 2023 04:56:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692421002; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=DPcQfa9YwgpNkChwVv7ATnWO5zfEuJyRIKD/R+3xynI=; b=udw7xkFkVBrL1Vg3+gc9W3dIW1lUbG9U06TUTtem6JtXTxDAQ47Mk3tK2GouDTOF71P1z2 n5NMjESOoEqCpTOYGfVBYZ8mHKLuNOhISuvyX4vDBO4diXsQwvkRdGKEoifFccAFY5t+Zp MfYyPUORrhCFC7pQLV1cqC3Ek/W8Vz/NFrfEq0VXdhTlabsqmbpoA1rpYYHk3+VIQ+W5lh sCz9HA4WBfMNTnGjt47OgDlp5O83wpmwKA+t1pZxDhOIDgU2NQD7fMoMEKyemBTLmG9tbH ExBZK6ndiBhICIC/f1VdSl544RA19eeGgKpwlz2VW6X7vvdePRDiQxAPtNX+Bg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692421002; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=DPcQfa9YwgpNkChwVv7ATnWO5zfEuJyRIKD/R+3xynI=; b=kmurzaYNHYunrg+oZci1UMfYDOfOkIgosJWxjEd/IElhDpN121O/fu1uLoy7jO/x2Qu+to MM+AaSCWsTrbTPILg06RDoXIe7uiOP3lldM9xHDXgCrlYHox+tVYefqTM2fDcl+T/YD+W6 qq+DQ8WWDq8mnhHFj35kSDsniQQbz0huAe9WyFrWmVUM3DPM6svlKl2bjNW/jaxGicWehp KiVII2rolq9yhZoE/HJeHtZJLEwwOEZwxdUZ7w2CLQ+qsrF2iilMILudx7hxPjPXWNTfto DzuRbp94I/bdghAITqPwkczEdZEBjAHWaCsAO8EYKJdgWKm8wgg5SmWsVjlG+g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692421002; a=rsa-sha256; cv=none; b=cxrNP1T0SHOyVUFye+5PCtLamkg2/bDZNDY1pVAX92lnsULSsY73ZswXo3kq5mLjfSPFL+ 64e4s+IqEbd5/UXuShKPCNDv1YGbXkvbgNZERIxa9oneeGdi0iqN655lTxUAthKnqIOT4X 0dpLjInmV0fhsHyBvPkbq3YF/LxraHIJ1Ey+GOQ8sSc1XAy6MY699X/7Q2godGvbqZSN9b A0wbpLIYWGvyxs1o91bu4Fia3sL7IqXbcqnbYi6M0Wlk/pHZKkP+IK3B0Ab7jwJjStQEo6 rnqqlFtkW50bn0f72AFL7KG9u/TFA9TnGWwhzxiIJ21a24NFFrOkYYhTPWjk+Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RSRKj6dzdzlMB; Sat, 19 Aug 2023 04:56:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37J4ufEu085478; Sat, 19 Aug 2023 04:56:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37J4ufGS085475; Sat, 19 Aug 2023 04:56:41 GMT (envelope-from git) Date: Sat, 19 Aug 2023 04:56:41 GMT Message-Id: <202308190456.37J4ufGS085475@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: "Bjoern A. Zeeb" Subject: git: e039b38d4652 - main - LinuxKPI: skbuff: add skb_cow_head() List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bz X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e039b38d4652b6a68567f8d632c3dfa4f15c40f6 Auto-Submitted: auto-generated The branch main has been updated by bz: URL: https://cgit.FreeBSD.org/src/commit/?id=e039b38d4652b6a68567f8d632c3dfa4f15c40f6 commit e039b38d4652b6a68567f8d632c3dfa4f15c40f6 Author: Bjoern A. Zeeb AuthorDate: 2023-08-10 02:07:41 +0000 Commit: Bjoern A. Zeeb CommitDate: 2023-08-19 04:55:56 +0000 LinuxKPI: skbuff: add skb_cow_head() Add dummy implementation of skb_cow_head(). Sponsored by: The FreeBSD Foundation MFC after: 10 days --- sys/compat/linuxkpi/common/include/linux/skbuff.h | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/sys/compat/linuxkpi/common/include/linux/skbuff.h b/sys/compat/linuxkpi/common/include/linux/skbuff.h index 6f48ac74996b..c917b3f09ac9 100644 --- a/sys/compat/linuxkpi/common/include/linux/skbuff.h +++ b/sys/compat/linuxkpi/common/include/linux/skbuff.h @@ -1067,6 +1067,14 @@ skb_mark_for_recycle(struct sk_buff *skb) SKB_TODO(); } +static inline int +skb_cow_head(struct sk_buff *skb, unsigned int headroom) +{ + SKB_TRACE(skb); + SKB_TODO(); + return (-1); +} + #define SKB_WITH_OVERHEAD(_s) \ (_s) - ALIGN(sizeof(struct skb_shared_info), CACHE_LINE_SIZE) From nobody Sat Aug 19 06:37:55 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RSTZW5nVPz4qHmD; Sat, 19 Aug 2023 06:37: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RSTZW5Bccz4QG4; Sat, 19 Aug 2023 06:37:55 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692427075; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=WNlmUoMwgv2uk/OaWj1um+YRgk6vn1hxqNjgAuhJVSg=; b=xH0bJJwys9xp8fchjmGWJhMbf665eiwoiTdT6us4hid51BMFgkj5noxf9A1TN0x741ZcC+ xqNUam8rPkONIduXTLlxUWfWuWu0Q1keI2ib+y0///VVsaGpQ/a6CXAj5TfzEIXg7QY/jU MOHfpzeGcs89ofY1vf+IPC5fCAE3gcWOmt2Gg3vuo7aA6vLbweVI8PTkjUUqnN6wDLsffQ kH+Z49xHHAOzq1devKsAiEPxtpDLVO+UxpbryAkZFYzvMP1SgXhc6BuRkbqQhLrKJFfOuf DVmB9bYe2kMqfMt+0QKNJoRpqb3tkUm6qx2nuIGEJE3Ytq01bkzJ4WJ3Uni7Vw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692427075; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=WNlmUoMwgv2uk/OaWj1um+YRgk6vn1hxqNjgAuhJVSg=; b=Rs8VsmUaKWu6JPov+0G6UqOSYELKZ7ZUkc/L0k+wHg6uPOjcqkEd53xQmxgbcrFhu93L6F aMCP0p38PJW13IQ2NvoD1Mm/xwRvaYWm91VvZVZOtQhgBSLgYZxWgjy/FSKx+EZYbEPmaq mlPvDjIJtQKDyCq80sSVeqBEDLoquavy/Jl10ebCqRNkSfCgX+XPrpCbA07VYh4jjucNqo TYGVJqv9X8OH+GftytXOx4QM2PFvojhimnvXqoDExyvmmuNr2ayWJ49JENWozmokV+m9yQ 1f/51QwTpTaqVHip4aP++qfaam+S+AF97Y+RnoCNfobQKlCikTtyhdzIwQaSmw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692427075; a=rsa-sha256; cv=none; b=M3dRSJpS2ftdcN3EZjvR5V12PKBllBs+QYX61IbFqs3p9sp45Hi8DaOOfUoM2RvghxwaiI Oy/clnZAHBPcP9A8m43FHY0Z/uyg+gV/FZn9DayD0g5Q5PwyszTnGBc6FuPAEHP4PuRewP 0a2CXpEIGK19rEMNeJDmNm1BQqVvV0WVeTXbZa4Su/LoGYxM0bCbz91ug5K9PRzCoEK1aI BBxmNL5ES9kmxMTbR29X2srschUjszm81f5JT7BQz5EczH7FZI3Nt24fwj1O+Z9AVbqsz+ 3DjBlRRl8FqxbjIVR4YJI0Gi+bcAdMAdWG2eYaCuuuScsj9SYGfc9khTDVJp/w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RSTZW3wQ4znj2; Sat, 19 Aug 2023 06:37:55 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37J6btq5052137; Sat, 19 Aug 2023 06:37:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37J6bt8P052134; Sat, 19 Aug 2023 06:37:55 GMT (envelope-from git) Date: Sat, 19 Aug 2023 06:37:55 GMT Message-Id: <202308190637.37J6bt8P052134@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Eugene Grosbein Subject: git: b71dde1aeba2 - stable/13 - tftpd: introduce new option -S List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: eugen X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: b71dde1aeba2972522a6742bbae77c2c6497eb01 Auto-Submitted: auto-generated The branch stable/13 has been updated by eugen: URL: https://cgit.FreeBSD.org/src/commit/?id=b71dde1aeba2972522a6742bbae77c2c6497eb01 commit b71dde1aeba2972522a6742bbae77c2c6497eb01 Author: Eugene Grosbein AuthorDate: 2023-07-20 20:11:33 +0000 Commit: Eugene Grosbein CommitDate: 2023-08-19 06:35:58 +0000 tftpd: introduce new option -S Historically, tftpd disallowed write requests to existing files that are not publicly writable. Such requirement is questionable at least. Let us make it possible to run tftpd in chrooted environment keeping files non-world writable. New option -S enables write requests to existing files for chrooted run according to generic file permissions. It is ignored unless tftpd runs chrooted. Requested by: marck Differential: https://reviews.freebsd.org/D41090 (based on) (cherry picked from commit 273a307d0b80743fb08e23237b3f74dc94a8fa2a) (cherry picked from commit 03c2616dc530e5b23f06f9aa421012154590e578) --- libexec/tftpd/tftpd.8 | 22 ++++++++++++++++++---- libexec/tftpd/tftpd.c | 14 +++++++++++--- 2 files changed, 29 insertions(+), 7 deletions(-) diff --git a/libexec/tftpd/tftpd.8 b/libexec/tftpd/tftpd.8 index e4f5ab94a2fe..a984cdc32c94 100644 --- a/libexec/tftpd/tftpd.8 +++ b/libexec/tftpd/tftpd.8 @@ -28,7 +28,7 @@ .\" @(#)tftpd.8 8.1 (Berkeley) 6/4/93 .\" $FreeBSD$ .\" -.Dd March 2, 2020 +.Dd July 20, 2023 .Dt TFTPD 8 .Os .Sh NAME @@ -72,7 +72,11 @@ Files containing the string or starting with .Dq Li "../" are not allowed. -Files may be written only if they already exist and are publicly writable. +Files may be written only if they already exist (unless the +.Fl w +option is used) and are publicly writable (unless chrooted and the +.Fl S +option is used). Note that this extends the concept of .Dq public to include @@ -191,6 +195,12 @@ to change its root directory to After doing that but before accepting commands, .Nm will switch credentials to an unprivileged user. +.It Fl S +If +.Nm +runs chrooted, the option allows write requests according to generic +file permissions, skipping requirement for files to be publicly writable. +The option is ignored for non-chrooted run. .It Fl u Ar user Switch credentials to .Ar user @@ -275,12 +285,16 @@ the .Fl c option was introduced in .Fx 4.3 , -and the +the .Fl F and .Fl W options were introduced in -.Fx 7.4 . +.Fx 7.4 , +and the +.Fl S +option was introduced in +.Fx 13.3 . .Pp Support for Timeout Interval and Transfer Size Options (RFC2349) was introduced in diff --git a/libexec/tftpd/tftpd.c b/libexec/tftpd/tftpd.c index 02fbaaf0d371..3b08fab33dca 100644 --- a/libexec/tftpd/tftpd.c +++ b/libexec/tftpd/tftpd.c @@ -98,6 +98,7 @@ static struct dirlist { static int suppress_naks; static int logging; static int ipchroot; +static int check_woth = 1; static int create_new = 0; static const char *newfile_format = "%Y%m%d"; static int increase_name = 0; @@ -138,7 +139,7 @@ main(int argc, char *argv[]) acting_as_client = 0; tftp_openlog("tftpd", LOG_PID | LOG_NDELAY, LOG_FTP); - while ((ch = getopt(argc, argv, "cCd:F:lnoOp:s:u:U:wW")) != -1) { + while ((ch = getopt(argc, argv, "cCd::F:lnoOp:s:Su:U:wW")) != -1) { switch (ch) { case 'c': ipchroot = 1; @@ -176,6 +177,9 @@ main(int argc, char *argv[]) case 's': chroot_dir = optarg; break; + case 'S': + check_woth = -1; + break; case 'u': chuser = optarg; break; @@ -385,7 +389,11 @@ main(int argc, char *argv[]) tftp_log(LOG_ERR, "setuid failed"); exit(1); } + if (check_woth == -1) + check_woth = 0; } + if (check_woth == -1) + check_woth = 1; len = sizeof(me_sock); if (getsockname(0, (struct sockaddr *)&me_sock, &len) == 0) { @@ -727,7 +735,7 @@ validate_access(int peer, char **filep, int mode) if ((stbuf.st_mode & S_IROTH) == 0) return (EACCESS); } else { - if ((stbuf.st_mode & S_IWOTH) == 0) + if (check_woth && ((stbuf.st_mode & S_IWOTH) == 0)) return (EACCESS); } } else { @@ -757,7 +765,7 @@ validate_access(int peer, char **filep, int mode) if ((stbuf.st_mode & S_IROTH) != 0) break; } else { - if ((stbuf.st_mode & S_IWOTH) != 0) + if (!check_woth || ((stbuf.st_mode & S_IWOTH) != 0)) break; } err = EACCESS; From nobody Sat Aug 19 06:44:59 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RSTkg4gmbz4qJ9J; Sat, 19 Aug 2023 06:44: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RSTkg49nKz4Qrg; Sat, 19 Aug 2023 06:44:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692427499; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=oD71L/JyLiRE6Ar8hhmV1IWCNo6EUKzUAZ2M3XRYGmo=; b=rtHT33mNFF2hsHWOxK47ydTDqsL5jRMMpxY8Qp4kYbxLtH4xSgINjFdpJ1LtofJWoV/Psg zxBrzrCniktroXmYiRO9LH3MZdnUwV7n70HftuGWvXKnBu4lC+ZKFcV+82SvKZvnx6L059 /8xWTIJ0Ff5txSOxPkxPadyNYKeBKgX8SZ7jCZWXdKxGCzDDObFSrOJOtJjUp7aPDdy3aJ HC0NbA8pDBf9bXsSPa+Z5fIZ7yvY8WI61r88f6yExz9B0O8No92NnPWo8EXr1Vk0ZjIPBz XVJwrMTheiYKLk+tDNDrb0Pk80yCE2kUSUhlJKRSRdgepDJAdLP2g75IK6HRLw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692427499; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=oD71L/JyLiRE6Ar8hhmV1IWCNo6EUKzUAZ2M3XRYGmo=; b=DDQkPXqbNcPiIItqZ0i35DYkm4Alo8zQ5am5QzOf+IWn6Nm3AVXBI0AojR2FpH3EEhJUWG H3q/EF5iM59zxwdrlsdr1YTk8RII8SCg5ys6rkj9ZsSWcOg0SYQKPa5LVG6L3C6z5QOJLp Kst1hQgeFdxgN42EcKR+3bFqI+omXc/tRqROsyL0dzJDe5EHofc5qYjcS0S60nbshgSrt2 zpNQH2UpZNInxWE/7SybE74ofUoCVjkwU1nf63irz/qoTN+CuykrLT0AIUQOqPWrBV6Cky WbQBVHkGBMfPPeeDA4/WVQCHM57fjbpSix/tmIZUbBk2dBgxvHa2G9t9IIBq7w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692427499; a=rsa-sha256; cv=none; b=cPppeiVyzWHOh3z7ReDuaKZ6Bjq8fPVSdbu7H9W1V/O5bBxN6pATQ2R4afv+whqaU7s0iz EE/sshwVWiZUGpvGvimypETg/Cc/+enC+rWzmIP4R6Ga0QnWYOfJzH4lJw/Xe4HL3PblLS cHSDAVg39kz/g+3a4K3yYWlBROy5sEEr1t18PjbovSua0FCGECFNqlf4F1eRbFpQloMF6U GpWa0dBA+7yoopB+gW0i8Dhut3ph7tYnd5T75L79xSnfghZtNQ0Fp4eHX287naFlfUB0Xy vZHO6ty8uqpe1P2MpJj9KE1qardiYHIp5u8fRFXSZr+B192tikNp3u509sPajQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RSTkg31QgznnF; Sat, 19 Aug 2023 06:44:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37J6ixPn068375; Sat, 19 Aug 2023 06:44:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37J6ixSK068372; Sat, 19 Aug 2023 06:44:59 GMT (envelope-from git) Date: Sat, 19 Aug 2023 06:44:59 GMT Message-Id: <202308190644.37J6ixSK068372@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Eugene Grosbein Subject: git: 9397112d89df - stable/13 - tftpd: fix wrong conflict resolution List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: eugen X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 9397112d89df25a9e1ab8d84e8fc88fe789e1324 Auto-Submitted: auto-generated The branch stable/13 has been updated by eugen: URL: https://cgit.FreeBSD.org/src/commit/?id=9397112d89df25a9e1ab8d84e8fc88fe789e1324 commit 9397112d89df25a9e1ab8d84e8fc88fe789e1324 Author: Eugene Grosbein AuthorDate: 2023-08-19 06:43:08 +0000 Commit: Eugene Grosbein CommitDate: 2023-08-19 06:43:08 +0000 tftpd: fix wrong conflict resolution This is direct commit to stable/13 after wrong previous one. Fixes: b71dde1aeba2972522a6742bbae77c2c6497eb01 --- libexec/tftpd/tftpd.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libexec/tftpd/tftpd.c b/libexec/tftpd/tftpd.c index 3b08fab33dca..ed030b23da30 100644 --- a/libexec/tftpd/tftpd.c +++ b/libexec/tftpd/tftpd.c @@ -139,7 +139,7 @@ main(int argc, char *argv[]) acting_as_client = 0; tftp_openlog("tftpd", LOG_PID | LOG_NDELAY, LOG_FTP); - while ((ch = getopt(argc, argv, "cCd::F:lnoOp:s:Su:U:wW")) != -1) { + while ((ch = getopt(argc, argv, "cCd:F:lnoOp:s:Su:U:wW")) != -1) { switch (ch) { case 'c': ipchroot = 1; From nobody Sat Aug 19 06:58:01 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RSV1j6mHpz4qJt0; Sat, 19 Aug 2023 06:58: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RSV1j5Rkyz4RGd; Sat, 19 Aug 2023 06:58:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692428281; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gn9pfMJd52n0P7pqUzuVWgueAhilAhdY20lCpVtLs78=; b=YQmCbdD3kOzXJd2FbviLB0fpgV2BcgGYfxovrDBWr5CvpdVY5NRXM5OQ8X3w3q+z4C5tG1 1PQYGHNXRVZ1Kfw1oM9jWHazGLByPx248APz+4TXpQa2+qRsiyB83QpjqNKhqvvdlzWwwY Rihiczv96+yQO1qQo7Y3jgHmtdHmHkIQlZqGp7KC2sxu7nHMCSDBdMv4vN6IZNwnUJUqPD XRmOUeHR3hJ2X4XJyyHxpl1XLa5XvNNK2eLZ/6JF1DKw+mR5LcXBhdLiP5nytDTUPleztn HZy0kxVzFg/HzOvtwDxTt8bkrQW5tGJNHwF+/5Vk+5yfB6UvIwdmHkOD1X/Uyw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692428281; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=gn9pfMJd52n0P7pqUzuVWgueAhilAhdY20lCpVtLs78=; b=jYb9AC299huytczGPY4xvlZsIde/jNi1D6CUGXfgXj9MtqnEtkLHAPeZ0uwRuLlYKYPlHF BYacd7dsk67wbCn5tJG7mw6BDyOzouVH/Rey9OKCsXGWQ/lz+jKEhCu0zCE92xMene7AvV w+FZ29v4QqskvLB//0MZOzN5b3P5SE0x3te2mcOyobRBd0bXLN0EVAiUg8Pq1C5ypyZsW0 czfLDZevzvF6o93SHXUM1yZt36NCNIgBNqAdr3tLuHPzEWgnezB5UyDnxYTdLMjW7Hq1Cm mjijLanjXxRXcuZdUMRpmF+sXOpDtoDdUC5M0KUTh3RCkoEUpxjjWlW+3Xi3wg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692428281; a=rsa-sha256; cv=none; b=wKuwERhzpG8N5lWc8S+jb8hJ1BLqiKJLu3fGLpXzHboPjkLbUhrYfOEQrnVtQTDcsUdzS2 VMim+d+KBiZMtiNDcs8P7zDEC0sEw6a93/hCg7n3V+yvcj29FYCUtUfanYyqDymO9NwztP R/T5ATEVCN5JGoHDkXejPajRCKVdUq4AoaZlmBejjZL07mQgBjzhx7C0iBSx0gzeo+cT3O FILmWFmka5rTHhCYt/94DamNwaUNwFfBVjM0HWuqX3kIgi6idXyy0cfSuvJZD2I4xnkiBG BtIrMeX5ZMsWYHQe4UmvOcggysJYst4MuWssar2cmqfyvWWZbywjp7/S3+lbxA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RSV1j45mLzp82; Sat, 19 Aug 2023 06:58:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37J6w1bQ085864; Sat, 19 Aug 2023 06:58:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37J6w1MR085861; Sat, 19 Aug 2023 06:58:01 GMT (envelope-from git) Date: Sat, 19 Aug 2023 06:58:01 GMT Message-Id: <202308190658.37J6w1MR085861@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Eugene Grosbein Subject: git: a99bf9966590 - stable/12 - tftpd: introduce new option -S List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: eugen X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: a99bf9966590859d21d28ec63798820dc07e0ba8 Auto-Submitted: auto-generated The branch stable/12 has been updated by eugen: URL: https://cgit.FreeBSD.org/src/commit/?id=a99bf9966590859d21d28ec63798820dc07e0ba8 commit a99bf9966590859d21d28ec63798820dc07e0ba8 Author: Eugene Grosbein AuthorDate: 2023-07-20 20:11:33 +0000 Commit: Eugene Grosbein CommitDate: 2023-08-19 06:53:28 +0000 tftpd: introduce new option -S Historically, tftpd disallowed write requests to existing files that are not publicly writable. Such requirement is questionable at least. Let us make it possible to run tftpd in chrooted environment keeping files non-world writable. New option -S enables write requests to existing files for chrooted run according to generic file permissions. It is ignored unless tftpd runs chrooted. Requested by: marck Differential: https://reviews.freebsd.org/D41090 (based on) (cherry picked from commit 273a307d0b80743fb08e23237b3f74dc94a8fa2a) (cherry picked from commit 03c2616dc530e5b23f06f9aa421012154590e578) --- libexec/tftpd/tftpd.8 | 22 ++++++++++++++++++---- libexec/tftpd/tftpd.c | 15 ++++++++++++--- 2 files changed, 30 insertions(+), 7 deletions(-) diff --git a/libexec/tftpd/tftpd.8 b/libexec/tftpd/tftpd.8 index e4f5ab94a2fe..a984cdc32c94 100644 --- a/libexec/tftpd/tftpd.8 +++ b/libexec/tftpd/tftpd.8 @@ -28,7 +28,7 @@ .\" @(#)tftpd.8 8.1 (Berkeley) 6/4/93 .\" $FreeBSD$ .\" -.Dd March 2, 2020 +.Dd July 20, 2023 .Dt TFTPD 8 .Os .Sh NAME @@ -72,7 +72,11 @@ Files containing the string or starting with .Dq Li "../" are not allowed. -Files may be written only if they already exist and are publicly writable. +Files may be written only if they already exist (unless the +.Fl w +option is used) and are publicly writable (unless chrooted and the +.Fl S +option is used). Note that this extends the concept of .Dq public to include @@ -191,6 +195,12 @@ to change its root directory to After doing that but before accepting commands, .Nm will switch credentials to an unprivileged user. +.It Fl S +If +.Nm +runs chrooted, the option allows write requests according to generic +file permissions, skipping requirement for files to be publicly writable. +The option is ignored for non-chrooted run. .It Fl u Ar user Switch credentials to .Ar user @@ -275,12 +285,16 @@ the .Fl c option was introduced in .Fx 4.3 , -and the +the .Fl F and .Fl W options were introduced in -.Fx 7.4 . +.Fx 7.4 , +and the +.Fl S +option was introduced in +.Fx 13.3 . .Pp Support for Timeout Interval and Transfer Size Options (RFC2349) was introduced in diff --git a/libexec/tftpd/tftpd.c b/libexec/tftpd/tftpd.c index 02fbaaf0d371..56b97d4791bc 100644 --- a/libexec/tftpd/tftpd.c +++ b/libexec/tftpd/tftpd.c @@ -98,6 +98,7 @@ static struct dirlist { static int suppress_naks; static int logging; static int ipchroot; +static int check_woth = 1; static int create_new = 0; static const char *newfile_format = "%Y%m%d"; static int increase_name = 0; @@ -138,7 +139,8 @@ main(int argc, char *argv[]) acting_as_client = 0; tftp_openlog("tftpd", LOG_PID | LOG_NDELAY, LOG_FTP); - while ((ch = getopt(argc, argv, "cCd:F:lnoOp:s:u:U:wW")) != -1) { + while ((ch = getopt(argc, argv, "cCd:F:lnoOp:s:Su:U:wW")) != -1) { +>>>>>>> 273a307d0b80 (tftpd: introduce new option -S) switch (ch) { case 'c': ipchroot = 1; @@ -176,6 +178,9 @@ main(int argc, char *argv[]) case 's': chroot_dir = optarg; break; + case 'S': + check_woth = -1; + break; case 'u': chuser = optarg; break; @@ -385,7 +390,11 @@ main(int argc, char *argv[]) tftp_log(LOG_ERR, "setuid failed"); exit(1); } + if (check_woth == -1) + check_woth = 0; } + if (check_woth == -1) + check_woth = 1; len = sizeof(me_sock); if (getsockname(0, (struct sockaddr *)&me_sock, &len) == 0) { @@ -727,7 +736,7 @@ validate_access(int peer, char **filep, int mode) if ((stbuf.st_mode & S_IROTH) == 0) return (EACCESS); } else { - if ((stbuf.st_mode & S_IWOTH) == 0) + if (check_woth && ((stbuf.st_mode & S_IWOTH) == 0)) return (EACCESS); } } else { @@ -757,7 +766,7 @@ validate_access(int peer, char **filep, int mode) if ((stbuf.st_mode & S_IROTH) != 0) break; } else { - if ((stbuf.st_mode & S_IWOTH) != 0) + if (!check_woth || ((stbuf.st_mode & S_IWOTH) != 0)) break; } err = EACCESS; From nobody Sat Aug 19 07:30:03 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RSVkg5bPWz4qLtw; Sat, 19 Aug 2023 07:30: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RSVkg53Lbz4TKQ; Sat, 19 Aug 2023 07: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=1692430203; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5/aomrVhwkDaHcEFi4z564e3Cog4vnawWcUca51nVxU=; b=HEL2JUNKPMwo3iojVv3h/T3/6QsOQa+vBfPQ+sFhUJSaezjVcfpppsFBPAiMSCKtk0edcm EBmmqfjopI9GEHi9dHNRFJq397v1SYscAafxPncY35vg2Ho3quwzOGzunU2c/UF+zl+6Az xqWjRjXp1iRi9d+7KSG6LByXmKF3et6T59yPtTFbqi1dXptJoiSGkPm+VexsjQyKlWUQnd dyM9gQWC2BywYh6RPYo31mCQsqchRIrVVWI54g4GothShPQFSzwtEOtuCGBx/NHfE4OSZb 6YaY4swoUJ1kjK+ZqkprovXFfXl0ZSFYAjV7v0u3ptpaeyihYF+sKrthl9YlHg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692430203; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=5/aomrVhwkDaHcEFi4z564e3Cog4vnawWcUca51nVxU=; b=sxO5AGNlTEFjkyyQUGkTz3Y2HMqufQmE9evx/Tj0eLu0aY8Gnc579ZjhsO+Qx/PXHrH7AP NSnE0aAioaK1yLfjBYqWqJ9qIE42UvpbtacUB8INU682Z7sLf+ONSjmKTYTUJrH3bYsfff GTN3y1uNqZK2AvRqFeGaGJeczH9ddkaOpx8u29FUucxt6NHVMi4RFTFKylu4npoMc+vNxw 3H+kU//PDoqg0hZB9iGh0nnDTnvKsj7exx92MYUG0DSCQQMR/ManM+mfREuaJ/AsTc3KuA TrI2siSbGvuBFuO0ZSi54bCFgIglAYLnsTIecR9aY4Sc82KvzxyUgGhFGDXYvA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692430203; a=rsa-sha256; cv=none; b=CdwI2OaL5YvP4JFKUqcU2zHOW2NpM59SnusZUwSyHcuPZ9UCDWOoMFsdAljqHMo7uTrUTL BTWkR1M0Vr+ILIx/r/Zxff4P8Ll1mwWy8dDjetVh7lmS/+/pW18YZjEeVBSE4TtK1P1Q3/ s9WGlQtJrxmY4Hs8SvHRaCx4YJ79oxMRlkWsGI98d6HmkayZi3RsnlNkY64aFRDE6cDnP2 aGtotMs/wr/Shh1VwZ1fjHpaQFoeEgq/bho+9n3xuVIq369Isy4cbHrZozVTEbhdsxnzCU arIcvioysqtWtWzDk9ifwHgnh7VYvEjifMholpJyCVdJvnRNG2aprMlk5xGTIw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RSVkg40kJzpys; Sat, 19 Aug 2023 07:30:03 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37J7U3Yg038312; Sat, 19 Aug 2023 07:30:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37J7U314038306; Sat, 19 Aug 2023 07:30:03 GMT (envelope-from git) Date: Sat, 19 Aug 2023 07:30:03 GMT Message-Id: <202308190730.37J7U314038306@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Peter Holm Subject: git: f322816aafa7 - main - stress2: Added a syzkaller reproducer List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: pho X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: f322816aafa759d618ff89da266c038d0694e189 Auto-Submitted: auto-generated The branch main has been updated by pho: URL: https://cgit.FreeBSD.org/src/commit/?id=f322816aafa759d618ff89da266c038d0694e189 commit f322816aafa759d618ff89da266c038d0694e189 Author: Peter Holm AuthorDate: 2023-08-19 07:28:10 +0000 Commit: Peter Holm CommitDate: 2023-08-19 07:28:10 +0000 stress2: Added a syzkaller reproducer --- tools/test/stress2/misc/syzkaller70.sh | 302 +++++++++++++++++++++++++++++++++ 1 file changed, 302 insertions(+) diff --git a/tools/test/stress2/misc/syzkaller70.sh b/tools/test/stress2/misc/syzkaller70.sh new file mode 100755 index 000000000000..7f63da7f6475 --- /dev/null +++ b/tools/test/stress2/misc/syzkaller70.sh @@ -0,0 +1,302 @@ +#!/bin/sh + +# db:1:pho1> bt +# Tracing pid 5640 tid 102468 td 0xfffffe00e4d26ac0 +# kdb_enter() at kdb_enter+0x32/frame 0xfffffe010dbcf260 +# vpanic() at vpanic+0x163/frame 0xfffffe010dbcf390 +# panic() at panic+0x43/frame 0xfffffe010dbcf3f0 +# vm_map_insert1() at vm_map_insert1+0x147/frame 0xfffffe010dbcf4a0 +# vm_map_insert() at vm_map_insert+0x69/frame 0xfffffe010dbcf510 +# vm_map_growstack() at vm_map_growstack+0x90e/frame 0xfffffe010dbcf650 +# vm_map_lookup() at vm_map_lookup+0x15f/frame 0xfffffe010dbcf6e0 +# vm_fault() at vm_fault+0x12f/frame 0xfffffe010dbcf820 +# vm_fault_trap() at vm_fault_trap+0x6f/frame 0xfffffe010dbcf860 +# trap_pfault() at trap_pfault+0x24a/frame 0xfffffe010dbcf8d0 +# calltrap() at calltrap+0x8/frame 0xfffffe010dbcf8d0 +# --- trap 0xc, rip = 0xffffffff81057a06, rsp = 0xfffffe010dbcf9a0, rbp = 0xfffffe010dbcf9a0 --- +# copyin_nosmap_erms() at copyin_nosmap_erms+0x156/frame 0xfffffe010dbcf9a0 +# uiomove_fromphys() at uiomove_fromphys+0x145/frame 0xfffffe010dbcfa10 +# uiomove_object_page() at uiomove_object_page+0x1dc/frame 0xfffffe010dbcfa70 +# uiomove_object() at uiomove_object+0xa4/frame 0xfffffe010dbcfac0 +# tmpfs_write() at tmpfs_write+0xe4/frame 0xfffffe010dbcfb10 +# VOP_WRITE_APV() at VOP_WRITE_APV+0xcf/frame 0xfffffe010dbcfc20 +# vn_write() at vn_write+0x2f4/frame 0xfffffe010dbcfcb0 +# vn_io_fault() at vn_io_fault+0x1e2/frame 0xfffffe010dbcfd40 +# dofilewrite() at dofilewrite+0x82/frame 0xfffffe010dbcfd90 +# kern_pwritev() at kern_pwritev+0x64/frame 0xfffffe010dbcfdd0 +# sys_pwritev() at sys_pwritev+0x3a/frame 0xfffffe010dbcfe00 +# amd64_syscall() at amd64_syscall+0x14f/frame 0xfffffe010dbcff30 +# fast_syscall_common() at fast_syscall_common+0xf8/frame 0xfffffe010dbcff30 +# --- syscall (0, FreeBSD ELF64, syscall), rip = 0x822d56fca, rsp = 0x824255f58, rbp = 0x824255f90 --- +# FreeBSD 14.0-ALPHA1 #1 main-n264742-81b41b2ef5bfd5-dirty: Tue Aug 15 19:52:50 CEST 2023 + +uname -p | grep -Eq "amd64" || exit 0 +[ `id -u ` -ne 0 ] && echo "Must be root!" && exit 1 + +. ../default.cfg +prog=$(basename "$0" .sh) +cat > /tmp/$prog.c < + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +static void kill_and_wait(int pid, int* status) +{ + kill(pid, SIGKILL); + while (waitpid(-1, status, 0) != pid) { + } +} + +static void sleep_ms(uint64_t ms) +{ + usleep(ms * 1000); +} + +static uint64_t current_time_ms(void) +{ + struct timespec ts; + if (clock_gettime(CLOCK_MONOTONIC, &ts)) + exit(1); + return (uint64_t)ts.tv_sec * 1000 + (uint64_t)ts.tv_nsec / 1000000; +} + +static void thread_start(void* (*fn)(void*), void* arg) +{ + pthread_t th; + pthread_attr_t attr; + pthread_attr_init(&attr); + pthread_attr_setstacksize(&attr, 128 << 10); + int i = 0; + for (; i < 100; i++) { + if (pthread_create(&th, &attr, fn, arg) == 0) { + pthread_attr_destroy(&attr); + return; + } + if (errno == EAGAIN) { + usleep(50); + continue; + } + break; + } + exit(1); +} + +typedef struct { + pthread_mutex_t mu; + pthread_cond_t cv; + int state; +} event_t; + +static void event_init(event_t* ev) +{ + if (pthread_mutex_init(&ev->mu, 0)) + exit(1); + if (pthread_cond_init(&ev->cv, 0)) + exit(1); + ev->state = 0; +} + +static void event_reset(event_t* ev) +{ + ev->state = 0; +} + +static void event_set(event_t* ev) +{ + pthread_mutex_lock(&ev->mu); + if (ev->state) + exit(1); + ev->state = 1; + pthread_mutex_unlock(&ev->mu); + pthread_cond_broadcast(&ev->cv); +} + +static void event_wait(event_t* ev) +{ + pthread_mutex_lock(&ev->mu); + while (!ev->state) + pthread_cond_wait(&ev->cv, &ev->mu); + pthread_mutex_unlock(&ev->mu); +} + +static int event_isset(event_t* ev) +{ + pthread_mutex_lock(&ev->mu); + int res = ev->state; + pthread_mutex_unlock(&ev->mu); + return res; +} + +static int event_timedwait(event_t* ev, uint64_t timeout) +{ + uint64_t start = current_time_ms(); + uint64_t now = start; + pthread_mutex_lock(&ev->mu); + for (;;) { + if (ev->state) + break; + uint64_t remain = timeout - (now - start); + struct timespec ts; + ts.tv_sec = remain / 1000; + ts.tv_nsec = (remain % 1000) * 1000 * 1000; + pthread_cond_timedwait(&ev->cv, &ev->mu, &ts); + now = current_time_ms(); + if (now - start > timeout) + break; + } + int res = ev->state; + pthread_mutex_unlock(&ev->mu); + return res; +} + +struct thread_t { + int created, call; + event_t ready, done; +}; + +static struct thread_t threads[16]; +static void execute_call(int call); +static int running; + +static void* thr(void* arg) +{ + struct thread_t* th = (struct thread_t*)arg; + for (;;) { + event_wait(&th->ready); + event_reset(&th->ready); + execute_call(th->call); + __atomic_fetch_sub(&running, 1, __ATOMIC_RELAXED); + event_set(&th->done); + } + return 0; +} + +static void execute_one(void) +{ + int i, call, thread; + for (call = 0; call < 4; call++) { + for (thread = 0; thread < (int)(sizeof(threads) / sizeof(threads[0])); + thread++) { + struct thread_t* th = &threads[thread]; + if (!th->created) { + th->created = 1; + event_init(&th->ready); + event_init(&th->done); + event_set(&th->done); + thread_start(thr, th); + } + if (!event_isset(&th->done)) + continue; + event_reset(&th->done); + th->call = call; + __atomic_fetch_add(&running, 1, __ATOMIC_RELAXED); + event_set(&th->ready); + event_timedwait(&th->done, 50); + break; + } + } + for (i = 0; i < 100 && __atomic_load_n(&running, __ATOMIC_RELAXED); i++) + sleep_ms(1); +} + +static void execute_one(void); + +#define WAIT_FLAGS 0 + +static void loop(void) +{ + int iter __unused = 0; + for (;; iter++) { + int pid = fork(); + if (pid < 0) + exit(1); + if (pid == 0) { + execute_one(); + exit(0); + } + int status = 0; + uint64_t start = current_time_ms(); + for (;;) { + if (waitpid(-1, &status, WNOHANG | WAIT_FLAGS) == pid) + break; + sleep_ms(1); + if (current_time_ms() - start < 5000) + continue; + kill_and_wait(pid, &status); + break; + } + } +} + +uint64_t r[1] = {0xffffffffffffffff}; + +void execute_call(int call) +{ + intptr_t res = 0; + switch (call) { + case 0: + memcpy((void*)0x20000240, "./file0\000", 8); + res = syscall(SYS_open, /*file=*/0x20000240ul, + /*flags=*/0x40000400000002c2ul, /*mode=*/0ul); + if (res != -1) + r[0] = res; + break; + case 1: + *(uint64_t*)0x20000080 = 0x200006c0; + *(uint64_t*)0x20000088 = 0x100000; + syscall(SYS_pwritev, /*fd=*/r[0], /*vec=*/0x20000080ul, /*vlen=*/1ul, + /*off=*/0ul); + break; + case 2: + syscall(SYS_mmap, /*addr=*/0x20000000ul, /*len=*/0x200000ul, /*prot=*/3ul, + /*flags=*/0x410ul, /*fd=*/-1, /*offset=*/0ul); + break; + case 3: + syscall(SYS_mmap, /*addr=*/0x2000c000ul, /*len=*/0x4000ul, /*prot=*/0ul, + /*flags=*/0x2010ul, /*fd=*/-1, /*offset=*/0ul); + break; + } +} +int main(void) +{ + syscall(SYS_mmap, /*addr=*/0x20000000ul, /*len=*/0x1000000ul, /*prot=*/7ul, + /*flags=*/0x1012ul, /*fd=*/-1, /*offset=*/0ul); + loop(); + return 0; +} +EOF +mycc -o /tmp/$prog -Wall -Wextra -O0 /tmp/$prog.c -lpthread || exit 1 + +mount | grep -q "on $mntpoint " && umount $mntpoint +mount -o size=10m -t tmpfs dummy $mntpoint + +cd $mntpoint +for i in `jot 20`; do + timeout 3m /tmp/$prog & +done +wait +cd - + +umount $mntpoint +rm -rf /tmp/$prog /tmp/$prog.c /tmp/$prog.core +exit 0 From nobody Sat Aug 19 07:30:04 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RSVkj51kDz4qLty; Sat, 19 Aug 2023 07:30:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RSVkh5pdzz4Tbr; Sat, 19 Aug 2023 07:30:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692430204; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=FBWe6/RQpVin/xlwbOS1HG02xiw7473yjKs0BciFQaA=; b=pNsYMJWUtHejR8TwCXygTlCkt6pVNX/DiWVYnLXVnxKCwD1B6+dzshHMhmpzD0ph3UJYRE EJemRr5hj3xC+h5w89PAYKFXAZwChnMFGNMOXnFmsMINxwPgIlvOTfl1a+gv0VIU2WPZWZ ABTkd17JOrvroFHMf+AigSbCbxm8bKLHw8+H+6JwvCaL1VNz0jJaJihZtWc7ciY3Q0wJVa omjhe9g7B7Or5J4ksoVBPmAkExhaojaa5qRBWnnwqd0dP4Cn/lnuwytFAITOpMi2aKjl5i 02feK/cIQLpWn3cBNSi1Bm/3kq+w6Pjn9PVl4BO7Z83ppdrEo0L5518WFm3btA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692430204; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=FBWe6/RQpVin/xlwbOS1HG02xiw7473yjKs0BciFQaA=; b=EBFARXgSV1i+2ojrzJ+XNYZrdllbCcOUNvStbdS0EyHiTDQ9b37OFeGu96UQTKvGbBnqFh heQKAQlLFVqz3npNpmGfDCk4LO/NnM3gUOE7Jp1Ksg+wp4zy1ynvK+uM0fpzXvsiJRDLVe Hc6cVIwjgZTipa5F0d6wlO3tkFj19lE4Dy+Dd7jR9jGiuxEY1QyuR68tUUqbX+3trj7Gf8 6yG94tN/UGXVEZTAzhJUEftRSZburDjDRTFRMobUkjnjlCuI7RRkIzu2LII14D1SHBckmx 3BSJWqpd2iegR9TNE2EpcTxy72/bNeXwRhoptwUGTWgl5kPnaHucEwJqPXvCew== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692430204; a=rsa-sha256; cv=none; b=QcDUadwe/rOErqTqB08A4gAT5iRRqu1hufJOh/NcPQ6PYPnNoNL7ShBEbr27PHVYpvLXaA +oyZIpd6c+82VN+JONuCAcg8j7jlz1OhTWE4/Var2F/PaOISKPgM3lXhdV70vkM5mGFaMT 9S5Gl8SCW5HQhhJkkt75NKXzuNE6hrvwiPq+72Aq9C/EX8Qsu7WZv7V5QKopbNL8z28Pk8 9tPEbOLovvWalgBEte1FjEqrO6w0p6kY37xQ0pzHajRTKUpfhPplG7FUyn0hM1Wm19MLnr UcjV6jJqUEA5Are1HWmG5BhsPxui+GOeWAfjxj8XPu4/i6952ZD5G4i+sibf7A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RSVkh4cXbzpcj; Sat, 19 Aug 2023 07:30:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37J7U4F7038617; Sat, 19 Aug 2023 07:30:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37J7U4FP038613; Sat, 19 Aug 2023 07:30:04 GMT (envelope-from git) Date: Sat, 19 Aug 2023 07:30:04 GMT Message-Id: <202308190730.37J7U4FP038613@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Peter Holm Subject: git: 0d30f3afa62b - main - stress2: No need to write to the console. Add revision to log string List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: pho X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 0d30f3afa62b4740810006476eb9de0c480619a1 Auto-Submitted: auto-generated The branch main has been updated by pho: URL: https://cgit.FreeBSD.org/src/commit/?id=0d30f3afa62b4740810006476eb9de0c480619a1 commit 0d30f3afa62b4740810006476eb9de0c480619a1 Author: Peter Holm AuthorDate: 2023-08-19 07:29:09 +0000 Commit: Peter Holm CommitDate: 2023-08-19 07:29:09 +0000 stress2: No need to write to the console. Add revision to log string --- tools/test/stress2/misc/all.sh | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/tools/test/stress2/misc/all.sh b/tools/test/stress2/misc/all.sh index 58bf3a630294..605c9958b552 100755 --- a/tools/test/stress2/misc/all.sh +++ b/tools/test/stress2/misc/all.sh @@ -237,9 +237,8 @@ while true; do [ -f ../tools/ministat.sh ] && ../tools/ministat.sh $allelapsed $i [ $((`date '+%s'` - start)) -gt 1980 ] && - printf "$ts *** Excessive run time: %s %d min\r\n" $i, \ - $(((`date '+%s'` - start) / 60)) | - tee $console >> $allexcess + printf "$ts $rev $i %d min\n" \ + $(((`date '+%s'` - start) / 60)) >> $allexcess while pgrep -q "^swap$"; do echo "swap still running" sleep 2 From nobody Sat Aug 19 10:47:25 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RSb6Q06b9z4qXyF; Sat, 19 Aug 2023 10:47: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RSb6P6YbLz3NYW; Sat, 19 Aug 2023 10:47:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692442045; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=WZA1TPevvS8iJsE5z0dgG4HDz6QxJRfE91eqaNR+WDc=; b=rk/bPwJe9m5RaqDlGRqpr3EwROIUA4CKPo/sH2vIw9mjvk6ZLYpfhykaJjDHehneJEUZMu v/IgREn0i5YlVe2w1yTbE7Tn4zBdc5QGozhyuz1pdBCIo+699/NY8QyItV2MEjF7pUXWOM IEOJTN1UEnourGEvFXpdLyM7zyNu2W8ySiZQn21m8Xtnzq3ZCHkm4xTAL1XVpDGg8PXoO0 6evtyr54kp97U47Sd+fokn58RRhZ0lgF/DJqNhs0juE5wS/rWXT+ka9Fsz74tn6PQU+JAf QGwazOI7lYkHuFQiXkFFxt7PBXTjhmeN82aN1d/3h5mzdjrpGlc5011y1ETC8w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692442045; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=WZA1TPevvS8iJsE5z0dgG4HDz6QxJRfE91eqaNR+WDc=; b=s4PcANVxxMGP480ghiF7msgr1rtj0dLBGxd8+pKhMykqDUPKXXzxmD+2g5e8rPxZRDdCyN bHJUNjsZilXa9ZNzlJXp/xBIApc2bcN8/3G8Nj70k8LmS///rOyISNNd+BwdPeCvCGRZ5r ETohaReH5o9+NOrBUsaVfCSnrOMfJRofO1YjzwzFNwcWgNti2Z3e3Aj9dc6URzrCI4dAF4 042bk2+mWgdIDORKDxouf+IEyk0a0RxkSKURGluzxp0HLAMCh93dpXivcGR7fcu4rwF0Dk 4SgNRCaMybUwLldY7qY0MiQ8z25D6nO3oTQexI8XdxqpcasIWEoAvUVfmkvE+w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692442045; a=rsa-sha256; cv=none; b=Dkq5dxhSGh9qkpuw8TyMXnCnGsUiESYCONHdNtpVT50vF+51jMHfzVVd4AyYuTgnNaYLeN tbtggO6+YFobigggxG3XCinbSbFCBAOI5sgR92CvFGiSRGK5OH4kzVjJoNX11yKcPgC9Qv THHMd/8IMIsaEYikNEXIqLSqHLuemx8fcfFrhcQnbFMLO7l/uXVfa9vUje7wgSFlw/nkuM +zWp7q+ySEk4SOcS4MKmpK8oH+3KQ7LkNjrbGBxyoicu/GhM971EfBpGuMvK33vMGqSUpx A8YkaXZLS7tTp7RNHt1scyZK8AukLX4JEhxZ9sxO4+Ge3Rz042WdIUxK/YgACg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RSb6P5MMbzvMG; Sat, 19 Aug 2023 10:47:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37JAlPE8069696; Sat, 19 Aug 2023 10:47:25 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37JAlPN4069693; Sat, 19 Aug 2023 10:47:25 GMT (envelope-from git) Date: Sat, 19 Aug 2023 10:47:25 GMT Message-Id: <202308191047.37JAlPN4069693@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Michael Tuexen Subject: git: 4f14d4b6b7f0 - main - sctp: cleanup handling of graceful shutdown of the peer List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: tuexen X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4f14d4b6b7f0ca49b14379e48117121af3ed2669 Auto-Submitted: auto-generated The branch main has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=4f14d4b6b7f0ca49b14379e48117121af3ed2669 commit 4f14d4b6b7f0ca49b14379e48117121af3ed2669 Author: Michael Tuexen AuthorDate: 2023-08-19 10:35:49 +0000 Commit: Michael Tuexen CommitDate: 2023-08-19 10:35:49 +0000 sctp: cleanup handling of graceful shutdown of the peer Don't handle a graceful shutdown of the peer as an implicit signal that all partial messages are complete. First, this is not implemented correctly and second this should not be done by the peer. It is more appropriate to handle this as a protocol violation. Remove the incorrect code and leave detecting the protocol violation and its handling in a followup commit. MFC after: 1 week --- sys/netinet/sctp_input.c | 63 +++++++++++----------------------------------- sys/netinet/sctp_pcb.c | 11 +------- sys/netinet/sctp_structs.h | 9 ------- 3 files changed, 16 insertions(+), 67 deletions(-) diff --git a/sys/netinet/sctp_input.c b/sys/netinet/sctp_input.c index 81b011b7e78a..059c6ded2e5e 100644 --- a/sys/netinet/sctp_input.c +++ b/sys/netinet/sctp_input.c @@ -837,8 +837,7 @@ sctp_handle_shutdown(struct sctp_shutdown_chunk *cp, int some_on_streamwheel; int old_state; - SCTPDBG(SCTP_DEBUG_INPUT2, - "sctp_handle_shutdown: handling SHUTDOWN\n"); + SCTPDBG(SCTP_DEBUG_INPUT2, "sctp_handle_shutdown: handling SHUTDOWN\n"); if (stcb == NULL) return; asoc = &stcb->asoc; @@ -855,40 +854,12 @@ sctp_handle_shutdown(struct sctp_shutdown_chunk *cp, if (*abort_flag) { return; } - if (asoc->control_pdapi) { - /* - * With a normal shutdown we assume the end of last record. - */ - SCTP_INP_READ_LOCK(stcb->sctp_ep); - if (asoc->control_pdapi->on_strm_q) { - struct sctp_stream_in *strm; - - strm = &asoc->strmin[asoc->control_pdapi->sinfo_stream]; - if (asoc->control_pdapi->on_strm_q == SCTP_ON_UNORDERED) { - /* Unordered */ - TAILQ_REMOVE(&strm->uno_inqueue, asoc->control_pdapi, next_instrm); - asoc->control_pdapi->on_strm_q = 0; - } else if (asoc->control_pdapi->on_strm_q == SCTP_ON_ORDERED) { - /* Ordered */ - TAILQ_REMOVE(&strm->inqueue, asoc->control_pdapi, next_instrm); - asoc->control_pdapi->on_strm_q = 0; -#ifdef INVARIANTS - } else { - panic("Unknown state on ctrl:%p on_strm_q:%d", - asoc->control_pdapi, - asoc->control_pdapi->on_strm_q); -#endif - } - } - asoc->control_pdapi->end_added = 1; - asoc->control_pdapi->pdapi_aborted = 1; - asoc->control_pdapi = NULL; - SCTP_INP_READ_UNLOCK(stcb->sctp_ep); - if (stcb->sctp_socket) { - sctp_sorwakeup(stcb->sctp_ep, stcb->sctp_socket); - } - } - /* goto SHUTDOWN_RECEIVED state to block new requests */ + /* + * FIXME MT: Handle the case where there are still incomplete + * received user messages or known missing user messages from the + * peer. One way to handle this is to abort the associations in this + * case. + */ if (stcb->sctp_socket) { if ((SCTP_GET_STATE(stcb) != SCTP_STATE_SHUTDOWN_RECEIVED) && (SCTP_GET_STATE(stcb) != SCTP_STATE_SHUTDOWN_ACK_SENT) && @@ -949,8 +920,9 @@ sctp_handle_shutdown_ack(struct sctp_shutdown_ack_chunk *cp SCTP_UNUSED, SCTPDBG(SCTP_DEBUG_INPUT2, "sctp_handle_shutdown_ack: handling SHUTDOWN ACK\n"); - if (stcb == NULL) + if (stcb == NULL) { return; + } asoc = &stcb->asoc; /* process according to association state */ @@ -967,17 +939,12 @@ sctp_handle_shutdown_ack(struct sctp_shutdown_ack_chunk *cp SCTP_UNUSED, SCTP_TCB_UNLOCK(stcb); return; } - if (asoc->control_pdapi) { - /* - * With a normal shutdown we assume the end of last record. - */ - SCTP_INP_READ_LOCK(stcb->sctp_ep); - asoc->control_pdapi->end_added = 1; - asoc->control_pdapi->pdapi_aborted = 1; - asoc->control_pdapi = NULL; - SCTP_INP_READ_UNLOCK(stcb->sctp_ep); - sctp_sorwakeup(stcb->sctp_ep, stcb->sctp_socket); - } + /* + * FIXME MT: Handle the case where there are still incomplete + * received user messages or known missing user messages from the + * peer. One way to handle this is to abort the associations in this + * case. + */ #ifdef INVARIANTS if (!TAILQ_EMPTY(&asoc->send_queue) || !TAILQ_EMPTY(&asoc->sent_queue) || diff --git a/sys/netinet/sctp_pcb.c b/sys/netinet/sctp_pcb.c index ac47b6aa1bfc..16cde18c4c1d 100644 --- a/sys/netinet/sctp_pcb.c +++ b/sys/netinet/sctp_pcb.c @@ -3405,7 +3405,6 @@ sctp_inpcb_free(struct sctp_inpcb *inp, int immediate, int from) continue; } if ((stcb->asoc.size_on_reasm_queue > 0) || - (stcb->asoc.control_pdapi) || (stcb->asoc.size_on_all_streams > 0) || ((so != NULL) && (SCTP_SBAVAIL(&so->so_rcv) > 0))) { /* Left with Data unread */ @@ -4762,18 +4761,10 @@ sctp_free_assoc(struct sctp_inpcb *inp, struct sctp_tcb *stcb, int from_inpcbfre * now. */ if (sq->end_added == 0) { - /* Held for PD-API clear that. */ + /* Held for PD-API, clear that. */ sq->pdapi_aborted = 1; sq->held_length = 0; if (sctp_stcb_is_feature_on(inp, stcb, SCTP_PCB_FLAGS_PDAPIEVNT) && (so != NULL)) { - /* - * Need to add a PD-API - * aborted indication. - * Setting the control_pdapi - * assures that it will be - * added right after this - * msg. - */ sctp_ulp_notify(SCTP_NOTIFY_PARTIAL_DELVIERY_INDICATION, stcb, SCTP_PARTIAL_DELIVERY_ABORTED, diff --git a/sys/netinet/sctp_structs.h b/sys/netinet/sctp_structs.h index 278afb2cc554..53d9bfd4f445 100644 --- a/sys/netinet/sctp_structs.h +++ b/sys/netinet/sctp_structs.h @@ -956,15 +956,6 @@ struct sctp_association { uint32_t fast_recovery_tsn; uint32_t sat_t3_recovery_tsn; uint32_t tsn_last_delivered; - /* - * For the pd-api we should re-write this a bit more efficient. We - * could have multiple sctp_queued_to_read's that we are building at - * once. Now we only do this when we get ready to deliver to the - * socket buffer. Note that we depend on the fact that the struct is - * "stuck" on the read queue until we finish all the pd-api. - */ - struct sctp_queued_to_read *control_pdapi; - uint32_t tsn_of_pdapi_last_delivered; uint32_t pdapi_ppid; uint32_t context; From nobody Sat Aug 19 12:14:12 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RSd3H1fTtz4qdBv; Sat, 19 Aug 2023 12:14:51 +0000 (UTC) (envelope-from freebsd@walstatt-de.de) Received: from smtp6.goneo.de (smtp6.goneo.de [85.220.129.31]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 4RSd3G6b10z3Ymq; Sat, 19 Aug 2023 12:14:50 +0000 (UTC) (envelope-from freebsd@walstatt-de.de) Authentication-Results: mx1.freebsd.org; none Received: from hub1.goneo.de (hub1.goneo.de [85.220.129.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp6.goneo.de (Postfix) with ESMTPS id 1206510A3312; Sat, 19 Aug 2023 14:14:43 +0200 (CEST) Received: from hub1.goneo.de (localhost [127.0.0.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by hub1.goneo.de (Postfix) with ESMTPS id 55D81105C65A; Sat, 19 Aug 2023 14:14:40 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=walstatt-de.de; s=DKIM001; t=1692447280; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=uUX0PRTLRrvawcFdumWny+HqHTToNmi5DandxkLu4ps=; b=hJblctCBWgOpHqiQJhcOzEpHSyVonDov9gUOWqn3iEQ6dWd+21OQhe1Hscqqnej0rZr6aV fO4BdEaGwcNQf9bOCvOtgbz5HwBcpHufTPiMVB4rPtuw2/dknygTJpVkDHbuMPOpUrECu/ YpV8rdJ03kcYNMJZNv1rx978Z9cxBAWFx2GVk6FdvhE3HvbAi0I2sV9HsySXlf+5LSY3gW hOblKdKD+w8rdPBwBGHqxLZsB5zgXJl+JuCLqXPWEks7tVAfFT9/8umXS1bbvhVw57bIoc wn9eIjfCyQYYJH47qTDRIWkAXeInBS0Uc+RgLOT7BvaFI1M+NU+Z7cJXra9bxw== Received: from thor.intern.walstatt.dynvpn.de (dynamic-089-012-150-235.89.12.pool.telefonica.de [89.12.150.235]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-256) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by hub1.goneo.de (Postfix) with ESMTPSA id 092E21060974; Sat, 19 Aug 2023 14:14:40 +0200 (CEST) Date: Sat, 19 Aug 2023 14:14:12 +0200 From: FreeBSD User To: Michael Tuexen Cc: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: Re: git: 4f14d4b6b7f0 - main - sctp: cleanup handling of graceful shutdown of the peer Message-ID: <20230819141439.613ed198@thor.intern.walstatt.dynvpn.de> In-Reply-To: <202308191047.37JAlPN4069693@gitrepo.freebsd.org> References: <202308191047.37JAlPN4069693@gitrepo.freebsd.org> Organization: walstatt-de.de List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-Rspamd-UID: 058395 X-Rspamd-UID: f676d7 X-Rspamd-Queue-Id: 4RSd3G6b10z3Ymq X-Spamd-Bar: ---- 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:25394, ipnet:85.220.128.0/17, country:DE] Am Sat, 19 Aug 2023 10:47:25 GMT Michael Tuexen schrieb: > The branch main has been updated by tuexen: > > URL: https://cgit.FreeBSD.org/src/commit/?id=4f14d4b6b7f0ca49b14379e48117121af3ed2669 > > commit 4f14d4b6b7f0ca49b14379e48117121af3ed2669 > Author: Michael Tuexen > AuthorDate: 2023-08-19 10:35:49 +0000 > Commit: Michael Tuexen > CommitDate: 2023-08-19 10:35:49 +0000 > > sctp: cleanup handling of graceful shutdown of the peer > > Don't handle a graceful shutdown of the peer as an implicit signal > that all partial messages are complete. First, this is not implemented > correctly and second this should not be done by the peer. It is more > appropriate to handle this as a protocol violation. > Remove the incorrect code and leave detecting the protocol violation > and its handling in a followup commit. > > MFC after: 1 week > --- > sys/netinet/sctp_input.c | 63 +++++++++++----------------------------------- > sys/netinet/sctp_pcb.c | 11 +------- > sys/netinet/sctp_structs.h | 9 ------- > 3 files changed, 16 insertions(+), 67 deletions(-) > > diff --git a/sys/netinet/sctp_input.c b/sys/netinet/sctp_input.c > index 81b011b7e78a..059c6ded2e5e 100644 > --- a/sys/netinet/sctp_input.c > +++ b/sys/netinet/sctp_input.c > @@ -837,8 +837,7 @@ sctp_handle_shutdown(struct sctp_shutdown_chunk *cp, > int some_on_streamwheel; > int old_state; > > - SCTPDBG(SCTP_DEBUG_INPUT2, > - "sctp_handle_shutdown: handling SHUTDOWN\n"); > + SCTPDBG(SCTP_DEBUG_INPUT2, "sctp_handle_shutdown: handling SHUTDOWN\n"); > if (stcb == NULL) > return; > asoc = &stcb->asoc; > @@ -855,40 +854,12 @@ sctp_handle_shutdown(struct sctp_shutdown_chunk *cp, > if (*abort_flag) { > return; > } > - if (asoc->control_pdapi) { > - /* > - * With a normal shutdown we assume the end of last record. > - */ > - SCTP_INP_READ_LOCK(stcb->sctp_ep); > - if (asoc->control_pdapi->on_strm_q) { > - struct sctp_stream_in *strm; > - > - strm = &asoc->strmin[asoc->control_pdapi->sinfo_stream]; > - if (asoc->control_pdapi->on_strm_q == SCTP_ON_UNORDERED) { > - /* Unordered */ > - TAILQ_REMOVE(&strm->uno_inqueue, asoc->control_pdapi, > next_instrm); > - asoc->control_pdapi->on_strm_q = 0; > - } else if (asoc->control_pdapi->on_strm_q == SCTP_ON_ORDERED) { > - /* Ordered */ > - TAILQ_REMOVE(&strm->inqueue, asoc->control_pdapi, > next_instrm); > - asoc->control_pdapi->on_strm_q = 0; > -#ifdef INVARIANTS > - } else { > - panic("Unknown state on ctrl:%p on_strm_q:%d", > - asoc->control_pdapi, > - asoc->control_pdapi->on_strm_q); > -#endif > - } > - } > - asoc->control_pdapi->end_added = 1; > - asoc->control_pdapi->pdapi_aborted = 1; > - asoc->control_pdapi = NULL; > - SCTP_INP_READ_UNLOCK(stcb->sctp_ep); > - if (stcb->sctp_socket) { > - sctp_sorwakeup(stcb->sctp_ep, stcb->sctp_socket); > - } > - } > - /* goto SHUTDOWN_RECEIVED state to block new requests */ > + /* > + * FIXME MT: Handle the case where there are still incomplete > + * received user messages or known missing user messages from the > + * peer. One way to handle this is to abort the associations in this > + * case. > + */ > if (stcb->sctp_socket) { > if ((SCTP_GET_STATE(stcb) != SCTP_STATE_SHUTDOWN_RECEIVED) && > (SCTP_GET_STATE(stcb) != SCTP_STATE_SHUTDOWN_ACK_SENT) && > @@ -949,8 +920,9 @@ sctp_handle_shutdown_ack(struct sctp_shutdown_ack_chunk *cp SCTP_UNUSED, > > SCTPDBG(SCTP_DEBUG_INPUT2, > "sctp_handle_shutdown_ack: handling SHUTDOWN ACK\n"); > - if (stcb == NULL) > + if (stcb == NULL) { > return; > + } > > asoc = &stcb->asoc; > /* process according to association state */ > @@ -967,17 +939,12 @@ sctp_handle_shutdown_ack(struct sctp_shutdown_ack_chunk *cp > SCTP_UNUSED, SCTP_TCB_UNLOCK(stcb); > return; > } > - if (asoc->control_pdapi) { > - /* > - * With a normal shutdown we assume the end of last record. > - */ > - SCTP_INP_READ_LOCK(stcb->sctp_ep); > - asoc->control_pdapi->end_added = 1; > - asoc->control_pdapi->pdapi_aborted = 1; > - asoc->control_pdapi = NULL; > - SCTP_INP_READ_UNLOCK(stcb->sctp_ep); > - sctp_sorwakeup(stcb->sctp_ep, stcb->sctp_socket); > - } > + /* > + * FIXME MT: Handle the case where there are still incomplete > + * received user messages or known missing user messages from the > + * peer. One way to handle this is to abort the associations in this > + * case. > + */ > #ifdef INVARIANTS > if (!TAILQ_EMPTY(&asoc->send_queue) || > !TAILQ_EMPTY(&asoc->sent_queue) || > diff --git a/sys/netinet/sctp_pcb.c b/sys/netinet/sctp_pcb.c > index ac47b6aa1bfc..16cde18c4c1d 100644 > --- a/sys/netinet/sctp_pcb.c > +++ b/sys/netinet/sctp_pcb.c > @@ -3405,7 +3405,6 @@ sctp_inpcb_free(struct sctp_inpcb *inp, int immediate, int from) > continue; > } > if ((stcb->asoc.size_on_reasm_queue > 0) || > - (stcb->asoc.control_pdapi) || > (stcb->asoc.size_on_all_streams > 0) || > ((so != NULL) && (SCTP_SBAVAIL(&so->so_rcv) > 0))) { > /* Left with Data unread */ > @@ -4762,18 +4761,10 @@ sctp_free_assoc(struct sctp_inpcb *inp, struct sctp_tcb *stcb, int > from_inpcbfre > * now. > */ > if (sq->end_added == 0) { > - /* Held for PD-API clear that. */ > + /* Held for PD-API, clear that. */ > sq->pdapi_aborted = 1; > sq->held_length = 0; > if (sctp_stcb_is_feature_on(inp, stcb, > SCTP_PCB_FLAGS_PDAPIEVNT) && (so != NULL)) { > - /* > - * Need to add a PD-API > - * aborted indication. > - * Setting the control_pdapi > - * assures that it will be > - * added right after this > - * msg. > - */ > sctp_ulp_notify(SCTP_NOTIFY_PARTIAL_DELVIERY_INDICATION, > stcb, > SCTP_PARTIAL_DELIVERY_ABORTED, > diff --git a/sys/netinet/sctp_structs.h b/sys/netinet/sctp_structs.h > index 278afb2cc554..53d9bfd4f445 100644 > --- a/sys/netinet/sctp_structs.h > +++ b/sys/netinet/sctp_structs.h > @@ -956,15 +956,6 @@ struct sctp_association { > uint32_t fast_recovery_tsn; > uint32_t sat_t3_recovery_tsn; > uint32_t tsn_last_delivered; > - /* > - * For the pd-api we should re-write this a bit more efficient. We > - * could have multiple sctp_queued_to_read's that we are building at > - * once. Now we only do this when we get ready to deliver to the > - * socket buffer. Note that we depend on the fact that the struct is > - * "stuck" on the read queue until we finish all the pd-api. > - */ > - struct sctp_queued_to_read *control_pdapi; > - > uint32_t tsn_of_pdapi_last_delivered; > uint32_t pdapi_ppid; > uint32_t context; > Something seems to go wrong after this commit: (buildworld/-kernel with WITHOUT_CLEAN=true): [...] ===> accf_dns (all) --- sctp_input.o --- /usr/src/sys/netinet/sctp_input.c:919:27: error: variable 'asoc' set but not used [-Werror,-Wunused-but-set-variable] struct sctp_association *asoc; ^ --- modules-all --- [...] Regards oh -- O. Hartmann From nobody Sat Aug 19 13:03:38 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RSf7Z38W6z4qh50; Sat, 19 Aug 2023 13:03: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RSf7Z2T16z3cRq; Sat, 19 Aug 2023 13:03:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692450218; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=IPQ/7pbh6kzNnUdYKA1mySAoppwSXKwnaNlLN/EtK6o=; b=V081GH+8DKt/iUlpFJ8X8w4deyGLzhyp90+GJ5a+9ETrkWhcxIBPryyot0ZF2aK2Ztncw6 2afufeTY01Xn59zZWJsXnbxzibrpOMUdjzBJvvAR1AC5s23PKX8abi4CrCop0xiNuCGx2b lwkO9kfBA+nCPU5PncirTQsTHTecqFGUqOyW7SApCNO3sgrkeWXk7azbS4zzrbEqCmTZmt U5nqJ9CmK4nh3fkijtw2ISE5r6QRc7++xngCy1IvIVxAWUAtvcDOmbZ58ns8XVXd8rtNt4 d5bPCDJvwu5vWPdIyQcIzpHnaBfNfdVm+OWpMPqOK8RxG1dc6WOwhBl9jGl/AQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692450218; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=IPQ/7pbh6kzNnUdYKA1mySAoppwSXKwnaNlLN/EtK6o=; b=IErCMGo712V1a/CqP9UVOI259j2q7kOdHl65g9cP2v9JzdQgVXv9XRfLX1kzPVP1p6sVuE ldEgoPx38D3bcx73L5KGXdgYjuAodD238KFROGu5FG1zv9oR4yrzisLMXuRJX8oV6UBEvM 0Ry5X8ficHlhPaktEoikx2uV77v/eYjhc9AATAwWeOCGRhy2RnUJ9/a+rU78IEuVzyLT4e ymQ07qyUGDQYhmAoe6h3L4NtDZt3tW4NEUmDTR86gflqYkpMWCDqMBKaDgrlgF7E6Ji+4w rte/aTfwuxeG9j4q8XW8GEKua+/oMgOLKSVFwzA9j8QE4hkBpzPgQ1Ai1AE8YA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692450218; a=rsa-sha256; cv=none; b=K8MSAbdBrRMhK8aTOBymZ0Jp634j8WhObDbfF+Mtl8vk4nJD9v6hMLBdnevrksPKY7ymXm RqayHMDtdklMYUcTd8OScnHJ2vG4gwDH1F7WijPopz/ecfjD1sBkDYf5rETp2VoWy1MQw8 ML42gAqbgFycv6juLeQVMtTWcpRbgZ5yerilidXNL6kOBSGzqShxbZDud5BdKFHBcvSb5B vQz0Dd1Ydpf5Cksh0FUB7Rh4xYJeateq3+urbFbkEHnGquEvKquUmhS2fu+dfZHYZgIOjl iCHj1ZVNn13J1BV3gD5L/kO7Yzqd9leuCkgS/f+Kb85av6+xv51oD8WFylIVwA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RSf7Z1Czxz101J; Sat, 19 Aug 2023 13:03:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37JD3cZK002579; Sat, 19 Aug 2023 13:03:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37JD3ceG002576; Sat, 19 Aug 2023 13:03:38 GMT (envelope-from git) Date: Sat, 19 Aug 2023 13:03:38 GMT Message-Id: <202308191303.37JD3ceG002576@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Michael Tuexen Subject: git: 1095da75032b - main - sctp: fix a warning List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: tuexen X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1095da75032b439d893c0947eda2f3738ecfe494 Auto-Submitted: auto-generated The branch main has been updated by tuexen: URL: https://cgit.FreeBSD.org/src/commit/?id=1095da75032b439d893c0947eda2f3738ecfe494 commit 1095da75032b439d893c0947eda2f3738ecfe494 Author: Michael Tuexen AuthorDate: 2023-08-19 11:24:02 +0000 Commit: Michael Tuexen CommitDate: 2023-08-19 11:24:02 +0000 sctp: fix a warning Fix an unused-but-set-variable warning for builds without INVARIANTS. Reported by: O. Hartmann MFC after: 1 week --- sys/netinet/sctp_input.c | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/sys/netinet/sctp_input.c b/sys/netinet/sctp_input.c index 059c6ded2e5e..f3227c913e1e 100644 --- a/sys/netinet/sctp_input.c +++ b/sys/netinet/sctp_input.c @@ -833,14 +833,12 @@ static void sctp_handle_shutdown(struct sctp_shutdown_chunk *cp, struct sctp_tcb *stcb, struct sctp_nets *net, int *abort_flag) { - struct sctp_association *asoc; int some_on_streamwheel; int old_state; SCTPDBG(SCTP_DEBUG_INPUT2, "sctp_handle_shutdown: handling SHUTDOWN\n"); if (stcb == NULL) return; - asoc = &stcb->asoc; if ((SCTP_GET_STATE(stcb) == SCTP_STATE_COOKIE_WAIT) || (SCTP_GET_STATE(stcb) == SCTP_STATE_COOKIE_ECHOED)) { return; @@ -872,7 +870,7 @@ sctp_handle_shutdown(struct sctp_shutdown_chunk *cp, sctp_ulp_notify(SCTP_NOTIFY_PEER_SHUTDOWN, stcb, 0, NULL, SCTP_SO_NOT_LOCKED); /* reset time */ - (void)SCTP_GETTIME_TIMEVAL(&asoc->time_entered); + (void)SCTP_GETTIME_TIMEVAL(&stcb->asoc.time_entered); } } if (SCTP_GET_STATE(stcb) == SCTP_STATE_SHUTDOWN_SENT) { @@ -886,8 +884,8 @@ sctp_handle_shutdown(struct sctp_shutdown_chunk *cp, /* Now is there unsent data on a stream somewhere? */ some_on_streamwheel = sctp_is_there_unsent_data(stcb, SCTP_SO_NOT_LOCKED); - if (!TAILQ_EMPTY(&asoc->send_queue) || - !TAILQ_EMPTY(&asoc->sent_queue) || + if (!TAILQ_EMPTY(&stcb->asoc.send_queue) || + !TAILQ_EMPTY(&stcb->asoc.sent_queue) || some_on_streamwheel) { /* By returning we will push more data out */ return; @@ -916,15 +914,12 @@ sctp_handle_shutdown_ack(struct sctp_shutdown_ack_chunk *cp SCTP_UNUSED, struct sctp_tcb *stcb, struct sctp_nets *net) { - struct sctp_association *asoc; - SCTPDBG(SCTP_DEBUG_INPUT2, "sctp_handle_shutdown_ack: handling SHUTDOWN ACK\n"); if (stcb == NULL) { return; } - asoc = &stcb->asoc; /* process according to association state */ if ((SCTP_GET_STATE(stcb) == SCTP_STATE_COOKIE_WAIT) || (SCTP_GET_STATE(stcb) == SCTP_STATE_COOKIE_ECHOED)) { @@ -946,8 +941,8 @@ sctp_handle_shutdown_ack(struct sctp_shutdown_ack_chunk *cp SCTP_UNUSED, * case. */ #ifdef INVARIANTS - if (!TAILQ_EMPTY(&asoc->send_queue) || - !TAILQ_EMPTY(&asoc->sent_queue) || + if (!TAILQ_EMPTY(&stcb->asoc.send_queue) || + !TAILQ_EMPTY(&stcb->asoc.sent_queue) || sctp_is_there_unsent_data(stcb, SCTP_SO_NOT_LOCKED)) { panic("Queues are not empty when handling SHUTDOWN-ACK"); } From nobody Sat Aug 19 13:04:55 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RSf9868yWz4qhVY; Sat, 19 Aug 2023 13:05:00 +0000 (UTC) (envelope-from tuexen@freebsd.org) Received: from drew.franken.de (mail-n.franken.de [193.175.24.27]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "*.franken.de", Issuer "Sectigo RSA Domain Validation Secure Server CA" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RSf982tyYz3d6j; Sat, 19 Aug 2023 13:05:00 +0000 (UTC) (envelope-from tuexen@freebsd.org) Authentication-Results: mx1.freebsd.org; none Received: from smtpclient.apple (unknown [IPv6:2a02:8109:1140:c3d:70f9:430b:3c08:cd93]) (Authenticated sender: micmac) by mail-n.franken.de (Postfix) with ESMTPSA id C8092772CC29F; Sat, 19 Aug 2023 15:04:55 +0200 (CEST) Content-Type: text/plain; charset=us-ascii List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org Mime-Version: 1.0 (Mac OS X Mail 16.0 \(3731.700.6\)) Subject: Re: git: 4f14d4b6b7f0 - main - sctp: cleanup handling of graceful shutdown of the peer From: tuexen@freebsd.org In-Reply-To: <20230819141439.613ed198@thor.intern.walstatt.dynvpn.de> Date: Sat, 19 Aug 2023 15:04:55 +0200 Cc: "src-committers@freebsd.org" , "dev-commits-src-all@freebsd.org" , "dev-commits-src-main@freebsd.org" Content-Transfer-Encoding: quoted-printable Message-Id: <756F5A29-BA8B-450A-866A-081AFB5E3324@freebsd.org> References: <202308191047.37JAlPN4069693@gitrepo.freebsd.org> <20230819141439.613ed198@thor.intern.walstatt.dynvpn.de> To: FreeBSD User X-Mailer: Apple Mail (2.3731.700.6) X-Spam-Status: No, score=-2.9 required=5.0 tests=ALL_TRUSTED,BAYES_00 autolearn=disabled version=3.4.1 X-Spam-Checker-Version: SpamAssassin 3.4.1 (2015-04-28) on mail-n.franken.de X-Rspamd-Queue-Id: 4RSf982tyYz3d6j X-Spamd-Bar: ---- 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:680, ipnet:193.174.0.0/15, country:DE] > On 19. Aug 2023, at 14:14, FreeBSD User = wrote: >=20 > Am Sat, 19 Aug 2023 10:47:25 GMT > Michael Tuexen schrieb: >=20 >> The branch main has been updated by tuexen: >>=20 >> URL: = https://cgit.FreeBSD.org/src/commit/?id=3D4f14d4b6b7f0ca49b14379e48117121a= f3ed2669 >>=20 >> commit 4f14d4b6b7f0ca49b14379e48117121af3ed2669 >> Author: Michael Tuexen >> AuthorDate: 2023-08-19 10:35:49 +0000 >> Commit: Michael Tuexen >> CommitDate: 2023-08-19 10:35:49 +0000 >>=20 >> sctp: cleanup handling of graceful shutdown of the peer >>=20 >> Don't handle a graceful shutdown of the peer as an implicit signal >> that all partial messages are complete. First, this is not = implemented >> correctly and second this should not be done by the peer. It is = more >> appropriate to handle this as a protocol violation. >> Remove the incorrect code and leave detecting the protocol = violation >> and its handling in a followup commit. >>=20 >> MFC after: 1 week >> --- >> sys/netinet/sctp_input.c | 63 = +++++++++++----------------------------------- >> sys/netinet/sctp_pcb.c | 11 +------- >> sys/netinet/sctp_structs.h | 9 ------- >> 3 files changed, 16 insertions(+), 67 deletions(-) >>=20 >> diff --git a/sys/netinet/sctp_input.c b/sys/netinet/sctp_input.c >> index 81b011b7e78a..059c6ded2e5e 100644 >> --- a/sys/netinet/sctp_input.c >> +++ b/sys/netinet/sctp_input.c >> @@ -837,8 +837,7 @@ sctp_handle_shutdown(struct sctp_shutdown_chunk = *cp, >> int some_on_streamwheel; >> int old_state; >>=20 >> - SCTPDBG(SCTP_DEBUG_INPUT2, >> - "sctp_handle_shutdown: handling SHUTDOWN\n"); >> + SCTPDBG(SCTP_DEBUG_INPUT2, "sctp_handle_shutdown: handling = SHUTDOWN\n"); >> if (stcb =3D=3D NULL) >> return; >> asoc =3D &stcb->asoc; >> @@ -855,40 +854,12 @@ sctp_handle_shutdown(struct sctp_shutdown_chunk = *cp, >> if (*abort_flag) { >> return; >> } >> - if (asoc->control_pdapi) { >> - /* >> - * With a normal shutdown we assume the end of last record. >> - */ >> - SCTP_INP_READ_LOCK(stcb->sctp_ep); >> - if (asoc->control_pdapi->on_strm_q) { >> - struct sctp_stream_in *strm; >> - >> - strm =3D &asoc->strmin[asoc->control_pdapi->sinfo_stream]; >> - if (asoc->control_pdapi->on_strm_q =3D=3D SCTP_ON_UNORDERED) { >> - /* Unordered */ >> - TAILQ_REMOVE(&strm->uno_inqueue, asoc->control_pdapi, >> next_instrm); >> - asoc->control_pdapi->on_strm_q =3D 0; >> - } else if (asoc->control_pdapi->on_strm_q =3D=3D SCTP_ON_ORDERED) { >> - /* Ordered */ >> - TAILQ_REMOVE(&strm->inqueue, asoc->control_pdapi, >> next_instrm); >> - asoc->control_pdapi->on_strm_q =3D 0; >> -#ifdef INVARIANTS >> - } else { >> - panic("Unknown state on ctrl:%p on_strm_q:%d", >> - asoc->control_pdapi, >> - asoc->control_pdapi->on_strm_q); >> -#endif >> - } >> - } >> - asoc->control_pdapi->end_added =3D 1; >> - asoc->control_pdapi->pdapi_aborted =3D 1; >> - asoc->control_pdapi =3D NULL; >> - SCTP_INP_READ_UNLOCK(stcb->sctp_ep); >> - if (stcb->sctp_socket) { >> - sctp_sorwakeup(stcb->sctp_ep, stcb->sctp_socket); >> - } >> - } >> - /* goto SHUTDOWN_RECEIVED state to block new requests */ >> + /* >> + * FIXME MT: Handle the case where there are still incomplete >> + * received user messages or known missing user messages from the >> + * peer. One way to handle this is to abort the associations in this >> + * case. >> + */ >> if (stcb->sctp_socket) { >> if ((SCTP_GET_STATE(stcb) !=3D SCTP_STATE_SHUTDOWN_RECEIVED) && >> (SCTP_GET_STATE(stcb) !=3D SCTP_STATE_SHUTDOWN_ACK_SENT) && >> @@ -949,8 +920,9 @@ sctp_handle_shutdown_ack(struct = sctp_shutdown_ack_chunk *cp SCTP_UNUSED, >>=20 >> SCTPDBG(SCTP_DEBUG_INPUT2, >> "sctp_handle_shutdown_ack: handling SHUTDOWN ACK\n"); >> - if (stcb =3D=3D NULL) >> + if (stcb =3D=3D NULL) { >> return; >> + } >>=20 >> asoc =3D &stcb->asoc; >> /* process according to association state */ >> @@ -967,17 +939,12 @@ sctp_handle_shutdown_ack(struct = sctp_shutdown_ack_chunk *cp >> SCTP_UNUSED, SCTP_TCB_UNLOCK(stcb); >> return; >> } >> - if (asoc->control_pdapi) { >> - /* >> - * With a normal shutdown we assume the end of last record. >> - */ >> - SCTP_INP_READ_LOCK(stcb->sctp_ep); >> - asoc->control_pdapi->end_added =3D 1; >> - asoc->control_pdapi->pdapi_aborted =3D 1; >> - asoc->control_pdapi =3D NULL; >> - SCTP_INP_READ_UNLOCK(stcb->sctp_ep); >> - sctp_sorwakeup(stcb->sctp_ep, stcb->sctp_socket); >> - } >> + /* >> + * FIXME MT: Handle the case where there are still incomplete >> + * received user messages or known missing user messages from the >> + * peer. One way to handle this is to abort the associations in this >> + * case. >> + */ >> #ifdef INVARIANTS >> if (!TAILQ_EMPTY(&asoc->send_queue) || >> !TAILQ_EMPTY(&asoc->sent_queue) || >> diff --git a/sys/netinet/sctp_pcb.c b/sys/netinet/sctp_pcb.c >> index ac47b6aa1bfc..16cde18c4c1d 100644 >> --- a/sys/netinet/sctp_pcb.c >> +++ b/sys/netinet/sctp_pcb.c >> @@ -3405,7 +3405,6 @@ sctp_inpcb_free(struct sctp_inpcb *inp, int = immediate, int from) >> continue; >> } >> if ((stcb->asoc.size_on_reasm_queue > 0) || >> - (stcb->asoc.control_pdapi) || >> (stcb->asoc.size_on_all_streams > 0) || >> ((so !=3D NULL) && (SCTP_SBAVAIL(&so->so_rcv) > 0))) { >> /* Left with Data unread */ >> @@ -4762,18 +4761,10 @@ sctp_free_assoc(struct sctp_inpcb *inp, = struct sctp_tcb *stcb, int >> from_inpcbfre >> * now. >> */ >> if (sq->end_added =3D=3D 0) { >> - /* Held for PD-API clear that. */ >> + /* Held for PD-API, clear that. */ >> sq->pdapi_aborted =3D 1; >> sq->held_length =3D 0; >> if (sctp_stcb_is_feature_on(inp, stcb, >> SCTP_PCB_FLAGS_PDAPIEVNT) && (so !=3D NULL)) { >> - /* >> - * Need to add a PD-API >> - * aborted indication. >> - * Setting the control_pdapi >> - * assures that it will be >> - * added right after this >> - * msg. >> - */ >> sctp_ulp_notify(SCTP_NOTIFY_PARTIAL_DELVIERY_INDICATION, >> stcb, >> SCTP_PARTIAL_DELIVERY_ABORTED, >> diff --git a/sys/netinet/sctp_structs.h b/sys/netinet/sctp_structs.h >> index 278afb2cc554..53d9bfd4f445 100644 >> --- a/sys/netinet/sctp_structs.h >> +++ b/sys/netinet/sctp_structs.h >> @@ -956,15 +956,6 @@ struct sctp_association { >> uint32_t fast_recovery_tsn; >> uint32_t sat_t3_recovery_tsn; >> uint32_t tsn_last_delivered; >> - /* >> - * For the pd-api we should re-write this a bit more efficient. We >> - * could have multiple sctp_queued_to_read's that we are building at >> - * once. Now we only do this when we get ready to deliver to the >> - * socket buffer. Note that we depend on the fact that the struct is >> - * "stuck" on the read queue until we finish all the pd-api. >> - */ >> - struct sctp_queued_to_read *control_pdapi; >> - >> uint32_t tsn_of_pdapi_last_delivered; >> uint32_t pdapi_ppid; >> uint32_t context; >>=20 >=20 > Something seems to go wrong after this commit: >=20 > (buildworld/-kernel with WITHOUT_CLEAN=3Dtrue): > [...] > =3D=3D=3D> accf_dns (all) > --- sctp_input.o --- > /usr/src/sys/netinet/sctp_input.c:919:27: error: variable 'asoc' set = but not used > [-Werror,-Wunused-but-set-variable] struct sctp_association *asoc; > ^ > --- modules-all --- > [...] Thanks for the report. The problem is fixed in: = https://cgit.FreeBSD.org/src/commit/?id=3D1095da75032b439d893c0947eda2f373= 8ecfe494 = Best regards Michael >=20 > Regards >=20 > oh >=20 >=20 > --=20 > O. Hartmann From nobody Sat Aug 19 18:56:16 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RSnyS5NzXz4mLRP; Sat, 19 Aug 2023 18:56:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RSnyS4ftZz4b40; Sat, 19 Aug 2023 18:56:16 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692471376; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=lzO7z9e6RJT/9WmxvYzoRYPlnmLqj05RCmicIIPF9lg=; b=EMRxXhEb7E0pbtvh1gUgxqiohOoJBfBnBE5p1qoCm3sVeoKDM0k7KN8FEe7/mq28+caJVP 5cWE3FSbpRVfqO4pCpP4EAUOwYbrJUaOi2/CuO2Ncl0LEGqX8ftNBfxLyTqX6VS4ZGmK8u 7557X6fa7NMhhCL+fNZBOx4Nal7FFBFDaWA//F6SkT6ZhcQ69mSUFdLBpvZCjI9rmOdNlu WQNEfJuEzBa9BWXU3vYsE+SiCYPKey/QV+6Dai85hWvXj2Uk0UGEL4k1tGX1k7SuQHOL7D 0loLsdwX0kDzGEFnc+JbwJfKY/UpfF1al78lB2k7jU6DVxPbeotwEIKSn0IHcg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692471376; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=lzO7z9e6RJT/9WmxvYzoRYPlnmLqj05RCmicIIPF9lg=; b=S19MseV/XiOWU29+67AAM8z7hV2VPjUMRpcua4S5ItD7bnrsIdu4wlOHC2uldxfNJYEJAy Hgx2VYlrQUm9HtwaUV0obP6+XiW5kb/e2t1RgMAEPPRu/tby1b8VL7gwU4FHg5CZOEtkF5 jUaDLrOn9gleS8YWDyotHF3YDAjvtEBRI4SAoIet9bf0fU/lHxzcsfUJhtzM6W0rNaUHgP w3t/74faJ3te+A0edUxc9jFW3i5FCMOu09xunQpVEEfCc6+AFEWrfR/376TxI1kS2MVWoO sad8DcgG0CrpBp8YE7qC0lck2Gbmx3r7N9cw3oLmCle0N8eN5ZbC2pQEK90Ilw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692471376; a=rsa-sha256; cv=none; b=LP2eXWrFWyi6cm3El0WnPLe41PHLax2KLvvXgcuJmHi9LbdfMXqAbqfwshwB165JX37gYK g4ChhaCtJo1t2DD0omIgxaDd9zQOEZHKhPdjzQ6f9RxuiHHb2OpHY0OPwHHFVtScX9OHf6 PX0jRgC1C3whMMiq4dffprark6ub6hIFUdMLTdJzJVvNtLLTv59EZ8HTiih2O7dcsuaFJB aiR1np/ax6jVDSKc/3gp65U7yiU2PevTQih6v4zoIFcu2sAdCyvecf0gC23kPhe83hneXE DwCbQnOOxr+jtW9XXDit9GsPeuHSOkGftbgMTlEmVU4nF5VlBS3X6anYpvBY8g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RSnyS3jY1z17Xd; Sat, 19 Aug 2023 18:56:16 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37JIuGmL084177; Sat, 19 Aug 2023 18:56:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37JIuGjm084174; Sat, 19 Aug 2023 18:56:16 GMT (envelope-from git) Date: Sat, 19 Aug 2023 18:56:16 GMT Message-Id: <202308191856.37JIuGjm084174@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dmitry Chagin Subject: git: da5a6738d589 - main - linux(4): Allow in fd to be a socket in sendfile List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dchagin X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: da5a6738d589d748ddf93678767d1565558bddd9 Auto-Submitted: auto-generated The branch main has been updated by dchagin: URL: https://cgit.FreeBSD.org/src/commit/?id=da5a6738d589d748ddf93678767d1565558bddd9 commit da5a6738d589d748ddf93678767d1565558bddd9 Author: Dmitry Chagin AuthorDate: 2023-08-19 18:55:23 +0000 Commit: Dmitry Chagin CommitDate: 2023-08-19 18:55:23 +0000 linux(4): Allow in fd to be a socket in sendfile In this case sendfile fallback is used. MFC after: 1 month --- sys/compat/linux/linux_socket.c | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/sys/compat/linux/linux_socket.c b/sys/compat/linux/linux_socket.c index 6c7cf12cf42e..67736ecc69f6 100644 --- a/sys/compat/linux/linux_socket.c +++ b/sys/compat/linux/linux_socket.c @@ -2381,16 +2381,24 @@ out: * with FreeBSD sendfile. */ static bool -is_stream_socket(struct file *fp) +is_sendfile(struct file *fp, struct file *ofp) { struct socket *so; + /* + * FreeBSD sendfile() system call sends a regular file or + * shared memory object out a stream socket. + */ + if ((fp->f_type != DTYPE_SHM && fp->f_type != DTYPE_VNODE) || + (fp->f_type == DTYPE_VNODE && + (fp->f_vnode == NULL || fp->f_vnode->v_type != VREG))) + return (false); /* * The socket must be a stream socket and connected. */ - if (fp->f_type != DTYPE_SOCKET) + if (ofp->f_type != DTYPE_SOCKET) return (false); - so = fp->f_data; + so = ofp->f_data; if (so->so_type != SOCK_STREAM) return (false); /* @@ -2556,7 +2564,7 @@ linux_sendfile_common(struct thread *td, l_int out, l_int in, 0); } else { sbytes = 0; - if (is_stream_socket(ofp)) + if (is_sendfile(fp, ofp)) error = sendfile_sendfile(td, fp, out, offset, count, &sbytes); else From nobody Sat Aug 19 18:56:17 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RSnyT6LNHz4mLGB; Sat, 19 Aug 2023 18:56: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RSnyT5wfzz4bDK; Sat, 19 Aug 2023 18:56:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692471377; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=sg03gFM5vIhrbt4+ockOA1Mejuy47eAj2HNgNNfkTAg=; b=v1LXin3McYgZeUuVQfHTs8KFeRNj73forYS3mbIyhblfjXbaHGKiDmgnonhtynvCmfStjQ w1YmVDS72zTI/dPG9tM+JHTgRgKlY6YPAzJNiKJm9COwFwUsO4cUqlT8kY3/WvSBSmr7G0 c7DgctFXZb5IVpCWiU00Qub2fiFrzTIOFOfKdDOgE8uMmopTiyWSa8NQBDfESZ6vsS9khv kqKJOLzxTo+D44IW8L5m+5Sgvn+f8g2GBS3r5HI7G1EPJItFVPCytQAqBevZPyJGHBTWOc UY/XxdT+fHua2LHjY6jhfi+4aA25CVfPatAAdOylNgQOxqD7JzqbgDJwwFrdrA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692471377; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=sg03gFM5vIhrbt4+ockOA1Mejuy47eAj2HNgNNfkTAg=; b=l43kt/Cb+a8ELHyDTDq2hv02JNo74MW4jsbJrJ304c35GLq5mZzhKJ87a06Mr5Sq3JhJWm 4R+Tex+CBoak9lKpspRqthtCbTH0x4Iin/6FyJMpoGeKBhvdzQ6o+Fa5dPcbL/fUtyN500 UWpH3/4cw6rsUF81YL65f/EwtUDutt3A76gsUr9ltGZjrtn5hKr/bCUJ5Kpa9cw1TVBwoK 8Ns4gcnbHUDWB9jfPczqRMdZSx+pYKkoC4qxg/c/heTfUD96s19LecDsDPUkfKYo6wjOIC CosPCm8EW+0fx/sQDy+wqZMHr3oyyyMdtrxmWLYzgr2TzfDuNiN0y+LBViML5Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692471377; a=rsa-sha256; cv=none; b=FuBjn8EVvdcvq8nqyB7w9VpzFsXZXGnaeOMSFvfyMqEc0GO0gJ62YQaqoid7UP9Po7QGcY ImnkOJiLIcgKiEOZdDQtpq5a+acezAy0mmyU+Lsh+ckaMFgWxQb1M7ZEthGVa89ebwK/9L jVCNDa06DmhP73CwIWrJFDga3tU5DhFwfNwbucTVwk+1448xOxg7C2smWOg02wVbWSasTQ fO8RRqmADY/7WbMkrwKvjKbrRZQ7Ktc7r+rtHBF1MbqEmgPNAYOV10N3GTTG0vmAveMMsD 0oxifyGW9Ee/kDgaswm/iiTQmDULN0KbllRp/mfKtcPOJuuYiUUReNZ6sFV60A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RSnyT4m4qz1885; Sat, 19 Aug 2023 18:56:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37JIuHCm084237; Sat, 19 Aug 2023 18:56:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37JIuH3B084234; Sat, 19 Aug 2023 18:56:17 GMT (envelope-from git) Date: Sat, 19 Aug 2023 18:56:17 GMT Message-Id: <202308191856.37JIuH3B084234@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dmitry Chagin Subject: git: 4f9fac78d4da - main - linux(4): Return EAGAIN instead of ENOBUFS for non-blocking sockets in sendfile List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dchagin X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4f9fac78d4da662d4ae29c4e1d71c66cd29fcfbb Auto-Submitted: auto-generated The branch main has been updated by dchagin: URL: https://cgit.FreeBSD.org/src/commit/?id=4f9fac78d4da662d4ae29c4e1d71c66cd29fcfbb commit 4f9fac78d4da662d4ae29c4e1d71c66cd29fcfbb Author: Dmitry Chagin AuthorDate: 2023-08-19 18:55:23 +0000 Commit: Dmitry Chagin CommitDate: 2023-08-19 18:55:23 +0000 linux(4): Return EAGAIN instead of ENOBUFS for non-blocking sockets in sendfile MFC after: 1 month --- sys/compat/linux/linux_socket.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/sys/compat/linux/linux_socket.c b/sys/compat/linux/linux_socket.c index 67736ecc69f6..834c2c938925 100644 --- a/sys/compat/linux/linux_socket.c +++ b/sys/compat/linux/linux_socket.c @@ -2570,6 +2570,8 @@ linux_sendfile_common(struct thread *td, l_int out, l_int in, else error = sendfile_fallback(td, fp, out, offset, count, &sbytes); + if (error == ENOBUFS && (ofp->f_flag & FNONBLOCK) != 0) + error = EAGAIN; if (error == 0) td->td_retval[0] = sbytes; } From nobody Sat Aug 19 19:29:50 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RSpjC28LBz4mNJq; Sat, 19 Aug 2023 19:29: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RSpjC1KHtz4gC6; Sat, 19 Aug 2023 19:29:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692473391; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=O6yBMmjoopWzLMWNXYV+Jpb+bj/jqkIuffedB70kYTU=; b=HsJJaC6GMwURnpykqtQqi/6uBrzrGOxqCDngCfqdgORk5Bh2ypvmAL3i9YNYGv4zWcPBvI g6JlStpFTJA7L3w52j5Z1pesVfx0vljEyKNNn2UDK5Pwe97GGZBJ4Yj6tQtkSUJpyd+Hdc BzUEn8YUmdHlP0h/ScLn7RfrULKly2HCRPXzcnTNBhXfKb2gHNv+1aHAng720zaT9bwIlF wfdeW3gitLE9kW59dgKYNWGRnxVK3I2N1nQohNOIQx2Yhw/GFLBFepq4NM6lC8tkmPVOzj QqJ+QpqJFK3m2vhDLiTffeiz7LiZPBL2rOpIA9J4Pe3yg5NPjn8YpEvl5LoqNA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692473391; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=O6yBMmjoopWzLMWNXYV+Jpb+bj/jqkIuffedB70kYTU=; b=MqRbyJGuTyuN4jmIN5Z4CeeFeLDYP3ZpkeetjuHlBLdxjORCITznJ1gD9t15bjc5XjOhmq GVA6VVc5QSfPVBMdE3VBhpXrNg4u37DCefhvEoKBWf6QeoXFZ6bFgT+SwoXqotClpF6i/H 8K14zKFDFZ5njcsDrj+QWAn4SsQI3BcaPB/IjONZ5H4Jq4fAXEsIM5CEo4xEsMQ5q0+8jt E9kHUCPGQHNETpjQAYxfogg3WdWhBMCWYL7zKdhdNKREArftgyov7p93pgaaOMGwZg5kfC RbLv4X7VFHuOzWL8NjFsBTgHCh3K9OYupzJpNONmKF2yP/RZ/bKlbl4c43znKg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692473391; a=rsa-sha256; cv=none; b=Uxa7PHFdkxuZwjeZNbgAvPQdPv/Jf2WqS0Mr0c0cDC7MyWcGNsViMlt8bS5rfEx44RmKH6 Dxoy6uEtnK055LFJHF7mF4pJ9u7h9uqydHjC3DxHGHzGnLgwvkYMVEwrVxBCDzo04rvqUQ WRtZTrJSQz6DKnPwZqzmG7qzDV6kTLY0cMJ23TxZxG8XCZmkEEjVsBYpD8O86bgYpX6p6d KW5uh3YvcQhI1O5i1Esr/VQCqBT/IOj9q5Vbm2YdUI+tgBqTrM3hE6DjZp8DAKk6o5AEQ/ O/REhwcnMm4lHOjvKzySsTBrFrwXqtDGvCAN4R+ahGmbGwY4XFfeLlkPCE2iOQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RSpjC0Nr5z186q; Sat, 19 Aug 2023 19:29:51 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37JJTonA035167; Sat, 19 Aug 2023 19:29:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37JJTokk035164; Sat, 19 Aug 2023 19:29:50 GMT (envelope-from git) Date: Sat, 19 Aug 2023 19:29:50 GMT Message-Id: <202308191929.37JJTokk035164@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Eugene Grosbein Subject: git: c6dc07c6f1a8 - stable/12 - tftpd: cleanup after conflict resolution List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: eugen X-Git-Repository: src X-Git-Refname: refs/heads/stable/12 X-Git-Reftype: branch X-Git-Commit: c6dc07c6f1a82ab8d97446f01eb0ec4832e92f0e Auto-Submitted: auto-generated The branch stable/12 has been updated by eugen: URL: https://cgit.FreeBSD.org/src/commit/?id=c6dc07c6f1a82ab8d97446f01eb0ec4832e92f0e commit c6dc07c6f1a82ab8d97446f01eb0ec4832e92f0e Author: Eugene Grosbein AuthorDate: 2023-08-19 19:28:49 +0000 Commit: Eugene Grosbein CommitDate: 2023-08-19 19:28:49 +0000 tftpd: cleanup after conflict resolution Fixes: a99bf9966590859d21d28ec63798820dc07e0ba8 --- libexec/tftpd/tftpd.c | 1 - 1 file changed, 1 deletion(-) diff --git a/libexec/tftpd/tftpd.c b/libexec/tftpd/tftpd.c index 56b97d4791bc..ed030b23da30 100644 --- a/libexec/tftpd/tftpd.c +++ b/libexec/tftpd/tftpd.c @@ -140,7 +140,6 @@ main(int argc, char *argv[]) tftp_openlog("tftpd", LOG_PID | LOG_NDELAY, LOG_FTP); while ((ch = getopt(argc, argv, "cCd:F:lnoOp:s:Su:U:wW")) != -1) { ->>>>>>> 273a307d0b80 (tftpd: introduce new option -S) switch (ch) { case 'c': ipchroot = 1; From nobody Sat Aug 19 20:01:06 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RSqPH1GYpz4mPnc for ; Sat, 19 Aug 2023 20:01: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RSqPH0lFKz3Dxt; Sat, 19 Aug 2023 20:01:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692475267; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=wJBgSpeMuNSlZBuYy5KSpDaSUHU+JHChz+vrKucuGvE=; b=atIcSF/p6kCCr9k21gpdtVUzajpg3HscOQYUu1CppaCAdT3l0RyZ9e5+B1acEzILwKW/6W oJ6a5VGAQKeex1aY6saR5C0YfJ4Wx5EHH8DBTFLu09mHUiZ58zl8SwVCcwzIWdBRbdAe0X rlzc7Br8+yI0wwkWpbIa5vYLUoW6gKfFmS7VNJrIBbcAREZov6Wrxqc00x/4dhaBPL7K+M 8pR3nhk+jQyca+kwm2WTOSI5FrpD6Oi7YoiBd3bkW4h5VQT/Y7DM6AMjdcWw0AGdoobR7O aCUWR89t+ViGiZjQFh+/KtuJxrNAMqN31Qysp5B0uf8E0dZfkW+pIQLJIK+2Ww== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692475267; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=wJBgSpeMuNSlZBuYy5KSpDaSUHU+JHChz+vrKucuGvE=; b=UaAkb3sWCN9Wb0KGnullnY3EL1/z8nxaYlSFJlU8pw6XI5SAMNhF3+1+C1aObh8p1uUUc8 PA8Mvl8vdYEyFqHIooelihsBqz6KM9vnytDV9gD8sQhP6scgxR43lDw8nYh1xwoFNeARVq MGjR2WdYh8LJTqXkb2mnRM1mhpUteHxj+JnKUAwnmnNsGlAd46idxw6v8cniBXC2AmrMqE bgqzcOTnFau1gt77I4k+9HD5Eb5WodNpcrzdMEOl4X+R+ZrN5mwAqaM6sxce0tT45sqi2/ +zJRSbajeJ74gQDWKhTavY4QUdX0TBbxV3nVOw1bNK4ttMGT72voBdIjNShrVA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692475267; a=rsa-sha256; cv=none; b=S0Gwiww3w3odqqOVZTvllCNCqpRkPqqlIJKnXsOAehmqJAprelKe5qQh7GS71HaeQhDCqF MLJYriq2x0VFT+RHNFmrdzkcspgl4+eGm/dlNtSnLVr8qX2z6BKUpXB/UHKMo9aC1DAvsP oKrSuHP8SBB6CHqacz/q0RmBpZf5xL+B5j3o/uCEl216SooQ1f5dL3CIvChvc/FI4hMxSS u7dXrls0jecbvwtVoOQlSWIhoe2eZu1uDcakAbTj8ockIRiZr268s3EF4aUGKWjONcFtoO V0P99zXVNOQHlN8/gA0TMPtf18+oabFAsQ4M6Y1YKvS1xM5v/UwKPcBfz7N9+A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RSqPG6dSGz19Yt; Sat, 19 Aug 2023 20:01:06 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37JK161W094210; Sat, 19 Aug 2023 20:01:06 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37JK16bW094209; Sat, 19 Aug 2023 20:01:06 GMT (envelope-from git) Date: Sat, 19 Aug 2023 20:01:06 GMT Message-Id: <202308192001.37JK16bW094209@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org From: Enji Cooper Subject: git: 954363ea213f..a339cc353658 - vendor/NetBSD/tests - vendor branch updated List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ngie X-Git-Repository: src X-Git-Refname: refs/heads/vendor/NetBSD/tests X-Git-Reftype: branch X-Git-Commit: a339cc353658ca6abbf6ad2919a9269210475b41 X-Git-Oldrev: 954363ea213f4f1731e69850d842ad433284ed66 X-Git-Newrev: a339cc353658ca6abbf6ad2919a9269210475b41 Auto-Submitted: auto-generated The branch vendor/NetBSD/tests has been updated by ngie: URL: https://cgit.FreeBSD.org/src/log/?id=954363ea213f..a339cc353658 a339cc353658 Import new NetBSD tests snapshot From nobody Sat Aug 19 20:10:15 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RSqbq4gKdz4mQcm for ; Sat, 19 Aug 2023 20:10:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RSqbq44Ffz3FRk; Sat, 19 Aug 2023 20:10:15 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692475815; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Xvb2ga4F4TON5dPq1sDqp0SF5fNA2ugEw2eAGq4hVg0=; b=ZaYaPdNAEFx5KSh3pOJeSbX7woeIEK8MuYwbCTt2AA2gCXu/aKzM1paF+Je7Sxv3HkcAt3 32P2eqJH1OtHZS78TwnooUTdDrram+BONx/uHDNLk0AWkx1TkDF4aZR2VVG0RU9e6IbyzV yayyAviXsd97ilteEsH0ud9QwquvVgix2UbI4u5IDrdWkZPELLf3dHk0in8c7VvmRjcrIH jEehPypTFRPskaZtmOa3wVJ15UZ1cThc8astVPydMhLHxqhyHEDaEEZfqC/ONgEQvSIw8+ S1SHFZmsajtRZO/o5N1Voe/Dxe5XL52QDq22Y5EM1XrXlTBOAaBtylDkp7LObg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692475815; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=Xvb2ga4F4TON5dPq1sDqp0SF5fNA2ugEw2eAGq4hVg0=; b=k4z4T0qRPJz6wzyQIS2FqGTxMdCsZsAIoG9ZziCYKdc+tjZFFQ5cZ82ZIv+xBvBJbZIN4B 8TONu+K9AO7mufnd3dbTsiyDNuCKj1WXtGN17ZPcvWsaJ42wUGjQ6vL9lCDQlE/glhDr7M hZjR+JyRD/EGA1VtSjBpds4yhQayqtmVPeWq9v+dHtYVizyJagQSdu3EZ5xb08JoawKE/0 Xtu/6aDj4qDWkzH71ErASGeemTf3FpyT0fzCVj+KOfzw+Bre6Dux+7Ol5n5EKU0zuxBwJ+ dOvlEK2vPxpv9mHNkENtOaOz5pSkTHx4y295+ggAq+isKugr5MjyQ638F4y97g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692475815; a=rsa-sha256; cv=none; b=LQ4jv27l16hNkrHdHymHYx5lN4isCP2Cj8LXbjpUAWi9DpfHb2WN76+4GbTtrXqPUVuZ5x xnroYMM3RAvQERXWDs3Uk1S5pNEPLpB/mRHKhummfN+xcMEKsLNMvRdDRZB7SHew7IJd28 dQ6OdGjgR/W90QDBt+YOi7gPqq5/GuZ81lWXX4tU/lpfXALnvtpNWbnKIGN0xqz5TMx6t7 qU6kpsKNLFGbh/0s0uEZXIdRa4OCrVU7lhQe8uG3nc4bJsQbUxfK7Rty8Ysr2e1pKbZLoP XHLqYz4E4aTeHhxywXSQ+Kg44ihJKW+QjKUfZseEKz/V99Tn2WMnQVJh+KzxiA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RSqbq32RKz19hH; Sat, 19 Aug 2023 20:10:15 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37JKAFM5009425; Sat, 19 Aug 2023 20:10:15 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37JKAFDw009416; Sat, 19 Aug 2023 20:10:15 GMT (envelope-from git) Date: Sat, 19 Aug 2023 20:10:15 GMT Message-Id: <202308192010.37JKAFDw009416@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org From: Enji Cooper Subject: git: 8249cbf2d645 - Create tag 2023.08.19-b34f66deb02e188104 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ngie X-Git-Repository: src X-Git-Refname: refs/tags/2023.08.19-b34f66deb02e188104 X-Git-Reftype: annotated tag X-Git-Commit: 8249cbf2d6459121a51ae38741ee474dc33f1361 Auto-Submitted: auto-generated The annotated tag 2023.08.19-b34f66deb02e188104 has been created by ngie: URL: https://cgit.FreeBSD.org/src/tag/?h=2023.08.19-b34f66deb02e188104 tag 2023.08.19-b34f66deb02e188104 Tagger: Enji Cooper TaggerDate: 2023-08-20 03:10:52 +0000 Tag version obtained on 2023/08/19 (b34f66deb02e188104) commit a339cc353658ca6abbf6ad2919a9269210475b41 Author: Enji Cooper AuthorDate: 2023-08-20 03:01:28 +0000 Commit: Enji Cooper CommitDate: 2023-08-20 03:01:28 +0000 Import new NetBSD tests snapshot This change pulls down the code from CVS trunk at the noted git commit. Obtained from: https://github.com/NetBSD/src (b34f66deb02e188104) From nobody Sat Aug 19 21:49:00 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RSsnm6Ybdz4qFx1; Sat, 19 Aug 2023 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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RSsnm5l37z3NyT; Sat, 19 Aug 2023 21:49:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692481740; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=BNZTvaSaPyunDZmY15tdil8vizoNfGr3c38YcVzLqLY=; b=u0408COD3np2niKsCogcQA+JaUBYsYklhzWU7X9jOag+WlE2JD8xFigxQd2e3obC34faPt A6DY5OGZqGtE5NrpKDbECSsfIHkwPwX3CGSKHdSwSKiQPB7+BIxKlgInBAqpySavmoRpM1 gnmxp6ssYb0zzuoDlGswLr9S+f0/VAAk9hJoT4ShCeej8IbmDDWqIp4KFEKRoY0JWH68Kr 3xmfjHeTOJ02HfeWQaG48sSbbD12Ue4P5RYCqtLRV8bEIy4Gz74mrD5wiQba9COSTk5+vu sYX+knflgDJnxussBRgV4XlRbhmp+gm06V2OYJAp0r2x8hqVIfJRSUSpOx0vtA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692481740; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=BNZTvaSaPyunDZmY15tdil8vizoNfGr3c38YcVzLqLY=; b=v9RvWnvRcj0aZoLbsmIJjStTijlACgsUcUtNqaJGYbAgw0DWVaozeGGZO7Xe0Z6r4HapE+ baW4wbQNYSUosjPGsdHrCl3knZ4mRASIC3oWEntnMvr5R7leedD3yIyAqZDqT0Kbx/DNPT RwcCjo+L5v8jWIJ2U2c6UMRJeqHbRl8fYN7cPXnI2ug7FojALOJLjXZ5nIpqgeB2AsMfYx /UhaqwaMOiykT5ET/IsQV42xyCm7hIMw4NC23fUKtHHE+EvJi24C26+TT52f8aJ9Jk3oYu Zx2qqrjvL7nQWDbuu48y2HB1U5I6GLsiMvGTph50LYOGM7231jfssX5SWCaAQg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692481740; a=rsa-sha256; cv=none; b=KNhw/AOz1zCf6cCssiqB6kxJtQAqzMCpyzrwhKIVw9KMSV1sWMxRJNU8zQzYVH7OPpm1sg tH+sc5ruFRkfAbjJPKC7G3HH2qf7GrKhZOqE3z5Sbu6HMJ1v7nq5XZfyutP4elNRuMXaN7 Qjl4h28r63m3mcIVIc7gYkwaC0aPN0jCXZZkF0BUAnxMFb8KrIoQ0oiS2H67G5CHAHU/9z tbJ2/WaxZXi3NUx3Ofsl2sx8/xoiMtVUZFxeDRsDaDweO8dTcd20X/cngoe4Jihd2vVgfX n/HGBwTPxE9NEA0jq/8svo9L31Y/MJjB3377nTK4pUpfywzOy99+k8f2obwQtw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RSsnm4nk8z8G; Sat, 19 Aug 2023 21:49:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37JLn0PO067543; Sat, 19 Aug 2023 21:49:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37JLn0eV067540; Sat, 19 Aug 2023 21:49:00 GMT (envelope-from git) Date: Sat, 19 Aug 2023 21:49:00 GMT Message-Id: <202308192149.37JLn0eV067540@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Dmitry Chagin Subject: git: a129642ced9e - main - linux(4): Fix linker warning about undefined vdso symbols List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dchagin X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: a129642ced9e6ceacf98c7663bc1178eb32a78be Auto-Submitted: auto-generated The branch main has been updated by dchagin: URL: https://cgit.FreeBSD.org/src/commit/?id=a129642ced9e6ceacf98c7663bc1178eb32a78be commit a129642ced9e6ceacf98c7663bc1178eb32a78be Author: Dmitry Chagin AuthorDate: 2023-08-19 21:48:36 +0000 Commit: Dmitry Chagin CommitDate: 2023-08-19 21:48:36 +0000 linux(4): Fix linker warning about undefined vdso symbols Pointed out by: bz MFC after: 3 days --- sys/compat/linux/linux_vdso_gtod.inc | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/sys/compat/linux/linux_vdso_gtod.inc b/sys/compat/linux/linux_vdso_gtod.inc index 05f19c67022a..e508f821725d 100644 --- a/sys/compat/linux/linux_vdso_gtod.inc +++ b/sys/compat/linux/linux_vdso_gtod.inc @@ -26,6 +26,14 @@ * SUCH DAMAGE. */ +#if defined(__aarch64__) +#define __VDSO_PREFIX __kernel +#else +#define __VDSO_PREFIX __vdso +#endif + +#define __vdsoN(x) __CONCAT(__CONCAT(__VDSO_PREFIX,_),x) + static int fls(int mask) { @@ -295,7 +303,7 @@ freebsd_clock_gettime(clockid_t clock_id, struct timespec *ts) * */ int -__vdso_clock_gettime(clockid_t clock_id, struct l_timespec *lts) +__vdsoN(clock_gettime)(clockid_t clock_id, struct l_timespec *lts) { struct timespec ts; clockid_t which; @@ -312,7 +320,7 @@ __vdso_clock_gettime(clockid_t clock_id, struct l_timespec *lts) } int -__vdso_gettimeofday(l_timeval *ltv, struct timezone *tz) +__vdsoN(gettimeofday)(l_timeval *ltv, struct timezone *tz) { struct timeval tv; int error; @@ -324,7 +332,7 @@ __vdso_gettimeofday(l_timeval *ltv, struct timezone *tz) } int -__vdso_clock_getres(clockid_t clock_id, struct l_timespec *lts) +__vdsoN(clock_getres)(clockid_t clock_id, struct l_timespec *lts) { return (__vdso_clock_getres_fallback(clock_id, lts)); From nobody Sat Aug 19 21:56:22 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RSsyH0ZRYz4qGFB for ; Sat, 19 Aug 2023 21:56: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RSsyG6RGgz3Q2p; Sat, 19 Aug 2023 21:56:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692482182; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=nFqrUigRzWg4GS8YofR/hLTsYvNgMshxUAWF71iFr3I=; b=gs4lvE/Vl/uUmNi1y5/nThPn+oYk6F752FlTpRJ3zgcWefib9lKly6HxZmL+9buUcogii2 LDRGeNWFrLuRD4Jflcm9c5iMrE3PW5wlHMUTbdQBtGl3ra7xlNJ2J8PGIf2dv2MIwVxWrI Em33uT7OgHEsmDIFrDYArBY2bNlb96UsoHKdLDq9uu7s2bUmKT9UMv240oZZZZ7S7Ucrz4 0HYcoMKxgg7RHmWQbzh0rt6U83ukUqquXuZp1qSRtZRBthMr4IcR/LcOY0JH/4QEZAwmzi xGha/C5JaCkCMOvXOC8VY3nNsE9Lq87swrA0tjlN+sdHVjUKIGrO4YtBZoL9Hw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692482182; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=nFqrUigRzWg4GS8YofR/hLTsYvNgMshxUAWF71iFr3I=; b=i72I2FWJbmWjjrkpYznC57uiGfMk/ksl1J/VPMCBbgFi46tFw6XEI9xgXS9Rfs1uxACqYW D89erc1rAbmbe4ieQDEuIp2oUz59n0hpYSqjn/sD9ntX1grA9iTDXKvtcPjUftx8o7aC5k OF51r8eXwciAeiOl1ZJWhUZXuE/Af/I8NBabGt010zk9iJM0xWAjKDK9rbym36K8e9QjjH P079aPgTdSTZ5+i4ehycXUytp0JAYUTxwuzNqAkaPZkp0TS9Jv3gD16NA9HIxeAlR35hdv ODakAV4k1ya8QVheBd+5mq7/62sH960o86+20M/WFh8mpgWg4vRXN13/EkQSJA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692482182; a=rsa-sha256; cv=none; b=pB6n0QwXoGNhsY39D21UfBWxEQ3h3v2Oagnl08TIYg74pcMZ+gc/6aqu9DQvWjFLupM5r8 5sH5cXZiO1hLkwFiH6nXH/jLyWGvkb3wjCBPblYBiVj4vPiZmlPbK3EUohsK1q/YB7ie5J 7vivf8VslPgXNE7W6Lcs4sQtfDLKRMzoJyPbIiLOkyEh5KyuxT2V1FyERQFfjBxKa84aWV k3ZAB9XHaUb2n9iZouU7LpRmmadqYLglw45+cJoHl08tyyQtj3fRehhcQNUiL3qcrqClhR 2DJ1loFnFthvxF4mcvFYAhsSSajSjmeVI4Uz/ZTs5wUxg2tCIbqmIcFV9VmWlQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RSsyG5BqCzBs; Sat, 19 Aug 2023 21:56:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37JLuMGC083641; Sat, 19 Aug 2023 21:56:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37JLuMmD083640; Sat, 19 Aug 2023 21:56:22 GMT (envelope-from git) Date: Sat, 19 Aug 2023 21:56:22 GMT Message-Id: <202308192156.37JLuMmD083640@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org From: Xin LI Subject: git: e188971328b0..b37eb25116f9 - vendor/zlib - vendor branch updated List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: delphij X-Git-Repository: src X-Git-Refname: refs/heads/vendor/zlib X-Git-Reftype: branch X-Git-Commit: b37eb25116f96e418b265bc68e8e35f549e72fa8 X-Git-Oldrev: e188971328b0961d8778882dcf37ebc5dde5ced9 X-Git-Newrev: b37eb25116f96e418b265bc68e8e35f549e72fa8 Auto-Submitted: auto-generated The branch vendor/zlib has been updated by delphij: URL: https://cgit.FreeBSD.org/src/log/?id=e188971328b0..b37eb25116f9 b37eb25116f9 Vendor import of zlib 1.3. From nobody Sat Aug 19 21:56:22 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4RSsyH0qN3z4qGKK for ; Sat, 19 Aug 2023 21:56: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4RSsyH09K5z3Pjt; Sat, 19 Aug 2023 21:56:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692482183; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=op+xriIHapo/1yFFwOn2oPI28QphLQ2cPlxAGI4fuG4=; b=WGioXA7LL9zi5M2kspP1RIfjyYlmaDlcj2s8FM8nzWE+lMrjJv5tQTKPCc4XqJNdNO/7yp EoOzU9AsN8+luZwI/7Mnz6ZeTt6hOrS9awJqfqNeA7Xlf+z0ifro3fLkwP0SGomhLp5Y7G sIWh0vyyS3JNoGMnFZdyVXreLl8Tve26dxh+Rm4IaSJzaUjTcnu4haW10/l0xWrJ3+bHK0 et9CeaQJPiH6OKX6mNAkh1ad/uSzNyZfEeAqz/PoXtTNjinvlLS9qRwua/TLKxpa4ZcXkH bXKnw4CeVxPm0TFoVpoM3Am6MkY3x9jQ+y0ERTMfADQvCT3To+6BzbTe02OK2Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692482183; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=op+xriIHapo/1yFFwOn2oPI28QphLQ2cPlxAGI4fuG4=; b=SwIrYDEtE9fp9Vzdi3GmT+4bMs5jfC+/3BkuvrB0uQhv836MMYCOqnPr+pk2LCyld8B4SZ aycGr/Ax8UM5Z3c2UyP7ipSslAxzKEg7eot391jBNUWupZAjgLwE6RGsbDP1dvvQNWSx88 HsOiV0j+KUHpg10PMhv5tulwyibPxCjALI5HX50+9LB88hmAM4a3c2+Zt5iBnMBp0qBvAb lnJnNmGeVtwu19QKevU2KjrLf6UigFS000MMcY9bbq2F0/IGx86VEFY3/8jBWVWFglUuhx +aH1C1n7t40/+cX315DbuMC3Jw2Ou17MskBJuStP+nVs7n8mKn2Yl5zsscB2yQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692482183; a=rsa-sha256; cv=none; b=wFGloFDsY1UUEL97a01t+WP1Z9N2ZIJzLvBp56hn1t72EE5D2sHw9eIknxVRY/0JkPOnMD 4FedsAgAB43PCJAf3Dhn5fBK+p+FhIHM3ev09wqPkTZctaOvUZm6IbUpZp/OCJCcWRlA6I fvTQkPw6U3UtOw3DamF4JtsAPalXNXQ6WnyugQKHw4nDID6N1CuRBhSGAuzy21cpMm9D7z G/pga/RRuM5v4cxOlWNFG1aOUTqyeR3RKoxTaGDzrXDE/2FX42k5a/qJsNvhB4HCltU2/I JfO8yOHcc0/gTJELI+We/up12vmoe3daJ9IYZzR5tpdXQzS6Cb38kNJslqcJuA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4RSsyG5s6Vz6l; Sat, 19 Aug 2023 21:56:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37JLuMDj083660; Sat, 19 Aug 2023 21:56:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37JLuMfJ083659; Sat, 19 Aug 2023 21:56:22 GMT (envelope-from git) Date: Sat, 19 Aug 2023 21:56:22 GMT Message-Id: <202308192156.37JLuMfJ083659@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org From: Xin LI Subject: git: 6ee9ade1decc - Create tag vendor/zlib/1.3 List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: delphij X-Git-Repository: src X-Git-Refname: refs/tags/vendor/zlib/1.3 X-Git-Reftype: annotated tag X-Git-Commit: 6ee9ade1deccdb607555efcd42bc05653db658c4 Auto-Submitted: auto-generated The annotated tag vendor/zlib/1.3 has been created by delphij: URL: https://cgit.FreeBSD.org/src/tag/?h=vendor/zlib/1.3 tag vendor/zlib/1.3 Tagger: Xin LI TaggerDate: 2023-08-19 21:55:38 +0000 Tag zlib 1.3. commit b37eb25116f96e418b265bc68e8e35f549e72fa8 Author: Xin LI AuthorDate: 2023-08-19 21:55:24 +0000 Commit: Xin LI CommitDate: 2023-08-19 21:55:24 +0000 Vendor import of zlib 1.3.